Merge tag 'u-boot-rockchip-20200501' of https://gitlab.denx.de/u-boot/custodians...

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

diff --git a/arch/arm/dts/exynos4210-universal_c210.dts b/arch/arm/dts/exynos4210-universal_c210.dts
index 57636276a8321a753f04c54745d39ddbfb6340e1..610a8ad2e71eba0e8dbdf7a5a23a8b68cb69e006 100644 (file)
--- a/arch/arm/dts/exynos4210-universal_c210.dts
+++ b/arch/arm/dts/exynos4210-universal_c210.dts
@@ -1,10 +1,9 @@
+// SPDX-License-Identifier: GPL-2.0+
 /*
  * Samsung's Exynos4210 based Universal C210 board device tree source
  *
  * Copyright (c) 2014 Samsung Electronics Co., Ltd.
  *             http://www.samsung.com
- *
- * SPDX-License-Identifier:    GPL-2.0+
  */
 
 /dts-v1/;
@@ -17,28 +16,6 @@
        aliases {
                serial0 = "/serial@13800000";
                console = "/serial@13820000";
-               mmc0 = "/sdhci@12510000";
-               mmc2 = "/sdhci@12530000";
-       };
-
-       sdhci@12510000 {
-               samsung,bus-width = <8>;
-               samsung,timing = <1 3 3>;
-               pwr-gpios = <&gpk0 2 0>;
-       };
-
-       sdhci@12520000 {
-               status = "disabled";
-       };
-
-       sdhci@12530000 {
-               samsung,bus-width = <4>;
-               samsung,timing = <1 2 3>;
-               cd-gpios = <&gpx3 4 0>;
-       };
-
-       sdhci@12540000 {
-               status = "disabled";
        };
 
        soft-spi {
@@ -48,8 +25,6 @@
                gpio-mosi = <&gpy3 3 0>;
                gpio-miso = <&gpy3 0 0>;
                spi-delay-us = <1>;
-               #address-cells = <1>;
-               #size-cells = <0>;
                cs@0 {
                };
        };
@@ -258,3 +233,17 @@
                };
        };
 };
+
+&sdhci0 {
+       samsung,bus-width = <8>;
+       samsung,timing = <1 3 3>;
+       pwr-gpios = <&gpk0 2 0>;
+       status = "okay";
+};
+
+&sdhci2 {
+       samsung,bus-width = <4>;
+       samsung,timing = <1 2 3>;
+       cd-gpios = <&gpx3 4 0>;
+       status = "okay";
+};