diff options
author | Shawn Guo <shawn.guo@linaro.org> | 2012-08-22 09:46:39 -0400 |
---|---|---|
committer | Shawn Guo <shawn.guo@linaro.org> | 2012-08-23 09:10:23 -0400 |
commit | a46d2619d7180bda12bad2bf15bbd0731dfc2dcf (patch) | |
tree | 875e06d81f33070d7bd247c734d9677cf636f488 | |
parent | c944b0b9354ea06ffb0c8a7178949f1185f9f499 (diff) |
ARM: dts: imx51-babbage: fix esdhc cd/wp properties
The binding doc and dts use properties "fsl,{cd,wp}-internal" while
esdhc driver uses "fsl,{cd,wp}-controller". Fix binding doc and dts
to get them match driver code.
Reported-by: Chris Ball <cjb@laptop.org>
Signed-off-by: Shawn Guo <shawn.guo@linaro.org>
Cc: <stable@vger.kernel.org>
Acked-by: Chris Ball <cjb@laptop.org>
-rw-r--r-- | Documentation/devicetree/bindings/mmc/fsl-imx-esdhc.txt | 8 | ||||
-rw-r--r-- | arch/arm/boot/dts/imx51-babbage.dts | 4 |
2 files changed, 6 insertions, 6 deletions
diff --git a/Documentation/devicetree/bindings/mmc/fsl-imx-esdhc.txt b/Documentation/devicetree/bindings/mmc/fsl-imx-esdhc.txt index 70cd49b1caa8..1dd622546d06 100644 --- a/Documentation/devicetree/bindings/mmc/fsl-imx-esdhc.txt +++ b/Documentation/devicetree/bindings/mmc/fsl-imx-esdhc.txt | |||
@@ -10,8 +10,8 @@ Required properties: | |||
10 | - compatible : Should be "fsl,<chip>-esdhc" | 10 | - compatible : Should be "fsl,<chip>-esdhc" |
11 | 11 | ||
12 | Optional properties: | 12 | Optional properties: |
13 | - fsl,cd-internal : Indicate to use controller internal card detection | 13 | - fsl,cd-controller : Indicate to use controller internal card detection |
14 | - fsl,wp-internal : Indicate to use controller internal write protection | 14 | - fsl,wp-controller : Indicate to use controller internal write protection |
15 | 15 | ||
16 | Examples: | 16 | Examples: |
17 | 17 | ||
@@ -19,8 +19,8 @@ esdhc@70004000 { | |||
19 | compatible = "fsl,imx51-esdhc"; | 19 | compatible = "fsl,imx51-esdhc"; |
20 | reg = <0x70004000 0x4000>; | 20 | reg = <0x70004000 0x4000>; |
21 | interrupts = <1>; | 21 | interrupts = <1>; |
22 | fsl,cd-internal; | 22 | fsl,cd-controller; |
23 | fsl,wp-internal; | 23 | fsl,wp-controller; |
24 | }; | 24 | }; |
25 | 25 | ||
26 | esdhc@70008000 { | 26 | esdhc@70008000 { |
diff --git a/arch/arm/boot/dts/imx51-babbage.dts b/arch/arm/boot/dts/imx51-babbage.dts index cd86177a3ea2..59d9789e5508 100644 --- a/arch/arm/boot/dts/imx51-babbage.dts +++ b/arch/arm/boot/dts/imx51-babbage.dts | |||
@@ -25,8 +25,8 @@ | |||
25 | aips@70000000 { /* aips-1 */ | 25 | aips@70000000 { /* aips-1 */ |
26 | spba@70000000 { | 26 | spba@70000000 { |
27 | esdhc@70004000 { /* ESDHC1 */ | 27 | esdhc@70004000 { /* ESDHC1 */ |
28 | fsl,cd-internal; | 28 | fsl,cd-controller; |
29 | fsl,wp-internal; | 29 | fsl,wp-controller; |
30 | status = "okay"; | 30 | status = "okay"; |
31 | }; | 31 | }; |
32 | 32 | ||