Merge tag 'for-v3.13' of git://git.infradead.org/battery-2.6

[android-x86/kernel.git] / arch / arm / boot / dts / twl4030.dtsi

diff --git a/arch/arm/boot/dts/twl4030.dtsi b/arch/arm/boot/dts/twl4030.dtsi
index 5a12540..4217096 100644 (file)
--- a/arch/arm/boot/dts/twl4030.dtsi
+++ b/arch/arm/boot/dts/twl4030.dtsi
@@ -29,6 +29,22 @@
                compatible = "ti,twl4030-wdt";
        };
 
+       vaux1: regulator-vaux1 {
+               compatible = "ti,twl4030-vaux1";
+       };
+
+       vaux2: regulator-vaux2 {
+               compatible = "ti,twl4030-vaux2";
+       };
+
+       vaux3: regulator-vaux3 {
+               compatible = "ti,twl4030-vaux3";
+       };
+
+       vaux4: regulator-vaux4 {
+               compatible = "ti,twl4030-vaux4";
+       };
+
        vcc: regulator-vdd1 {
                compatible = "ti,twl4030-vdd1";
                regulator-min-microvolt = <600000>;
@@ -41,10 +57,20 @@
                regulator-max-microvolt = <1800000>;
        };
 
-       vpll2: regulator-vpll2 {
-               compatible = "ti,twl4030-vpll2";
-               regulator-min-microvolt = <1800000>;
-               regulator-max-microvolt = <1800000>;
+       vio: regulator-vio {
+               compatible = "ti,twl4030-vio";
+       };
+
+       vintana1: regulator-vintana1 {
+               compatible = "ti,twl4030-vintana1";
+       };
+
+       vintana2: regulator-vintana2 {
+               compatible = "ti,twl4030-vintana2";
+       };
+
+       vintdig: regulator-vintdig {
+               compatible = "ti,twl4030-vintdig";
        };
 
        vmmc1: regulator-vmmc1 {
@@ -71,6 +97,16 @@
                compatible = "ti,twl4030-vusb3v1";
        };
 
+       vpll1: regulator-vpll1 {
+               compatible = "ti,twl4030-vpll1";
+       };
+
+       vpll2: regulator-vpll2 {
+               compatible = "ti,twl4030-vpll2";
+               regulator-min-microvolt = <1800000>;
+               regulator-max-microvolt = <1800000>;
+       };
+
        vsim: regulator-vsim {
                compatible = "ti,twl4030-vsim";
                regulator-min-microvolt = <1800000>;
@@ -92,6 +128,7 @@
                usb1v8-supply = <&vusb1v8>;
                usb3v1-supply = <&vusb3v1>;
                usb_mode = <1>;
+               #phy-cells = <0>;
        };
 
        twl_pwm: pwm {
@@ -103,4 +140,9 @@
                compatible = "ti,twl4030-pwmled";
                #pwm-cells = <2>;
        };
+
+       twl_pwrbutton: pwrbutton {
+               compatible = "ti,twl4030-pwrbutton";
+               interrupts = <8>;
+       };
 };