iio: adc: ad7606: Add compatibility to fw_nodes
authorGuillaume Stols <gstols@baylibre.com>
Tue, 15 Oct 2024 13:56:18 +0000 (13:56 +0000)
committerJonathan Cameron <Jonathan.Cameron@huawei.com>
Mon, 21 Oct 2024 18:19:26 +0000 (19:19 +0100)
On the parallel version, the current implementation is only compatible
with id tables and won't work with fw_nodes, this commit intends to fix
it.

Doing so required to declare ad7606_chip_info structures in the .h file
so to make them accessible to all the driver files that can set a
pointer to the corresponding chip as the driver data.

Signed-off-by: Guillaume Stols <gstols@baylibre.com>
Link: https://patch.msgid.link/20241015-ad7606_add_iio_backend_support-v5-5-654faf1ae08c@baylibre.com
Signed-off-by: Jonathan Cameron <Jonathan.Cameron@huawei.com>
drivers/iio/adc/ad7606.c
drivers/iio/adc/ad7606.h
drivers/iio/adc/ad7606_par.c
drivers/iio/adc/ad7606_spi.c

index 8f42d5a..0bfef17 100644 (file)
@@ -78,6 +78,155 @@ static const unsigned int ad7616_oversampling_avail[8] = {
        1, 2, 4, 8, 16, 32, 64, 128,
 };
 
