Merge remote-tracking branch 'mkp-scsi/fixes' into fixes

[mirror_ubuntu-eoan-kernel.git] / arch / arm / boot / dts / am335x-chiliboard.dts

diff --git a/arch/arm/boot/dts/am335x-chiliboard.dts b/arch/arm/boot/dts/am335x-chiliboard.dts
index 2a624b3c9258fe29d8875e2ac32b7e8c7c0507b1..d8769799772ea6cdacb0693427648cf61e0f0879 100644 (file)
--- a/arch/arm/boot/dts/am335x-chiliboard.dts
+++ b/arch/arm/boot/dts/am335x-chiliboard.dts
@@ -185,3 +185,19 @@
        cd-gpios = <&gpio0 6 GPIO_ACTIVE_HIGH>;
        status = "okay";
 };
+
+&tps {
+       interrupt-parent = <&intc>;
+       interrupts = <7>; /* NNMI */
+
+       charger {
+               interrupts = <0>, <1>;
+               interrupt-names = "USB", "AC";
+               status = "okay";
+       };
+
+       pwrbutton {
+               interrupts = <2>;
+               status = "okay";
+       };
+};