Merge branch 'drm-next' of git://people.freedesktop.org/~airlied/linux

[linux.git] / arch / arm / boot / dts / exynos4412-trats2.dts

diff --git a/arch/arm/boot/dts/exynos4412-trats2.dts b/arch/arm/boot/dts/exynos4412-trats2.dts
index 53c717b6eb6918fab6527a104af0bf326254dd31..9583563dd0ef7a3f0d4cd89765a20bb243b10117 100644 (file)
--- a/arch/arm/boot/dts/exynos4412-trats2.dts
+++ b/arch/arm/boot/dts/exynos4412-trats2.dts
@@ -17,7 +17,7 @@
 
 / {
        model = "Samsung Trats 2 based on Exynos4412";
-       compatible = "samsung,trats2", "samsung,exynos4412";
+       compatible = "samsung,trats2", "samsung,exynos4412", "samsung,exynos4";
 
        aliases {
                i2c8 = &i2c_ak8975;
@@ -115,6 +115,11 @@
                };
        };
 
+       adc: adc@126C0000 {
+               vdd-supply = <&ldo3_reg>;
+               status = "okay";
+       };
+
        i2c@13890000 {
                samsung,i2c-sda-delay = <100>;
                samsung,i2c-slave-addr = <0x10>;
@@ -659,4 +664,20 @@
                        };
                };
        };
+
+       thermistor-ap@0 {
+               compatible = "ntc,ncp15wb473";
+               pullup-uv = <1800000>;   /* VCC_1.8V_AP */
+               pullup-ohm = <100000>;   /* 100K */
+               pulldown-ohm = <100000>; /* 100K */
+               io-channels = <&adc 1>;  /* AP temperature */
+       };
+
+       thermistor-battery@1 {
+               compatible = "ntc,ncp15wb473";
+               pullup-uv = <1800000>;   /* VCC_1.8V_AP */
+               pullup-ohm = <100000>;   /* 100K */
+               pulldown-ohm = <100000>; /* 100K */
+               io-channels = <&adc 2>;  /* Battery temperature */
+       };
 };