Merge tag 'for-linus' of git://git.kernel.org/pub/scm/virt/kvm/kvm

[mirror_ubuntu-bionic-kernel.git] / arch / arm / boot / dts / omap5-board-common.dtsi

diff --git a/arch/arm/boot/dts/omap5-board-common.dtsi b/arch/arm/boot/dts/omap5-board-common.dtsi
index 914bf4c47404f641f823a122c26ff93127f8d25e..dc759a3028b790d1b525ee889077c5cca0ce2b8d 100644 (file)
--- a/arch/arm/boot/dts/omap5-board-common.dtsi
+++ b/arch/arm/boot/dts/omap5-board-common.dtsi
@@ -391,11 +391,21 @@
                        ti,backup-battery-charge-high-current;
                };
 
+               gpadc {
+                       compatible = "ti,palmas-gpadc";
+                       interrupts = <18 0
+                                     16 0
+                                     17 0>;
+                       #io-channel-cells = <1>;
+                       ti,channel0-current-microamp = <5>;
+                       ti,channel3-current-microamp = <10>;
+               };
+
                palmas_pmic {
                        compatible = "ti,palmas-pmic";
                        interrupt-parent = <&palmas>;
                        interrupts = <14 IRQ_TYPE_NONE>;
-                       interrupt-name = "short-irq";
+                       interrupt-names = "short-irq";
 
                        ti,ldo6-vibrator;