* [PATCH] bma150: extend chip detection for bma180
@ 2014-04-10 9:30 Dr. H. Nikolaus Schaller
2014-04-25 6:52 ` Dmitry Torokhov
0 siblings, 1 reply; 2+ messages in thread
From: Dr. H. Nikolaus Schaller @ 2014-04-10 9:30 UTC (permalink / raw)
To: Dmitry Torokhov; +Cc: Jingoo Han, Fugang Duan, linux-input, LKML, Marek Belisko
This driver has been used while on the OpenPhoenux GTA04 with
a BMA180.
Signed-off-by: H. Nikolaus Schaller <hns@goldelico.com>
---
drivers/input/misc/bma150.c | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/drivers/input/misc/bma150.c b/drivers/input/misc/bma150.c
index 52d3a9b..b36831c 100644
--- a/drivers/input/misc/bma150.c
+++ b/drivers/input/misc/bma150.c
@@ -70,6 +70,7 @@
#define BMA150_CFG_5_REG 0x11
#define BMA150_CHIP_ID 2
+#define BMA180_CHIP_ID 3
#define BMA150_CHIP_ID_REG BMA150_DATA_0_REG
#define BMA150_ACC_X_LSB_REG BMA150_DATA_2_REG
@@ -539,7 +540,7 @@ static int bma150_probe(struct i2c_client *client,
}
chip_id = i2c_smbus_read_byte_data(client, BMA150_CHIP_ID_REG);
- if (chip_id != BMA150_CHIP_ID) {
+ if (chip_id != BMA150_CHIP_ID && chip_id != BMA180_CHIP_ID) {
dev_err(&client->dev, "BMA150 chip id error: %d\n", chip_id);
return -EINVAL;
}
@@ -643,6 +644,7 @@ static UNIVERSAL_DEV_PM_OPS(bma150_pm, bma150_suspend, bma150_resume, NULL);
static const struct i2c_device_id bma150_id[] = {
{ "bma150", 0 },
+ { "bma180", 0 },
{ "smb380", 0 },
{ "bma023", 0 },
{ }
--
1.9.1
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [PATCH] bma150: extend chip detection for bma180
2014-04-10 9:30 [PATCH] bma150: extend chip detection for bma180 Dr. H. Nikolaus Schaller
@ 2014-04-25 6:52 ` Dmitry Torokhov
0 siblings, 0 replies; 2+ messages in thread
From: Dmitry Torokhov @ 2014-04-25 6:52 UTC (permalink / raw)
To: Dr. H. Nikolaus Schaller
Cc: Jingoo Han, Fugang Duan, linux-input, LKML, Marek Belisko
On Thu, Apr 10, 2014 at 11:30:02AM +0200, Dr. H. Nikolaus Schaller wrote:
> This driver has been used while on the OpenPhoenux GTA04 with
> a BMA180.
>
> Signed-off-by: H. Nikolaus Schaller <hns@goldelico.com>
Applied, thank you.
> ---
> drivers/input/misc/bma150.c | 4 +++-
> 1 file changed, 3 insertions(+), 1 deletion(-)
>
> diff --git a/drivers/input/misc/bma150.c b/drivers/input/misc/bma150.c
> index 52d3a9b..b36831c 100644
> --- a/drivers/input/misc/bma150.c
> +++ b/drivers/input/misc/bma150.c
> @@ -70,6 +70,7 @@
> #define BMA150_CFG_5_REG 0x11
>
> #define BMA150_CHIP_ID 2
> +#define BMA180_CHIP_ID 3
> #define BMA150_CHIP_ID_REG BMA150_DATA_0_REG
>
> #define BMA150_ACC_X_LSB_REG BMA150_DATA_2_REG
> @@ -539,7 +540,7 @@ static int bma150_probe(struct i2c_client *client,
> }
>
> chip_id = i2c_smbus_read_byte_data(client, BMA150_CHIP_ID_REG);
> - if (chip_id != BMA150_CHIP_ID) {
> + if (chip_id != BMA150_CHIP_ID && chip_id != BMA180_CHIP_ID) {
> dev_err(&client->dev, "BMA150 chip id error: %d\n", chip_id);
> return -EINVAL;
> }
> @@ -643,6 +644,7 @@ static UNIVERSAL_DEV_PM_OPS(bma150_pm, bma150_suspend, bma150_resume, NULL);
>
> static const struct i2c_device_id bma150_id[] = {
> { "bma150", 0 },
> + { "bma180", 0 },
> { "smb380", 0 },
> { "bma023", 0 },
> { }
> --
> 1.9.1
>
>
--
Dmitry
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2014-04-25 6:52 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2014-04-10 9:30 [PATCH] bma150: extend chip detection for bma180 Dr. H. Nikolaus Schaller
2014-04-25 6:52 ` Dmitry Torokhov
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).