Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mszeredi...

[karo-tx-linux.git] / arch / arm / boot / dts / motorola-cpcap-mapphone.dtsi

diff --git a/arch/arm/boot/dts/motorola-cpcap-mapphone.dtsi b/arch/arm/boot/dts/motorola-cpcap-mapphone.dtsi
index f5aeb3959afd9c2a6d4787bafa21c3cacfe9ce0e..1eb5da1dc8f0a9fd2ee02195678b56aa67ddf23a 100644 (file)
--- a/arch/arm/boot/dts/motorola-cpcap-mapphone.dtsi
+++ b/arch/arm/boot/dts/motorola-cpcap-mapphone.dtsi
@@ -26,6 +26,22 @@
                        #io-channel-cells = <1>;
                };
 
+               cpcap_battery: battery {
+                       compatible = "motorola,cpcap-battery";
+                       interrupts-extended = <
+                               &cpcap 6 0 &cpcap 5 0 &cpcap 3 0
+                               &cpcap 20 0 &cpcap 54 0
+                       >;
+                       interrupt-names =
+                               "eol", "lowbph", "lowbpl",
+                               "chrgcurr1", "battdetb";
+                       io-channels = <&cpcap_adc 0 &cpcap_adc 1
+                                      &cpcap_adc 5 &cpcap_adc 6>;
+                       io-channel-names = "battdetb", "battp",
+                                          "chg_isense", "batti";
+                       power-supplies = <&cpcap_charger>;
+               };
+
                cpcap_charger: charger {
                        compatible = "motorola,mapphone-cpcap-charger";
                        interrupts-extended = <