Commit 45ea75eb authored by Kishon Vijay Abraham I's avatar Kishon Vijay Abraham I Committed by Tony Lindgren

ARM: dts: omap*: Replace deprecated "vmmc_aux" with "vqmmc"

Replace deprecated "vmmc_aux" with the generic "vqmmc" binding for
MMC IO supply.
Signed-off-by: default avatarKishon Vijay Abraham I <kishon@ti.com>
Signed-off-by: default avatarTony Lindgren <tony@atomide.com>
parent c002c278
...@@ -79,7 +79,7 @@ &extcon_usb2 { ...@@ -79,7 +79,7 @@ &extcon_usb2 {
&mmc1 { &mmc1 {
status = "okay"; status = "okay";
vmmc-supply = <&v3_3d>; vmmc-supply = <&v3_3d>;
vmmc_aux-supply = <&ldo1_reg>; vqmmc-supply = <&ldo1_reg>;
bus-width = <4>; bus-width = <4>;
cd-gpios = <&gpio6 27 0>; /* gpio 219 */ cd-gpios = <&gpio6 27 0>; /* gpio 219 */
}; };
......
...@@ -446,7 +446,7 @@ &mmc1 { ...@@ -446,7 +446,7 @@ &mmc1 {
pinctrl-names = "default"; pinctrl-names = "default";
pinctrl-0 = <&mmc1_pins_default>; pinctrl-0 = <&mmc1_pins_default>;
vmmc-supply = <&evm_3v3_sd>; vmmc-supply = <&evm_3v3_sd>;
vmmc_aux-supply = <&ldo1_reg>; vqmmc-supply = <&ldo1_reg>;
bus-width = <4>; bus-width = <4>;
/* /*
* SDCD signal is not being used here - using the fact that GPIO mode * SDCD signal is not being used here - using the fact that GPIO mode
......
...@@ -172,7 +172,7 @@ p0 { ...@@ -172,7 +172,7 @@ p0 {
}; };
&mmc1 { &mmc1 {
vmmc_aux-supply = <&vpo_sd_1v8_3v3>; vqmmc-supply = <&vpo_sd_1v8_3v3>;
}; };
&mmc2 { &mmc2 {
......
...@@ -146,5 +146,5 @@ &dss { ...@@ -146,5 +146,5 @@ &dss {
}; };
&mmc1 { &mmc1 {
vmmc_aux-supply = <&ldo1_reg>; vqmmc-supply = <&ldo1_reg>;
}; };
...@@ -299,7 +299,7 @@ &i2c3 { ...@@ -299,7 +299,7 @@ &i2c3 {
&mmc1 { &mmc1 {
vmmc-supply = <&vmmc1>; vmmc-supply = <&vmmc1>;
vmmc_aux-supply = <&vsim>; vqmmc-supply = <&vsim>;
bus-width = <8>; bus-width = <8>;
}; };
......
...@@ -283,7 +283,7 @@ &i2c3 { ...@@ -283,7 +283,7 @@ &i2c3 {
&mmc1 { &mmc1 {
vmmc-supply = <&vmmc1>; vmmc-supply = <&vmmc1>;
vmmc_aux-supply = <&vsim>; vqmmc-supply = <&vsim>;
bus-width = <8>; bus-width = <8>;
}; };
......
...@@ -129,7 +129,7 @@ &mmc2 { ...@@ -129,7 +129,7 @@ &mmc2 {
pinctrl-names = "default"; pinctrl-names = "default";
pinctrl-0 = <&mmc2_pins>; pinctrl-0 = <&mmc2_pins>;
vmmc-supply = <&wl12xx_vmmc2>; vmmc-supply = <&wl12xx_vmmc2>;
vmmc_aux-supply = <&wl12xx_vaux2>; vqmmc-supply = <&wl12xx_vaux2>;
non-removable; non-removable;
bus-width = <4>; bus-width = <4>;
cap-power-off-card; cap-power-off-card;
......
...@@ -69,7 +69,7 @@ &mmc2 { ...@@ -69,7 +69,7 @@ &mmc2 {
pinctrl-names = "default"; pinctrl-names = "default";
pinctrl-0 = <&mmc2_pins>; pinctrl-0 = <&mmc2_pins>;
vmmc-supply = <&wl12xx_vmmc2>; vmmc-supply = <&wl12xx_vmmc2>;
vmmc_aux-supply = <&wl12xx_vaux2>; vqmmc-supply = <&wl12xx_vaux2>;
non-removable; non-removable;
bus-width = <4>; bus-width = <4>;
cap-power-off-card; cap-power-off-card;
......
...@@ -149,7 +149,7 @@ &i2c3 { ...@@ -149,7 +149,7 @@ &i2c3 {
&mmc1 { &mmc1 {
vmmc-supply = <&vmmc1>; vmmc-supply = <&vmmc1>;
vmmc_aux-supply = <&vsim>; vqmmc-supply = <&vsim>;
bus-width = <8>; bus-width = <8>;
}; };
......
...@@ -115,7 +115,7 @@ tsc2046@0 { ...@@ -115,7 +115,7 @@ tsc2046@0 {
&mmc1 { &mmc1 {
interrupts-extended = <&intc 83 &omap3_pmx_core 0x11a>; interrupts-extended = <&intc 83 &omap3_pmx_core 0x11a>;
vmmc-supply = <&vmmc1>; vmmc-supply = <&vmmc1>;
vmmc_aux-supply = <&vsim>; vqmmc-supply = <&vsim>;
bus-width = <8>; bus-width = <8>;
}; };
......
...@@ -741,7 +741,7 @@ &mmc2 { ...@@ -741,7 +741,7 @@ &mmc2 {
pinctrl-names = "default"; pinctrl-names = "default";
pinctrl-0 = <&mmc2_pins>; pinctrl-0 = <&mmc2_pins>;
vmmc-supply = <&vaux3>; vmmc-supply = <&vaux3>;
vmmc_aux-supply = <&vsim>; vqmmc-supply = <&vsim>;
bus-width = <8>; bus-width = <8>;
non-removable; non-removable;
no-sdio; no-sdio;
......
...@@ -181,7 +181,7 @@ &mmc2 { ...@@ -181,7 +181,7 @@ &mmc2 {
pinctrl-names = "default"; pinctrl-names = "default";
pinctrl-0 = <&mmc2_pins>; pinctrl-0 = <&mmc2_pins>;
vmmc-supply = <&w3cbw003c_npoweron>; vmmc-supply = <&w3cbw003c_npoweron>;
vmmc_aux-supply = <&w3cbw003c_wifi_nreset>; vqmmc-supply = <&w3cbw003c_wifi_nreset>;
bus-width = <4>; bus-width = <4>;
cap-sdio-irq; cap-sdio-irq;
non-removable; non-removable;
......
...@@ -223,7 +223,7 @@ &mmc1 { ...@@ -223,7 +223,7 @@ &mmc1 {
pinctrl-names = "default"; pinctrl-names = "default";
pinctrl-0 = <&mmc1_pins>; pinctrl-0 = <&mmc1_pins>;
vmmc-supply = <&vmmc1>; vmmc-supply = <&vmmc1>;
vmmc_aux-supply = <&vsim>; vqmmc-supply = <&vsim>;
cd-gpios = <&twl_gpio 0 GPIO_ACTIVE_HIGH>; cd-gpios = <&twl_gpio 0 GPIO_ACTIVE_HIGH>;
bus-width = <8>; bus-width = <8>;
}; };
......
...@@ -174,7 +174,7 @@ &twl_gpio { ...@@ -174,7 +174,7 @@ &twl_gpio {
&mmc1 { &mmc1 {
vmmc-supply = <&vmmc1>; vmmc-supply = <&vmmc1>;
vmmc_aux-supply = <&vsim>; vqmmc-supply = <&vsim>;
bus-width = <4>; bus-width = <4>;
pinctrl-names = "default"; pinctrl-names = "default";
pinctrl-0 = <&mmc1_pins>; pinctrl-0 = <&mmc1_pins>;
......
...@@ -33,7 +33,7 @@ twl: twl@48 { ...@@ -33,7 +33,7 @@ twl: twl@48 {
&mmc1 { &mmc1 {
vmmc-supply = <&vmmc1>; vmmc-supply = <&vmmc1>;
vmmc_aux-supply = <&vsim>; vqmmc-supply = <&vsim>;
/* /*
* S6-3 must be in ON position for 8 bit mode to function * S6-3 must be in ON position for 8 bit mode to function
* Else, use 4 bit mode * Else, use 4 bit mode
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment