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>

diff --git a/arch/arm/boot/dts/Makefile b/arch/arm/boot/dts/Makefile
index e9d7d69..b589ad7 100644 (file)
--- a/arch/arm/boot/dts/Makefile
+++ b/arch/arm/boot/dts/Makefile
@@ -493,6 +493,7 @@ dtb-$(CONFIG_SOC_IMX6ULL) += \
        imx6ull-14x14-ddr3-arm2-lcdif.dtb \
        imx6ull-14x14-ddr3-arm2-ldo.dtb \
        imx6ull-14x14-ddr3-arm2-qspi.dtb \
+       imx6ull-14x14-ddr3-arm2-tsc.dtb \
        imx6ull-14x14-ddr3-arm2-uart2.dtb \
        imx6ull-14x14-ddr3-arm2-usb.dtb \
        imx6ull-14x14-ddr3-arm2-wm8958.dtb

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 1f12d12..40e86a4 100644 (file)
--- 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>;
-};

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 (file)
index 0000000..8893e39
--- /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";
+};
+
+&reg_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>;
+};