lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

ARM: dts: imx51-babbage: fix esdhc cd/wp properties

Browse Source 
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>
This commit is contained in:
Shawn Guo
2012-08-22 21:46:39 +08:00
parent c944b0b935
commit a46d2619d7
2 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
Documentation/devicetree/bindings/mmc/fsl-imx-esdhc.txt
View File

@@ -10,8 +10,8 @@ Required properties:
- compatible : Should be "fsl,<chip>-esdhc" - compatible : Should be "fsl,<chip>-esdhc"
Optional properties: Optional properties:
- fsl,cd-internal : Indicate to use controller internal card detection - fsl,cd-controller : Indicate to use controller internal card detection
- fsl,wp-internal : Indicate to use controller internal write protection - fsl,wp-controller : Indicate to use controller internal write protection
Examples: Examples:
@@ -19,8 +19,8 @@ esdhc@70004000 {
compatible = "fsl,imx51-esdhc"; compatible = "fsl,imx51-esdhc";
reg = <0x70004000 0x4000>; reg = <0x70004000 0x4000>;
interrupts = <1>; interrupts = <1>;
fsl,cd-internal; fsl,cd-controller;
fsl,wp-internal; fsl,wp-controller;
}; };
esdhc@70008000 { esdhc@70008000 {

4
arch/arm/boot/dts/imx51-babbage.dts
View File

@@ -25,8 +25,8 @@
aips@70000000 { /* aips-1 */ aips@70000000 { /* aips-1 */
spba@70000000 { spba@70000000 {
esdhc@70004000 { /* ESDHC1 */ esdhc@70004000 { /* ESDHC1 */
fsl,cd-internal; fsl,cd-controller;
fsl,wp-internal; fsl,wp-controller;
status = "okay"; status = "okay";
}; };