ARM: dts: Move am33xx and am43xx mmc nodes to sdhci-omap driver

Move mmc nodes to be compatible with the sdhci-omap driver. The following
modifications are required for omap_hsmmc specific properties:

ti,non-removable: convert to the generic mmc non-removable
ti,needs-special-reset:  co-opted into the sdhci-omap driver
ti,dual-volt: removed. Legacy property not used in am335x or am43xx
ti,needs-special-hs-handling: removed. Legacy property not used in am335x
or am43xx

Also since the sdhci-omap driver does not support runtime PM, explicitly
disable the mmc3 instance in the dtsi.

Signed-off-by: Faiz Abbas <[email protected]>
Signed-off-by: Tony Lindgren <[email protected]>

diff --git a/arch/arm/boot/dts/am335x-baltos.dtsi b/arch/arm/boot/dts/am335x-baltos.dtsi
index 05e7b5d4a95b4e712150d7dc1ddebad9df0e266e..04f0b1227efea7b01e05780316428fac22b80411 100644 (file)
--- a/arch/arm/boot/dts/am335x-baltos.dtsi
+++ b/arch/arm/boot/dts/am335x-baltos.dtsi
@@ -369,7 +369,7 @@
 &mmc2 {
        status = "okay";
        vmmc-supply = <&wl12xx_vmmc>;
-       ti,non-removable;
+       non-removable;
        bus-width = <4>;
        cap-power-off-card;
        pinctrl-names = "default";

diff --git a/arch/arm/boot/dts/am335x-boneblack-common.dtsi b/arch/arm/boot/dts/am335x-boneblack-common.dtsi
index 91f93bc89716d68f915438e77c216bac429194f8..dd932220a8bf783a1cfbc52defbdfb9fd54d4f30 100644 (file)
--- a/arch/arm/boot/dts/am335x-boneblack-common.dtsi
+++ b/arch/arm/boot/dts/am335x-boneblack-common.dtsi
@@ -22,6 +22,7 @@
        pinctrl-0 = <&emmc_pins>;
        bus-width = <8>;
        status = "okay";
+       non-removable;
 };
 
 &am33xx_pinmux {

diff --git a/arch/arm/boot/dts/am335x-boneblack-wireless.dts b/arch/arm/boot/dts/am335x-boneblack-wireless.dts
index 3124d94c0b3cc25a7bfe71450205e2b671a107cd..e07dd7979586811e8bd38b5d9fb122af06bcad23 100644 (file)
--- a/arch/arm/boot/dts/am335x-boneblack-wireless.dts
+++ b/arch/arm/boot/dts/am335x-boneblack-wireless.dts
@@ -75,7 +75,6 @@
        bus-width = <4>;
        non-removable;
        cap-power-off-card;
-       ti,needs-special-hs-handling;
        keep-power-in-suspend;
        pinctrl-names = "default";
        pinctrl-0 = <&mmc3_pins &wl18xx_pins>;

diff --git a/arch/arm/boot/dts/am335x-boneblue.dts b/arch/arm/boot/dts/am335x-boneblue.dts
index 5811fb8d4fdfc26eff8d9821e618f48e1d564172..83f9452c9cd38348ff147dd4ba9d54d3cffa510c 100644 (file)
--- a/arch/arm/boot/dts/am335x-boneblue.dts
+++ b/arch/arm/boot/dts/am335x-boneblue.dts
@@ -367,7 +367,6 @@
        bus-width = <4>;
        non-removable;
        cap-power-off-card;
-       ti,needs-special-hs-handling;
        keep-power-in-suspend;
        pinctrl-names = "default";
        pinctrl-0 = <&mmc3_pins &wl18xx_pins>;

diff --git a/arch/arm/boot/dts/am335x-bonegreen-wireless.dts b/arch/arm/boot/dts/am335x-bonegreen-wireless.dts
index 4092cd193b8a67cc3fe5b7825667fda4ce9e4d77..609c8db687ec636f58fd5102b0a8e1c75e1a46c9 100644 (file)
--- a/arch/arm/boot/dts/am335x-bonegreen-wireless.dts
+++ b/arch/arm/boot/dts/am335x-bonegreen-wireless.dts
@@ -75,7 +75,6 @@
        bus-width = <4>;
        non-removable;
        cap-power-off-card;
-       ti,needs-special-hs-handling;
        keep-power-in-suspend;
        pinctrl-names = "default";
        pinctrl-0 = <&mmc3_pins &wl18xx_pins>;

diff --git a/arch/arm/boot/dts/am335x-evm.dts b/arch/arm/boot/dts/am335x-evm.dts
index 68252dab32c3e93f89959fb480c260f5705881fc..a4fc6b168a859f1f78651c0d7ec3737ac9ff52ac 100644 (file)
--- a/arch/arm/boot/dts/am335x-evm.dts
+++ b/arch/arm/boot/dts/am335x-evm.dts
@@ -743,8 +743,7 @@
        bus-width = <4>;
        pinctrl-names = "default";
        pinctrl-0 = <&mmc3_pins &wlan_pins>;
-       ti,non-removable;
-       ti,needs-special-hs-handling;
+       non-removable;
        cap-power-off-card;
        keep-power-in-suspend;
 

diff --git a/arch/arm/boot/dts/am335x-evmsk.dts b/arch/arm/boot/dts/am335x-evmsk.dts
index 32f515a295eeca19b157374391e9c3e41ba534b4..78b6e1f594c9b56a729b3395af728fadd01345d8 100644 (file)
--- a/arch/arm/boot/dts/am335x-evmsk.dts
+++ b/arch/arm/boot/dts/am335x-evmsk.dts
@@ -655,7 +655,7 @@
 &mmc2 {
        status = "okay";
        vmmc-supply = <&wl12xx_vmmc>;
-       ti,non-removable;
+       non-removable;
        bus-width = <4>;
        cap-power-off-card;
        keep-power-in-suspend;

diff --git a/arch/arm/boot/dts/am335x-lxm.dts b/arch/arm/boot/dts/am335x-lxm.dts
index fef582852820c583f9bbb53f156060c0a2434323..dbedf729205cd28e5f0c502106e09f2caf10d929 100644 (file)
--- a/arch/arm/boot/dts/am335x-lxm.dts
+++ b/arch/arm/boot/dts/am335x-lxm.dts
@@ -339,7 +339,7 @@
        pinctrl-0 = <&emmc_pins>;
        vmmc-supply = <&vmmcsd_fixed>;
        bus-width = <8>;
-       ti,non-removable;
+       non-removable;
        status = "okay";
 };
 

diff --git a/arch/arm/boot/dts/am335x-moxa-uc-2100-common.dtsi b/arch/arm/boot/dts/am335x-moxa-uc-2100-common.dtsi
index 6495a125c01ffaa8828f5e27b99bc02c41e1a4e4..4e90f9c23d2e57eae56d93318319fcbf78b3edef 100644 (file)
--- a/arch/arm/boot/dts/am335x-moxa-uc-2100-common.dtsi
+++ b/arch/arm/boot/dts/am335x-moxa-uc-2100-common.dtsi
@@ -159,7 +159,7 @@
        vmmc-supply = <&vmmcsd_fixed>;
        bus-width = <8>;
        pinctrl-0 = <&mmc1_pins_default>;
-       ti,non-removable;
+       non-removable;
        status = "okay";
 };
 

