aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorVishal Mahaveer2016-03-04 13:29:15 -0600
committerVishal Mahaveer2016-03-04 13:29:15 -0600
commit70212583ae2b5572b5f27fb7806606e504cbbd52 (patch)
tree5fc4a7517352ac5ff2569cd367f4647f3b5e3280
parent2dba68e631a575e29776861eb09e822bee7c22f1 (diff)
parentcb0be57bb221063a21ec56c99888dc27c1da5872 (diff)
downloadkernel-video-70212583ae2b5572b5f27fb7806606e504cbbd52.tar.gz
kernel-video-70212583ae2b5572b5f27fb7806606e504cbbd52.tar.xz
kernel-video-70212583ae2b5572b5f27fb7806606e504cbbd52.zip
Merge branch 'p-ti-linux-3.14.y-common' into p-ti-linux-3.14.y-android
* p-ti-linux-3.14.y-common: ARM: dts: dra72-evm: fix touchscreen on OSD LCD Change-Id: If8299df49a85f544fc11d88e68520f1214b277f6 Signed-off-by: Vishal Mahaveer <vishalm@ti.com>
-rw-r--r--arch/arm/boot/dts/dra7-evm-lcd-osd.dts5
-rw-r--r--arch/arm/boot/dts/dra72-evm-lcd-osd.dts5
-rw-r--r--arch/arm/boot/dts/dra7x-evm-lcd-osd.dtsi5
3 files changed, 11 insertions, 4 deletions
diff --git a/arch/arm/boot/dts/dra7-evm-lcd-osd.dts b/arch/arm/boot/dts/dra7-evm-lcd-osd.dts
index db5fc4ab88f..00610912ff0 100644
--- a/arch/arm/boot/dts/dra7-evm-lcd-osd.dts
+++ b/arch/arm/boot/dts/dra7-evm-lcd-osd.dts
@@ -12,3 +12,8 @@
12&ldc3001 { 12&ldc3001 {
13 status = "disabled"; 13 status = "disabled";
14}; 14};
15
16&touchscreen {
17 interrupt-parent = <&gpio1>;
18 interrupts = <2 IRQ_TYPE_EDGE_FALLING>;
19};
diff --git a/arch/arm/boot/dts/dra72-evm-lcd-osd.dts b/arch/arm/boot/dts/dra72-evm-lcd-osd.dts
index fbf1e96ca9b..2b8082503a8 100644
--- a/arch/arm/boot/dts/dra72-evm-lcd-osd.dts
+++ b/arch/arm/boot/dts/dra72-evm-lcd-osd.dts
@@ -12,3 +12,8 @@
12&ldc3001 { 12&ldc3001 {
13 status = "disabled"; 13 status = "disabled";
14}; 14};
15
16&touchscreen {
17 interrupt-parent = <&gpio1>;
18 interrupts = <15 IRQ_TYPE_EDGE_FALLING>;
19};
diff --git a/arch/arm/boot/dts/dra7x-evm-lcd-osd.dtsi b/arch/arm/boot/dts/dra7x-evm-lcd-osd.dtsi
index 20200111e74..01388e0b15d 100644
--- a/arch/arm/boot/dts/dra7x-evm-lcd-osd.dtsi
+++ b/arch/arm/boot/dts/dra7x-evm-lcd-osd.dtsi
@@ -35,15 +35,12 @@
35 enable-gpios = <&pcf_lcd 13 GPIO_ACTIVE_LOW>; /* P15, CON_LCD_PWR_DN */ 35 enable-gpios = <&pcf_lcd 13 GPIO_ACTIVE_LOW>; /* P15, CON_LCD_PWR_DN */
36 }; 36 };
37 37
38 edt-ft5506@38 { 38 touchscreen: edt-ft5506@38 {
39 status = "okay"; 39 status = "okay";
40 compatible = "edt,edt-ft5506", "edt,edt-ft5x06"; 40 compatible = "edt,edt-ft5506", "edt,edt-ft5x06";
41 41
42 reg = <0x38>; 42 reg = <0x38>;
43 43
44 interrupt-parent = <&gpio1>;
45 interrupts = <2 IRQ_TYPE_EDGE_FALLING>;
46
47 /* GPIO line is inverted before going to touch panel */ 44 /* GPIO line is inverted before going to touch panel */
48 enable-gpios = <&pcf_lcd_tc3587x 5 GPIO_ACTIVE_HIGH>; 45 enable-gpios = <&pcf_lcd_tc3587x 5 GPIO_ACTIVE_HIGH>;
49 46