iio: accel: mc3230: add multiple devices support

Refactor code to support multiple generations of MCUBE devices by
defining name, chip id and product code in mc3230_chip_info struct.

Signed-off-by: Vasiliy Doylov <nekodevelopper@gmail.com>
Link: https://patch.msgid.link/20250116-mainlining-mc3510c-v4-4-a41308b85ec2@gmail.com
Signed-off-by: Jonathan Cameron <Jonathan.Cameron@huawei.com>

diff --git a/drivers/iio/accel/mc3230.c b/drivers/iio/accel/mc3230.c
index 443b5b30c83144478c27a86dbdc12e4e944a34df..c8d394c3ecf08fad60f0f2ae7be6fd992327d843 100644 (file)
--- a/drivers/iio/accel/mc3230.c
+++ b/drivers/iio/accel/mc3230.c
@@ -22,20 +22,29 @@
 #define MC3230_MODE_OPCON_STANDBY      0x03
 
 #define MC3230_REG_CHIP_ID             0x18
-#define MC3230_CHIP_ID                 0x01
-
 #define MC3230_REG_PRODUCT_CODE                0x3b
-#define MC3230_PRODUCT_CODE            0x19
 
 /*
  * The accelerometer has one measurement range:
  *
  * -1.5g - +1.5g (8-bit, signed)
  *
- * scale = (1.5 + 1.5) * 9.81 / (2^8 - 1)      = 0.115411765
  */
 
-static const int mc3230_nscale = 115411765;
+struct mc3230_chip_info {
+       const char *name;
+       const u8 chip_id;
+       const u8 product_code;
+       const int scale;
+};
+
+static const struct mc3230_chip_info mc3230_chip_info = {
+       .name = "mc3230",
+       .chip_id = 0x01,
+       .product_code = 0x19,
+       /* (1.5 + 1.5) * 9.81 / (2^8 - 1) = 0.115411765 */
+       .scale = 115411765,
+};
 
 #define MC3230_CHANNEL(reg, axis) {    \
        .type = IIO_ACCEL,      \
@@ -48,6 +57,7 @@ static const int mc3230_nscale = 115411765;
 }
 
 struct mc3230_data {
+       const struct mc3230_chip_info *chip_info;
        struct i2c_client *client;
        struct iio_mount_matrix orientation;
 };
@@ -111,7 +121,7 @@ static int mc3230_read_raw(struct iio_dev *indio_dev,
                return IIO_VAL_INT;
        case IIO_CHAN_INFO_SCALE:
                *val = 0;
-               *val2 = mc3230_nscale;
+               *val2 = data->chip_info->scale;
                return IIO_VAL_INT_PLUS_NANO;
        default:
                return -EINVAL;
@@ -127,15 +137,28 @@ static int mc3230_probe(struct i2c_client *client)
        int ret;
        struct iio_dev *indio_dev;
        struct mc3230_data *data;
+       const struct mc3230_chip_info *chip_info;
+
+       chip_info = i2c_get_match_data(client);
+       if (chip_info == NULL) {
+               dev_err(&client->dev, "failed to get match data");
+               return -ENODATA;
+       }
 
        /* First check chip-id and product-id */
        ret = i2c_smbus_read_byte_data(client, MC3230_REG_CHIP_ID);
-       if (ret != MC3230_CHIP_ID)
-               return (ret < 0) ? ret : -ENODEV;
+       if (ret != chip_info->chip_id) {
+               dev_info(&client->dev,
+                       "chip id check fail: 0x%x != 0x%x !\n",
+                       ret, chip_info->chip_id);
+       }
 
        ret = i2c_smbus_read_byte_data(client, MC3230_REG_PRODUCT_CODE);
-       if (ret != MC3230_PRODUCT_CODE)
-               return (ret < 0) ? ret : -ENODEV;
+       if (ret != chip_info->product_code) {
+               dev_info(&client->dev,
+                       "product code check fail: 0x%x != 0x%x !\n",
+                       ret, chip_info->product_code);
+       }
 
        indio_dev = devm_iio_device_alloc(&client->dev, sizeof(*data));
        if (!indio_dev) {
@@ -144,11 +167,12 @@ static int mc3230_probe(struct i2c_client *client)
        }
 
        data = iio_priv(indio_dev);
+       data->chip_info = chip_info;
        data->client = client;
        i2c_set_clientdata(client, indio_dev);
 
        indio_dev->info = &mc3230_info;
-       indio_dev->name = "mc3230";
+       indio_dev->name = chip_info->name;
        indio_dev->modes = INDIO_DIRECT_MODE;
        indio_dev->channels = mc3230_channels;
        indio_dev->num_channels = ARRAY_SIZE(mc3230_channels);
@@ -200,13 +224,13 @@ static int mc3230_resume(struct device *dev)
 static DEFINE_SIMPLE_DEV_PM_OPS(mc3230_pm_ops, mc3230_suspend, mc3230_resume);
 
 static const struct i2c_device_id mc3230_i2c_id[] = {
-       { "mc3230" },
-       {}
+       { "mc3230", (kernel_ulong_t)&mc3230_chip_info },
+       { }
 };
 MODULE_DEVICE_TABLE(i2c, mc3230_i2c_id);
 
 static const struct of_device_id mc3230_of_match[] = {
-       { .compatible = "mcube,mc3230" },
+       { .compatible = "mcube,mc3230", &mc3230_chip_info },
        { }
 };
 MODULE_DEVICE_TABLE(of, mc3230_of_match);