diff --git a/arch/arm/boot/dts/am335x-moxa-uc-8100-me-t.dts b/arch/arm/boot/dts/am335x-moxa-uc-8100-me-t.dts
index 244df9c5a53779763d22e62cd0120c17012e0d82..f03e72cada411d368e0ababc493c1623b9fe7afe 100644 (file)
--- a/arch/arm/boot/dts/am335x-moxa-uc-8100-me-t.dts
+++ b/arch/arm/boot/dts/am335x-moxa-uc-8100-me-t.dts
@@ -451,7 +451,7 @@
        vmmc-supply = <&vmmcsd_fixed>;
        bus-width = <8>;
        pinctrl-0 = <&mmc2_pins_default>;
-       ti,non-removable;
+       non-removable;
        status = "okay";
 };
 

diff --git a/arch/arm/boot/dts/am335x-pepper.dts b/arch/arm/boot/dts/am335x-pepper.dts
index 6d7608d9377bd1d6f7fea111a6a59440ca75b100..f9a027b479620c27a167c777091d2e2e681cd726 100644 (file)
--- a/arch/arm/boot/dts/am335x-pepper.dts
+++ b/arch/arm/boot/dts/am335x-pepper.dts
@@ -341,7 +341,7 @@
        pinctrl-0 = <&emmc_pins>;
        vmmc-supply = <&ldo3_reg>;
        bus-width = <8>;
