MLK-14303: ARM: dts: imx7d: Fix duplicate tsc2046 definition

Reconcile MLK-12075 ARM: dts: remove imx7d-sdb-touch.dts
with the upstream tsc2046@0 definition. When this patch was ported to
imx_4.9.y a new touchscreen definition was added instead.

Signed-off-by: Leonard Crestez <leonard.crestez@nxp.com>

diff --git a/arch/arm/boot/dts/imx7d-sdb.dts b/arch/arm/boot/dts/imx7d-sdb.dts
index 8dfa52e..e07cbd1 100644 (file)
--- a/arch/arm/boot/dts/imx7d-sdb.dts
+++ b/arch/arm/boot/dts/imx7d-sdb.dts
@@ -208,7 +208,7 @@
 &ecspi3 {
        fsl,spi-num-chipselects = <1>;
        pinctrl-names = "default";
-       pinctrl-0 = <&pinctrl_ecspi3>;
+       pinctrl-0 = <&pinctrl_ecspi3 &pinctrl_ecspi3_cs>;
        cs-gpios = <&gpio5 9 GPIO_ACTIVE_HIGH>;
        status = "okay";
 
@@ -261,32 +261,6 @@
        status = "okay";
 };
 
-&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 = <29 0>;
-               pendown-gpio = <&gpio2 29 0>;
-               ti,x-min = /bits/ 16 <0>;
-               ti,x-max = /bits/ 16 <0>;
-               ti,y-min = /bits/ 16 <0>;
-               ti,y-max = /bits/ 16 <0>;
-               ti,pressure-max = /bits/ 16 <0>;
-               ti,x-plat-ohms = /bits/ 16 <400>;
-               linux,wakeup;
-       };
-};
-
 &fec1 {
        pinctrl-names = "default";
        pinctrl-0 = <&pinctrl_enet1>;