Merge commit 'origin/master' into next

[deliverable/linux.git] / arch / powerpc / boot / dts / mpc8378_mds.dts

diff --git a/arch/powerpc/boot/dts/mpc8378_mds.dts b/arch/powerpc/boot/dts/mpc8378_mds.dts
index 6bbee4989fbe29a065dbafde7531a80ce4d92ae9..c3b212cf9025dfc9d763a802996df6bd7bae97b4 100644 (file)
--- a/arch/powerpc/boot/dts/mpc8378_mds.dts
+++ b/arch/powerpc/boot/dts/mpc8378_mds.dts
@@ -313,12 +313,13 @@
                        fsl,descriptor-types-mask = <0x3ab0ebf>;
                };
 
-               sdhc@2e000 {
-                       model = "eSDHC";
-                       compatible = "fsl,esdhc";
+               sdhci@2e000 {
+                       compatible = "fsl,mpc8378-esdhc", "fsl,mpc8379-esdhc";
                        reg = <0x2e000 0x1000>;
                        interrupts = <42 0x8>;
                        interrupt-parent = <&ipic>;
+                       /* Filled in by U-Boot */
+                       clock-frequency = <0>;
                };
 
                /* IPIC