ARM: ux500: Add SDI (MMC) support to the HREF Device Tree
authorLee Jones <lee.jones@linaro.org>
Fri, 14 Sep 2012 14:27:41 +0000 (15:27 +0100)
committerLee Jones <lee.jones@linaro.org>
Thu, 1 Nov 2012 11:59:29 +0000 (12:59 +0100)
Here we add the Device Tree nodes which are required to successfully
probe the MMCI driver which will enable the four cards available on
ST-Ericsson's HREF hardware development platform.

Acked-by: Linus Walleij <linus.walleij@linaro.org>
Signed-off-by: Lee Jones <lee.jones@linaro.org>
arch/arm/boot/dts/hrefv60plus.dts
arch/arm/mach-ux500/board-mop500.c

index e221320423e3cfc17bdd031bcf26290cf619f09a..3fd83c695a5c95708f3d86f4a4228b13d7439b5c 100644 (file)
                        };
                };
 
+               // 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";
 
index e7dd757a79fb0b99c6cdb70da45a7c5c44583359..d141dd03d2ea8c098a0243306959f9d77e8a8be6 100644 (file)
@@ -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);