iio:accel:bmc150-accel: Use the chip ID to detect sensor variant

Instead of using the I2C or ACPI ID to determine which variant of
the chipset to use, determine that from the chip ID.

Under Windows, the same driver is used for those variants and, despite
incorrect ACPI data, it is able to load and operate the accelerometer.

Fixes the accelerometer failing with:
bmc150_accel i2c-BMA250E:00: Invalid chip f8
on the WinBook TW100

Signed-off-by: Bastien Nocera <hadess@hadess.net>
Signed-off-by: Jonathan Cameron <jic23@kernel.org>

diff --git a/drivers/iio/accel/bmc150-accel.c b/drivers/iio/accel/bmc150-accel.c
index 5be65e2cb244e19328df43276217aa10c58b95df..a7b66edf2a38c640848ac4daa237b1734db880b1 100644 (file)
--- a/drivers/iio/accel/bmc150-accel.c
+++ b/drivers/iio/accel/bmc150-accel.c
@@ -151,6 +151,7 @@ struct bmc150_scale_info {
 };
 
 struct bmc150_accel_chip_info {
+       const char *name;
        u8 chip_id;
        const struct iio_chan_spec *channels;
        int num_channels;
@@ -1062,6 +1063,7 @@ enum {
 
 static const struct bmc150_accel_chip_info bmc150_accel_chip_info_tbl[] = {
        [bmc150] = {
+               .name = "BMC150A",
                .chip_id = 0xFA,
                .channels = bmc150_accel_channels,
                .num_channels = ARRAY_SIZE(bmc150_accel_channels),
@@ -1071,6 +1073,7 @@ static const struct bmc150_accel_chip_info bmc150_accel_chip_info_tbl[] = {
                                 {76590, BMC150_ACCEL_DEF_RANGE_16G} },
        },
        [bmi055] = {
+               .name = "BMI055A",
                .chip_id = 0xFA,
                .channels = bmc150_accel_channels,
                .num_channels = ARRAY_SIZE(bmc150_accel_channels),
@@ -1080,6 +1083,7 @@ static const struct bmc150_accel_chip_info bmc150_accel_chip_info_tbl[] = {
                                 {76590, BMC150_ACCEL_DEF_RANGE_16G} },
        },
        [bma255] = {
+               .name = "BMA0255",
                .chip_id = 0xFA,
                .channels = bmc150_accel_channels,
                .num_channels = ARRAY_SIZE(bmc150_accel_channels),
@@ -1089,6 +1093,7 @@ static const struct bmc150_accel_chip_info bmc150_accel_chip_info_tbl[] = {
                                 {76590, BMC150_ACCEL_DEF_RANGE_16G} },
        },
        [bma250e] = {
+               .name = "BMA250E",
                .chip_id = 0xF9,
                .channels = bma250e_accel_channels,
                .num_channels = ARRAY_SIZE(bma250e_accel_channels),
@@ -1098,6 +1103,7 @@ static const struct bmc150_accel_chip_info bmc150_accel_chip_info_tbl[] = {
                                 {306457, BMC150_ACCEL_DEF_RANGE_16G} },
        },
        [bma222e] = {
+               .name = "BMA222E",
                .chip_id = 0xF8,
                .channels = bma222e_accel_channels,
                .num_channels = ARRAY_SIZE(bma222e_accel_channels),
@@ -1107,6 +1113,7 @@ static const struct bmc150_accel_chip_info bmc150_accel_chip_info_tbl[] = {
                                 {1225831, BMC150_ACCEL_DEF_RANGE_16G} },
        },
        [bma280] = {
+               .name = "BMA0280",
                .chip_id = 0xFB,
                .channels = bma280_accel_channels,
                .num_channels = ARRAY_SIZE(bma280_accel_channels),
@@ -1353,20 +1360,6 @@ static irqreturn_t bmc150_accel_irq_handler(int irq, void *private)
        return IRQ_NONE;
 }
 
-static const char *bmc150_accel_match_acpi_device(struct device *dev, int *data)
-{
-       const struct acpi_device_id *id;
-
-       id = acpi_match_device(dev->driver->acpi_match_table, dev);
-
-       if (!id)
-               return NULL;
-
-       *data = (int)id->driver_data;
-
-       return dev_name(dev);
-}
-
 static int bmc150_accel_gpio_probe(struct i2c_client *client,
                                   struct bmc150_accel_data *data)
 {
@@ -1563,7 +1556,7 @@ static const struct iio_buffer_setup_ops bmc150_accel_buffer_ops = {
 
 static int bmc150_accel_chip_init(struct bmc150_accel_data *data)
 {
-       int ret;
+       int ret, i;
 
        ret = i2c_smbus_read_byte_data(data->client, BMC150_ACCEL_REG_CHIP_ID);
        if (ret < 0) {
@@ -1572,8 +1565,15 @@ static int bmc150_accel_chip_init(struct bmc150_accel_data *data)
        }
 
        dev_dbg(&data->client->dev, "Chip Id %x\n", ret);
-       if (ret != data->chip_info->chip_id) {
-               dev_err(&data->client->dev, "Invalid chip %x\n", ret);
+       for (i = 0; i < ARRAY_SIZE(bmc150_accel_chip_info_tbl); i++) {
+               if (bmc150_accel_chip_info_tbl[i].chip_id == ret) {
+                       data->chip_info = &bmc150_accel_chip_info_tbl[i];
+                       break;
+               }
+       }
+
+       if (!data->chip_info) {
+               dev_err(&data->client->dev, "Unsupported chip %x\n", ret);
                return -ENODEV;
        }
 
@@ -1625,7 +1625,6 @@ static int bmc150_accel_probe(struct i2c_client *client,
        struct iio_dev *indio_dev;
        int ret;
        const char *name = NULL;
-       int chip_id = 0;
 
        indio_dev = devm_iio_device_alloc(&client->dev, sizeof(*data));
        if (!indio_dev)
@@ -1635,15 +1634,8 @@ static int bmc150_accel_probe(struct i2c_client *client,
        i2c_set_clientdata(client, indio_dev);
        data->client = client;
 
-       if (id) {
+       if (id)
                name = id->name;
-               chip_id = id->driver_data;
-       }
-
-       if (ACPI_HANDLE(&client->dev))
-               name = bmc150_accel_match_acpi_device(&client->dev, &chip_id);
-
-       data->chip_info = &bmc150_accel_chip_info_tbl[chip_id];
 
        ret = bmc150_accel_chip_init(data);
        if (ret < 0)
@@ -1654,7 +1646,7 @@ static int bmc150_accel_probe(struct i2c_client *client,
        indio_dev->dev.parent = &client->dev;
        indio_dev->channels = data->chip_info->channels;
        indio_dev->num_channels = data->chip_info->num_channels;
-       indio_dev->name = name;
+       indio_dev->name = name ? name : data->chip_info->name;
        indio_dev->modes = INDIO_DIRECT_MODE;
        indio_dev->info = &bmc150_accel_info;