From 32b0ab74c4c37b64a6482dc32bf0064e6fdf608d Mon Sep 17 00:00:00 2001 From: Haibo Chen Date: Fri, 22 May 2015 15:25:11 +0800 Subject: [PATCH] MLK-10961-1 arm: dts: imx7d-sdb-touch.dts: add support for touch screen Add an new dts file: imx7d-sdb-touch.dts.This file add tsc2046 touch screen controller support. Due to the pin PENIRQ of tsc2046 is conflict with the interrupt pin of HDMI, so in this patch, disable the HDMI. Signed-off-by: Haibo Chen (cherry picked from commit b690c1093a3a88a99da366200362fb4ae8172f9b) Conflicts: arch/arm/boot/dts/Makefile arch/arm/boot/dts/imx7d-sdb.dts --- arch/arm/boot/dts/Makefile | 1 + arch/arm/boot/dts/imx7d-sdb-touch.dts | 32 +++++++++++++++++++++++++++ arch/arm/boot/dts/imx7d-sdb.dts | 8 ++++++- 3 files changed, 40 insertions(+), 1 deletion(-) create mode 100644 arch/arm/boot/dts/imx7d-sdb-touch.dts diff --git a/arch/arm/boot/dts/Makefile b/arch/arm/boot/dts/Makefile index 60fee7aa24bb..8b6cad7be29e 100644 --- a/arch/arm/boot/dts/Makefile +++ b/arch/arm/boot/dts/Makefile @@ -460,6 +460,7 @@ dtb-$(CONFIG_SOC_IMX7D) += \ imx7d-sbc-imx7.dtb \ imx7d-sdb.dtb \ imx7d-sdb-epdc.dtb \ + imx7d-sdb-touch.dtb \ imx7d-sdb-m4.dtb \ imx7s-colibri-eval-v3.dtb \ imx7s-warp.dtb \ diff --git a/arch/arm/boot/dts/imx7d-sdb-touch.dts b/arch/arm/boot/dts/imx7d-sdb-touch.dts new file mode 100644 index 000000000000..b53f0be328da --- /dev/null +++ b/arch/arm/boot/dts/imx7d-sdb-touch.dts @@ -0,0 +1,32 @@ +#include "imx7d-sdb.dts" + +&sii902x { + status = "disabled"; +}; + +&ecspi3 { + fsl,spi-num-chipselects = <1>; + pinctrl-names = "default"; + pinctrl-0 = <&pinctrl_ecspi3 &pinctrl_ecspi3_cs>; + cs-gpios = <&gpio5 9 0>; + status = "okay"; + + tsc2046 { + compatible = "ti,tsc2046"; + reg = <0>; + spi-max-frequency = <1000000>; + pinctrl-names ="default"; + pinctrl-0 = <&pinctrl_tsc2046_pendown>; + interrupt-parent = <&gpio2>; + interrupts = <13 0>; + pendown-gpio = <&gpio2 13 0>; + ti,x-min = <0>; + ti,x-max = <8000>; + ti,y-min = <0>; + ti,y-max = <4800>; + ti,pressure-max = <255>; + ti,x-plat-ohms = <40>; + linux,wakeup; + }; +}; + diff --git a/arch/arm/boot/dts/imx7d-sdb.dts b/arch/arm/boot/dts/imx7d-sdb.dts index 2379c9c0a12e..c10d50731e0f 100644 --- a/arch/arm/boot/dts/imx7d-sdb.dts +++ b/arch/arm/boot/dts/imx7d-sdb.dts @@ -757,12 +757,18 @@ pinctrl-0 = <&pinctrl_hog>; imx7d-sdb { + + pinctrl_ecspi3_cs: ecspi3_cs_grp { + fsl,pins = < + MX7D_PAD_SD2_CD_B__GPIO5_IO9 0x80000000 + >; + }; + pinctrl_ecspi3: ecspi3grp { fsl,pins = < MX7D_PAD_SAI2_TX_SYNC__ECSPI3_MISO 0x2 MX7D_PAD_SAI2_TX_BCLK__ECSPI3_MOSI 0x2 MX7D_PAD_SAI2_RX_DATA__ECSPI3_SCLK 0x2 - MX7D_PAD_SD2_CD_B__GPIO5_IO9 0x59 >; }; -- 2.17.1