aboutsummaryrefslogtreecommitdiffstats
path: root/arch/arm/boot/dts
diff options
context:
space:
mode:
authorArnd Bergmann <arnd@arndb.de>2012-05-13 00:14:24 -0400
committerArnd Bergmann <arnd@arndb.de>2012-05-15 07:29:42 -0400
commit7f217794ffa72f208a250b79ab0b7ea3de19677f (patch)
treee158792f6662bc7cad4e55a62f4efe7426215141 /arch/arm/boot/dts
parente6511df4f25607e2e6d60062eb69c28c057329fa (diff)
mmc: dt: Consolidate DT bindings
This patch unifies the current DT MMC bindings documentation and code, adds generic MMC DT bindings documentation, and updates .dts files for consistency. [cjb: typo fixes, addition of max-frequency property] Signed-off-by: Chris Ball <cjb@laptop.org> Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Diffstat (limited to 'arch/arm/boot/dts')
-rw-r--r--arch/arm/boot/dts/imx53-smd.dts4
-rw-r--r--arch/arm/boot/dts/imx6q-arm2.dts2
-rw-r--r--arch/arm/boot/dts/omap3-beagle.dts2
-rw-r--r--arch/arm/boot/dts/omap4-panda.dts4
-rw-r--r--arch/arm/boot/dts/omap4-sdp.dts6
-rw-r--r--arch/arm/boot/dts/tegra-cardhu.dts2
-rw-r--r--arch/arm/boot/dts/tegra-harmony.dts2
-rw-r--r--arch/arm/boot/dts/tegra-paz00.dts2
-rw-r--r--arch/arm/boot/dts/tegra-seaboard.dts2
-rw-r--r--arch/arm/boot/dts/tegra-ventana.dts2
10 files changed, 19 insertions, 9 deletions
diff --git a/arch/arm/boot/dts/imx53-smd.dts b/arch/arm/boot/dts/imx53-smd.dts
index c7ee86c2dfb..139138a556b 100644
--- a/arch/arm/boot/dts/imx53-smd.dts
+++ b/arch/arm/boot/dts/imx53-smd.dts
@@ -35,7 +35,7 @@
35 }; 35 };
36 36
37 esdhc@50008000 { /* ESDHC2 */ 37 esdhc@50008000 { /* ESDHC2 */
38 fsl,card-wired; 38 non-removable;
39 status = "okay"; 39 status = "okay";
40 }; 40 };
41 41
@@ -76,7 +76,7 @@
76 }; 76 };
77 77
78 esdhc@50020000 { /* ESDHC3 */ 78 esdhc@50020000 { /* ESDHC3 */
79 fsl,card-wired; 79 non-removable;
80 status = "okay"; 80 status = "okay";
81 }; 81 };
82 }; 82 };
diff --git a/arch/arm/boot/dts/imx6q-arm2.dts b/arch/arm/boot/dts/imx6q-arm2.dts
index ce1c8238c89..d2eaf521c9f 100644
--- a/arch/arm/boot/dts/imx6q-arm2.dts
+++ b/arch/arm/boot/dts/imx6q-arm2.dts
@@ -41,7 +41,7 @@
41 }; 41 };
42 42
43 usdhc@0219c000 { /* uSDHC4 */ 43 usdhc@0219c000 { /* uSDHC4 */
44 fsl,card-wired; 44 non-removable;
45 vmmc-supply = <&reg_3p3v>; 45 vmmc-supply = <&reg_3p3v>;
46 status = "okay"; 46 status = "okay";
47 }; 47 };
diff --git a/arch/arm/boot/dts/omap3-beagle.dts b/arch/arm/boot/dts/omap3-beagle.dts
index 8c756be4d7a..5b4506c0a8c 100644
--- a/arch/arm/boot/dts/omap3-beagle.dts
+++ b/arch/arm/boot/dts/omap3-beagle.dts
@@ -57,7 +57,7 @@
57&mmc1 { 57&mmc1 {
58 vmmc-supply = <&vmmc1>; 58 vmmc-supply = <&vmmc1>;
59 vmmc_aux-supply = <&vsim>; 59 vmmc_aux-supply = <&vsim>;
60 ti,bus-width = <8>; 60 bus-width = <8>;
61}; 61};
62 62
63&mmc2 { 63&mmc2 {
diff --git a/arch/arm/boot/dts/omap4-panda.dts b/arch/arm/boot/dts/omap4-panda.dts
index ea6f5bb8a12..31fb4218d3a 100644
--- a/arch/arm/boot/dts/omap4-panda.dts
+++ b/arch/arm/boot/dts/omap4-panda.dts
@@ -55,7 +55,7 @@
55 55
56&mmc1 { 56&mmc1 {
57 vmmc-supply = <&vmmc>; 57 vmmc-supply = <&vmmc>;
58 ti,bus-width = <8>; 58 bus-width = <8>;
59}; 59};
60 60
61&mmc2 { 61&mmc2 {
@@ -72,5 +72,5 @@
72 72
73&mmc5 { 73&mmc5 {
74 ti,non-removable; 74 ti,non-removable;
75 ti,bus-width = <4>; 75 bus-width = <4>;
76}; 76};
diff --git a/arch/arm/boot/dts/omap4-sdp.dts b/arch/arm/boot/dts/omap4-sdp.dts
index 67b2e98074c..a1dd873425f 100644
--- a/arch/arm/boot/dts/omap4-sdp.dts
+++ b/arch/arm/boot/dts/omap4-sdp.dts
@@ -94,12 +94,12 @@
94 94
95&mmc1 { 95&mmc1 {
96 vmmc-supply = <&vmmc>; 96 vmmc-supply = <&vmmc>;
97 ti,bus-width = <8>; 97 bus-width = <8>;
98}; 98};
99 99
100&mmc2 { 100&mmc2 {
101 vmmc-supply = <&vaux1>; 101 vmmc-supply = <&vaux1>;
102 ti,bus-width = <8>; 102 bus-width = <8>;
103 ti,non-removable; 103 ti,non-removable;
104}; 104};
105 105
@@ -112,6 +112,6 @@
112}; 112};
113 113
114&mmc5 { 114&mmc5 {
115 ti,bus-width = <4>; 115 bus-width = <4>;
116 ti,non-removable; 116 ti,non-removable;
117}; 117};
diff --git a/arch/arm/boot/dts/tegra-cardhu.dts b/arch/arm/boot/dts/tegra-cardhu.dts
index ac3fb755845..67c6511f637 100644
--- a/arch/arm/boot/dts/tegra-cardhu.dts
+++ b/arch/arm/boot/dts/tegra-cardhu.dts
@@ -54,6 +54,7 @@
54 cd-gpios = <&gpio 69 0>; /* gpio PI5 */ 54 cd-gpios = <&gpio 69 0>; /* gpio PI5 */
55 wp-gpios = <&gpio 155 0>; /* gpio PT3 */ 55 wp-gpios = <&gpio 155 0>; /* gpio PT3 */
56 power-gpios = <&gpio 31 0>; /* gpio PD7 */ 56 power-gpios = <&gpio 31 0>; /* gpio PD7 */
57 bus-width = <4>;
57 }; 58 };
58 59
59 sdhci@78000200 { 60 sdhci@78000200 {
@@ -66,5 +67,6 @@
66 67
67 sdhci@78000400 { 68 sdhci@78000400 {
68 support-8bit; 69 support-8bit;
70 bus-width = <8>;
69 }; 71 };
70}; 72};
diff --git a/arch/arm/boot/dts/tegra-harmony.dts b/arch/arm/boot/dts/tegra-harmony.dts
index 6e8447dc020..e9cae68861d 100644
--- a/arch/arm/boot/dts/tegra-harmony.dts
+++ b/arch/arm/boot/dts/tegra-harmony.dts
@@ -100,6 +100,7 @@
100 cd-gpios = <&gpio 69 0>; /* gpio PI5 */ 100 cd-gpios = <&gpio 69 0>; /* gpio PI5 */
101 wp-gpios = <&gpio 57 0>; /* gpio PH1 */ 101 wp-gpios = <&gpio 57 0>; /* gpio PH1 */
102 power-gpios = <&gpio 155 0>; /* gpio PT3 */ 102 power-gpios = <&gpio 155 0>; /* gpio PT3 */
103 bus-width = <4>;
103 }; 104 };
104 105
105 sdhci@c8000400 { 106 sdhci@c8000400 {
@@ -111,5 +112,6 @@
111 wp-gpios = <&gpio 59 0>; /* gpio PH3 */ 112 wp-gpios = <&gpio 59 0>; /* gpio PH3 */
112 power-gpios = <&gpio 70 0>; /* gpio PI6 */ 113 power-gpios = <&gpio 70 0>; /* gpio PI6 */
113 support-8bit; 114 support-8bit;
115 bus-width = <8>;
114 }; 116 };
115}; 117};
diff --git a/arch/arm/boot/dts/tegra-paz00.dts b/arch/arm/boot/dts/tegra-paz00.dts
index 6c02abb469d..03d3d7994da 100644
--- a/arch/arm/boot/dts/tegra-paz00.dts
+++ b/arch/arm/boot/dts/tegra-paz00.dts
@@ -97,6 +97,7 @@
97 cd-gpios = <&gpio 173 0>; /* gpio PV5 */ 97 cd-gpios = <&gpio 173 0>; /* gpio PV5 */
98 wp-gpios = <&gpio 57 0>; /* gpio PH1 */ 98 wp-gpios = <&gpio 57 0>; /* gpio PH1 */
99 power-gpios = <&gpio 169 0>; /* gpio PV1 */ 99 power-gpios = <&gpio 169 0>; /* gpio PV1 */
100 bus-width = <4>;
100 }; 101 };
101 102
102 sdhci@c8000200 { 103 sdhci@c8000200 {
@@ -109,6 +110,7 @@
109 110
110 sdhci@c8000600 { 111 sdhci@c8000600 {
111 support-8bit; 112 support-8bit;
113 bus-width = <8>;
112 }; 114 };
113 115
114 gpio-keys { 116 gpio-keys {
diff --git a/arch/arm/boot/dts/tegra-seaboard.dts b/arch/arm/boot/dts/tegra-seaboard.dts
index dbf1c5a171c..8decf722997 100644
--- a/arch/arm/boot/dts/tegra-seaboard.dts
+++ b/arch/arm/boot/dts/tegra-seaboard.dts
@@ -104,10 +104,12 @@
104 cd-gpios = <&gpio 69 0>; /* gpio PI5 */ 104 cd-gpios = <&gpio 69 0>; /* gpio PI5 */
105 wp-gpios = <&gpio 57 0>; /* gpio PH1 */ 105 wp-gpios = <&gpio 57 0>; /* gpio PH1 */
106 power-gpios = <&gpio 70 0>; /* gpio PI6 */ 106 power-gpios = <&gpio 70 0>; /* gpio PI6 */
107 bus-width = <4>;
107 }; 108 };
108 109
109 sdhci@c8000600 { 110 sdhci@c8000600 {
110 support-8bit; 111 support-8bit;
112 bus-width = <8>;
111 }; 113 };
112 114
113 usb@c5000000 { 115 usb@c5000000 {
diff --git a/arch/arm/boot/dts/tegra-ventana.dts b/arch/arm/boot/dts/tegra-ventana.dts
index 2dcff8728e9..29e54c7a365 100644
--- a/arch/arm/boot/dts/tegra-ventana.dts
+++ b/arch/arm/boot/dts/tegra-ventana.dts
@@ -100,9 +100,11 @@
100 cd-gpios = <&gpio 69 0>; /* gpio PI5 */ 100 cd-gpios = <&gpio 69 0>; /* gpio PI5 */
101 wp-gpios = <&gpio 57 0>; /* gpio PH1 */ 101 wp-gpios = <&gpio 57 0>; /* gpio PH1 */
102 power-gpios = <&gpio 70 0>; /* gpio PI6 */ 102 power-gpios = <&gpio 70 0>; /* gpio PI6 */
103 bus-width = <4>;
103 }; 104 };
104 105
105 sdhci@c8000600 { 106 sdhci@c8000600 {
106 support-8bit; 107 support-8bit;
108 bus-width = <8>;
107 }; 109 };
108}; 110};
generated by cgit v1.2.2 (git 2.25.0) at 2024-10-22 13:53:04 -0400