Merge tag 'regmap-v3.11' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie...

[deliverable/linux.git] / arch / arm / boot / dts / snowball.dts

diff --git a/arch/arm/boot/dts/snowball.dts b/arch/arm/boot/dts/snowball.dts
index c0a34a68b0c473b019a42c3660f24b46d58f2016..49824be668450cf02f45ccd226d0243f5fd9dc8b 100644 (file)
--- a/arch/arm/boot/dts/snowball.dts
+++ b/arch/arm/boot/dts/snowball.dts
@@ -22,12 +22,13 @@
 
        en_3v3_reg: en_3v3 {
                compatible = "regulator-fixed";
-                regulator-name = "en-3v3-fixed-supply";
-                regulator-min-microvolt = <3300000>;
-                regulator-max-microvolt = <3300000>;
-                gpios = <&gpio0 26  0x4>; // 26
-                startup-delay-us = <5000>;
-                enable-active-high;
+               regulator-name = "en-3v3-fixed-supply";
+               regulator-min-microvolt = <3300000>;
+               regulator-max-microvolt = <3300000>;
+               /* AB8500 GPIOs start from 1 - offset 25 is GPIO26. */
+               gpio = <&ab8500_gpio 25 0x4>;
+               startup-delay-us = <5000>;
+               enable-active-high;
        };
 
        gpio_keys {
@@ -105,7 +106,7 @@
                        ethernet@0 {
                                compatible = "smsc,lan9115";
                                reg = <0 0x10000>;
-                               interrupts = <12 0x1>;
+                               interrupts = <12 IRQ_TYPE_EDGE_RISING>;
                                interrupt-parent = <&gpio4>;
                                vdd33a-supply = <&en_3v3_reg>;
                                vddvario-supply = <&db8500_vape_reg>;
@@ -178,15 +179,15 @@
                };
 
                i2c@80128000 {
-                       lp5521@0x33 {
+                       lp5521@33 {
                                // compatible = "lp5521";
                                reg = <0x33>;
                        };
-                       lp5521@0x34 {
+                       lp5521@34 {
                                // compatible = "lp5521";
                                reg = <0x34>;
                        };
-                       bh1780@0x29 {
+                       bh1780@29 {
                                // compatible = "rohm,bh1780gli";
                                reg = <0x33>;
                        };
@@ -342,7 +343,7 @@
                                                regulator-name = "V-AMIC1";
                                        };
 
-                                       ab8500_ldo_amamic2_reg: ab8500_ldo_amamic2 {
+                                       ab8500_ldo_anamic2_reg: ab8500_ldo_anamic2 {
                                                regulator-name = "V-AMIC2";
                                        };