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

[ Upstream commit 914caa22a7c47b2886cca0ffa4dd4ff58b820feb ]

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 <faiz_abbas@ti.com>
Signed-off-by: Tony Lindgren <tony@atomide.com>
Stable-dep-of: a727741cbe78 ("ARM: dts: am33xx: Fix MMCHS0 dma properties")
Signed-off-by: Sasha Levin <sashal@kernel.org>

diff --git a/arch/arm/boot/dts/am335x-baltos.dtsi b/arch/arm/boot/dts/am335x-baltos.dtsi
index ed235f263e2937efae7e46c3ef5b8f1a5e544c73..ee84155844adb37f21eca051e8384b147f63faeb 100644 (file)
--- a/arch/arm/boot/dts/am335x-baltos.dtsi
+++ b/arch/arm/boot/dts/am335x-baltos.dtsi
@@ -381,7 +381,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 2f6652ef9a1579554a257b6d051165efa1493694..30b62de86b5b16b20909ac4b2df71dfd0c9653a4 100644 (file)
--- a/arch/arm/boot/dts/am335x-boneblue.dts
+++ b/arch/arm/boot/dts/am335x-boneblue.dts
@@ -389,7 +389,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 a00145705c9bed9e353f09de61914ec146441d54..af25b42e85f4d0270660b90dd4e20b949528eb64 100644 (file)
--- a/arch/arm/boot/dts/am335x-evm.dts
+++ b/arch/arm/boot/dts/am335x-evm.dts
@@ -782,8 +782,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 e28a5b82fdf3084fbe5b502e8a97249fcbfd1568..7805b0618a4fb8b4b52800da6f67098991edb089 100644 (file)
--- a/arch/arm/boot/dts/am335x-evmsk.dts
+++ b/arch/arm/boot/dts/am335x-evmsk.dts
@@ -700,7 +700,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 a8005e975ea2404779016d42ad643cf7a08565ac..c3bfd8ed5f884271c5f51b0a6f26ab02b03b099c 100644 (file)
--- a/arch/arm/boot/dts/am335x-lxm.dts
+++ b/arch/arm/boot/dts/am335x-lxm.dts
@@ -361,7 +361,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 671d4a5da9c43ad5ae0e92ea8099c0e2a30a66e5..7749122dad71d46a22c9fbf3d781daa10e358d29 100644 (file)
--- a/arch/arm/boot/dts/am335x-moxa-uc-2100-common.dtsi
+++ b/arch/arm/boot/dts/am335x-moxa-uc-2100-common.dtsi
@@ -176,7 +176,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 783d411f2cefe77f8d681f508243491cfd0e0390..66a5c09ff388a5b76ca15f4533e16c041a432518 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
@@ -473,7 +473,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 e7764ecdf65f839ce45e9287b85bbff61bbf48bd..03852eff2b3ce343798cabff438ce3c9bb731f7d 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 7a9eb2b0d45b012f6592e9227d55158899f5f2e7..b0fe02a91c3786b4104cf58b91e721d21e4daf89 100644 (file)
--- a/arch/arm/boot/dts/am33xx-l4.dtsi
+++ b/arch/arm/boot/dts/am33xx-l4.dtsi
@@ -1333,10 +1333,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";
@@ -1827,7 +1825,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 77fa7c0f2104699660469a13136bfd5f0fbf21e3..efe36f395bdd0578da116d7382fd0942dbe0fd69 100644 (file)
--- a/arch/arm/boot/dts/am33xx.dtsi
+++ b/arch/arm/boot/dts/am33xx.dtsi
@@ -259,10 +259,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 14bbc438055fd445092c177f85afb28262c1a7d4..c5b67993743d695e61cb084b433183494c2a143e 100644 (file)
--- a/arch/arm/boot/dts/am4372.dtsi
+++ b/arch/arm/boot/dts/am4372.dtsi
@@ -250,10 +250,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 126965a34841e63c3573f8923431be4022973391..448853701d3d19055efc76da73c143c27c4b378d 100644 (file)
--- a/arch/arm/boot/dts/am437x-gp-evm.dts
+++ b/arch/arm/boot/dts/am437x-gp-evm.dts
@@ -872,7 +872,7 @@
        pinctrl-names = "default", "sleep";
        pinctrl-0 = <&emmc_pins_default>;
        pinctrl-1 = <&emmc_pins_sleep>;
-       ti,non-removable;
+       non-removable;
 };
 
 &mmc3 {
@@ -889,7 +889,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 64fdd5079d49b71e45fc3954c8c198958bf363c7..8c9e7e723fc979dc52168e48affb63188ab92e85 100644 (file)
--- a/arch/arm/boot/dts/am437x-l4.dtsi
+++ b/arch/arm/boot/dts/am437x-l4.dtsi
@@ -1104,9 +1104,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>;
@@ -1641,7 +1640,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 74eaa6a3b258c8781758a505e8b93d103f75534f..292153c6cb5d3df429f755c58f6c30713de37fd3 100644 (file)
--- a/arch/arm/boot/dts/am437x-sk-evm.dts
+++ b/arch/arm/boot/dts/am437x-sk-evm.dts
@@ -694,7 +694,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>;