mmc: do not overwrite cfg->f_max if "max-frequency" if missing

[u-boot] / arch / arm / dts / exynos4210-origen.dts

diff --git a/arch/arm/dts/exynos4210-origen.dts b/arch/arm/dts/exynos4210-origen.dts
index 15059d22022738954eea77af7f8e30b07bd8696e..a13d033ca9832d45a7828ab081e88842e2354936 100644 (file)
--- a/arch/arm/dts/exynos4210-origen.dts
+++ b/arch/arm/dts/exynos4210-origen.dts
@@ -8,8 +8,8 @@
  */
 
 /dts-v1/;
-/include/ "skeleton.dtsi"
-/include/ "exynos4.dtsi"
+#include "skeleton.dtsi"
+#include "exynos4210.dtsi"
 
 / {
        model = "Insignal Origen evaluation board based on Exynos4210";
@@ -22,24 +22,12 @@
        aliases {
                serial0 = "/serial@13800000";
                console = "/serial@13820000";
-               mmc2 = "sdhci@12530000";
-       };
-
-       sdhci@12510000 {
-               status = "disabled";
-       };
-
-       sdhci@12520000 {
-               status = "disabled";
-       };
-
-       sdhci@12530000 {
-               samsung,bus-width = <4>;
-               samsung,timing = <1 2 3>;
-               cd-gpios = <&gpio 0xA2 0>;
        };
+};
 
-       sdhci@12540000 {
-               status = "disabled";
-       };
+&sdhci2 {
+       samsung,bus-width = <4>;
+       samsung,timing = <1 2 3>;
+       cd-gpios = <&gpk2 2 0>;
+       status = "okay";
 };