Skip to content

Commit

Permalink
Merge remote-tracking branch 'spi/for-5.14' into spi-next
Browse files Browse the repository at this point in the history
  • Loading branch information
broonie committed Jun 25, 2021
2 parents edf978a + b470e10 commit 1bee1ec
Show file tree
Hide file tree
Showing 57 changed files with 1,236 additions and 849 deletions.
11 changes: 0 additions & 11 deletions Documentation/devicetree/bindings/spi/renesas,rzn1-spi.txt

This file was deleted.

6 changes: 6 additions & 0 deletions Documentation/devicetree/bindings/spi/snps,dw-apb-ssi.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -67,6 +67,12 @@ properties:
const: baikal,bt1-sys-ssi
- description: Canaan Kendryte K210 SoS SPI Controller
const: canaan,k210-spi
- description: Renesas RZ/N1 SPI Controller
items:
- enum:
- renesas,r9a06g032-spi # RZ/N1D
- renesas,r9a06g033-spi # RZ/N1S
- const: renesas,rzn1-spi # RZ/N1

reg:
minItems: 1
Expand Down
30 changes: 0 additions & 30 deletions Documentation/devicetree/bindings/spi/spi-cadence.txt

This file was deleted.

66 changes: 66 additions & 0 deletions Documentation/devicetree/bindings/spi/spi-cadence.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,66 @@
# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause)
%YAML 1.2
---
$id: http://devicetree.org/schemas/spi/spi-cadence.yaml#
$schema: http://devicetree.org/meta-schemas/core.yaml#

title: Cadence SPI controller Device Tree Bindings

maintainers:
- Michal Simek <[email protected]>

allOf:
- $ref: "spi-controller.yaml#"

properties:
compatible:
enum:
- cdns,spi-r1p6
- xlnx,zynq-spi-r1p6

reg:
maxItems: 1

interrupts:
maxItems: 1

clock-names:
items:
- const: ref_clk
- const: pclk

clocks:
maxItems: 2

num-cs:
description: |
Number of chip selects used. If a decoder is used,
this will be the number of chip selects after the
decoder.
$ref: /schemas/types.yaml#/definitions/uint32
minimum: 1
maximum: 4
default: 4

is-decoded-cs:
description: |
Flag to indicate whether decoder is used or not.
$ref: /schemas/types.yaml#/definitions/uint32
enum: [ 0, 1 ]
default: 0

unevaluatedProperties: false

examples:
- |
spi@e0007000 {
compatible = "xlnx,zynq-spi-r1p6";
clock-names = "ref_clk", "pclk";
clocks = <&clkc 26>, <&clkc 35>;
interrupt-parent = <&intc>;
interrupts = <0 49 4>;
num-cs = <4>;
is-decoded-cs = <0>;
reg = <0xe0007000 0x1000>;
};
...
7 changes: 5 additions & 2 deletions Documentation/devicetree/bindings/spi/spi-controller.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -114,8 +114,11 @@ patternProperties:
Compatible of the SPI device.

reg:
minimum: 0
maximum: 256
minItems: 1
maxItems: 256
items:
minimum: 0
maximum: 256
description:
Chip select used by the device.

Expand Down
1 change: 1 addition & 0 deletions Documentation/devicetree/bindings/spi/spi-rockchip.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,7 @@ properties:
- rockchip,rk3328-spi
- rockchip,rk3368-spi
- rockchip,rk3399-spi
- rockchip,rv1126-spi
- const: rockchip,rk3066-spi

reg:
Expand Down
23 changes: 0 additions & 23 deletions Documentation/devicetree/bindings/spi/spi-xilinx.txt

This file was deleted.

57 changes: 57 additions & 0 deletions Documentation/devicetree/bindings/spi/spi-xilinx.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,57 @@
# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause)
%YAML 1.2
---
$id: http://devicetree.org/schemas/spi/spi-xilinx.yaml#
$schema: http://devicetree.org/meta-schemas/core.yaml#

title: Xilinx SPI controller Device Tree Bindings

maintainers:
- Michal Simek <[email protected]>

allOf:
- $ref: "spi-controller.yaml#"

properties:
compatible:
enum:
- xlnx,xps-spi-2.00.a
- xlnx,xps-spi-2.00.b
- xlnx,axi-quad-spi-1.00.a

reg:
maxItems: 1

interrupts:
maxItems: 1

xlnx,num-ss-bits:
description: Number of chip selects used.
$ref: /schemas/types.yaml#/definitions/uint32
minimum: 1
maximum: 32

xlnx,num-transfer-bits:
description: Number of bits per transfer. This will be 8 if not specified.
$ref: /schemas/types.yaml#/definitions/uint32
enum: [8, 16, 32]
default: 8

required:
- compatible
- reg
- interrupts

unevaluatedProperties: false

examples:
- |
spi0: spi@41e00000 {
compatible = "xlnx,xps-spi-2.00.a";
interrupt-parent = <&intc>;
interrupts = <0 31 1>;
reg = <0x41e00000 0x10000>;
xlnx,num-ss-bits = <0x1>;
xlnx,num-transfer-bits = <32>;
};
...
25 changes: 0 additions & 25 deletions Documentation/devicetree/bindings/spi/spi-zynqmp-qspi.txt

This file was deleted.

51 changes: 51 additions & 0 deletions Documentation/devicetree/bindings/spi/spi-zynqmp-qspi.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,51 @@
# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause)
%YAML 1.2
---
$id: http://devicetree.org/schemas/spi/spi-zynqmp-qspi.yaml#
$schema: http://devicetree.org/meta-schemas/core.yaml#

title: Xilinx Zynq UltraScale+ MPSoC GQSPI controller Device Tree Bindings

maintainers:
- Michal Simek <[email protected]>

allOf:
- $ref: "spi-controller.yaml#"

properties:
compatible:
const: xlnx,zynqmp-qspi-1.0

reg:
maxItems: 2

interrupts:
maxItems: 1

clock-names:
items:
- const: ref_clk
- const: pclk

clocks:
maxItems: 2

unevaluatedProperties: false

examples:
- |
#include <dt-bindings/clock/xlnx-zynqmp-clk.h>
soc {
#address-cells = <2>;
#size-cells = <2>;
qspi: spi@ff0f0000 {
compatible = "xlnx,zynqmp-qspi-1.0";
clocks = <&zynqmp_clk QSPI_REF>, <&zynqmp_clk LPD_LSBUS>;
clock-names = "ref_clk", "pclk";
interrupts = <0 15 4>;
interrupt-parent = <&gic>;
reg = <0x0 0xff0f0000 0x0 0x1000>,
<0x0 0xc0000000 0x0 0x8000000>;
};
};
Loading

0 comments on commit 1bee1ec

Please sign in to comment.