diff options
| author |   Mark Brown <broonie@kernel.org> | 2019-08-23 12:00:22 +0100 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2019-08-23 12:00:22 +0100 |
| commit | 795227660d05e109b57896e2df1de0f012c64662 (patch) | |
| tree | 063c92088ee4c90b006a3b7e5c8f7837280694f7 /Documentation/devicetree/bindings/spi | |
| parent | spi: spi-fsl-qspi: Add ls2080a compatibility string to bindings (diff) | |
| parent | spi: spi-fsl-dspi: Exit the ISR with IRQ_NONE when it's not ours (diff) | |
| download | linux-dev-795227660d05e109b57896e2df1de0f012c64662.tar.xz linux-dev-795227660d05e109b57896e2df1de0f012c64662.zip | |
Merge branch 'spi-5.3' into spi-5.4
Diffstat (limited to 'Documentation/devicetree/bindings/spi')
| -rw-r--r-- | Documentation/devicetree/bindings/spi/spi-controller.yaml | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/Documentation/devicetree/bindings/spi/spi-controller.yaml b/Documentation/devicetree/bindings/spi/spi-controller.yaml index 876c0623f322..732339275848 100644 --- a/Documentation/devicetree/bindings/spi/spi-controller.yaml +++ b/Documentation/devicetree/bindings/spi/spi-controller.yaml @@ -31,7 +31,7 @@ properties: If that property is used, the number of chip selects will be increased automatically with max(cs-gpios, hardware chip selects). - So if, for example, the controller has 2 CS lines, and the + So if, for example, the controller has 4 CS lines, and the cs-gpios looks like this cs-gpios = <&gpio1 0 0>, <0>, <&gpio1 1 0>, <&gpio1 2 0>; @@ -73,7 +73,6 @@ patternProperties: Compatible of the SPI device. reg: - maxItems: 1 minimum: 0 maximum: 256 description: |