+static const struct iio_chan_spec ad7605_channels[] = {
+       IIO_CHAN_SOFT_TIMESTAMP(4),
+       AD7605_CHANNEL(0),
+       AD7605_CHANNEL(1),
+       AD7605_CHANNEL(2),
+       AD7605_CHANNEL(3),
+};
+
+static const struct iio_chan_spec ad7606_channels_16bit[] = {
+       IIO_CHAN_SOFT_TIMESTAMP(8),
+       AD7606_CHANNEL(0, 16),
+       AD7606_CHANNEL(1, 16),
+       AD7606_CHANNEL(2, 16),
+       AD7606_CHANNEL(3, 16),
+       AD7606_CHANNEL(4, 16),
+       AD7606_CHANNEL(5, 16),
+       AD7606_CHANNEL(6, 16),
+       AD7606_CHANNEL(7, 16),
+};
+
+static const struct iio_chan_spec ad7606_channels_18bit[] = {
+       IIO_CHAN_SOFT_TIMESTAMP(8),
+       AD7606_CHANNEL(0, 18),
+       AD7606_CHANNEL(1, 18),
+       AD7606_CHANNEL(2, 18),
+       AD7606_CHANNEL(3, 18),
+       AD7606_CHANNEL(4, 18),
+       AD7606_CHANNEL(5, 18),
+       AD7606_CHANNEL(6, 18),
+       AD7606_CHANNEL(7, 18),
+};
+
+/*
+ * The current assumption that this driver makes for AD7616, is that it's
+ * working in Hardware Mode with Serial, Burst and Sequencer modes activated.
+ * To activate them, following pins must be pulled high:
+ *     -SER/PAR
+ *     -SEQEN
+ * And following pins must be pulled low:
+ *     -WR/BURST
+ *     -DB4/SER1W
+ */
+static const struct iio_chan_spec ad7616_channels[] = {
+       IIO_CHAN_SOFT_TIMESTAMP(16),
+       AD7606_CHANNEL(0, 16),
+       AD7606_CHANNEL(1, 16),
+       AD7606_CHANNEL(2, 16),
+       AD7606_CHANNEL(3, 16),
+       AD7606_CHANNEL(4, 16),
+       AD7606_CHANNEL(5, 16),
+       AD7606_CHANNEL(6, 16),
+       AD7606_CHANNEL(7, 16),
+       AD7606_CHANNEL(8, 16),
+       AD7606_CHANNEL(9, 16),
+       AD7606_CHANNEL(10, 16),
+       AD7606_CHANNEL(11, 16),
+       AD7606_CHANNEL(12, 16),
+       AD7606_CHANNEL(13, 16),
+       AD7606_CHANNEL(14, 16),
+       AD7606_CHANNEL(15, 16),
+};
+
+static int ad7606c_18bit_chan_scale_setup(struct ad7606_state *st,
+                                         struct iio_chan_spec *chan, int ch);
+static int ad7606c_16bit_chan_scale_setup(struct ad7606_state *st,
+                                         struct iio_chan_spec *chan, int ch);
+static int ad7606_16bit_chan_scale_setup(struct ad7606_state *st,
+                                        struct iio_chan_spec *chan, int ch);
+
+const struct ad7606_chip_info ad7605_4_info = {
+       .channels = ad7605_channels,
+       .name = "ad7605-4",
+       .num_channels = 5,
+       .scale_setup_cb = ad7606_16bit_chan_scale_setup,
+};
+EXPORT_SYMBOL_NS_GPL(ad7605_4_info, IIO_AD7606);
+
+const struct ad7606_chip_info ad7606_8_info = {
+       .channels = ad7606_channels_16bit,
+       .name = "ad7606-8",
+       .num_channels = 9,
+       .oversampling_avail = ad7606_oversampling_avail,
+       .oversampling_num = ARRAY_SIZE(ad7606_oversampling_avail),
+       .scale_setup_cb = ad7606_16bit_chan_scale_setup,
+};
+EXPORT_SYMBOL_NS_GPL(ad7606_8_info, IIO_AD7606);
+
+const struct ad7606_chip_info ad7606_6_info = {
+       .channels = ad7606_channels_16bit,
+       .name = "ad7606-6",
+       .num_channels = 7,
+       .oversampling_avail = ad7606_oversampling_avail,
+       .oversampling_num = ARRAY_SIZE(ad7606_oversampling_avail),
+       .scale_setup_cb = ad7606_16bit_chan_scale_setup,
+};
+EXPORT_SYMBOL_NS_GPL(ad7606_6_info, IIO_AD7606);
+
+const struct ad7606_chip_info ad7606_4_info = {
+       .channels = ad7606_channels_16bit,
+       .name = "ad7606-4",
+       .num_channels = 5,
+       .oversampling_avail = ad7606_oversampling_avail,
+       .oversampling_num = ARRAY_SIZE(ad7606_oversampling_avail),
+       .scale_setup_cb = ad7606_16bit_chan_scale_setup,
+};
+EXPORT_SYMBOL_NS_GPL(ad7606_4_info, IIO_AD7606);
+
+const struct ad7606_chip_info ad7606b_info = {
+       .channels = ad7606_channels_16bit,
+       .name = "ad7606b",
+       .num_channels = 9,
+       .oversampling_avail = ad7606_oversampling_avail,
+       .oversampling_num = ARRAY_SIZE(ad7606_oversampling_avail),
+       .scale_setup_cb = ad7606_16bit_chan_scale_setup,
+};
+EXPORT_SYMBOL_NS_GPL(ad7606b_info, IIO_AD7606);
+
+const struct ad7606_chip_info ad7606c_16_info = {
+       .channels = ad7606_channels_16bit,
+       .name = "ad7606c16",
+       .num_channels = 9,
+       .oversampling_avail = ad7606_oversampling_avail,
+       .oversampling_num = ARRAY_SIZE(ad7606_oversampling_avail),
+       .scale_setup_cb = ad7606c_16bit_chan_scale_setup,
+};
+EXPORT_SYMBOL_NS_GPL(ad7606c_16_info, IIO_AD7606);
+
+const struct ad7606_chip_info ad7606c_18_info = {
+       .channels = ad7606_channels_18bit,
+       .name = "ad7606c18",
+       .num_channels = 9,
+       .oversampling_avail = ad7606_oversampling_avail,
+       .oversampling_num = ARRAY_SIZE(ad7606_oversampling_avail),
+       .scale_setup_cb = ad7606c_18bit_chan_scale_setup,
+};
+EXPORT_SYMBOL_NS_GPL(ad7606c_18_info, IIO_AD7606);
+
+const struct ad7606_chip_info ad7616_info = {
+       .channels = ad7616_channels,
+       .init_delay_ms = 15,
+       .name = "ad7616",
+       .num_channels = 17,
+       .oversampling_avail = ad7616_oversampling_avail,
+       .oversampling_num = ARRAY_SIZE(ad7616_oversampling_avail),
+       .os_req_reset = true,
+       .scale_setup_cb = ad7606_16bit_chan_scale_setup,
+};
+EXPORT_SYMBOL_NS_GPL(ad7616_info, IIO_AD7606);
+
 int ad7606_reset(struct ad7606_state *st)
 {
        if (st->gpio_reset) {
@@ -622,128 +771,6 @@ static const struct attribute_group ad7606_attribute_group_range = {
        .attrs = ad7606_attributes_range,
 };
 
-static const struct iio_chan_spec ad7605_channels[] = {
-       IIO_CHAN_SOFT_TIMESTAMP(4),
-       AD7605_CHANNEL(0),
-       AD7605_CHANNEL(1),
-       AD7605_CHANNEL(2),
-       AD7605_CHANNEL(3),
-};
-
-static const struct iio_chan_spec ad7606_channels_16bit[] = {
-       IIO_CHAN_SOFT_TIMESTAMP(8),
-       AD7606_CHANNEL(0, 16),
-       AD7606_CHANNEL(1, 16),
-       AD7606_CHANNEL(2, 16),
-       AD7606_CHANNEL(3, 16),
-       AD7606_CHANNEL(4, 16),
-       AD7606_CHANNEL(5, 16),
-       AD7606_CHANNEL(6, 16),
-       AD7606_CHANNEL(7, 16),
-};
-
-static const struct iio_chan_spec ad7606_channels_18bit[] = {
-       IIO_CHAN_SOFT_TIMESTAMP(8),
-       AD7606_CHANNEL(0, 18),
-       AD7606_CHANNEL(1, 18),
-       AD7606_CHANNEL(2, 18),
-       AD7606_CHANNEL(3, 18),
-       AD7606_CHANNEL(4, 18),
-       AD7606_CHANNEL(5, 18),
-       AD7606_CHANNEL(6, 18),
-       AD7606_CHANNEL(7, 18),
-};
-
-/*
- * The current assumption that this driver makes for AD7616, is that it's
- * working in Hardware Mode with Serial, Burst and Sequencer modes activated.
- * To activate them, following pins must be pulled high:
- *     -SER/PAR
- *     -SEQEN
- * And following pins must be pulled low:
- *     -WR/BURST
- *     -DB4/SER1W
- */
-static const struct iio_chan_spec ad7616_channels[] = {
-       IIO_CHAN_SOFT_TIMESTAMP(16),
-       AD7606_CHANNEL(0, 16),
-       AD7606_CHANNEL(1, 16),
-       AD7606_CHANNEL(2, 16),
-       AD7606_CHANNEL(3, 16),
-       AD7606_CHANNEL(4, 16),
-       AD7606_CHANNEL(5, 16),
-       AD7606_CHANNEL(6, 16),
-       AD7606_CHANNEL(7, 16),
-       AD7606_CHANNEL(8, 16),
-       AD7606_CHANNEL(9, 16),
-       AD7606_CHANNEL(10, 16),
-       AD7606_CHANNEL(11, 16),
-       AD7606_CHANNEL(12, 16),
-       AD7606_CHANNEL(13, 16),
-       AD7606_CHANNEL(14, 16),
-       AD7606_CHANNEL(15, 16),
-};
-
-static const struct ad7606_chip_info ad7606_chip_info_tbl[] = {
-       /* More devices added in future */
-       [ID_AD7605_4] = {
-               .channels = ad7605_channels,
-               .num_channels = 5,
-               .scale_setup_cb = ad7606_16bit_chan_scale_setup,
-       },
-       [ID_AD7606_8] = {
-               .channels = ad7606_channels_16bit,
-               .num_channels = 9,
-               .scale_setup_cb = ad7606_16bit_chan_scale_setup,
-               .oversampling_avail = ad7606_oversampling_avail,
-               .oversampling_num = ARRAY_SIZE(ad7606_oversampling_avail),
-       },
-       [ID_AD7606_6] = {
-               .channels = ad7606_channels_16bit,
-               .num_channels = 7,
-               .scale_setup_cb = ad7606_16bit_chan_scale_setup,
-               .oversampling_avail = ad7606_oversampling_avail,
-               .oversampling_num = ARRAY_SIZE(ad7606_oversampling_avail),
-       },
-       [ID_AD7606_4] = {
-               .channels = ad7606_channels_16bit,
-               .num_channels = 5,
-               .scale_setup_cb = ad7606_16bit_chan_scale_setup,
-               .oversampling_avail = ad7606_oversampling_avail,
-               .oversampling_num = ARRAY_SIZE(ad7606_oversampling_avail),
-       },
-       [ID_AD7606B] = {
-               .channels = ad7606_channels_16bit,
-               .num_channels = 9,
-               .scale_setup_cb = ad7606_16bit_chan_scale_setup,
-               .oversampling_avail = ad7606_oversampling_avail,
-               .oversampling_num = ARRAY_SIZE(ad7606_oversampling_avail),
-       },
-       [ID_AD7606C_16] = {
-               .channels = ad7606_channels_16bit,
-               .num_channels = 9,
-               .scale_setup_cb = ad7606c_16bit_chan_scale_setup,
-               .oversampling_avail = ad7606_oversampling_avail,
-               .oversampling_num = ARRAY_SIZE(ad7606_oversampling_avail),
-       },
-       [ID_AD7606C_18] = {
-               .channels = ad7606_channels_18bit,
-               .num_channels = 9,
-               .scale_setup_cb = ad7606c_18bit_chan_scale_setup,
-               .oversampling_avail = ad7606_oversampling_avail,
-               .oversampling_num = ARRAY_SIZE(ad7606_oversampling_avail),
-       },
-       [ID_AD7616] = {
-               .channels = ad7616_channels,
-               .num_channels = 17,
-               .scale_setup_cb = ad7606_16bit_chan_scale_setup,
-               .oversampling_avail = ad7616_oversampling_avail,
-               .oversampling_num = ARRAY_SIZE(ad7616_oversampling_avail),
-               .os_req_reset = true,
-               .init_delay_ms = 15,
-       },
-};
-
 static int ad7606_request_gpios(struct ad7606_state *st)
 {
        struct device *dev = st->dev;
@@ -922,7 +949,7 @@ static const struct iio_trigger_ops ad7606_trigger_ops = {
        .validate_device = iio_trigger_validate_own_device,
 };
 
-static int ad7606_sw_mode_setup(struct iio_dev *indio_dev, unsigned int id)
+static int ad7606_sw_mode_setup(struct iio_dev *indio_dev)
 {
        struct ad7606_state *st = iio_priv(indio_dev);
 
@@ -983,7 +1010,7 @@ static void ad7606_pwm_disable(void *data)
 }
 
 int ad7606_probe(struct device *dev, int irq, void __iomem *base_address,
-                const char *name, unsigned int id,
+                const struct ad7606_chip_info *chip_info,
                 const struct ad7606_bus_ops *bops)
 {
        struct ad7606_state *st;
@@ -1008,7 +1035,7 @@ int ad7606_probe(struct device *dev, int irq, void __iomem *base_address,
                return dev_err_probe(dev, ret,
                                     "Failed to enable specified AVcc supply\n");
 
-       st->chip_info = &ad7606_chip_info_tbl[id];
+       st->chip_info = chip_info;
 
        if (st->chip_info->oversampling_num) {
                st->oversampling_avail = st->chip_info->oversampling_avail;
@@ -1031,7 +1058,7 @@ int ad7606_probe(struct device *dev, int irq, void __iomem *base_address,
                        indio_dev->info = &ad7606_info_no_os_or_range;
        }
        indio_dev->modes = INDIO_DIRECT_MODE;
-       indio_dev->name = name;
+       indio_dev->name = chip_info->name;
        indio_dev->channels = st->chip_info->channels;
        indio_dev->num_channels = st->chip_info->num_channels;
 
@@ -1050,7 +1077,7 @@ int ad7606_probe(struct device *dev, int irq, void __iomem *base_address,
        st->write_scale = ad7606_write_scale_hw;
        st->write_os = ad7606_write_os_hw;
 
-       ret = ad7606_sw_mode_setup(indio_dev, id);
+       ret = ad7606_sw_mode_setup(indio_dev);
        if (ret)
                return ret;
 
@@ -1101,7 +1128,7 @@ int ad7606_probe(struct device *dev, int irq, void __iomem *base_address,
                                        NULL,
                                        &ad7606_interrupt,
                                        IRQF_TRIGGER_FALLING | IRQF_ONESHOT,
-                                       name, indio_dev);
+                                       chip_info->name, indio_dev);
        if (ret)
                return ret;
 
index 760cf5e..d401d3a 100644 (file)
@@ -69,6 +69,7 @@ typedef int (*ad7606_scale_setup_cb_t)(struct ad7606_state *st,
 /**
  * struct ad7606_chip_info - chip specific information
  * @channels:          channel specification
+ * @name               device name
  * @num_channels:      number of channels
  * @scale_setup_cb:    callback to setup the scales for each channel
  * @oversampling_avail pointer to the array which stores the available
@@ -80,6 +81,7 @@ typedef int (*ad7606_scale_setup_cb_t)(struct ad7606_state *st,
  */
 struct ad7606_chip_info {
        const struct iio_chan_spec      *channels;
+       const char                      *name;
        unsigned int                    num_channels;
        ad7606_scale_setup_cb_t         scale_setup_cb;
        const unsigned int              *oversampling_avail;
@@ -199,22 +201,30 @@ struct ad7606_bus_ops {
        u16 (*rd_wr_cmd)(int addr, char isWriteOp);
 };
 
+/**
+ * struct ad7606_bus_info - agregate ad7606_chip_info and ad7606_bus_ops
+ * @chip_info          entry in the table of chips that describes this device
+ * @bops               bus operations (SPI or parallel)
+ */
+struct ad7606_bus_info {
+       const struct ad7606_chip_info   *chip_info;
+       const struct ad7606_bus_ops     *bops;
+};
+
 int ad7606_probe(struct device *dev, int irq, void __iomem *base_address,
-                const char *name, unsigned int id,
+                const struct ad7606_chip_info *info,
                 const struct ad7606_bus_ops *bops);
 
 int ad7606_reset(struct ad7606_state *st);
 
-enum ad7606_supported_device_ids {
-       ID_AD7605_4,
-       ID_AD7606_8,
-       ID_AD7606_6,
-       ID_AD7606_4,
-       ID_AD7606B,
-       ID_AD7606C_16,
-       ID_AD7606C_18,
-       ID_AD7616,
-};
+extern const struct ad7606_chip_info ad7605_4_info;
+extern const struct ad7606_chip_info ad7606_8_info;
+extern const struct ad7606_chip_info ad7606_6_info;
+extern const struct ad7606_chip_info ad7606_4_info;
+extern const struct ad7606_chip_info ad7606b_info;
+extern const struct ad7606_chip_info ad7606c_16_info;
+extern const struct ad7606_chip_info ad7606c_18_info;
+extern const struct ad7606_chip_info ad7616_info;
 
 #ifdef CONFIG_PM_SLEEP
 extern const struct dev_pm_ops ad7606_pm_ops;
index d651639..b87be2f 100644 (file)
@@ -11,6 +11,7 @@
 #include <linux/mod_devicetable.h>
 #include <linux/module.h>
 #include <linux/platform_device.h>
+#include <linux/property.h>
 #include <linux/types.h>
 
 #include <linux/iio/iio.h>
@@ -89,12 +90,20 @@ static const struct ad7606_bus_ops ad7606_par8_bops = {
 
 static int ad7606_par_probe(struct platform_device *pdev)
 {
-       const struct platform_device_id *id = platform_get_device_id(pdev);
+       const struct ad7606_chip_info *chip_info;
+       const struct platform_device_id *id;
        struct resource *res;
        void __iomem *addr;
        resource_size_t remap_size;
        int irq;
 
+       if (dev_fwnode(&pdev->dev)) {
+               chip_info = device_get_match_data(&pdev->dev);
+       } else {
+               id = platform_get_device_id(pdev);
+               chip_info = (const struct ad7606_chip_info *)id->driver_data;
+       }
+
        irq = platform_get_irq(pdev, 0);
        if (irq < 0)
                return irq;
@@ -105,26 +114,25 @@ static int ad7606_par_probe(struct platform_device *pdev)
 
        remap_size = resource_size(res);
 
-       return ad7606_probe(&pdev->dev, irq, addr,
-                           id->name, id->driver_data,
+       return ad7606_probe(&pdev->dev, irq, addr, chip_info,
                            remap_size > 1 ? &ad7606_par16_bops :
                            &ad7606_par8_bops);
 }
 
 static const struct platform_device_id ad7606_driver_ids[] = {
-       { .name = "ad7605-4", .driver_data = ID_AD7605_4, },
-       { .name = "ad7606-4", .driver_data = ID_AD7606_4, },
-       { .name = "ad7606-6", .driver_data = ID_AD7606_6, },
-       { .name = "ad7606-8", .driver_data = ID_AD7606_8, },
+       { .name = "ad7605-4", .driver_data = (kernel_ulong_t)&ad7605_4_info, },
+       { .name = "ad7606-4", .driver_data = (kernel_ulong_t)&ad7606_4_info, },
+       { .name = "ad7606-6", .driver_data = (kernel_ulong_t)&ad7606_6_info, },
+       { .name = "ad7606-8", .driver_data = (kernel_ulong_t)&ad7606_8_info, },
        { }
 };
 MODULE_DEVICE_TABLE(platform, ad7606_driver_ids);
 
 static const struct of_device_id ad7606_of_match[] = {
-       { .compatible = "adi,ad7605-4" },
-       { .compatible = "adi,ad7606-4" },
-       { .compatible = "adi,ad7606-6" },
-       { .compatible = "adi,ad7606-8" },
+       { .compatible = "adi,ad7605-4", .data = &ad7605_4_info },
+       { .compatible = "adi,ad7606-4", .data = &ad7606_4_info },
+       { .compatible = "adi,ad7606-6", .data = &ad7606_6_info },
+       { .compatible = "adi,ad7606-8", .data = &ad7606_8_info },
        { }
 };
 MODULE_DEVICE_TABLE(of, ad7606_of_match);
index d12e551..44c6031 100644 (file)
@@ -334,7 +334,7 @@ static const struct ad7606_bus_ops ad7616_spi_bops = {
        .sw_mode_config = ad7616_sw_mode_config,
 };
 
-static const struct ad7606_bus_ops ad7606B_spi_bops = {
+static const struct ad7606_bus_ops ad7606b_spi_bops = {
        .read_block = ad7606_spi_read_block,
        .reg_read = ad7606_spi_reg_read,
        .reg_write = ad7606_spi_reg_write,
@@ -352,54 +352,76 @@ static const struct ad7606_bus_ops ad7606c_18_spi_bops = {
        .sw_mode_config = ad7606c_18_sw_mode_config,
 };
 
+static const struct ad7606_bus_info ad7605_4_bus_info = {
+       .chip_info = &ad7605_4_info,
+       .bops = &ad7606_spi_bops,
+};
+
+static const struct ad7606_bus_info ad7606_8_bus_info = {
+       .chip_info = &ad7606_8_info,
+       .bops = &ad7606_spi_bops,
+};
+
+static const struct ad7606_bus_info ad7606_6_bus_info = {
+       .chip_info = &ad7606_6_info,
+       .bops = &ad7606_spi_bops,
+};
+
+static const struct ad7606_bus_info ad7606_4_bus_info = {
+       .chip_info = &ad7606_4_info,
+       .bops = &ad7606_spi_bops,
+};
+
+static const struct ad7606_bus_info ad7606b_bus_info = {
+       .chip_info = &ad7606b_info,
+       .bops = &ad7606b_spi_bops,
+};
+
+static const struct ad7606_bus_info ad7606c_16_bus_info = {
+       .chip_info = &ad7606c_16_info,
+       .bops = &ad7606b_spi_bops,
+};
+
+static const struct ad7606_bus_info ad7606c_18_bus_info = {
+       .chip_info = &ad7606c_18_info,
+       .bops = &ad7606c_18_spi_bops,
+};
+
+static const struct ad7606_bus_info ad7616_bus_info = {
+       .chip_info = &ad7616_info,
+       .bops = &ad7616_spi_bops,
+};
+
 static int ad7606_spi_probe(struct spi_device *spi)
 {
-       const struct spi_device_id *id = spi_get_device_id(spi);
-       const struct ad7606_bus_ops *bops;
-
-       switch (id->driver_data) {
-       case ID_AD7616:
-               bops = &ad7616_spi_bops;
-               break;
-       case ID_AD7606B:
-       case ID_AD7606C_16:
-               bops = &ad7606B_spi_bops;
-               break;
-       case ID_AD7606C_18:
-               bops = &ad7606c_18_spi_bops;
-               break;
-       default:
-               bops = &ad7606_spi_bops;
-               break;
-       }
+       const struct ad7606_bus_info *bus_info = spi_get_device_match_data(spi);
 
        return ad7606_probe(&spi->dev, spi->irq, NULL,
-                           id->name, id->driver_data,
-                           bops);
+                           bus_info->chip_info, bus_info->bops);
 }
 
 static const struct spi_device_id ad7606_id_table[] = {
-       { "ad7605-4", ID_AD7605_4 },
-       { "ad7606-4", ID_AD7606_4 },
-       { "ad7606-6", ID_AD7606_6 },
-       { "ad7606-8", ID_AD7606_8 },
-       { "ad7606b",  ID_AD7606B },
-       { "ad7606c-16",  ID_AD7606C_16 },
-       { "ad7606c-18",  ID_AD7606C_18 },
-       { "ad7616",   ID_AD7616 },
+       { "ad7605-4", (kernel_ulong_t)&ad7605_4_bus_info },
+       { "ad7606-4", (kernel_ulong_t)&ad7606_4_bus_info },
+       { "ad7606-6", (kernel_ulong_t)&ad7606_6_bus_info },
+       { "ad7606-8", (kernel_ulong_t)&ad7606_8_bus_info },
+       { "ad7606b",  (kernel_ulong_t)&ad7606b_bus_info },
+       { "ad7606c-16", (kernel_ulong_t)&ad7606c_16_bus_info },
+       { "ad7606c-18", (kernel_ulong_t)&ad7606c_18_bus_info },
+       { "ad7616",   (kernel_ulong_t)&ad7616_bus_info },
        { }
 };
 MODULE_DEVICE_TABLE(spi, ad7606_id_table);
 
 static const struct of_device_id ad7606_of_match[] = {
-       { .compatible = "adi,ad7605-4" },
-       { .compatible = "adi,ad7606-4" },
-       { .compatible = "adi,ad7606-6" },
-       { .compatible = "adi,ad7606-8" },
-       { .compatible = "adi,ad7606b" },
-       { .compatible = "adi,ad7606c-16" },
-       { .compatible = "adi,ad7606c-18" },
-       { .compatible = "adi,ad7616" },
+       { .compatible = "adi,ad7605-4", .data = &ad7605_4_bus_info },
+       { .compatible = "adi,ad7606-4", .data = &ad7606_4_bus_info },
+       { .compatible = "adi,ad7606-6", .data = &ad7606_6_bus_info },
+       { .compatible = "adi,ad7606-8", .data = &ad7606_8_bus_info },
+       { .compatible = "adi,ad7606b", .data = &ad7606b_bus_info },
+       { .compatible = "adi,ad7606c-16", .data = &ad7606c_16_bus_info },
+       { .compatible = "adi,ad7606c-18", .data = &ad7606c_18_bus_info },
+       { .compatible = "adi,ad7616", .data = &ad7616_bus_info },
        { }
 };
 MODULE_DEVICE_TABLE(of, ad7606_of_match);