ARM: ux500: Convert to the common mmc DT bindings for highspeed mode

The mmci host driver supports the common mmc DT parser, which enables
us to use the use common names instead.

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

diff --git a/arch/arm/boot/dts/ste-ccu9540.dts b/arch/arm/boot/dts/ste-ccu9540.dts
index 229508750890f53644f72c5c068f74ae29b3dab6..651c56d400a416e4056208b0ddd2b9963aaa2daa 100644 (file)
--- a/arch/arm/boot/dts/ste-ccu9540.dts
+++ b/arch/arm/boot/dts/ste-ccu9540.dts
@@ -38,8 +38,8 @@
                        arm,primecell-periphid = <0x10480180>;
                        max-frequency = <100000000>;
                        bus-width = <4>;
-                       mmc-cap-sd-highspeed;
-                       mmc-cap-mmc-highspeed;
+                       cap-sd-highspeed;
+                       cap-mmc-highspeed;
                        vmmc-supply = <&ab8500_ldo_aux3_reg>;
 
                        cd-gpios  = <&gpio7 6 0x4>; // 230
@@ -63,7 +63,7 @@
                        arm,primecell-periphid = <0x10480180>;
                        max-frequency = <100000000>;
                        bus-width = <8>;
-                       mmc-cap-mmc-highspeed;
+                       cap-mmc-highspeed;
                        vmmc-supply = <&ab8500_ldo_aux2_reg>;
 
                        status = "okay";

diff --git a/arch/arm/boot/dts/ste-href.dtsi b/arch/arm/boot/dts/ste-href.dtsi
index 46dce428b2943ef1ae5dbd92cf67dcb5540281f2..3f07c587960027ca1f6a0299849e9378fde709bf 100644 (file)
--- a/arch/arm/boot/dts/ste-href.dtsi
+++ b/arch/arm/boot/dts/ste-href.dtsi
@@ -116,8 +116,8 @@
                        arm,primecell-periphid = <0x10480180>;
                        max-frequency = <100000000>;
                        bus-width = <4>;
-                       mmc-cap-sd-highspeed;
-                       mmc-cap-mmc-highspeed;
+                       cap-sd-highspeed;
+                       cap-mmc-highspeed;
                        st,sig-dir-dat0;
                        st,sig-dir-dat2;
                        st,sig-dir-cmd;
@@ -148,7 +148,7 @@
                        arm,primecell-periphid = <0x10480180>;
                        max-frequency = <100000000>;
                        bus-width = <8>;
-                       mmc-cap-mmc-highspeed;
+                       cap-mmc-highspeed;
                        pinctrl-names = "default", "sleep";
                        pinctrl-0 = <&sdi2_default_mode>;
                        pinctrl-1 = <&sdi2_sleep_mode>;
@@ -161,7 +161,7 @@
                        arm,primecell-periphid = <0x10480180>;
                        max-frequency = <100000000>;
                        bus-width = <8>;
-                       mmc-cap-mmc-highspeed;
+                       cap-mmc-highspeed;
                        vmmc-supply = <&ab8500_ldo_aux2_reg>;
                        pinctrl-names = "default", "sleep";
                        pinctrl-0 = <&sdi4_default_mode>;

diff --git a/arch/arm/boot/dts/ste-snowball.dts b/arch/arm/boot/dts/ste-snowball.dts
index a2f632d0be2a2da510d2f7e430e19f157c0f0dfa..474ef83229cd9b368a9604205d9e8c8a42c68972 100644 (file)
--- a/arch/arm/boot/dts/ste-snowball.dts
+++ b/arch/arm/boot/dts/ste-snowball.dts
@@ -156,7 +156,7 @@
                        arm,primecell-periphid = <0x10480180>;
                        max-frequency = <100000000>;
                        bus-width = <4>;
-                       mmc-cap-mmc-highspeed;
+                       cap-mmc-highspeed;
                        vmmc-supply = <&ab8500_ldo_aux3_reg>;
                        vqmmc-supply = <&vmmci>;
                        pinctrl-names = "default", "sleep";
@@ -195,7 +195,7 @@
                        arm,primecell-periphid = <0x10480180>;
                        max-frequency = <100000000>;
                        bus-width = <8>;
-                       mmc-cap-mmc-highspeed;
+                       cap-mmc-highspeed;
                        vmmc-supply = <&ab8500_ldo_aux2_reg>;
                        pinctrl-names = "default", "sleep";
                        pinctrl-0 = <&sdi4_default_mode>;