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

[sfrench/cifs-2.6.git] / arch / arm / boot / dts / ste-hrefprev60-stuib.dts

diff --git a/arch/arm/boot/dts/ste-hrefprev60-stuib.dts b/arch/arm/boot/dts/ste-hrefprev60-stuib.dts
index aed940bd65a8067122e0adc0f406e65beb3b404e..b78be5f4c212efff8ab82ab2f3535225513b5d50 100644 (file)
--- a/arch/arm/boot/dts/ste-hrefprev60-stuib.dts
+++ b/arch/arm/boot/dts/ste-hrefprev60-stuib.dts
@@ -4,6 +4,8 @@
  */
 
 /dts-v1/;
+#include <dt-bindings/gpio/gpio.h>
+#include <dt-bindings/interrupt-controller/irq.h>
 #include "ste-hrefprev60.dtsi"
 #include "ste-href-stuib.dtsi"
 
@@ -23,12 +25,16 @@
                i2c@80110000 {
                        /* Only one of these will be used */
                        bu21013_tp@5c {
-                               touch-gpio = <&gpio2 12 0x4>;
-                               reset-gpio = <&tc3589x_gpio 13 0x4>;
+                               interrupt-parent = <&gpio2>;
+                               interrupts = <12 IRQ_TYPE_LEVEL_LOW>;
+                               touch-gpios = <&gpio2 12 GPIO_ACTIVE_LOW>;
+                               reset-gpios = <&tc3589x_gpio 13 GPIO_LINE_OPEN_DRAIN>;
                        };
                        bu21013_tp@5d {
-                               touch-gpio = <&gpio2 12 0x4>;
-                               reset-gpio = <&tc3589x_gpio 13 0x4>;
+                               interrupt-parent = <&gpio2>;
+                               interrupts = <12 IRQ_TYPE_LEVEL_LOW>;
+                               touch-gpios = <&gpio2 12 GPIO_ACTIVE_LOW>;
+                               reset-gpios = <&tc3589x_gpio 13 GPIO_LINE_OPEN_DRAIN>;
                        };
                };
        };