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

[karo-tx-linux.git] / arch / arm / boot / dts / exynos4210-trats.dts

diff --git a/arch/arm/boot/dts/exynos4210-trats.dts b/arch/arm/boot/dts/exynos4210-trats.dts
index 1743ca850070969aac2571fefcbdacc735809d19..645feffb9239d2465782ea04989ce063b6ae2b97 100644 (file)
--- a/arch/arm/boot/dts/exynos4210-trats.dts
+++ b/arch/arm/boot/dts/exynos4210-trats.dts
@@ -281,7 +281,7 @@
                compatible = "melfas,mms114";
                reg = <0x48>;
                interrupt-parent = <&gpx0>;
-               interrupts = <4 2>;
+               interrupts = <4 IRQ_TYPE_EDGE_FALLING>;
                x-size = <720>;
                y-size = <1280>;
                avdd-supply = <&tsp_reg>;
@@ -302,7 +302,7 @@
 
                reg = <0x66>;
                interrupt-parent = <&gpx0>;
-               interrupts = <7 0>;
+               interrupts = <7 IRQ_TYPE_NONE>;
 
                max8997,pmic-buck1-uses-gpio-dvs;
                max8997,pmic-buck2-uses-gpio-dvs;