summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKishon Vijay Abraham I2017-06-07 00:46:34 -0500
committerKishon Vijay Abraham I2017-08-01 09:30:56 -0500
commit1d99d34165d3b5d9fbf001301986ae76da7f8ede (patch)
tree6fe35aec28e6945e4697812384cd267af9f53276
parentf396f4f9a769130517aba7509fc7d3e420759dbd (diff)
downloadlinux-phy-mainline_master.tar.gz
linux-phy-mainline_master.tar.xz
linux-phy-mainline_master.zip
ARM: dts: omap*: Replace deprecated "vmmc_aux" with "vqmmc"mainline_master
Replace deprecated "vmmc_aux" with the generic "vqmmc" binding for MMC IO supply. Signed-off-by: Kishon Vijay Abraham I <kishon@ti.com>
-rw-r--r--arch/arm/boot/dts/am572x-idk.dts2
-rw-r--r--arch/arm/boot/dts/dra7-evm.dts2
-rw-r--r--arch/arm/boot/dts/dra71-evm.dts2
-rw-r--r--arch/arm/boot/dts/dra72-evm-tps65917.dtsi2
-rw-r--r--arch/arm/boot/dts/omap3-beagle-xm.dts2
-rw-r--r--arch/arm/boot/dts/omap3-beagle.dts2
-rw-r--r--arch/arm/boot/dts/omap3-cm-t3517.dts2
-rw-r--r--arch/arm/boot/dts/omap3-cm-t3730.dts2
-rw-r--r--arch/arm/boot/dts/omap3-devkit8000-common.dtsi2
-rw-r--r--arch/arm/boot/dts/omap3-evm-common.dtsi2
-rw-r--r--arch/arm/boot/dts/omap3-igep.dtsi2
-rw-r--r--arch/arm/boot/dts/omap3-n900.dts2
-rw-r--r--arch/arm/boot/dts/omap3-overo-base.dtsi2
-rw-r--r--arch/arm/boot/dts/omap3-tao3530.dtsi2
-rw-r--r--arch/arm/boot/dts/omap3-zoom3.dts2
-rw-r--r--arch/arm/boot/dts/omap3430-sdp.dts2
16 files changed, 16 insertions, 16 deletions
diff --git a/arch/arm/boot/dts/am572x-idk.dts b/arch/arm/boot/dts/am572x-idk.dts
index 9da6d83ca185..21383924a947 100644
--- a/arch/arm/boot/dts/am572x-idk.dts
+++ b/arch/arm/boot/dts/am572x-idk.dts
@@ -79,7 +79,7 @@
79&mmc1 { 79&mmc1 {
80 status = "okay"; 80 status = "okay";
81 vmmc-supply = <&v3_3d>; 81 vmmc-supply = <&v3_3d>;
82 vmmc_aux-supply = <&ldo1_reg>; 82 vqmmc-supply = <&ldo1_reg>;
83 bus-width = <4>; 83 bus-width = <4>;
84 cd-gpios = <&gpio6 27 0>; /* gpio 219 */ 84 cd-gpios = <&gpio6 27 0>; /* gpio 219 */
85}; 85};
diff --git a/arch/arm/boot/dts/dra7-evm.dts b/arch/arm/boot/dts/dra7-evm.dts
index 9491b29cf7e5..343872acdd29 100644
--- a/arch/arm/boot/dts/dra7-evm.dts
+++ b/arch/arm/boot/dts/dra7-evm.dts
@@ -446,7 +446,7 @@
446 pinctrl-names = "default"; 446 pinctrl-names = "default";
447 pinctrl-0 = <&mmc1_pins_default>; 447 pinctrl-0 = <&mmc1_pins_default>;
448 vmmc-supply = <&evm_3v3_sd>; 448 vmmc-supply = <&evm_3v3_sd>;
449 vmmc_aux-supply = <&ldo1_reg>; 449 vqmmc-supply = <&ldo1_reg>;
450 bus-width = <4>; 450 bus-width = <4>;
451 /* 451 /*
452 * SDCD signal is not being used here - using the fact that GPIO mode 452 * SDCD signal is not being used here - using the fact that GPIO mode
diff --git a/arch/arm/boot/dts/dra71-evm.dts b/arch/arm/boot/dts/dra71-evm.dts
index c7a56b6263a6..02c11e658810 100644
--- a/arch/arm/boot/dts/dra71-evm.dts
+++ b/arch/arm/boot/dts/dra71-evm.dts
@@ -172,7 +172,7 @@
172}; 172};
173 173
174&mmc1 { 174&mmc1 {
175 vmmc_aux-supply = <&vpo_sd_1v8_3v3>; 175 vqmmc-supply = <&vpo_sd_1v8_3v3>;
176}; 176};
177 177
178&mmc2 { 178&mmc2 {
diff --git a/arch/arm/boot/dts/dra72-evm-tps65917.dtsi b/arch/arm/boot/dts/dra72-evm-tps65917.dtsi
index e6df676886c0..57bfe5caf5e4 100644
--- a/arch/arm/boot/dts/dra72-evm-tps65917.dtsi
+++ b/arch/arm/boot/dts/dra72-evm-tps65917.dtsi
@@ -146,5 +146,5 @@
146}; 146};
147 147
148&mmc1 { 148&mmc1 {
149 vmmc_aux-supply = <&ldo1_reg>; 149 vqmmc-supply = <&ldo1_reg>;
150}; 150};
diff --git a/arch/arm/boot/dts/omap3-beagle-xm.dts b/arch/arm/boot/dts/omap3-beagle-xm.dts
index 673cee2234b2..683b96a8f73e 100644
--- a/arch/arm/boot/dts/omap3-beagle-xm.dts
+++ b/arch/arm/boot/dts/omap3-beagle-xm.dts
@@ -299,7 +299,7 @@
299 299
300&mmc1 { 300&mmc1 {
301 vmmc-supply = <&vmmc1>; 301 vmmc-supply = <&vmmc1>;
302 vmmc_aux-supply = <&vsim>; 302 vqmmc-supply = <&vsim>;
303 bus-width = <8>; 303 bus-width = <8>;
304}; 304};
305 305
diff --git a/arch/arm/boot/dts/omap3-beagle.dts b/arch/arm/boot/dts/omap3-beagle.dts
index 4be85ce59dd1..4d2eaf843fa9 100644
--- a/arch/arm/boot/dts/omap3-beagle.dts
+++ b/arch/arm/boot/dts/omap3-beagle.dts
@@ -283,7 +283,7 @@
283 283
284&mmc1 { 284&mmc1 {
285 vmmc-supply = <&vmmc1>; 285 vmmc-supply = <&vmmc1>;
286 vmmc_aux-supply = <&vsim>; 286 vqmmc-supply = <&vsim>;
287 bus-width = <8>; 287 bus-width = <8>;
288}; 288};
289 289
diff --git a/arch/arm/boot/dts/omap3-cm-t3517.dts b/arch/arm/boot/dts/omap3-cm-t3517.dts
index 53ae04f9104d..3d293b345e99 100644
--- a/arch/arm/boot/dts/omap3-cm-t3517.dts
+++ b/arch/arm/boot/dts/omap3-cm-t3517.dts
@@ -129,7 +129,7 @@
129 pinctrl-names = "default"; 129 pinctrl-names = "default";
130 pinctrl-0 = <&mmc2_pins>; 130 pinctrl-0 = <&mmc2_pins>;
131 vmmc-supply = <&wl12xx_vmmc2>; 131 vmmc-supply = <&wl12xx_vmmc2>;
132 vmmc_aux-supply = <&wl12xx_vaux2>; 132 vqmmc-supply = <&wl12xx_vaux2>;
133 non-removable; 133 non-removable;
134 bus-width = <4>; 134 bus-width = <4>;
135 cap-power-off-card; 135 cap-power-off-card;
diff --git a/arch/arm/boot/dts/omap3-cm-t3730.dts b/arch/arm/boot/dts/omap3-cm-t3730.dts
index 2294f5b0aa10..bdf4b7fdda39 100644
--- a/arch/arm/boot/dts/omap3-cm-t3730.dts
+++ b/arch/arm/boot/dts/omap3-cm-t3730.dts
@@ -69,7 +69,7 @@
69 pinctrl-names = "default"; 69 pinctrl-names = "default";
70 pinctrl-0 = <&mmc2_pins>; 70 pinctrl-0 = <&mmc2_pins>;
71 vmmc-supply = <&wl12xx_vmmc2>; 71 vmmc-supply = <&wl12xx_vmmc2>;
72 vmmc_aux-supply = <&wl12xx_vaux2>; 72 vqmmc-supply = <&wl12xx_vaux2>;
73 non-removable; 73 non-removable;
74 bus-width = <4>; 74 bus-width = <4>;
75 cap-power-off-card; 75 cap-power-off-card;
diff --git a/arch/arm/boot/dts/omap3-devkit8000-common.dtsi b/arch/arm/boot/dts/omap3-devkit8000-common.dtsi
index 82aa9c4a0f1c..0c0bb1b01b0b 100644
--- a/arch/arm/boot/dts/omap3-devkit8000-common.dtsi
+++ b/arch/arm/boot/dts/omap3-devkit8000-common.dtsi
@@ -149,7 +149,7 @@
149 149
150&mmc1 { 150&mmc1 {
151 vmmc-supply = <&vmmc1>; 151 vmmc-supply = <&vmmc1>;
152 vmmc_aux-supply = <&vsim>; 152 vqmmc-supply = <&vsim>;
153 bus-width = <8>; 153 bus-width = <8>;
154}; 154};
155 155
diff --git a/arch/arm/boot/dts/omap3-evm-common.dtsi b/arch/arm/boot/dts/omap3-evm-common.dtsi
index 2b1d6977a535..ff35803088e3 100644
--- a/arch/arm/boot/dts/omap3-evm-common.dtsi
+++ b/arch/arm/boot/dts/omap3-evm-common.dtsi
@@ -115,7 +115,7 @@
115&mmc1 { 115&mmc1 {
116 interrupts-extended = <&intc 83 &omap3_pmx_core 0x11a>; 116 interrupts-extended = <&intc 83 &omap3_pmx_core 0x11a>;
117 vmmc-supply = <&vmmc1>; 117 vmmc-supply = <&vmmc1>;
118 vmmc_aux-supply = <&vsim>; 118 vqmmc-supply = <&vsim>;
119 bus-width = <8>; 119 bus-width = <8>;
120}; 120};
121 121
diff --git a/arch/arm/boot/dts/omap3-igep.dtsi b/arch/arm/boot/dts/omap3-igep.dtsi
index 4ad7d5565906..677adc1dbef3 100644
--- a/arch/arm/boot/dts/omap3-igep.dtsi
+++ b/arch/arm/boot/dts/omap3-igep.dtsi
@@ -217,7 +217,7 @@
217 pinctrl-names = "default"; 217 pinctrl-names = "default";
218 pinctrl-0 = <&mmc1_pins>; 218 pinctrl-0 = <&mmc1_pins>;
219 vmmc-supply = <&vmmc1>; 219 vmmc-supply = <&vmmc1>;
220 vmmc_aux-supply = <&vsim>; 220 vqmmc-supply = <&vsim>;
221 bus-width = <4>; 221 bus-width = <4>;
222 cd-gpios = <&twl_gpio 0 GPIO_ACTIVE_LOW>; 222 cd-gpios = <&twl_gpio 0 GPIO_ACTIVE_LOW>;
223}; 223};
diff --git a/arch/arm/boot/dts/omap3-n900.dts b/arch/arm/boot/dts/omap3-n900.dts
index 49f37084e435..92c1f4ac4040 100644
--- a/arch/arm/boot/dts/omap3-n900.dts
+++ b/arch/arm/boot/dts/omap3-n900.dts
@@ -741,7 +741,7 @@
741 pinctrl-names = "default"; 741 pinctrl-names = "default";
742 pinctrl-0 = <&mmc2_pins>; 742 pinctrl-0 = <&mmc2_pins>;
743 vmmc-supply = <&vaux3>; 743 vmmc-supply = <&vaux3>;
744 vmmc_aux-supply = <&vsim>; 744 vqmmc-supply = <&vsim>;
745 bus-width = <8>; 745 bus-width = <8>;
746 non-removable; 746 non-removable;
747 no-sdio; 747 no-sdio;
diff --git a/arch/arm/boot/dts/omap3-overo-base.dtsi b/arch/arm/boot/dts/omap3-overo-base.dtsi
index cd220342a805..f25e158e7163 100644
--- a/arch/arm/boot/dts/omap3-overo-base.dtsi
+++ b/arch/arm/boot/dts/omap3-overo-base.dtsi
@@ -181,7 +181,7 @@
181 pinctrl-names = "default"; 181 pinctrl-names = "default";
182 pinctrl-0 = <&mmc2_pins>; 182 pinctrl-0 = <&mmc2_pins>;
183 vmmc-supply = <&w3cbw003c_npoweron>; 183 vmmc-supply = <&w3cbw003c_npoweron>;
184 vmmc_aux-supply = <&w3cbw003c_wifi_nreset>; 184 vqmmc-supply = <&w3cbw003c_wifi_nreset>;
185 bus-width = <4>; 185 bus-width = <4>;
186 cap-sdio-irq; 186 cap-sdio-irq;
187 non-removable; 187 non-removable;
diff --git a/arch/arm/boot/dts/omap3-tao3530.dtsi b/arch/arm/boot/dts/omap3-tao3530.dtsi
index 06ac0f80bcf0..9a601d15247b 100644
--- a/arch/arm/boot/dts/omap3-tao3530.dtsi
+++ b/arch/arm/boot/dts/omap3-tao3530.dtsi
@@ -223,7 +223,7 @@
223 pinctrl-names = "default"; 223 pinctrl-names = "default";
224 pinctrl-0 = <&mmc1_pins>; 224 pinctrl-0 = <&mmc1_pins>;
225 vmmc-supply = <&vmmc1>; 225 vmmc-supply = <&vmmc1>;
226 vmmc_aux-supply = <&vsim>; 226 vqmmc-supply = <&vsim>;
227 cd-gpios = <&twl_gpio 0 GPIO_ACTIVE_HIGH>; 227 cd-gpios = <&twl_gpio 0 GPIO_ACTIVE_HIGH>;
228 bus-width = <8>; 228 bus-width = <8>;
229}; 229};
diff --git a/arch/arm/boot/dts/omap3-zoom3.dts b/arch/arm/boot/dts/omap3-zoom3.dts
index 45e2ce0803de..96d0301a336a 100644
--- a/arch/arm/boot/dts/omap3-zoom3.dts
+++ b/arch/arm/boot/dts/omap3-zoom3.dts
@@ -174,7 +174,7 @@
174 174
175&mmc1 { 175&mmc1 {
176 vmmc-supply = <&vmmc1>; 176 vmmc-supply = <&vmmc1>;
177 vmmc_aux-supply = <&vsim>; 177 vqmmc-supply = <&vsim>;
178 bus-width = <4>; 178 bus-width = <4>;
179 pinctrl-names = "default"; 179 pinctrl-names = "default";
180 pinctrl-0 = <&mmc1_pins>; 180 pinctrl-0 = <&mmc1_pins>;
diff --git a/arch/arm/boot/dts/omap3430-sdp.dts b/arch/arm/boot/dts/omap3430-sdp.dts
index abd6921143be..908951eb5943 100644
--- a/arch/arm/boot/dts/omap3430-sdp.dts
+++ b/arch/arm/boot/dts/omap3430-sdp.dts
@@ -33,7 +33,7 @@
33 33
34&mmc1 { 34&mmc1 {
35 vmmc-supply = <&vmmc1>; 35 vmmc-supply = <&vmmc1>;
36 vmmc_aux-supply = <&vsim>; 36 vqmmc-supply = <&vsim>;
37 /* 37 /*
38 * S6-3 must be in ON position for 8 bit mode to function 38 * S6-3 must be in ON position for 8 bit mode to function
39 * Else, use 4 bit mode 39 * Else, use 4 bit mode