forked from torvalds/linux
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge remote-tracking branch 'spi/for-5.14' into spi-next
- Loading branch information
Showing
57 changed files
with
1,236 additions
and
849 deletions.
There are no files selected for viewing
11 changes: 0 additions & 11 deletions
11
Documentation/devicetree/bindings/spi/renesas,rzn1-spi.txt
This file was deleted.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file was deleted.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
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>; | ||
}; | ||
... |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file was deleted.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
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>; | ||
}; | ||
... |
This file was deleted.
Oops, something went wrong.
51 changes: 51 additions & 0 deletions
51
Documentation/devicetree/bindings/spi/spi-zynqmp-qspi.yaml
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
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>; | ||
}; | ||
}; |
Oops, something went wrong.