linux-input.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Rostislav Lisovy <lisovy@gmail.com>
To: linux-kernel@vger.kernel.org, linux-input@vger.kernel.org,
	Dmitry Torokhov <dmitry.torokhov@gmail.com>
Cc: "Simon Budig" <simon.budig@kernelconcepts.de>,
	"Daniel Wagener" <daniel.wagener@kernelconcepts.de>,
	"Lothar Waßmann" <LW@KARO-electronics.de>,
	lisovy@jablotron.cz
Subject: [PATCH 1/2] input: edt-ft5x06: Do not hardcode register numbers in code, use #define
Date: Tue, 21 Apr 2015 13:19:52 +0200	[thread overview]
Message-ID: <1429615193-16794-1-git-send-email-lisovy@jablotron.cz> (raw)

Signed-off-by: Rostislav Lisovy <lisovy@jablotron.cz>
---
 drivers/input/touchscreen/edt-ft5x06.c | 17 +++++++++++------
 1 file changed, 11 insertions(+), 6 deletions(-)

diff --git a/drivers/input/touchscreen/edt-ft5x06.c b/drivers/input/touchscreen/edt-ft5x06.c
index e6aef3e..c938d4b 100644
--- a/drivers/input/touchscreen/edt-ft5x06.c
+++ b/drivers/input/touchscreen/edt-ft5x06.c
@@ -48,6 +48,9 @@
 #define WORK_REGISTER_OFFSET		0x31
 #define WORK_REGISTER_NUM_X		0x33
 #define WORK_REGISTER_NUM_Y		0x34
+#define WORK_REGISTER_FW_ID		0xA6
+#define WORK_REGISTER_FT_ID		0xA8
+#define WORK_REGISTER_FW_VER		0xBB
 
 #define M09_REGISTER_THRESHOLD		0x80
 #define M09_REGISTER_GAIN		0x92
@@ -799,14 +802,16 @@ static int edt_ft5x06_ts_identify(struct i2c_client *client,
 	char *p;
 	int error;
 	char *model_name = tsdata->name;
+	u8 cmd;
 
 	/* see what we find if we assume it is a M06 *
 	 * if we get less than EDT_NAME_LEN, we don't want
 	 * to have garbage in there
 	 */
 	memset(rdbuf, 0, sizeof(rdbuf));
-	error = edt_ft5x06_ts_readwrite(client, 1, "\xbb",
-					EDT_NAME_LEN - 1, rdbuf);
+	cmd = WORK_REGISTER_FW_VER;
+	error = edt_ft5x06_ts_readwrite(client, 1, &cmd, EDT_NAME_LEN - 1,
+					rdbuf);
 	if (error)
 		return error;
 
@@ -831,15 +836,15 @@ static int edt_ft5x06_ts_identify(struct i2c_client *client,
 		/* since there are only two versions around (M06, M09) */
 		tsdata->version = M09;
 
-		error = edt_ft5x06_ts_readwrite(client, 1, "\xA6",
-						2, rdbuf);
+		cmd = WORK_REGISTER_FW_ID;
+		error = edt_ft5x06_ts_readwrite(client, 1, &cmd, 2, rdbuf);
 		if (error)
 			return error;
 
 		strlcpy(fw_version, rdbuf, 2);
 
-		error = edt_ft5x06_ts_readwrite(client, 1, "\xA8",
-						1, rdbuf);
+		cmd = WORK_REGISTER_FT_ID;
+		error = edt_ft5x06_ts_readwrite(client, 1, &cmd, 1, rdbuf);
 		if (error)
 			return error;
 
-- 
2.1.0


             reply	other threads:[~2015-04-21 11:20 UTC|newest]

Thread overview: 2+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2015-04-21 11:19 Rostislav Lisovy [this message]
2015-04-21 11:19 ` [PATCH 2/2] input: edt-ft5x06: Perform register read from the very beginning (reg 0x0) Rostislav Lisovy

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=1429615193-16794-1-git-send-email-lisovy@jablotron.cz \
    --to=lisovy@gmail.com \
    --cc=LW@KARO-electronics.de \
    --cc=daniel.wagener@kernelconcepts.de \
    --cc=dmitry.torokhov@gmail.com \
    --cc=linux-input@vger.kernel.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=lisovy@jablotron.cz \
    --cc=simon.budig@kernelconcepts.de \
    /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).