From 1c41f59967df680ba7ff9c09533e252b4d907abf Mon Sep 17 00:00:00 2001 From: Haibo Chen Date: Fri, 29 Apr 2016 10:24:58 +0800 Subject: [PATCH] MLK-12734 ARM: dts: add TSC support for imx6ull-ddr3-arm2 board. Add touch support for the LCD screen on imx6ull-ddr3-arm2 board. Due to the touch pin conflict with usbotg1 and I2C1 bus, so this patch disable I2C1 bus and usbotg1. Signed-off-by: Haibo Chen Signed-off-by: Arulpandiyan Vadivel Signed-off-by: Srikanth Krishnakar --- .../dts/imx6ull-14x14-ddr3-arm2-lcdif.dts | 22 +++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/arch/arm/boot/dts/imx6ull-14x14-ddr3-arm2-lcdif.dts b/arch/arm/boot/dts/imx6ull-14x14-ddr3-arm2-lcdif.dts index 40e86a4e08c3..1f12d12cf605 100644 --- a/arch/arm/boot/dts/imx6ull-14x14-ddr3-arm2-lcdif.dts +++ b/arch/arm/boot/dts/imx6ull-14x14-ddr3-arm2-lcdif.dts @@ -27,3 +27,25 @@ &pwm1 { status = "okay"; }; + +&i2c1 { + status = "disabled"; +}; + +®_usb_otg1_vbus { + pinctrl-0 = < >; + gpio = < >; +}; + +&usbotg1 { + status = "disabled"; +}; + +&tsc { + pinctrl-names = "default"; + pinctrl-0 = <&pinctrl_tsc>; + status = "okay"; + xnur-gpio = <&gpio1 3 0>; + measure_delay_time = <0xfff>; + pre_charge_time = <0xffff>; +}; -- 2.17.1