diff options
author | Arnd Bergmann <arnd@arndb.de> | 2012-07-18 00:25:03 +0400 |
---|---|---|
committer | Arnd Bergmann <arnd@arndb.de> | 2012-07-18 00:25:03 +0400 |
commit | 45bcc91aca328ba33f39cd711cf70b46ddd41ba0 (patch) | |
tree | e2cf2730ea8181e61b04f57760c49f0c13772669 /Documentation/devicetree/bindings/mmc | |
parent | f923c8e887d6eed9f14937b8e09a8f5a7d5941d5 (diff) | |
parent | 0da47184eafe0eb3ddb1340a70f8a150b477b6a0 (diff) | |
download | linux-45bcc91aca328ba33f39cd711cf70b46ddd41ba0.tar.xz |
Merge branch 'clps711x/cleanup' into next/cleanup
Patches from Alexander Shiyan <shc_work@mail.ru>:
* clps711x/cleanup:
ARM: clps711x: Remove the setting of the time
ARM: clps711x: Removed superfluous transform virt_to_bus and related functions
ARM: clps711x/p720t: Replace __initcall by .init_early call
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Diffstat (limited to 'Documentation/devicetree/bindings/mmc')
-rw-r--r-- | Documentation/devicetree/bindings/mmc/fsl-imx-esdhc.txt | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Documentation/devicetree/bindings/mmc/fsl-imx-esdhc.txt b/Documentation/devicetree/bindings/mmc/fsl-imx-esdhc.txt index c7e404b3ef05..fea541ee8b34 100644 --- a/Documentation/devicetree/bindings/mmc/fsl-imx-esdhc.txt +++ b/Documentation/devicetree/bindings/mmc/fsl-imx-esdhc.txt @@ -29,6 +29,6 @@ esdhc@70008000 { compatible = "fsl,imx51-esdhc"; reg = <0x70008000 0x4000>; interrupts = <2>; - cd-gpios = <&gpio0 6 0>; /* GPIO1_6 */ - wp-gpios = <&gpio0 5 0>; /* GPIO1_5 */ + cd-gpios = <&gpio1 6 0>; /* GPIO1_6 */ + wp-gpios = <&gpio1 5 0>; /* GPIO1_5 */ }; |