-       ti,non-removable;
+       non-removable;
 };
 
 &mmc3 {
@@ -351,7 +351,7 @@
        pinctrl-0 = <&wireless_pins>;
        vmmmc-supply = <&v3v3c_reg>;
        bus-width = <4>;
-       ti,non-removable;
+       non-removable;
        dmas = <&edma_xbar 12 0 1
                &edma_xbar 13 0 2>;
        dma-names = "tx", "rx";

diff --git a/arch/arm/boot/dts/am335x-phycore-som.dtsi b/arch/arm/boot/dts/am335x-phycore-som.dtsi
index 3d0672b53d779e84b76a0e992bdcba8486d83bc7..7e46b4c027094ab38cab7b18bd8431b45a15753c 100644 (file)
--- a/arch/arm/boot/dts/am335x-phycore-som.dtsi
+++ b/arch/arm/boot/dts/am335x-phycore-som.dtsi
@@ -69,7 +69,7 @@
        pinctrl-0 = <&emmc_pins>;
        vmmc-supply = <&vmmc_reg>;
        bus-width = <8>;
-       ti,non-removable;
+       non-removable;
        status = "disabled";
 };
 

diff --git a/arch/arm/boot/dts/am33xx-l4.dtsi b/arch/arm/boot/dts/am33xx-l4.dtsi
index 5ed7f3c58c0f2bd326fa84780655ffb976fa8f27..573ff076178bc5e1024c1bf9fb091a329ae8daff 100644 (file)
--- a/arch/arm/boot/dts/am33xx-l4.dtsi
+++ b/arch/arm/boot/dts/am33xx-l4.dtsi
@@ -1337,10 +1337,8 @@
                        ranges = <0x0 0x60000 0x1000>;
 
                        mmc1: mmc@0 {
-                               compatible = "ti,omap4-hsmmc";
-                               ti,dual-volt;
+                               compatible = "ti,am335-sdhci";
                                ti,needs-special-reset;
-                               ti,needs-special-hs-handling;
                                dmas = <&edma_xbar 24 0 0
                                        &edma_xbar 25 0 0>;
                                dma-names = "tx", "rx";
@@ -1818,7 +1816,7 @@
                        ranges = <0x0 0xd8000 0x1000>;
 
                        mmc2: mmc@0 {
-                               compatible = "ti,omap4-hsmmc";
+                               compatible = "ti,am335-sdhci";
                                ti,needs-special-reset;
                                dmas = <&edma 2 0
                                        &edma 3 0>;

diff --git a/arch/arm/boot/dts/am33xx.dtsi b/arch/arm/boot/dts/am33xx.dtsi
index a35f5052d76f698d224082159a85c331f87f999f..3b9d4d2d35bf918f54c8c7a5ad37f46cdf5aac65 100644 (file)
--- a/arch/arm/boot/dts/am33xx.dtsi
+++ b/arch/arm/boot/dts/am33xx.dtsi
@@ -322,10 +322,11 @@
                        ranges = <0x0 0x47810000 0x1000>;
 
                        mmc3: mmc@0 {
-                               compatible = "ti,omap4-hsmmc";
+                               compatible = "ti,am335-sdhci";
                                ti,needs-special-reset;
                                interrupts = <29>;
                                reg = <0x0 0x1000>;
+                               status = "disabled";
                        };
                };
 

diff --git a/arch/arm/boot/dts/am4372.dtsi b/arch/arm/boot/dts/am4372.dtsi
index dba87bfaf33e6828d20348ae1c10ad714a73bb8c..092b3d4404f44d6174853ce0ca1a2a8b8929235c 100644 (file)
--- a/arch/arm/boot/dts/am4372.dtsi
+++ b/arch/arm/boot/dts/am4372.dtsi
@@ -316,10 +316,11 @@
                        ranges = <0x0 0x47810000 0x1000>;
 
                        mmc3: mmc@0 {
-                               compatible = "ti,omap4-hsmmc";
+                               compatible = "ti,am437-sdhci";
                                ti,needs-special-reset;
                                interrupts = <GIC_SPI 29 IRQ_TYPE_LEVEL_HIGH>;
                                reg = <0x0 0x1000>;
+                               status = "disabled";
                        };
                };
 

