From: Ricardo Ribalda Delgado <ricardo.ribalda@gmail.com>
To: dmitry.torokhov@gmail.com, sameo@linux.intel.com,
peter.ujfalusi@ti.com, aghayal@codeaurora.org, david@hardeman.nu,
Shubhrajyoti@ti.com, saaguirre@ti.com, jic23@cam.ac.uk,
hemanthv@ti.com, linux-input@vger.kernel.org,
linux-kernel@vger.kernel.org
Cc: Ricardo Ribalda Delgado <ricardo.ribalda@gmail.com>
Subject: [PATCH 2/5] input/cma3000_d0x: Check silicon version
Date: Tue, 18 Oct 2011 10:28:03 +0200 [thread overview]
Message-ID: <1318926486-10330-3-git-send-email-ricardo.ribalda@gmail.com> (raw)
In-Reply-To: <1318926486-10330-1-git-send-email-ricardo.ribalda@gmail.com>
Improve probing of the cma3000 chip, by checking the revision of the
device.
Signed-off-by: Ricardo Ribalda Delgado <ricardo.ribalda@gmail.com>
---
drivers/input/misc/cma3000_d0x.c | 15 ++++++++++++++-
1 files changed, 14 insertions(+), 1 deletions(-)
diff --git a/drivers/input/misc/cma3000_d0x.c b/drivers/input/misc/cma3000_d0x.c
index 2f993d5..9899742 100644
--- a/drivers/input/misc/cma3000_d0x.c
+++ b/drivers/input/misc/cma3000_d0x.c
@@ -26,6 +26,8 @@
#include "cma3000_d0x.h"
+#define CMA3000_REV 0x10
+
#define CMA3000_WHOAMI 0x00
#define CMA3000_REVID 0x01
#define CMA3000_CTRL 0x02
@@ -373,9 +375,20 @@ struct cma3000_accl_data *cma3000_init(struct device *dev, int irq,
error = rev;
goto err_free_mem;
}
-
+ if (rev != CMA3000_REV) {
+ error = -EINVAL;
+ pr_err("CMA3000 Accelerometer: Unknown Revision %x\n", rev);
+ goto err_free_mem;
+ }
pr_info("CMA3000 Accelerometer: Revision %x\n", rev);
+ rev = CMA3000_READ(data, CMA3000_WHOAMI, "WhoamI");
+ if (rev < 0) {
+ error = rev;
+ goto err_free_mem;
+ }
+ pr_info("CMA3000 Accelerometer: WhoamI %x\n", rev);
+
error = request_threaded_irq(irq, NULL, cma3000_thread_irq,
pdata->irqflags | IRQF_ONESHOT,
"cma3000_d0x", data);
--
1.7.7
next prev parent reply other threads:[~2011-10-18 8:28 UTC|newest]
Thread overview: 17+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-10-18 8:28 [PATCH 0/5] Add spi support for CMA3000 driver and new driver CMR3000 Ricardo Ribalda Delgado
2011-10-18 8:28 ` [PATCH 1/5] input/cma3000_d0x: Support devices without pdata Ricardo Ribalda Delgado
2011-10-18 8:32 ` Jonathan Cameron
2011-10-18 12:07 ` Ricardo Ribalda Delgado
2011-10-18 12:51 ` Jonathan Cameron
2011-10-18 8:28 ` Ricardo Ribalda Delgado [this message]
2011-10-18 8:34 ` [PATCH 2/5] input/cma3000_d0x: Check silicon version Jonathan Cameron
2011-10-18 12:07 ` Ricardo Ribalda Delgado
2011-10-18 8:28 ` [PATCH 3/5] input/cma3000_d0x: Keep configuration on poweroff Ricardo Ribalda Delgado
2011-10-18 8:35 ` Jonathan Cameron
2011-10-18 12:07 ` Ricardo Ribalda Delgado
2011-10-18 12:45 ` Jonathan Cameron
2011-10-18 8:28 ` [PATCH 4/5] input/cma3000_d0x: Add CMA3000 spi support Ricardo Ribalda Delgado
2011-10-18 8:44 ` Jonathan Cameron
2011-10-18 8:28 ` [PATCH 5/5] Input: add CMR3000 gyrsocope driver Ricardo Ribalda Delgado
2011-10-18 8:54 ` Jonathan Cameron
2011-10-18 12:07 ` Ricardo Ribalda Delgado
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=1318926486-10330-3-git-send-email-ricardo.ribalda@gmail.com \
--to=ricardo.ribalda@gmail.com \
--cc=Shubhrajyoti@ti.com \
--cc=aghayal@codeaurora.org \
--cc=david@hardeman.nu \
--cc=dmitry.torokhov@gmail.com \
--cc=hemanthv@ti.com \
--cc=jic23@cam.ac.uk \
--cc=linux-input@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=peter.ujfalusi@ti.com \
--cc=saaguirre@ti.com \
--cc=sameo@linux.intel.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
all inboxes | Powered by JetHome®