devicetree.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Stefan Agner <stefan@agner.ch>
To: stefan@agner.ch, marex@denx.de, viresh.linux@gmail.com,
	shiraz.hashim@st.com
Cc: devicetree@vger.kernel.org, linux-arm-kernel@lists.infradead.org,
	linux@arm.linux.org.uk, linux-kernel@vger.kernel.org,
	galak@codeaurora.org, ijc+devicetree@hellion.org.uk,
	mark.rutland@arm.com, pawel.moll@arm.com,
	rob.herring@calxeda.com
Subject: [PATCH] ARM: dts: stmpe-ts: fix wrong bindings
Date: Mon,  9 Dec 2013 21:15:11 +0100	[thread overview]
Message-ID: <1386620111-1413-1-git-send-email-stefan@agner.ch> (raw)

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

             reply	other threads:[~2013-12-09 20:15 UTC|newest]

Thread overview: 4+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2013-12-09 20:15 Stefan Agner [this message]
     [not found] ` <1386620111-1413-1-git-send-email-stefan-XLVq0VzYD2Y@public.gmane.org>
2013-12-09 20:32   ` [PATCH] ARM: dts: stmpe-ts: fix wrong bindings Marek Vasut
2014-04-02  7:48     ` Stefan Agner
     [not found]       ` <2acd964e18e59b35996d042a3dd6e99b-XLVq0VzYD2Y@public.gmane.org>
2014-04-02  9:15         ` Shawn Guo

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1386620111-1413-1-git-send-email-stefan@agner.ch \
    --to=stefan@agner.ch \
    --cc=devicetree@vger.kernel.org \
    --cc=galak@codeaurora.org \
    --cc=ijc+devicetree@hellion.org.uk \
    --cc=linux-arm-kernel@lists.infradead.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux@arm.linux.org.uk \
    --cc=marex@denx.de \
    --cc=mark.rutland@arm.com \
    --cc=pawel.moll@arm.com \
    --cc=rob.herring@calxeda.com \
    --cc=shiraz.hashim@st.com \
    --cc=viresh.linux@gmail.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).