ARM: dts: imx6: rename touch screen's node name to touchscreen

Rename touch to touchscreen.
Rename stmpe_touchscreen to touchscreen.
Rename stmpe_adc to adc.

Fix below CHECK_DTBS warning:
arch/arm/boot/dts/nxp/imx/imx7d-nitrogen7.dtb: touch@48 (ti,tsc2004): 'wakeup-gpios' does not match any of the regexes: '^pinctrl-[0-9]+$'
        from schema $id: http://devicetree.org/schemas/input/touchscreen/ti,tsc2005.yaml#

Signed-off-by: Frank Li <Frank.Li@nxp.com>
Reviewed-by: Peng Fan <peng.fan@nxp.com>
Signed-off-by: Shawn Guo <shawnguo@kernel.org>

diff --git a/arch/arm/boot/dts/nxp/imx/imx53-m53.dtsi b/arch/arm/boot/dts/nxp/imx/imx53-m53.dtsi
index df543b4751e0a66f22c42a0df9e2c51982648ca3..89b17509ad48729c2e4e985aac8f05d1f80a36e8 100644 (file)
--- a/arch/arm/boot/dts/nxp/imx/imx53-m53.dtsi
+++ b/arch/arm/boot/dts/nxp/imx/imx53-m53.dtsi
@@ -47,7 +47,7 @@
                interrupt-parent = <&gpio7>;
                irq-trigger = <0x1>;
 
-               stmpe_touchscreen {
+               touchscreen {
                        compatible = "st,stmpe-ts";
                        st,sample-time = <4>;
                        st,mod-12b = <1>;

diff --git a/arch/arm/boot/dts/nxp/imx/imx6q-novena.dts b/arch/arm/boot/dts/nxp/imx/imx6q-novena.dts
index 4d25090db55f956972c7535e7309fd4ca17ddb7b..24fc3ff1c70c2f3c9ac4309f9c7c723f003096d9 100644 (file)
--- a/arch/arm/boot/dts/nxp/imx/imx6q-novena.dts
+++ b/arch/arm/boot/dts/nxp/imx/imx6q-novena.dts
@@ -288,7 +288,7 @@
                vio-supply = <&reg_3p3v>;
                vcc-supply = <&reg_3p3v>;
 
-               stmpe_touchscreen {
+               touchscreen {
                        compatible = "st,stmpe-ts";
                        st,sample-time = <4>;
                        st,mod-12b = <1>;

diff --git a/arch/arm/boot/dts/nxp/imx/imx6qdl-apalis.dtsi b/arch/arm/boot/dts/nxp/imx/imx6qdl-apalis.dtsi
index b13000a62a7bcd87c74f66d52bcb8f3cc4696b90..5fcd7cdb7001ff3ec9e31a68f31b6b813b4ba821 100644 (file)
--- a/arch/arm/boot/dts/nxp/imx/imx6qdl-apalis.dtsi
+++ b/arch/arm/boot/dts/nxp/imx/imx6qdl-apalis.dtsi
@@ -648,7 +648,7 @@
                /* ADC conversion time: 80 clocks */
                st,sample-time = <4>;
 
-               stmpe_ts: stmpe_touchscreen {
+               stmpe_ts: touchscreen {
                        compatible = "st,stmpe-ts";
                        /* 8 sample average control */
                        st,ave-ctrl = <3>;
@@ -665,7 +665,7 @@
                        st,touch-det-delay = <5>;
                };
 
-               stmpe_adc: stmpe_adc {
+               stmpe_adc: adc {
                        compatible = "st,stmpe-adc";
                        #io-channel-cells = <1>;
                        /* forbid to use ADC channels 3-0 (touch) */

diff --git a/arch/arm/boot/dts/nxp/imx/imx6qdl-colibri.dtsi b/arch/arm/boot/dts/nxp/imx/imx6qdl-colibri.dtsi
index 3525cbcda57fdf800205792e9b64e5219c5b06e7..419d85b5a66061d4389df5d42de626183c27a9e6 100644 (file)
--- a/arch/arm/boot/dts/nxp/imx/imx6qdl-colibri.dtsi
+++ b/arch/arm/boot/dts/nxp/imx/imx6qdl-colibri.dtsi
@@ -572,7 +572,7 @@
                /* ADC converstion time: 80 clocks */
                st,sample-time = <4>;
 
-               stmpe_ts: stmpe_touchscreen {
+               stmpe_ts: touchscreen {
                        compatible = "st,stmpe-ts";
                        /* 8 sample average control */
                        st,ave-ctrl = <3>;

diff --git a/arch/arm/boot/dts/nxp/imx/imx6qdl-phytec-mira.dtsi b/arch/arm/boot/dts/nxp/imx/imx6qdl-phytec-mira.dtsi
index 0b4c09b09c03dcc2a8628a8eb449143e32cbf8fe..a3c2811e9c6fa90c1722f9b3a29401637b8eee1a 100644 (file)
--- a/arch/arm/boot/dts/nxp/imx/imx6qdl-phytec-mira.dtsi
+++ b/arch/arm/boot/dts/nxp/imx/imx6qdl-phytec-mira.dtsi
@@ -162,7 +162,7 @@
                interrupts = <12 IRQ_TYPE_NONE>;
                status = "disabled";
 
-               stmpe_touchscreen {
+               touchscreen {
                        compatible = "st,stmpe-ts";
                        st,sample-time = <4>;
                        st,mod-12b = <1>;

diff --git a/arch/arm/boot/dts/nxp/imx/imx6ul-phytec-segin-peb-av-02.dtsi b/arch/arm/boot/dts/nxp/imx/imx6ul-phytec-segin-peb-av-02.dtsi
index ec042648bd98f4b73a03e059e6452e63a328ab33..c6064f4c679b32e2215ac90646c3c2f2636be59f 100644 (file)
--- a/arch/arm/boot/dts/nxp/imx/imx6ul-phytec-segin-peb-av-02.dtsi
+++ b/arch/arm/boot/dts/nxp/imx/imx6ul-phytec-segin-peb-av-02.dtsi
@@ -61,7 +61,7 @@
                wakeup-source;
                status = "disabled";
 
-               stmpe_touchscreen {
+               touchscreen {
                        compatible = "st,stmpe-ts";
                        st,sample-time = <4>;
                        st,mod-12b = <1>;

diff --git a/arch/arm/boot/dts/nxp/imx/imx7d-nitrogen7.dts b/arch/arm/boot/dts/nxp/imx/imx7d-nitrogen7.dts
index 7ee66be8bccbe67211dbee0094642f122805739b..7acd28658e6ffa3bc649c93c19d2f0b8e5a9f51e 100644 (file)
--- a/arch/arm/boot/dts/nxp/imx/imx7d-nitrogen7.dts
+++ b/arch/arm/boot/dts/nxp/imx/imx7d-nitrogen7.dts
@@ -270,7 +270,7 @@
        pinctrl-0 = <&pinctrl_i2c3>;
        status = "okay";
 
-       touch@48 {
+       touchscreen@48 {
                compatible = "ti,tsc2004";
                reg = <0x48>;
                pinctrl-names = "default";