From: Ulf Hansson <ulf.hansson@linaro.org>
Date: Tue, 18 Mar 2014 19:36:50 +0000 (+0100)
Subject: ARM: nomadik: Convert to the common mmc DT bindings for highspeed mode
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=c1bc0e8cace46e4118e2dcbd1af5117f5938ed4c;p=linux-beck.git

ARM: nomadik: 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.

Cc: Alessandro Rubini <rubini@unipv.it>
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-nomadik-stn8815.dtsi b/arch/arm/boot/dts/ste-nomadik-stn8815.dtsi
index 5acc0449676a..d316c955bd5f 100644
--- a/arch/arm/boot/dts/ste-nomadik-stn8815.dtsi
+++ b/arch/arm/boot/dts/ste-nomadik-stn8815.dtsi
@@ -840,8 +840,8 @@
 			interrupts = <22>;
 			max-frequency = <48000000>;
 			bus-width = <4>;
-			mmc-cap-mmc-highspeed;
-			mmc-cap-sd-highspeed;
+			cap-mmc-highspeed;
+			cap-sd-highspeed;
 			cd-gpios = <&gpio3 15 0x1>;
 			cd-inverted;
 			pinctrl-names = "default";