iio: accel: bma180: Add OF device ID table

The driver doesn't have a struct of_device_id table but supported devices
are registered via Device Trees. This is working on the assumption that a
I2C device registered via OF will always match a legacy I2C device ID and
that the MODALIAS reported will always be of the form i2c:<device>.

But this could change in the future so the correct approach is to have an
OF device ID table if the devices are registered via OF.

Signed-off-by: Javier Martinez Canillas <javier@osg.samsung.com>
Signed-off-by: Jonathan Cameron <jic23@kernel.org>

diff --git a/drivers/iio/accel/bma180.c b/drivers/iio/accel/bma180.c
index dd84e87052e15f0c01883cbf6c73da8fee8a4806..efc67739c28f35d0cb6c8f354ac03de63e74d39e 100644 (file)
--- a/drivers/iio/accel/bma180.c
+++ b/drivers/iio/accel/bma180.c
@@ -18,6 +18,7 @@
 #include <linux/i2c.h>
 #include <linux/interrupt.h>
 #include <linux/delay.h>
+#include <linux/of_device.h>
 #include <linux/of.h>
 #include <linux/bitops.h>
 #include <linux/slab.h>
@@ -32,7 +33,7 @@
 #define BMA180_DRV_NAME "bma180"
 #define BMA180_IRQ_NAME "bma180_event"
 
-enum {
+enum chip_ids {
        BMA180,
        BMA250,
 };
@@ -707,6 +708,7 @@ static int bma180_probe(struct i2c_client *client,
 {
        struct bma180_data *data;
        struct iio_dev *indio_dev;
+       enum chip_ids chip;
        int ret;
 
        indio_dev = devm_iio_device_alloc(&client->dev, sizeof(*data));
@@ -716,7 +718,11 @@ static int bma180_probe(struct i2c_client *client,
        data = iio_priv(indio_dev);
        i2c_set_clientdata(client, indio_dev);
        data->client = client;
-       data->part_info = &bma180_part_info[id->driver_data];
+       if (client->dev.of_node)
+               chip = (enum chip_ids)of_device_get_match_data(&client->dev);
+       else
+               chip = id->driver_data;
+       data->part_info = &bma180_part_info[chip];
 
        ret = data->part_info->chip_config(data);
        if (ret < 0)
@@ -844,10 +850,24 @@ static struct i2c_device_id bma180_ids[] = {
 
 MODULE_DEVICE_TABLE(i2c, bma180_ids);
 
+static const struct of_device_id bma180_of_match[] = {
+       {
+               .compatible = "bosch,bma180",
+               .data = (void *)BMA180
+       },
+       {
+               .compatible = "bosch,bma250",
+               .data = (void *)BMA250
+       },
+       { }
+};
+MODULE_DEVICE_TABLE(of, bma180_of_match);
+
 static struct i2c_driver bma180_driver = {
        .driver = {
                .name   = "bma180",
                .pm     = BMA180_PM_OPS,
+               .of_match_table = bma180_of_match,
        },
        .probe          = bma180_probe,
        .remove         = bma180_remove,