powerpc/44x/fsp2: Enable eMMC arasan for fsp2 platform

Add mmc0 changes for enabling arasan emmc and change
defconfig appropriately.

Signed-off-by: Ivan Mikhaylov <ivan@de.ibm.com>
Signed-off-by: Michael Ellerman <mpe@ellerman.id.au>

diff --git a/arch/powerpc/boot/dts/fsp2.dts b/arch/powerpc/boot/dts/fsp2.dts
index 475953ada7072c80d67e379af736220677a7b496..f10a64aeb83bd64046b0147f33e9a71baf174f18 100644 (file)
--- a/arch/powerpc/boot/dts/fsp2.dts
+++ b/arch/powerpc/boot/dts/fsp2.dts
@@ -52,6 +52,7 @@
        clocks {
                mmc_clk: mmc_clk {
                        compatible = "fixed-clock";
+                       #clock-cells = <0>;
                        clock-frequency = <50000000>;
                        clock-output-names = "mmc_clk";
                };
@@ -359,20 +360,6 @@
                interrupts = <31 0x4 15 0x84>;
        };
 
-       mmc0: sdhci@020c0000 {
-               compatible      = "st,sdhci-stih407", "st,sdhci";
-               status          = "disabled";
-               reg             = <0x020c0000 0x20000>;
-               reg-names       = "mmc";
-               interrupt-parent = <&UIC1_3>;
-               interrupts      = <21 0x4 22 0x4>;
-               interrupt-names = "mmcirq";
-               pinctrl-names   = "default";
-               pinctrl-0       = <>;
-               clock-names     = "mmc";
-               clocks          = <&mmc_clk>;
-       };
-
        plb6 {
                compatible = "ibm,plb6";
                #address-cells = <2>;
@@ -501,6 +488,24 @@
                                         /*RXDE*/  4 &UIC1_2 13 0x4>;
                };
 
+               mmc0: mmc@20c0000 {
+                       compatible      = "st,sdhci-stih407", "st,sdhci";
+                       reg             = <0x020c0000 0x20000>;
+                       reg-names       = "mmc";
+                       interrupts      = <21 0x4>;
+                       interrupt-parent = <&UIC1_3>;
+                       interrupt-names = "mmcirq";
+                       pinctrl-names   = "default";
+                       pinctrl-0       = <>;
+                       clock-names     = "mmc";
+                       clocks          = <&mmc_clk>;
+                       bus-width       = <4>;
+                       non-removable;
+                       sd-uhs-sdr50;
+                       sd-uhs-sdr104;
+                       sd-uhs-ddr50;
+               };
+
                opb {
                        compatible = "ibm,opb";
                        #address-cells = <1>;

diff --git a/arch/powerpc/configs/44x/fsp2_defconfig b/arch/powerpc/configs/44x/fsp2_defconfig
index e8e6a69998527e0567768146e3688c633576fc3f..935aabe488c1f3672e934f920c315d0702b518a5 100644 (file)
--- a/arch/powerpc/configs/44x/fsp2_defconfig
+++ b/arch/powerpc/configs/44x/fsp2_defconfig
@@ -92,8 +92,10 @@ CONFIG_MMC_DEBUG=y
 CONFIG_MMC_SDHCI=y
 CONFIG_MMC_SDHCI_PLTFM=y
 CONFIG_MMC_SDHCI_OF_ARASAN=y
+CONFIG_MMC_SDHCI_ST=y
 CONFIG_RTC_CLASS=y
 CONFIG_RTC_DRV_M41T80=y
+CONFIG_RESET_CONTROLLER=y
 CONFIG_EXT2_FS=y
 CONFIG_EXT4_FS=y
 CONFIG_EXT4_FS_POSIX_ACL=y