summaryrefslogtreecommitdiffstats
path: root/Documentation
diff options
context:
space:
mode:
authorRalf Baechle <ralf@linux-mips.org>2012-09-27 18:09:12 +0200
committerRalf Baechle <ralf@linux-mips.org>2012-09-27 18:09:12 +0200
commit73d155b304575435cd9f6deeb93fbd4d2a6cc9af (patch)
tree2acffa77ef49f321cd85c68e0a4c427c5eb5f089 /Documentation
parent35a041e77ab5faad7916b8f77fae0b34b9fa7878 (diff)
parenta0aa4577ec579eb230557b85d721fd019ea69e02 (diff)
downloadtalos-op-linux-73d155b304575435cd9f6deeb93fbd4d2a6cc9af.tar.gz
talos-op-linux-73d155b304575435cd9f6deeb93fbd4d2a6cc9af.zip
Merge branch 'ath79' of git://dev.phrozen.org/mips-next into mips-for-linux-next
Diffstat (limited to 'Documentation')
-rw-r--r--Documentation/devicetree/bindings/mmc/fsl-imx-esdhc.txt8
1 files changed, 4 insertions, 4 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:
- compatible : Should be "fsl,<chip>-esdhc"
Optional properties:
-- fsl,cd-internal : Indicate to use controller internal card detection
-- fsl,wp-internal : Indicate to use controller internal write protection
+- fsl,cd-controller : Indicate to use controller internal card detection
+- fsl,wp-controller : Indicate to use controller internal write protection
Examples:
@@ -19,8 +19,8 @@ esdhc@70004000 {
compatible = "fsl,imx51-esdhc";
reg = <0x70004000 0x4000>;
interrupts = <1>;
- fsl,cd-internal;
- fsl,wp-internal;
+ fsl,cd-controller;
+ fsl,wp-controller;
};
esdhc@70008000 {
OpenPOWER on IntegriCloud