[PATCH] ARM: dts: stmpe-ts: fix wrong bindings

[PATCH] ARM: dts: stmpe-ts: fix wrong bindings

[Stefan Agner]

Fix bindings for STMPE touchscreen device to match the documented
bindings and the actual bindings used by the driver.

Signed-off-by: Stefan Agner <stefan@agner.ch>
---
I don't have any of these hardware, but the error is obvious. The device
probably works anyway since the device/driver will use default values.
---
 arch/arm/boot/dts/imx53-m53evk.dts  | 20 ++++++++++----------
 arch/arm/boot/dts/spear1310-evb.dts | 18 +++++++++---------
 arch/arm/boot/dts/spear1340-evb.dts | 18 +++++++++---------
 arch/arm/boot/dts/spear320-hmi.dts  | 20 ++++++++++----------
 4 files changed, 38 insertions(+), 38 deletions(-)

diff --git a/arch/arm/boot/dts/imx53-m53evk.dts b/arch/arm/boot/dts/imx53-m53evk.dts
index 7d304d0..e97f298 100644
--- a/arch/arm/boot/dts/imx53-m53evk.dts
+++ b/arch/arm/boot/dts/imx53-m53evk.dts
@@ -165,17 +165,17 @@
 		irq-trigger = <0x1>;
 
 		stmpe_touchscreen {
-			compatible = "stmpe,ts";
+			compatible = "st,stmpe-ts";
 			reg = <0>;
-			ts,sample-time = <4>;
-			ts,mod-12b = <1>;
-			ts,ref-sel = <0>;
-			ts,adc-freq = <1>;
-			ts,ave-ctrl = <3>;
-			ts,touch-det-delay = <3>;
-			ts,settling = <4>;
-			ts,fraction-z = <7>;
-			ts,i-drive = <1>;
+			st,sample-time = <4>;
+			st,mod-12b = <1>;
+			st,ref-sel = <0>;
+			st,adc-freq = <1>;
+			st,ave-ctrl = <3>;
+			st,touch-det-delay = <3>;
+			st,settling = <4>;
+			st,fraction-z = <7>;
+			st,i-drive = <1>;
 		};
 	};
 
diff --git a/arch/arm/boot/dts/spear1310-evb.dts b/arch/arm/boot/dts/spear1310-evb.dts
index b56a801..fe2ece2 100644
--- a/arch/arm/boot/dts/spear1310-evb.dts
+++ b/arch/arm/boot/dts/spear1310-evb.dts
@@ -369,15 +369,15 @@
 
 					stmpe_touchscreen {
 						compatible = "st,stmpe-ts";
-						ts,sample-time = <4>;
-						ts,mod-12b = <1>;
-						ts,ref-sel = <0>;
-						ts,adc-freq = <1>;
-						ts,ave-ctrl = <1>;
-						ts,touch-det-delay = <2>;
-						ts,settling = <2>;
-						ts,fraction-z = <7>;
-						ts,i-drive = <1>;
+						st,sample-time = <4>;
+						st,mod-12b = <1>;
+						st,ref-sel = <0>;
+						st,adc-freq = <1>;
+						st,ave-ctrl = <1>;
+						st,touch-det-delay = <2>;
+						st,settling = <2>;
+						st,fraction-z = <7>;
+						st,i-drive = <1>;
 					};
 				};
 
diff --git a/arch/arm/boot/dts/spear1340-evb.dts b/arch/arm/boot/dts/spear1340-evb.dts
index d6c30ae..d3dcba9 100644
--- a/arch/arm/boot/dts/spear1340-evb.dts
+++ b/arch/arm/boot/dts/spear1340-evb.dts
@@ -480,15 +480,15 @@
 
 					stmpe_touchscreen {
 						compatible = "st,stmpe-ts";
-						ts,sample-time = <4>;
-						ts,mod-12b = <1>;
-						ts,ref-sel = <0>;
-						ts,adc-freq = <1>;
-						ts,ave-ctrl = <1>;
-						ts,touch-det-delay = <2>;
-						ts,settling = <2>;
-						ts,fraction-z = <7>;
-						ts,i-drive = <1>;
+						st,sample-time = <4>;
+						st,mod-12b = <1>;
+						st,ref-sel = <0>;
+						st,adc-freq = <1>;
+						st,ave-ctrl = <1>;
+						st,touch-det-delay = <2>;
+						st,settling = <2>;
+						st,fraction-z = <7>;
+						st,i-drive = <1>;
 					};
 				};
 
