ARM: dts: Add stmpe-adc DT node to Toradex iMX6 modules

Add the stmpe-adc DT node as found on Toradex iMX6 modules

Signed-off-by: Philippe Schenker <philippe.schenker@toradex.com>
Reviewed-by: Stefan Agner <stefan@agner.ch>
Signed-off-by: Shawn Guo <shawnguo@kernel.org>

diff --git a/arch/arm/boot/dts/imx6qdl-apalis.dtsi b/arch/arm/boot/dts/imx6qdl-apalis.dtsi
index 5e6cec9..7c4ad54 100644 (file)
--- a/arch/arm/boot/dts/imx6qdl-apalis.dtsi
+++ b/arch/arm/boot/dts/imx6qdl-apalis.dtsi
@@ -332,11 +332,17 @@
                id = <0>;
                blocks = <0x5>;
                irq-trigger = <0x1>;
+               /* 3.25 MHz ADC clock speed */
+               st,adc-freq = <1>;
+               /* 12-bit ADC */
+               st,mod-12b = <1>;
+               /* internal ADC reference */
+               st,ref-sel = <0>;
+               /* ADC converstion time: 80 clocks */
+               st,sample-time = <4>;
 
                stmpe_touchscreen {
                        compatible = "st,stmpe-ts";
-                       /* 3.25 MHz ADC clock speed */
-                       st,adc-freq = <1>;
                        /* 8 sample average control */
                        st,ave-ctrl = <3>;
                        /* 7 length fractional part in z */
@@ -346,17 +352,17 @@
                         * current limit value
                         */
                        st,i-drive = <1>;
-                       /* 12-bit ADC */
-                       st,mod-12b = <1>;
-                       /* internal ADC reference */
-                       st,ref-sel = <0>;
-                       /* ADC converstion time: 80 clocks */
-                       st,sample-time = <4>;
                        /* 1 ms panel driver settling time */
                        st,settling = <3>;
                        /* 5 ms touch detect interrupt delay */
                        st,touch-det-delay = <5>;
                };
+
+               stmpe_adc {
+                       compatible = "st,stmpe-adc";
+                       /* forbid to use ADC channels 3-0 (touch) */
+                       st,norequest-mask = <0x0F>;
+               };
        };
 };
 

diff --git a/arch/arm/boot/dts/imx6qdl-colibri.dtsi b/arch/arm/boot/dts/imx6qdl-colibri.dtsi
index 8a27c2a..1beac22 100644 (file)
--- a/arch/arm/boot/dts/imx6qdl-colibri.dtsi
+++ b/arch/arm/boot/dts/imx6qdl-colibri.dtsi
@@ -262,11 +262,17 @@
                id = <0>;
                blocks = <0x5>;
                irq-trigger = <0x1>;
+               /* 3.25 MHz ADC clock speed */
+               st,adc-freq = <1>;
+               /* 12-bit ADC */
+               st,mod-12b = <1>;
+               /* internal ADC reference */
+               st,ref-sel = <0>;
+               /* ADC converstion time: 80 clocks */
+               st,sample-time = <4>;
 
                stmpe_touchscreen {
                        compatible = "st,stmpe-ts";
-                       /* 3.25 MHz ADC clock speed */
-                       st,adc-freq = <1>;
                        /* 8 sample average control */
                        st,ave-ctrl = <3>;
                        /* 7 length fractional part in z */
@@ -276,17 +282,17 @@
                         * current limit value
                         */
                        st,i-drive = <1>;
-                       /* 12-bit ADC */
-                       st,mod-12b = <1>;
-                       /* internal ADC reference */
-                       st,ref-sel = <0>;
-                       /* ADC converstion time: 80 clocks */
-                       st,sample-time = <4>;
                        /* 1 ms panel driver settling time */
                        st,settling = <3>;
                        /* 5 ms touch detect interrupt delay */
                        st,touch-det-delay = <5>;
                };
+
+               stmpe_adc {
+                       compatible = "st,stmpe-adc";
+                       /* forbid to use ADC channels 3-0 (touch) */
+                       st,norequest-mask = <0x0F>;
+               };
        };
 };