[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-Id: <1318926486-10330-3-git-send-email-ricardo.ribalda@gmail.com>
Date: Tue, 18 Oct 2011 10:28:03 +0200
From: Ricardo Ribalda Delgado <ricardo.ribalda@...il.com>
To: dmitry.torokhov@...il.com, sameo@...ux.intel.com,
peter.ujfalusi@...com, aghayal@...eaurora.org, david@...deman.nu,
Shubhrajyoti@...com, saaguirre@...com, jic23@....ac.uk,
hemanthv@...com, linux-input@...r.kernel.org,
linux-kernel@...r.kernel.org
Cc: Ricardo Ribalda Delgado <ricardo.ribalda@...il.com>
Subject: [PATCH 2/5] input/cma3000_d0x: Check silicon version
Improve probing of the cma3000 chip, by checking the revision of the
device.
Signed-off-by: Ricardo Ribalda Delgado <ricardo.ribalda@...il.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
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists