From b14c2547b83c609c8ee3e094435a3ed1d7db128a Mon Sep 17 00:00:00 2001 From: Robby Cai Date: Tue, 24 May 2016 17:29:48 +0800 Subject: MLK-12849 ARM: dts: imx6ull-ddr3-arm2: add a new dts file for TSC Since TSC has pin conflict with I2C1 which is used by PMIC and Camera, we need to move TSC setting from LCDIF dts file into a separated one to achieve the LCDIF and Camera feature in one DTS file. After the change, we can get the supported features as follows. -lcdif.dtb: lcd and camera, but no tsc -tsc.dtb: lcd and tsc, but no camera Signed-off-by: Robby Cai --- arch/arm/boot/dts/imx6ull-14x14-ddr3-arm2-tsc.dts | 39 +++++++++++++++++++++++ 1 file changed, 39 insertions(+) create mode 100644 arch/arm/boot/dts/imx6ull-14x14-ddr3-arm2-tsc.dts (limited to 'arch/arm/boot/dts/imx6ull-14x14-ddr3-arm2-tsc.dts') diff --git a/arch/arm/boot/dts/imx6ull-14x14-ddr3-arm2-tsc.dts b/arch/arm/boot/dts/imx6ull-14x14-ddr3-arm2-tsc.dts new file mode 100644 index 000000000000..8893e39b0ac3 --- /dev/null +++ b/arch/arm/boot/dts/imx6ull-14x14-ddr3-arm2-tsc.dts @@ -0,0 +1,39 @@ +/* + * Copyright (C) 2016 Freescale Semiconductor, Inc. + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License version 2 as + * published by the Free Software Foundation. + */ + +#include "imx6ull-14x14-ddr3-arm2-lcdif.dts" + +&csi { + status = "disabled"; +}; + +&i2c1 { + status = "disabled"; +}; + +®_usb_otg1_vbus { + pinctrl-0 = < >; + gpio = < >; +}; + +&ov5640 { + status = "disabled"; +}; + +&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>; +}; -- cgit v1.2.3