summaryrefslogtreecommitdiff
path: root/Documentation/devicetree/bindings/mfd
diff options
context:
space:
mode:
authorMark Brown <broonie@opensource.wolfsonmicro.com>2012-07-16 00:49:21 +0400
committerMark Brown <broonie@opensource.wolfsonmicro.com>2012-07-16 00:49:21 +0400
commitd5b2e30bdc695a1735b3c970e1f9738e9ca3dbf0 (patch)
tree79e832eb50d3b416bdada4903b2a2e2fefcc2800 /Documentation/devicetree/bindings/mfd
parent7c7fac30581b2fe2e0783d9b6f53ca333cc2296c (diff)
parent84a1caf1453c3d44050bd22db958af4a7f99315c (diff)
downloadlinux-d5b2e30bdc695a1735b3c970e1f9738e9ca3dbf0.tar.xz
Merge tag 'v3.5-rc7' into regulator-drivers
Linux 3.5-rc7
Diffstat (limited to 'Documentation/devicetree/bindings/mfd')
-rw-r--r--Documentation/devicetree/bindings/mfd/mc13xxx.txt4
1 files changed, 2 insertions, 2 deletions
diff --git a/Documentation/devicetree/bindings/mfd/mc13xxx.txt b/Documentation/devicetree/bindings/mfd/mc13xxx.txt
index 19f6af47a792..baf07987ae68 100644
--- a/Documentation/devicetree/bindings/mfd/mc13xxx.txt
+++ b/Documentation/devicetree/bindings/mfd/mc13xxx.txt
@@ -46,8 +46,8 @@ Examples:
ecspi@70010000 { /* ECSPI1 */
fsl,spi-num-chipselects = <2>;
- cs-gpios = <&gpio3 24 0>, /* GPIO4_24 */
- <&gpio3 25 0>; /* GPIO4_25 */
+ cs-gpios = <&gpio4 24 0>, /* GPIO4_24 */
+ <&gpio4 25 0>; /* GPIO4_25 */
status = "okay";
pmic: mc13892@0 {