diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2012-07-10 08:05:56 -0400 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2012-07-12 11:35:42 -0400 |
| commit | 14d597b74aed3c44af0ee8f5ea24b970a50aec99 (patch) | |
| tree | 7cd25aa0621ccc82dd2b613656e74aacdf4afdde /Documentation/devicetree/bindings/spi | |
| parent | 8caec0d048609ccf8c75025b0d73af10f74e2157 (diff) | |
| parent | bd0a521e88aa7a06ae7aabaed7ae196ed4ad867a (diff) | |
Merge tag 'v3.5-rc6' into next/dt
New pull requests are based on Linux 3.5-rc6
Diffstat (limited to 'Documentation/devicetree/bindings/spi')
| -rw-r--r-- | Documentation/devicetree/bindings/spi/fsl-imx-cspi.txt | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Documentation/devicetree/bindings/spi/fsl-imx-cspi.txt b/Documentation/devicetree/bindings/spi/fsl-imx-cspi.txt index 9841057d112b..4256a6df9b79 100644 --- a/Documentation/devicetree/bindings/spi/fsl-imx-cspi.txt +++ b/Documentation/devicetree/bindings/spi/fsl-imx-cspi.txt | |||
| @@ -17,6 +17,6 @@ ecspi@70010000 { | |||
| 17 | reg = <0x70010000 0x4000>; | 17 | reg = <0x70010000 0x4000>; |
| 18 | interrupts = <36>; | 18 | interrupts = <36>; |
| 19 | fsl,spi-num-chipselects = <2>; | 19 | fsl,spi-num-chipselects = <2>; |
| 20 | cs-gpios = <&gpio3 24 0>, /* GPIO4_24 */ | 20 | cs-gpios = <&gpio3 24 0>, /* GPIO3_24 */ |
| 21 | <&gpio3 25 0>; /* GPIO4_25 */ | 21 | <&gpio3 25 0>; /* GPIO3_25 */ |
| 22 | }; | 22 | }; |