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

[u-boot] / arch / arm / dts / exynos5250-smdk5250.dts

diff --git a/arch/arm/dts/exynos5250-smdk5250.dts b/arch/arm/dts/exynos5250-smdk5250.dts
index 9020382d97cf4df92f7ba13513248c58a8f5f5f1..3cebfc28a5f701598c039c613ac47645270c4ac5 100644 (file)
--- a/arch/arm/dts/exynos5250-smdk5250.dts
+++ b/arch/arm/dts/exynos5250-smdk5250.dts
@@ -10,7 +10,7 @@
 */
 
 /dts-v1/;
-/include/ "exynos5250.dtsi"
+#include "exynos5250.dtsi"
 
 / {
        model = "SAMSUNG SMDK5250 board based on EXYNOS5250";
@@ -68,7 +68,7 @@
        i2c@12c60000 {
                pmic@9 {
                        reg = <0x9>;
-                       compatible = "maxim,max77686_pmic";
+                       compatible = "maxim,max77686";
                };
        };
 
@@ -146,6 +146,6 @@
        };
 
        ehci@12110000 {
-               samsung,vbus-gpio = <&gpio 0x316 0>; /* X26 */
+               samsung,vbus-gpio = <&gpx2 6 GPIO_ACTIVE_HIGH>;
        };
 };