ARM: dts: imx6: rename stmpgpio to gpio

Rename stmpgpio to gpio and add gpio-controller and interrupt-controller.
Rename stmpe_adc to adc. Move interrupt-controller and gpio-controller
under gpio node.

to fix below CHECK_DTBS warnings:

/home/lizhi/source/linux-upstream-pci/arch/arm/boot/dts/nxp/imx/imx6q-dmo-edmqmx6.dtb: stmpe1601@40 (st,stmpe1601): gpio: 'interrupt-controller' is a required property
	from schema $id: http://devicetree.org/schemas/mfd/st,stmpe.yaml#
/home/lizhi/source/linux-upstream-pci/arch/arm/boot/dts/nxp/imx/imx6q-dmo-edmqmx6.dtb: gpio (st,stmpe-gpio): 'interrupt-controller' is a required property
	from schema $id: http://devicetree.org/schemas/gpio/st,stmpe-gpio.yaml#
/home/lizhi/source/linux-upstream-pci/arch/arm/boot/dts/nxp/imx/imx6q-dmo-edmqmx6.dtb: stmpe1601@44 (st,stmpe1601): gpio: 'interrupt-controller' is a required property
	from schema $id: http://devicetree.org/schemas/mfd/st,stmpe.yaml#
/home/lizhi/source/linux-upstream-pci/arch/arm/boot/dts/nxp/imx/imx6q-dmo-edmqmx6.dtb: gpio (st,stmpe-gpio): 'interrupt-controller' is a required property
	from schema $id: http://devicetree.org/schemas/gpio/st,stmpe-gpio.yaml#

Signed-off-by: Frank Li <Frank.Li@nxp.com>
Signed-off-by: Shawn Guo <shawnguo@kernel.org>

diff --git a/arch/arm/boot/dts/nxp/imx/imx6q-dmo-edmqmx6.dts b/arch/arm/boot/dts/nxp/imx/imx6q-dmo-edmqmx6.dts
index 17fabff80e903f621814492a8f8b837c5721adbe..cbe580dec182e1428d39477fa800a6e5ae1fe20c 100644 (file)
--- a/arch/arm/boot/dts/nxp/imx/imx6q-dmo-edmqmx6.dts
+++ b/arch/arm/boot/dts/nxp/imx/imx6q-dmo-edmqmx6.dts
@@ -236,9 +236,12 @@
                vcc-supply = <&sw2_reg>;
                vio-supply = <&sw2_reg>;
 
-               stmpe_gpio1: stmpe_gpio {
+               stmpe_gpio1: gpio {
                        #gpio-cells = <2>;
                        compatible = "st,stmpe-gpio";
+                       gpio-controller;
+                       #interrupt-cells = <2>;
+                       interrupt-controller;
                };
        };
 
@@ -250,9 +253,12 @@
                vcc-supply = <&sw2_reg>;
                vio-supply = <&sw2_reg>;
 
-               stmpe_gpio2: stmpe_gpio {
+               stmpe_gpio2: gpio {
                        #gpio-cells = <2>;
                        compatible = "st,stmpe-gpio";
+                       gpio-controller;
+                       #interrupt-cells = <2>;
+                       interrupt-controller;
                };
        };
 

diff --git a/arch/arm/boot/dts/nxp/imx/imx6qdl-colibri.dtsi b/arch/arm/boot/dts/nxp/imx/imx6qdl-colibri.dtsi
index 419d85b5a66061d4389df5d42de626183c27a9e6..8a0ce250e57607ef157fe34859cf77f45f54935b 100644 (file)
--- a/arch/arm/boot/dts/nxp/imx/imx6qdl-colibri.dtsi
+++ b/arch/arm/boot/dts/nxp/imx/imx6qdl-colibri.dtsi
@@ -589,7 +589,7 @@
                        st,touch-det-delay = <5>;
                };
 
-               stmpe_adc: stmpe_adc {
+               stmpe_adc: adc {
                        compatible = "st,stmpe-adc";
                        /* forbid to use ADC channels 3-0 (touch) */
                        st,norequest-mask = <0x0F>;

diff --git a/arch/arm/boot/dts/nxp/imx/imx6ul-isiot.dtsi b/arch/arm/boot/dts/nxp/imx/imx6ul-isiot.dtsi
index 4c09bb31269662adeb0b06991f45765935bef01e..e34c8cbe36aec682f46ffa128247bc47f3a6cab9 100644 (file)
--- a/arch/arm/boot/dts/nxp/imx/imx6ul-isiot.dtsi
+++ b/arch/arm/boot/dts/nxp/imx/imx6ul-isiot.dtsi
@@ -122,15 +122,21 @@
                VDDD-supply = <&reg_1p8v>;
        };
 
-       stmpe811: gpio-expander@44 {
+       gpio-expander@44 {
                compatible = "st,stmpe811";
                reg = <0x44>;
                pinctrl-names = "default";
                pinctrl-0 = <&pinctrl_stmpe>;
                interrupt-parent = <&gpio1>;
                interrupts = <18 IRQ_TYPE_EDGE_FALLING>;
-               interrupt-controller;
-               #interrupt-cells = <2>;
+
+               gpio {
+                       compatible = "st,stmpe-gpio";
+                       gpio-controller;
+                       #gpio-cells = <2>;
+                       interrupt-controller;
+                       #interrupt-cells = <2>;
+               };
 
                stmpe: touchscreen {
                        compatible = "st,stmpe-ts";