diff options
| author | Rafael J. Wysocki <rjw@sisk.pl> | 2012-07-19 01:58:24 +0400 |
|---|---|---|
| committer | Rafael J. Wysocki <rjw@sisk.pl> | 2012-07-19 01:58:24 +0400 |
| commit | 823d93640927d739f7c918b73fe5ec494fb27e17 (patch) | |
| tree | dea028ddd214541b76c1c26f5f21ddc46157e67e /Documentation/devicetree/bindings/spi/fsl-imx-cspi.txt | |
| parent | 7664e969359917ba3212c5d6efdec494eaf8586e (diff) | |
| parent | d9914cf66181b8aa0929775f5c6f675c6ebc3eb5 (diff) | |
| download | linux-823d93640927d739f7c918b73fe5ec494fb27e17.tar.xz | |
Merge branch 'fixes' into pm-sleep
The 'fixes' branch contains material the next commit depends on.
Diffstat (limited to 'Documentation/devicetree/bindings/spi/fsl-imx-cspi.txt')
| -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 { reg = <0x70010000 0x4000>; interrupts = <36>; fsl,spi-num-chipselects = <2>; - cs-gpios = <&gpio3 24 0>, /* GPIO4_24 */ - <&gpio3 25 0>; /* GPIO4_25 */ + cs-gpios = <&gpio3 24 0>, /* GPIO3_24 */ + <&gpio3 25 0>; /* GPIO3_25 */ }; |