ARM: tegra: Add stmpe-adc DT node to Toradex T30 modules

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

Signed-off-by: Philippe Schenker <philippe.schenker@toradex.com>
Reviewed-by: Oleksandr Suvorov <oleksandr.suvorov@toradex.com>
Signed-off-by: Thierry Reding <treding@nvidia.com>

diff --git a/arch/arm/boot/dts/tegra30-apalis-v1.1.dtsi b/arch/arm/boot/dts/tegra30-apalis-v1.1.dtsi
index 02f8126481a2413f502ebfe601d284efcfd86590..8b7a827d604d8bacdd83fdda18af7644bf37306b 100644 (file)
--- a/arch/arm/boot/dts/tegra30-apalis-v1.1.dtsi
+++ b/arch/arm/boot/dts/tegra30-apalis-v1.1.dtsi
@@ -994,11 +994,17 @@ touchscreen@41 {
                        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 */
@@ -1008,17 +1014,17 @@ stmpe_touchscreen {
                                 * 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/tegra30-apalis.dtsi b/arch/arm/boot/dts/tegra30-apalis.dtsi
index 7f112f192fe9a4ebe2e0db0c0d6e7e2715b65811..c18f6f61d76493b2882f8b5ad71489e64f97b635 100644 (file)
--- a/arch/arm/boot/dts/tegra30-apalis.dtsi
+++ b/arch/arm/boot/dts/tegra30-apalis.dtsi
@@ -976,11 +976,17 @@ touchscreen@41 {
                        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 */
@@ -990,17 +996,17 @@ stmpe_touchscreen {
                                 * 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/tegra30-colibri.dtsi b/arch/arm/boot/dts/tegra30-colibri.dtsi
index 35af03ca9e908e9146715dcf2005e39d79c65de2..1f9198bb24ff3f7a0fe7352a090f007dc3153e82 100644 (file)
--- a/arch/arm/boot/dts/tegra30-colibri.dtsi
+++ b/arch/arm/boot/dts/tegra30-colibri.dtsi
@@ -845,11 +845,18 @@ touchscreen@41 {
                        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>;
+                       /* forbid to use ADC channels 3-0 (touch) */
 
                        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 */
@@ -859,17 +866,16 @@ stmpe_touchscreen {
                                 * 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";
+                               st,norequest-mask = <0x0F>;
+                       };
                };
 
                /*