diff options
| author | Dr. H. Nikolaus Schaller <hns@goldelico.com> | 2014-04-24 23:42:43 -0700 |
|---|---|---|
| committer | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2014-04-24 23:53:10 -0700 |
| commit | ef3714fdbc8d4bb0af2eff584519f9687aed0fcb (patch) | |
| tree | fca01c2a8c49e5e585ef80be4581ca9c702a6812 | |
| parent | 3d725caa9dcc78c3dc9e7ea0c04f626468edd9c9 (diff) | |
| download | linux-stable-ef3714fdbc8d4bb0af2eff584519f9687aed0fcb.tar.gz linux-stable-ef3714fdbc8d4bb0af2eff584519f9687aed0fcb.tar.bz2 linux-stable-ef3714fdbc8d4bb0af2eff584519f9687aed0fcb.zip | |
Input: bma150 - extend chip detection for bma180
This driver has been used while on the OpenPhoenux GTA04 with a BMA180.
Signed-off-by: H. Nikolaus Schaller <hns@goldelico.com>
Signed-off-by: Dmitry Torokhov <dmitry.torokhov@gmail.com>
| -rw-r--r-- | drivers/input/misc/bma150.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/drivers/input/misc/bma150.c b/drivers/input/misc/bma150.c index 52d3a9b28f0b..b36831c828d3 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 }, { } |