Merge git://www.denx.de/git/u-boot-cfi-flash

[u-boot] / arch / arm / dts / exynos4412-trats2.dts

diff --git a/arch/arm/dts/exynos4412-trats2.dts b/arch/arm/dts/exynos4412-trats2.dts
index 2d4e522ea2770ef0e428eea352b4ffd4e43271d9..0938e7941a7b9fa4ac4d4f720eac8808f03198f2 100644 (file)
--- a/arch/arm/dts/exynos4412-trats2.dts
+++ b/arch/arm/dts/exynos4412-trats2.dts
@@ -27,11 +27,28 @@
                i2c5 = "/i2c@138b0000";
                i2c6 = "/i2c@138c0000";
                i2c7 = "/i2c@138d0000";
+               i2c8 = &i2c_fg;
+               i2c9 = &i2c_max77693;
                serial0 = "/serial@13800000";
                console = "/serial@13820000";
-               mmc0 = "sdhci@12510000";
-               mmc2 = "sdhci@12530000";
-               mmc4 = "dwmmc@12550000";
+               mmc0 = &mshc_0;
+               mmc1 = &sdhci2;
+       };
+
+       i2c_fg: fuel-gauge {
+               compatible = "i2c-gpio";
+               gpios = <&gpf1 5 0>,    /* sda */
+                       <&gpf1 4 0>;    /* scl */
+               i2c-gpio,delay-us = <2>;        /* ~100 kHz */
+               status = "okay";
+       };
+
+       i2c_max77693: max77693 {
+               compatible = "i2c-gpio";
+               gpio = <&gpm2 0 0>,     /* sda */
+                      <&gpm2 1 0>;     /* scl */
+               i2c-gpio,delay-us = <2>;        /* ~100 kHz */
+               status = "okay";
        };
 
        i2c@138d0000 {
@@ -419,28 +436,30 @@
                pwr-gpios = <&gpk0 4 0>;
                status = "disabled";
        };
+};
 
-       sdhci@12520000 {
-               status = "disabled";
-       };
-
-       sdhci@12530000 {
-               samsung,bus-width = <4>;
-               samsung,timing = <1 2 3>;
-               cd-gpios = <&gpk2 2 0>;
-       };
+&sdhci0 {
+       samsung,bus-width = <8>;
+       samsung,timing = <1 3 3>;
+       pwr-gpios = <&gpk0 4 0>;
+       status = "disabled";
+};
 
-       sdhci@12540000 {
-               status = "disabled";
-       };
+&sdhci2 {
+       samsung,bus-width = <4>;
+       samsung,timing = <1 2 3>;
+       cd-gpios = <&gpk2 2 0>;
+       status = "okay";
+};
 
-       dwmmc@12550000 {
-               samsung,bus-width = <8>;
-               samsung,timing = <2 1 0>;
-               pwr-gpios = <&gpk0 4 0>;
-               fifoth_val = <0x203f0040>;
-               bus_hz = <400000000>;
-               div = <0x3>;
-               index = <4>;
-       };
+&mshc_0 {
+       samsung,bus-width = <8>;
+       samsung,timing = <2 1 0>;
+       samsung,removable = <0>;
+       fifoth_val = <0x203f0040>;
+       bus_hz = <400000000>;
+       div = <0x3>;
+       index = <4>;
+       fifo-depth = <0x80>;
+       status = "okay";
 };