summaryrefslogtreecommitdiff
path: root/arch/arm/boot/dts/imx6ull-14x14-ddr3-arm2-lcdif.dts
diff options
context:
space:
mode:
authorRobby Cai <robby.cai@nxp.com>2016-05-24 17:29:48 +0800
committerAnson Huang <Anson.Huang@nxp.com>2017-06-08 19:23:25 +0800
commit00df71c8e5b3e4e83f5e2cfd6b25b3d749c3c2ab (patch)
tree2f30d9b792b2452461af673b836cb5310c26e93f /arch/arm/boot/dts/imx6ull-14x14-ddr3-arm2-lcdif.dts
parent1e3654ff4c9502999e2091901cac8b030640978c (diff)
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 <robby.cai@nxp.com>
Diffstat (limited to 'arch/arm/boot/dts/imx6ull-14x14-ddr3-arm2-lcdif.dts')
-rw-r--r--arch/arm/boot/dts/imx6ull-14x14-ddr3-arm2-lcdif.dts22
1 files changed, 0 insertions, 22 deletions
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 1f12d12cf605..40e86a4e08c3 100644
--- a/arch/arm/boot/dts/imx6ull-14x14-ddr3-arm2-lcdif.dts
+++ b/arch/arm/boot/dts/imx6ull-14x14-ddr3-arm2-lcdif.dts
@@ -27,25 +27,3 @@
&pwm1 {
status = "okay";
};
-
-&i2c1 {
- status = "disabled";
-};
-
-&reg_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>;
-};