From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755753Ab1JRI2h (ORCPT ); Tue, 18 Oct 2011 04:28:37 -0400 Received: from mail-bw0-f46.google.com ([209.85.214.46]:55184 "EHLO mail-bw0-f46.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751238Ab1JRI2c (ORCPT ); Tue, 18 Oct 2011 04:28:32 -0400 From: Ricardo Ribalda Delgado 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 Subject: [PATCH 2/5] input/cma3000_d0x: Check silicon version Date: Tue, 18 Oct 2011 10:28:03 +0200 Message-Id: <1318926486-10330-3-git-send-email-ricardo.ribalda@gmail.com> X-Mailer: git-send-email 1.7.7 In-Reply-To: <1318926486-10330-1-git-send-email-ricardo.ribalda@gmail.com> References: <1318926486-10330-1-git-send-email-ricardo.ribalda@gmail.com> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Improve probing of the cma3000 chip, by checking the revision of the device. Signed-off-by: Ricardo Ribalda Delgado --- 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