Merge branch 'master' of git://git.denx.de/u-boot

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

diff --git a/arch/arm/dts/exynos4210-origen.dts b/arch/arm/dts/exynos4210-origen.dts
index 556a3a24b9ff1b28781e4ff2b500d5488c8d2a64..65a5fcd67effe09bbd148c4c51922f7fb4b26770 100644 (file)
--- a/arch/arm/dts/exynos4210-origen.dts
+++ b/arch/arm/dts/exynos4210-origen.dts
@@ -1,15 +1,14 @@
+// SPDX-License-Identifier: GPL-2.0+
 /*
  * Samsung's Exynos4210 based Origen board device tree source
  *
  * Copyright (c) 2014 Samsung Electronics Co., Ltd.
  *             http://www.samsung.com
- *
- * SPDX-License-Identifier:    GPL-2.0+
  */
 
 /dts-v1/;
 #include "skeleton.dtsi"
-#include "exynos4.dtsi"
+#include "exynos4210.dtsi"
 
 / {
        model = "Insignal Origen evaluation board based on Exynos4210";
@@ -22,24 +21,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";
 };