From: Ulf Hansson <ulf.hansson@linaro.org>
Date: Tue, 18 Mar 2014 19:37:26 +0000 (+0100)
Subject: ARM: u300: Convert to the common mmc DT bindings for highspeed mode
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=2071f852bf1fb4481d613fdbe5e2439efeb06419;p=linux.git

ARM: u300: 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-u300.dts b/arch/arm/boot/dts/ste-u300.dts
index 6fe688e9e4da5..82a661677e97e 100644
--- a/arch/arm/boot/dts/ste-u300.dts
+++ b/arch/arm/boot/dts/ste-u300.dts
@@ -442,8 +442,8 @@
 			clock-names = "apb_pclk", "mclk";
 			max-frequency = <24000000>;
 			bus-width = <4>; // SD-card slot
-			mmc-cap-mmc-highspeed;
-			mmc-cap-sd-highspeed;
+			cap-mmc-highspeed;
+			cap-sd-highspeed;
 			cd-gpios = <&gpio 12 0x4>;
 			cd-inverted;
 			vmmc-supply = <&ab3100_ldo_g_reg>;