diff --git a/arch/arm/boot/dts/spear320-hmi.dts b/arch/arm/boot/dts/spear320-hmi.dts
index 3075d2d..2a5d013 100644
--- a/arch/arm/boot/dts/spear320-hmi.dts
+++ b/arch/arm/boot/dts/spear320-hmi.dts
@@ -256,17 +256,17 @@
 					};
 
 					stmpe610-ts {
-						compatible = "stmpe,ts";
+						compatible = "st,stmpe-ts";
 						reg = <0>;
-						ts,sample-time = <4>;
-						ts,mod-12b = <1>;
-						ts,ref-sel = <0>;
-						ts,adc-freq = <1>;
-						ts,ave-ctrl = <1>;
-						ts,touch-det-delay = <3>;
-						ts,settling = <4>;
-						ts,fraction-z = <7>;
-						ts,i-drive = <1>;
+						st,sample-time = <4>;
+						st,mod-12b = <1>;
+						st,ref-sel = <0>;
+						st,adc-freq = <1>;
+						st,ave-ctrl = <1>;
+						st,touch-det-delay = <3>;
+						st,settling = <4>;
+						st,fraction-z = <7>;
+						st,i-drive = <1>;
 					};
 				};
 			};
-- 
1.8.4.2

Re: [PATCH] ARM: dts: stmpe-ts: fix wrong bindings

[Marek Vasut]

On Monday, December 09, 2013 at 09:15:11 PM, Stefan Agner wrote:
> Fix bindings for STMPE touchscreen device to match the documented
> bindings and the actual bindings used by the driver.
> 
> Signed-off-by: Stefan Agner <stefan-XLVq0VzYD2Y@public.gmane.org>
> ---
> I don't have any of these hardware, but the error is obvious. The device
> probably works anyway since the device/driver will use default values.

Full agreement here.

Reviewed-by: Marek Vasut <marex-ynQEQJNshbs@public.gmane.org>

btw. I plan to rework the STMPE TS as it doesn't work nicely on my device at 
all. I am seriously lacking time, but I will try! ;-)

Best regards,
Marek Vasut
--
To unsubscribe from this list: send the line "unsubscribe devicetree" in
the body of a message to majordomo-u79uwXL29TY76Z2rM5mHXA@public.gmane.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Re: [PATCH] ARM: dts: stmpe-ts: fix wrong bindings

[Stefan Agner]

Am 2013-12-09 21:32, schrieb Marek Vasut:
> On Monday, December 09, 2013 at 09:15:11 PM, Stefan Agner wrote:
>> Fix bindings for STMPE touchscreen device to match the documented
>> bindings and the actual bindings used by the driver.
>>
>> Signed-off-by: Stefan Agner <stefan@agner.ch>
>> ---
>> I don't have any of these hardware, but the error is obvious. The device
>> probably works anyway since the device/driver will use default values.
> 
> Full agreement here.
> 
> Reviewed-by: Marek Vasut <marex@denx.de>
> 
> btw. I plan to rework the STMPE TS as it doesn't work nicely on my device at 
> all. I am seriously lacking time, but I will try! ;-)
> 
> Best regards,
> Marek Vasut

Hi Shawn,

Just noticed that I forgot to add you when sending this patch. I guess
this should go through your tree...

--
Stefan

Re: [PATCH] ARM: dts: stmpe-ts: fix wrong bindings

[Shawn Guo]

On Wed, Apr 02, 2014 at 09:48:58AM +0200, Stefan Agner wrote:
> Am 2013-12-09 21:32, schrieb Marek Vasut:
> > On Monday, December 09, 2013 at 09:15:11 PM, Stefan Agner wrote:
> >> Fix bindings for STMPE touchscreen device to match the documented
> >> bindings and the actual bindings used by the driver.
> >>
> >> Signed-off-by: Stefan Agner <stefan-XLVq0VzYD2Y@public.gmane.org>
> >> ---
> >> I don't have any of these hardware, but the error is obvious. The device
> >> probably works anyway since the device/driver will use default values.
> > 
> > Full agreement here.
> > 
> > Reviewed-by: Marek Vasut <marex-ynQEQJNshbs@public.gmane.org>
> > 
> > btw. I plan to rework the STMPE TS as it doesn't work nicely on my device at 
> > all. I am seriously lacking time, but I will try! ;-)
> > 
> > Best regards,
> > Marek Vasut
> 
> Hi Shawn,
> 
> Just noticed that I forgot to add you when sending this patch. I guess
> this should go through your tree...

You should probably resend the patch against the latest kernel, and with
imx change in a separate patch.

Shawn

--
To unsubscribe from this list: send the line "unsubscribe devicetree" in
the body of a message to majordomo-u79uwXL29TY76Z2rM5mHXA@public.gmane.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html