From 061ba59ce37dd2a64ab126fd9bf889b53457885d Mon Sep 17 00:00:00 2001
From: Lee Jones <lee.jones@linaro.org>
Date: Fri, 14 Sep 2012 15:27:41 +0100
Subject: [PATCH] --- yaml --- r: 342167 b: refs/heads/master c:
 706b0a07ec3251063cca9a7912f6228ec892f44a h: refs/heads/master i:   342165:
 89c4601d95bbd3eaf57b425355af371d6da24ae9   342163:
 66e687a6b7750ae78a77dcea8cade71bc05966cb   342159:
 5d4916ff61b1abef313df18bbc2728d8602a23aa v: v3

---
 [refs]                                   |  2 +-
 trunk/arch/arm/boot/dts/hrefv60plus.dts  | 44 ++++++++++++++++++++++++
 trunk/arch/arm/mach-ux500/board-mop500.c |  1 -
 3 files changed, 45 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 8383f183cc9f..d3bdcbe12ae5 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 81bf8c2e0f473c443bb067a55f55e6311adf5993
+refs/heads/master: 706b0a07ec3251063cca9a7912f6228ec892f44a
diff --git a/trunk/arch/arm/boot/dts/hrefv60plus.dts b/trunk/arch/arm/boot/dts/hrefv60plus.dts
index e221320423e3..3fd83c695a5c 100644
--- a/trunk/arch/arm/boot/dts/hrefv60plus.dts
+++ b/trunk/arch/arm/boot/dts/hrefv60plus.dts
@@ -77,6 +77,50 @@
 			};
 		};
 
+		// External Micro SD slot
+		sdi0_per1@80126000 {
+			arm,primecell-periphid = <0x10480180>;
+			max-frequency = <50000000>;
+			bus-width = <4>;
+			mmc-cap-sd-highspeed;
+			mmc-cap-mmc-highspeed;
+			vmmc-supply = <&ab8500_ldo_aux3_reg>;
+
+			cd-gpios  = <&tc3589x_gpio 3 0x4>;
+
+			status = "okay";
+		};
+
+		// WLAN SDIO channel
+		sdi1_per2@80118000 {
+			arm,primecell-periphid = <0x10480180>;
+			max-frequency = <50000000>;
+			bus-width = <4>;
+
+			status = "okay";
+		};
+
+		// PoP:ed eMMC
+		sdi2_per3@80005000 {
+			arm,primecell-periphid = <0x10480180>;
+			max-frequency = <50000000>;
+			bus-width = <8>;
+			mmc-cap-mmc-highspeed;
+
+			status = "okay";
+		};
+
+		// On-board eMMC
+		sdi4_per2@80114000 {
+			arm,primecell-periphid = <0x10480180>;
+		        max-frequency = <50000000>;
+			bus-width = <8>;
+			mmc-cap-mmc-highspeed;
+			vmmc-supply = <&ab8500_ldo_aux2_reg>;
+
+			status = "okay";
+		};
+
 		sound {
 			compatible = "stericsson,snd-soc-mop500";
 
diff --git a/trunk/arch/arm/mach-ux500/board-mop500.c b/trunk/arch/arm/mach-ux500/board-mop500.c
index e7dd757a79fb..d141dd03d2ea 100644
--- a/trunk/arch/arm/mach-ux500/board-mop500.c
+++ b/trunk/arch/arm/mach-ux500/board-mop500.c
@@ -800,7 +800,6 @@ static void __init u8500_init_machine(void)
 		platform_add_devices(mop500_platform_devs,
 				ARRAY_SIZE(mop500_platform_devs));
 
-		mop500_sdi_init(parent);
 		mop500_audio_init(parent);
 		i2c0_devs = ARRAY_SIZE(mop500_i2c0_devices);
 		i2c_register_board_info(0, mop500_i2c0_devices, i2c0_devs);