ARM: dts: ux500: Flag eMMCs as non-SDIO/SD

We use the no-sdio and no-sd flags to indicate that these eMMCs
are neither, so that the operating system can skip trying to
identify them as SDIO or SD during boot, which just takes time.

Reviewed-by: Ulf Hansson <ulf.hansson@linaro.org>
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>

diff --git a/arch/arm/boot/dts/ste-href.dtsi b/arch/arm/boot/dts/ste-href.dtsi
index c97e8d29004f8983852d481a50e9770344c7be30..961f2c7274ce5e0a47f6c9d870f3a498976a4827 100644 (file)
--- a/arch/arm/boot/dts/ste-href.dtsi
+++ b/arch/arm/boot/dts/ste-href.dtsi
@@ -163,6 +163,8 @@
                        bus-width = <8>;
                        cap-mmc-highspeed;
                        non-removable;
+                       no-sdio;
+                       no-sd;
                        vmmc-supply = <&db8500_vsmps2_reg>;
                        pinctrl-names = "default", "sleep";
                        pinctrl-0 = <&mc2_a_1_default>;
@@ -178,6 +180,8 @@
                        bus-width = <8>;
                        cap-mmc-highspeed;
                        non-removable;
+                       no-sdio;
+                       no-sd;
                        vmmc-supply = <&ab8500_ldo_aux2_reg>;
                        pinctrl-names = "default", "sleep";
                        pinctrl-0 = <&mc4_a_1_default>;

diff --git a/arch/arm/boot/dts/ste-snowball.dts b/arch/arm/boot/dts/ste-snowball.dts
index 40f1d7c9c1d4cdd2b6f1aa745ae6a0c2c0674ec5..934fc788fe1dee144a51b69e0e37ab36a77e101d 100644 (file)
--- a/arch/arm/boot/dts/ste-snowball.dts
+++ b/arch/arm/boot/dts/ste-snowball.dts
@@ -267,6 +267,8 @@
                        max-frequency = <100000000>;
                        bus-width = <8>;
                        cap-mmc-highspeed;
+                       no-sdio;
+                       no-sd;
                        vmmc-supply = <&ab8500_ldo_aux2_reg>;
                        pinctrl-names = "default", "sleep";
                        pinctrl-0 = <&mc4_a_1_default>;

diff --git a/arch/arm/boot/dts/ste-ux500-samsung-gavini.dts b/arch/arm/boot/dts/ste-ux500-samsung-gavini.dts
index 251a393f85287f4f9766b51e9f61d225a158c5e3..fabc390ccb0cf13779cdb834efd34d83224f4cd8 100644 (file)
--- a/arch/arm/boot/dts/ste-ux500-samsung-gavini.dts
+++ b/arch/arm/boot/dts/ste-ux500-samsung-gavini.dts
@@ -378,6 +378,8 @@
                        non-removable;
                        cap-mmc-highspeed;
                        mmc-ddr-1_8v;
+                       no-sdio;
+                       no-sd;
                        vmmc-supply = <&ldo_3v3_reg>;
                        pinctrl-names = "default", "sleep";
                        pinctrl-0 = <&mc2_a_1_default>;

diff --git a/arch/arm/boot/dts/ste-ux500-samsung-golden.dts b/arch/arm/boot/dts/ste-ux500-samsung-golden.dts
index 40df7c61bf69e6baa15245fa3fced734a2a1eea0..ee6379ab688c1934cdfd270e49b86fdda041790a 100644 (file)
--- a/arch/arm/boot/dts/ste-ux500-samsung-golden.dts
+++ b/arch/arm/boot/dts/ste-ux500-samsung-golden.dts
@@ -145,6 +145,8 @@
                        non-removable;
                        cap-mmc-highspeed;
                        mmc-ddr-1_8v;
+                       no-sdio;
+                       no-sd;
 
                        vmmc-supply = <&vmem_3v3>;
 

diff --git a/arch/arm/boot/dts/ste-ux500-samsung-janice.dts b/arch/arm/boot/dts/ste-ux500-samsung-janice.dts
index 25af066f6f3ae384a571b8a8eb2ef31c58c2606b..a0e87046f1dafae954e845d636754950642c3c94 100644 (file)
--- a/arch/arm/boot/dts/ste-ux500-samsung-janice.dts
+++ b/arch/arm/boot/dts/ste-ux500-samsung-janice.dts
@@ -420,6 +420,8 @@
                        non-removable;
                        cap-mmc-highspeed;
                        mmc-ddr-1_8v;
+                       no-sdio;
+                       no-sd;
                        vmmc-supply = <&ldo_3v3_reg>;
                        pinctrl-names = "default", "sleep";
                        pinctrl-0 = <&mc2_a_1_default>;

diff --git a/arch/arm/boot/dts/ste-ux500-samsung-skomer.dts b/arch/arm/boot/dts/ste-ux500-samsung-skomer.dts
index 94afd7a0fe1f00bd2f288380b67364cc9d22f2e8..264f3e9b5fce52dca84f182204cde81b1e371b68 100644 (file)
--- a/arch/arm/boot/dts/ste-ux500-samsung-skomer.dts
+++ b/arch/arm/boot/dts/ste-ux500-samsung-skomer.dts
@@ -230,6 +230,8 @@
                        non-removable;
                        cap-mmc-highspeed;
                        mmc-ddr-1_8v;
+                       no-sdio;
+                       no-sd;
                        vmmc-supply = <&ldo_3v3_reg>;
                        pinctrl-names = "default", "sleep";
                        pinctrl-0 = <&mc2_a_1_default>;