diff --git a/arch/arm/boot/dts/am437x-cm-t43.dts b/arch/arm/boot/dts/am437x-cm-t43.dts
index 063113a5da2d444ffc1b82c8e7bce7e4ffe7ceff..a6b4fca8626acbb60b3af794c541fca284668a92 100644 (file)
--- a/arch/arm/boot/dts/am437x-cm-t43.dts
+++ b/arch/arm/boot/dts/am437x-cm-t43.dts
@@ -291,7 +291,7 @@
        pinctrl-0 = <&emmc_pins>;
        vmmc-supply = <&vmmc_3v3>;
        bus-width = <8>;
-       ti,non-removable;
+       non-removable;
 };
 
 &spi0 {

diff --git a/arch/arm/boot/dts/am437x-gp-evm.dts b/arch/arm/boot/dts/am437x-gp-evm.dts
index 811c8cae315b520f445964fc07dc00e16266b5f9..cadf47ee337f3f29fdfeaae1a14847234ad94620 100644 (file)
--- a/arch/arm/boot/dts/am437x-gp-evm.dts
+++ b/arch/arm/boot/dts/am437x-gp-evm.dts
@@ -869,7 +869,7 @@
        pinctrl-names = "default", "sleep";
        pinctrl-0 = <&emmc_pins_default>;
        pinctrl-1 = <&emmc_pins_sleep>;
-       ti,non-removable;
+       non-removable;
 };
 
 &mmc3 {
@@ -886,7 +886,7 @@
        pinctrl-1 = <&mmc3_pins_sleep>;
        cap-power-off-card;
        keep-power-in-suspend;
-       ti,non-removable;
+       non-removable;
 
        #address-cells = <1>;
        #size-cells = <0>;

diff --git a/arch/arm/boot/dts/am437x-l4.dtsi b/arch/arm/boot/dts/am437x-l4.dtsi
index 49c6a872052e4e37c9a8f8e65254dcf5e9f33459..f4eb36d8b66000b8f40690efddb904c6b16ac117 100644 (file)
--- a/arch/arm/boot/dts/am437x-l4.dtsi
+++ b/arch/arm/boot/dts/am437x-l4.dtsi
@@ -1086,9 +1086,8 @@
                        ranges = <0x0 0x60000 0x1000>;
 
                        mmc1: mmc@0 {
-                               compatible = "ti,omap4-hsmmc";
+                               compatible = "ti,am437-sdhci";
                                reg = <0x0 0x1000>;
-                               ti,dual-volt;
                                ti,needs-special-reset;
                                dmas = <&edma 24 0>,
                                        <&edma 25 0>;
@@ -1601,7 +1600,7 @@
                        ranges = <0x0 0xd8000 0x1000>;
 
                        mmc2: mmc@0 {
-                               compatible = "ti,omap4-hsmmc";
+                               compatible = "ti,am437-sdhci";
                                reg = <0x0 0x1000>;
                                ti,needs-special-reset;
                                dmas = <&edma 2 0>,

diff --git a/arch/arm/boot/dts/am437x-sk-evm.dts b/arch/arm/boot/dts/am437x-sk-evm.dts
index 25222497f82854a9edbe213c144d3a9f4daa9634..2416597a4f5cf7e545d6f89783db2364244bee87 100644 (file)
--- a/arch/arm/boot/dts/am437x-sk-evm.dts
+++ b/arch/arm/boot/dts/am437x-sk-evm.dts
@@ -719,7 +719,7 @@
        pinctrl-1 = <&mmc3_pins_sleep>;
        cap-power-off-card;
        keep-power-in-suspend;
-       ti,non-removable;
+       non-removable;
 
        #address-cells = <1>;
        #size-cells = <0>;