Merge tag 'ceph-for-4.9-rc1' of git://github.com/ceph/ceph-client

[cascardo/linux.git] / arch / arm / boot / dts / exynos4210-trats.dts

diff --git a/arch/arm/boot/dts/exynos4210-trats.dts b/arch/arm/boot/dts/exynos4210-trats.dts
index 1df2f0b..0ca1b4d 100644 (file)
--- a/arch/arm/boot/dts/exynos4210-trats.dts
+++ b/arch/arm/boot/dts/exynos4210-trats.dts
@@ -20,7 +20,8 @@
        model = "Samsung Trats based on Exynos4210";
        compatible = "samsung,trats", "samsung,exynos4210", "samsung,exynos4";
 
-       memory {
+       memory@40000000 {
+               device_type = "memory";
                reg =  <0x40000000 0x10000000
                        0x50000000 0x10000000
                        0x60000000 0x10000000
@@ -298,6 +299,8 @@
                compatible = "maxim,max8997-pmic";
 
                reg = <0x66>;
+               interrupt-parent = <&gpx0>;
+               interrupts = <7 0>;
 
                max8997,pmic-buck1-uses-gpio-dvs;
                max8997,pmic-buck2-uses-gpio-dvs;
@@ -359,7 +362,7 @@
                        };
 
                        vusbdac_reg: LDO8 {
-                            regulator-name = "VUSB/VDAC_3.3V_C210";
+                            regulator-name = "VUSB+VDAC_3.3V_C210";
                             regulator-min-microvolt = <3300000>;
                             regulator-max-microvolt = <3300000>;
                        };