drop iio-imu-adis16475-add-spi_device_id-table.patch from a bunch of queues

diff --git a/queue-5.10/iio-imu-adis16475-add-spi_device_id-table.patch b/queue-5.10/iio-imu-adis16475-add-spi_device_id-table.patch
deleted file mode 100644 (file)
index a9981be..0000000
--- a/queue-5.10/iio-imu-adis16475-add-spi_device_id-table.patch
+++ /dev/null
@@ -1,171 +0,0 @@
-From ee4d79055aeea27f1b8c42233cc0c90d0a8b5355 Mon Sep 17 00:00:00 2001
-From: Nuno Sa <nuno.sa@analog.com>
-Date: Thu, 2 Nov 2023 13:52:58 +0100
-Subject: iio: imu: adis16475: add spi_device_id table
-
-From: Nuno Sa <nuno.sa@analog.com>
-
-commit ee4d79055aeea27f1b8c42233cc0c90d0a8b5355 upstream.
-
-This prevents the warning message "SPI driver has no spi_device_id for..."
-when registering the driver. More importantly, it makes sure that
-module autoloading works as spi relies on spi: modaliases and not of.
-
-While at it, move the of_device_id table to it's natural place.
-
-Fixes: fff7352bf7a3c ("iio: imu: Add support for adis16475")
-Signed-off-by: Nuno Sa <nuno.sa@analog.com>
-Link: https://lore.kernel.org/r/20231102125258.3284830-1-nuno.sa@analog.com
-Cc: <Stable@vger.kernel.org>
-Signed-off-by: Jonathan Cameron <Jonathan.Cameron@huawei.com>
-Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
----
- drivers/iio/imu/adis16475.c |  117 +++++++++++++++++++++++++++-----------------
- 1 file changed, 72 insertions(+), 45 deletions(-)
-
---- a/drivers/iio/imu/adis16475.c
-+++ b/drivers/iio/imu/adis16475.c
-@@ -1214,50 +1214,6 @@ static int adis16475_config_irq_pin(stru
-       return 0;
- }
- 
--static const struct of_device_id adis16475_of_match[] = {
--      { .compatible = "adi,adis16470",
--              .data = &adis16475_chip_info[ADIS16470] },
--      { .compatible = "adi,adis16475-1",
--              .data = &adis16475_chip_info[ADIS16475_1] },
--      { .compatible = "adi,adis16475-2",
--              .data = &adis16475_chip_info[ADIS16475_2] },
--      { .compatible = "adi,adis16475-3",
--              .data = &adis16475_chip_info[ADIS16475_3] },
--      { .compatible = "adi,adis16477-1",
--              .data = &adis16475_chip_info[ADIS16477_1] },
--      { .compatible = "adi,adis16477-2",
--              .data = &adis16475_chip_info[ADIS16477_2] },
--      { .compatible = "adi,adis16477-3",
--              .data = &adis16475_chip_info[ADIS16477_3] },
--      { .compatible = "adi,adis16465-1",
--              .data = &adis16475_chip_info[ADIS16465_1] },
--      { .compatible = "adi,adis16465-2",
--              .data = &adis16475_chip_info[ADIS16465_2] },
--      { .compatible = "adi,adis16465-3",
--              .data = &adis16475_chip_info[ADIS16465_3] },
--      { .compatible = "adi,adis16467-1",
--              .data = &adis16475_chip_info[ADIS16467_1] },
--      { .compatible = "adi,adis16467-2",
--              .data = &adis16475_chip_info[ADIS16467_2] },
--      { .compatible = "adi,adis16467-3",
--              .data = &adis16475_chip_info[ADIS16467_3] },
--      { .compatible = "adi,adis16500",
--              .data = &adis16475_chip_info[ADIS16500] },
--      { .compatible = "adi,adis16505-1",
--              .data = &adis16475_chip_info[ADIS16505_1] },
--      { .compatible = "adi,adis16505-2",
--              .data = &adis16475_chip_info[ADIS16505_2] },
--      { .compatible = "adi,adis16505-3",
--              .data = &adis16475_chip_info[ADIS16505_3] },
--      { .compatible = "adi,adis16507-1",
--              .data = &adis16475_chip_info[ADIS16507_1] },
--      { .compatible = "adi,adis16507-2",
--              .data = &adis16475_chip_info[ADIS16507_2] },
--      { .compatible = "adi,adis16507-3",
--              .data = &adis16475_chip_info[ADIS16507_3] },
--      { },
--};
--MODULE_DEVICE_TABLE(of, adis16475_of_match);
- 
- static int adis16475_probe(struct spi_device *spi)
- {
-@@ -1272,7 +1228,7 @@ static int adis16475_probe(struct spi_de
-       st = iio_priv(indio_dev);
-       spi_set_drvdata(spi, indio_dev);
- 
--      st->info = device_get_match_data(&spi->dev);
-+      st->info = spi_get_device_match_data(spi);
-       if (!st->info)
-               return -EINVAL;
- 
-@@ -1312,12 +1268,83 @@ static int adis16475_probe(struct spi_de
-       return 0;
- }
- 
-+static const struct of_device_id adis16475_of_match[] = {
-+      { .compatible = "adi,adis16470",
-+              .data = &adis16475_chip_info[ADIS16470] },
-+      { .compatible = "adi,adis16475-1",
-+              .data = &adis16475_chip_info[ADIS16475_1] },
-+      { .compatible = "adi,adis16475-2",
-+              .data = &adis16475_chip_info[ADIS16475_2] },
-+      { .compatible = "adi,adis16475-3",
-+              .data = &adis16475_chip_info[ADIS16475_3] },
-+      { .compatible = "adi,adis16477-1",
-+              .data = &adis16475_chip_info[ADIS16477_1] },
-+      { .compatible = "adi,adis16477-2",
-+              .data = &adis16475_chip_info[ADIS16477_2] },
-+      { .compatible = "adi,adis16477-3",
-+              .data = &adis16475_chip_info[ADIS16477_3] },
-+      { .compatible = "adi,adis16465-1",
-+              .data = &adis16475_chip_info[ADIS16465_1] },
-+      { .compatible = "adi,adis16465-2",
-+              .data = &adis16475_chip_info[ADIS16465_2] },
-+      { .compatible = "adi,adis16465-3",
-+              .data = &adis16475_chip_info[ADIS16465_3] },
-+      { .compatible = "adi,adis16467-1",
-+              .data = &adis16475_chip_info[ADIS16467_1] },
-+      { .compatible = "adi,adis16467-2",
-+              .data = &adis16475_chip_info[ADIS16467_2] },
-+      { .compatible = "adi,adis16467-3",
-+              .data = &adis16475_chip_info[ADIS16467_3] },
-+      { .compatible = "adi,adis16500",
-+              .data = &adis16475_chip_info[ADIS16500] },
-+      { .compatible = "adi,adis16505-1",
-+              .data = &adis16475_chip_info[ADIS16505_1] },
-+      { .compatible = "adi,adis16505-2",
-+              .data = &adis16475_chip_info[ADIS16505_2] },
-+      { .compatible = "adi,adis16505-3",
-+              .data = &adis16475_chip_info[ADIS16505_3] },
-+      { .compatible = "adi,adis16507-1",
-+              .data = &adis16475_chip_info[ADIS16507_1] },
-+      { .compatible = "adi,adis16507-2",
-+              .data = &adis16475_chip_info[ADIS16507_2] },
-+      { .compatible = "adi,adis16507-3",
-+              .data = &adis16475_chip_info[ADIS16507_3] },
-+      { },
-+};
-+MODULE_DEVICE_TABLE(of, adis16475_of_match);
-+
-+static const struct spi_device_id adis16475_ids[] = {
-+      { "adis16470", (kernel_ulong_t)&adis16475_chip_info[ADIS16470] },
-+      { "adis16475-1", (kernel_ulong_t)&adis16475_chip_info[ADIS16475_1] },
-+      { "adis16475-2", (kernel_ulong_t)&adis16475_chip_info[ADIS16475_2] },
-+      { "adis16475-3", (kernel_ulong_t)&adis16475_chip_info[ADIS16475_3] },
-+      { "adis16477-1", (kernel_ulong_t)&adis16475_chip_info[ADIS16477_1] },
-+      { "adis16477-2", (kernel_ulong_t)&adis16475_chip_info[ADIS16477_2] },
-+      { "adis16477-3", (kernel_ulong_t)&adis16475_chip_info[ADIS16477_3] },
-+      { "adis16465-1", (kernel_ulong_t)&adis16475_chip_info[ADIS16465_1] },
-+      { "adis16465-2", (kernel_ulong_t)&adis16475_chip_info[ADIS16465_2] },
-+      { "adis16465-3", (kernel_ulong_t)&adis16475_chip_info[ADIS16465_3] },
-+      { "adis16467-1", (kernel_ulong_t)&adis16475_chip_info[ADIS16467_1] },
-+      { "adis16467-2", (kernel_ulong_t)&adis16475_chip_info[ADIS16467_2] },
-+      { "adis16467-3", (kernel_ulong_t)&adis16475_chip_info[ADIS16467_3] },
-+      { "adis16500", (kernel_ulong_t)&adis16475_chip_info[ADIS16500] },
-+      { "adis16505-1", (kernel_ulong_t)&adis16475_chip_info[ADIS16505_1] },
-+      { "adis16505-2", (kernel_ulong_t)&adis16475_chip_info[ADIS16505_2] },
-+      { "adis16505-3", (kernel_ulong_t)&adis16475_chip_info[ADIS16505_3] },
-+      { "adis16507-1", (kernel_ulong_t)&adis16475_chip_info[ADIS16507_1] },
-+      { "adis16507-2", (kernel_ulong_t)&adis16475_chip_info[ADIS16507_2] },
-+      { "adis16507-3", (kernel_ulong_t)&adis16475_chip_info[ADIS16507_3] },
-+      { }
-+};
-+MODULE_DEVICE_TABLE(spi, adis16475_ids);
-+
- static struct spi_driver adis16475_driver = {
-       .driver = {
-               .name = "adis16475",
-               .of_match_table = adis16475_of_match,
-       },
-       .probe = adis16475_probe,
-+      .id_table = adis16475_ids,
- };
- module_spi_driver(adis16475_driver);
- 

diff --git a/queue-5.10/series b/queue-5.10/series
index 1719404e9064851ea0f68bd4c0b3d445903efe60..3cab41a6f55312ab7938a0964fe21e38dd1bf9cb 100644 (file)
--- a/queue-5.10/series
+++ b/queue-5.10/series
@@ -30,7 +30,6 @@ interconnect-qcom-sm8250-enable-sync_state.patch
 input-ipaq-micro-keys-add-error-handling-for-devm_km.patch
 scsi-bnx2fc-fix-skb-double-free-in-bnx2fc_rcv.patch
 iio-common-ms_sensors-ms_sensors_i2c-fix-humidity-conversion-time-table.patch
-iio-imu-adis16475-add-spi_device_id-table.patch
 iio-adc-ti_am335x_adc-fix-return-value-check-of-tiadc_request_dma.patch
 wifi-cfg80211-add-my-certificate.patch
 wifi-cfg80211-fix-certs-build-to-not-depend-on-file-order.patch

diff --git a/queue-5.15/iio-imu-adis16475-add-spi_device_id-table.patch b/queue-5.15/iio-imu-adis16475-add-spi_device_id-table.patch
deleted file mode 100644 (file)
index be0467d..0000000
--- a/queue-5.15/iio-imu-adis16475-add-spi_device_id-table.patch
+++ /dev/null
@@ -1,171 +0,0 @@
-From ee4d79055aeea27f1b8c42233cc0c90d0a8b5355 Mon Sep 17 00:00:00 2001
-From: Nuno Sa <nuno.sa@analog.com>
-Date: Thu, 2 Nov 2023 13:52:58 +0100
-Subject: iio: imu: adis16475: add spi_device_id table
-
-From: Nuno Sa <nuno.sa@analog.com>
-
-commit ee4d79055aeea27f1b8c42233cc0c90d0a8b5355 upstream.
-
-This prevents the warning message "SPI driver has no spi_device_id for..."
-when registering the driver. More importantly, it makes sure that
-module autoloading works as spi relies on spi: modaliases and not of.
-
-While at it, move the of_device_id table to it's natural place.
-
-Fixes: fff7352bf7a3c ("iio: imu: Add support for adis16475")
-Signed-off-by: Nuno Sa <nuno.sa@analog.com>
-Link: https://lore.kernel.org/r/20231102125258.3284830-1-nuno.sa@analog.com
-Cc: <Stable@vger.kernel.org>
-Signed-off-by: Jonathan Cameron <Jonathan.Cameron@huawei.com>
-Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
----
- drivers/iio/imu/adis16475.c |  117 +++++++++++++++++++++++++++-----------------
- 1 file changed, 72 insertions(+), 45 deletions(-)
-
---- a/drivers/iio/imu/adis16475.c
-+++ b/drivers/iio/imu/adis16475.c
-@@ -1273,50 +1273,6 @@ static int adis16475_config_irq_pin(stru
-       return 0;
- }
- 
--static const struct of_device_id adis16475_of_match[] = {
--      { .compatible = "adi,adis16470",
--              .data = &adis16475_chip_info[ADIS16470] },
--      { .compatible = "adi,adis16475-1",
--              .data = &adis16475_chip_info[ADIS16475_1] },
--      { .compatible = "adi,adis16475-2",
--              .data = &adis16475_chip_info[ADIS16475_2] },
--      { .compatible = "adi,adis16475-3",
--              .data = &adis16475_chip_info[ADIS16475_3] },
--      { .compatible = "adi,adis16477-1",
--              .data = &adis16475_chip_info[ADIS16477_1] },
--      { .compatible = "adi,adis16477-2",
--              .data = &adis16475_chip_info[ADIS16477_2] },
--      { .compatible = "adi,adis16477-3",
--              .data = &adis16475_chip_info[ADIS16477_3] },
--      { .compatible = "adi,adis16465-1",
--              .data = &adis16475_chip_info[ADIS16465_1] },
--      { .compatible = "adi,adis16465-2",
--              .data = &adis16475_chip_info[ADIS16465_2] },
--      { .compatible = "adi,adis16465-3",
--              .data = &adis16475_chip_info[ADIS16465_3] },
--      { .compatible = "adi,adis16467-1",
--              .data = &adis16475_chip_info[ADIS16467_1] },
--      { .compatible = "adi,adis16467-2",
--              .data = &adis16475_chip_info[ADIS16467_2] },
--      { .compatible = "adi,adis16467-3",
--              .data = &adis16475_chip_info[ADIS16467_3] },
--      { .compatible = "adi,adis16500",
--              .data = &adis16475_chip_info[ADIS16500] },
--      { .compatible = "adi,adis16505-1",
--              .data = &adis16475_chip_info[ADIS16505_1] },
--      { .compatible = "adi,adis16505-2",
--              .data = &adis16475_chip_info[ADIS16505_2] },
--      { .compatible = "adi,adis16505-3",
--              .data = &adis16475_chip_info[ADIS16505_3] },
--      { .compatible = "adi,adis16507-1",
--              .data = &adis16475_chip_info[ADIS16507_1] },
--      { .compatible = "adi,adis16507-2",
--              .data = &adis16475_chip_info[ADIS16507_2] },
--      { .compatible = "adi,adis16507-3",
--              .data = &adis16475_chip_info[ADIS16507_3] },
--      { },
--};
--MODULE_DEVICE_TABLE(of, adis16475_of_match);
- 
- static int adis16475_probe(struct spi_device *spi)
- {
-@@ -1330,7 +1286,7 @@ static int adis16475_probe(struct spi_de
- 
-       st = iio_priv(indio_dev);
- 
--      st->info = device_get_match_data(&spi->dev);
-+      st->info = spi_get_device_match_data(spi);
-       if (!st->info)
-               return -EINVAL;
- 
-@@ -1370,12 +1326,83 @@ static int adis16475_probe(struct spi_de
-       return 0;
- }
- 
-+static const struct of_device_id adis16475_of_match[] = {
-+      { .compatible = "adi,adis16470",
-+              .data = &adis16475_chip_info[ADIS16470] },
-+      { .compatible = "adi,adis16475-1",
-+              .data = &adis16475_chip_info[ADIS16475_1] },
-+      { .compatible = "adi,adis16475-2",
-+              .data = &adis16475_chip_info[ADIS16475_2] },
-+      { .compatible = "adi,adis16475-3",
-+              .data = &adis16475_chip_info[ADIS16475_3] },
-+      { .compatible = "adi,adis16477-1",
-+              .data = &adis16475_chip_info[ADIS16477_1] },
-+      { .compatible = "adi,adis16477-2",
-+              .data = &adis16475_chip_info[ADIS16477_2] },
-+      { .compatible = "adi,adis16477-3",
-+              .data = &adis16475_chip_info[ADIS16477_3] },
-+      { .compatible = "adi,adis16465-1",
-+              .data = &adis16475_chip_info[ADIS16465_1] },
-+      { .compatible = "adi,adis16465-2",
-+              .data = &adis16475_chip_info[ADIS16465_2] },
-+      { .compatible = "adi,adis16465-3",
-+              .data = &adis16475_chip_info[ADIS16465_3] },
-+      { .compatible = "adi,adis16467-1",
-+              .data = &adis16475_chip_info[ADIS16467_1] },
-+      { .compatible = "adi,adis16467-2",
-+              .data = &adis16475_chip_info[ADIS16467_2] },
-+      { .compatible = "adi,adis16467-3",
-+              .data = &adis16475_chip_info[ADIS16467_3] },
-+      { .compatible = "adi,adis16500",
-+              .data = &adis16475_chip_info[ADIS16500] },
-+      { .compatible = "adi,adis16505-1",
-+              .data = &adis16475_chip_info[ADIS16505_1] },
-+      { .compatible = "adi,adis16505-2",
-+              .data = &adis16475_chip_info[ADIS16505_2] },
-+      { .compatible = "adi,adis16505-3",
-+              .data = &adis16475_chip_info[ADIS16505_3] },
-+      { .compatible = "adi,adis16507-1",
-+              .data = &adis16475_chip_info[ADIS16507_1] },
-+      { .compatible = "adi,adis16507-2",
-+              .data = &adis16475_chip_info[ADIS16507_2] },
-+      { .compatible = "adi,adis16507-3",
-+              .data = &adis16475_chip_info[ADIS16507_3] },
-+      { },
-+};
-+MODULE_DEVICE_TABLE(of, adis16475_of_match);
-+
-+static const struct spi_device_id adis16475_ids[] = {
-+      { "adis16470", (kernel_ulong_t)&adis16475_chip_info[ADIS16470] },
-+      { "adis16475-1", (kernel_ulong_t)&adis16475_chip_info[ADIS16475_1] },
-+      { "adis16475-2", (kernel_ulong_t)&adis16475_chip_info[ADIS16475_2] },
-+      { "adis16475-3", (kernel_ulong_t)&adis16475_chip_info[ADIS16475_3] },
-+      { "adis16477-1", (kernel_ulong_t)&adis16475_chip_info[ADIS16477_1] },
-+      { "adis16477-2", (kernel_ulong_t)&adis16475_chip_info[ADIS16477_2] },
-+      { "adis16477-3", (kernel_ulong_t)&adis16475_chip_info[ADIS16477_3] },
-+      { "adis16465-1", (kernel_ulong_t)&adis16475_chip_info[ADIS16465_1] },
-+      { "adis16465-2", (kernel_ulong_t)&adis16475_chip_info[ADIS16465_2] },
-+      { "adis16465-3", (kernel_ulong_t)&adis16475_chip_info[ADIS16465_3] },
-+      { "adis16467-1", (kernel_ulong_t)&adis16475_chip_info[ADIS16467_1] },
-+      { "adis16467-2", (kernel_ulong_t)&adis16475_chip_info[ADIS16467_2] },
-+      { "adis16467-3", (kernel_ulong_t)&adis16475_chip_info[ADIS16467_3] },
-+      { "adis16500", (kernel_ulong_t)&adis16475_chip_info[ADIS16500] },
-+      { "adis16505-1", (kernel_ulong_t)&adis16475_chip_info[ADIS16505_1] },
-+      { "adis16505-2", (kernel_ulong_t)&adis16475_chip_info[ADIS16505_2] },
-+      { "adis16505-3", (kernel_ulong_t)&adis16475_chip_info[ADIS16505_3] },
-+      { "adis16507-1", (kernel_ulong_t)&adis16475_chip_info[ADIS16507_1] },
-+      { "adis16507-2", (kernel_ulong_t)&adis16475_chip_info[ADIS16507_2] },
-+      { "adis16507-3", (kernel_ulong_t)&adis16475_chip_info[ADIS16507_3] },
-+      { }
-+};
-+MODULE_DEVICE_TABLE(spi, adis16475_ids);
-+
- static struct spi_driver adis16475_driver = {
-       .driver = {
-               .name = "adis16475",
-               .of_match_table = adis16475_of_match,
-       },
-       .probe = adis16475_probe,
-+      .id_table = adis16475_ids,
- };
- module_spi_driver(adis16475_driver);
- 

diff --git a/queue-5.15/series b/queue-5.15/series
index ebed61242c0dc2835ffccd909ac404b3eb86d1b3..965769745a719d780d7dfba98f4fe02c3d3150cf 100644 (file)
--- a/queue-5.15/series
+++ b/queue-5.15/series
@@ -38,7 +38,6 @@ interconnect-qcom-sm8250-enable-sync_state.patch
 input-ipaq-micro-keys-add-error-handling-for-devm_km.patch
 scsi-bnx2fc-fix-skb-double-free-in-bnx2fc_rcv.patch
 iio-common-ms_sensors-ms_sensors_i2c-fix-humidity-conversion-time-table.patch
-iio-imu-adis16475-add-spi_device_id-table.patch
 iio-adc-ti_am335x_adc-fix-return-value-check-of-tiadc_request_dma.patch
 iio-triggered-buffer-prevent-possible-freeing-of-wrong-buffer.patch
 alsa-usb-audio-increase-delay-in-motu-m-quirk.patch

diff --git a/queue-6.1/iio-imu-adis16475-add-spi_device_id-table.patch b/queue-6.1/iio-imu-adis16475-add-spi_device_id-table.patch
deleted file mode 100644 (file)
index 76ff135..0000000
--- a/queue-6.1/iio-imu-adis16475-add-spi_device_id-table.patch
+++ /dev/null
@@ -1,171 +0,0 @@
-From ee4d79055aeea27f1b8c42233cc0c90d0a8b5355 Mon Sep 17 00:00:00 2001
-From: Nuno Sa <nuno.sa@analog.com>
-Date: Thu, 2 Nov 2023 13:52:58 +0100
-Subject: iio: imu: adis16475: add spi_device_id table
-
-From: Nuno Sa <nuno.sa@analog.com>
-
-commit ee4d79055aeea27f1b8c42233cc0c90d0a8b5355 upstream.
-
-This prevents the warning message "SPI driver has no spi_device_id for..."
-when registering the driver. More importantly, it makes sure that
-module autoloading works as spi relies on spi: modaliases and not of.
-
-While at it, move the of_device_id table to it's natural place.
-
-Fixes: fff7352bf7a3c ("iio: imu: Add support for adis16475")
-Signed-off-by: Nuno Sa <nuno.sa@analog.com>
-Link: https://lore.kernel.org/r/20231102125258.3284830-1-nuno.sa@analog.com
-Cc: <Stable@vger.kernel.org>
-Signed-off-by: Jonathan Cameron <Jonathan.Cameron@huawei.com>
-Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
----
- drivers/iio/imu/adis16475.c |  117 +++++++++++++++++++++++++++-----------------
- 1 file changed, 72 insertions(+), 45 deletions(-)
-
---- a/drivers/iio/imu/adis16475.c
-+++ b/drivers/iio/imu/adis16475.c
-@@ -1243,50 +1243,6 @@ static int adis16475_config_irq_pin(stru
-       return 0;
- }
- 
--static const struct of_device_id adis16475_of_match[] = {
--      { .compatible = "adi,adis16470",
--              .data = &adis16475_chip_info[ADIS16470] },
--      { .compatible = "adi,adis16475-1",
--              .data = &adis16475_chip_info[ADIS16475_1] },
--      { .compatible = "adi,adis16475-2",
--              .data = &adis16475_chip_info[ADIS16475_2] },
--      { .compatible = "adi,adis16475-3",
--              .data = &adis16475_chip_info[ADIS16475_3] },
--      { .compatible = "adi,adis16477-1",
--              .data = &adis16475_chip_info[ADIS16477_1] },
--      { .compatible = "adi,adis16477-2",
--              .data = &adis16475_chip_info[ADIS16477_2] },
--      { .compatible = "adi,adis16477-3",
--              .data = &adis16475_chip_info[ADIS16477_3] },
--      { .compatible = "adi,adis16465-1",
--              .data = &adis16475_chip_info[ADIS16465_1] },
--      { .compatible = "adi,adis16465-2",
--              .data = &adis16475_chip_info[ADIS16465_2] },
--      { .compatible = "adi,adis16465-3",
--              .data = &adis16475_chip_info[ADIS16465_3] },
--      { .compatible = "adi,adis16467-1",
--              .data = &adis16475_chip_info[ADIS16467_1] },
--      { .compatible = "adi,adis16467-2",
--              .data = &adis16475_chip_info[ADIS16467_2] },
--      { .compatible = "adi,adis16467-3",
--              .data = &adis16475_chip_info[ADIS16467_3] },
--      { .compatible = "adi,adis16500",
--              .data = &adis16475_chip_info[ADIS16500] },
--      { .compatible = "adi,adis16505-1",
--              .data = &adis16475_chip_info[ADIS16505_1] },
--      { .compatible = "adi,adis16505-2",
--              .data = &adis16475_chip_info[ADIS16505_2] },
--      { .compatible = "adi,adis16505-3",
--              .data = &adis16475_chip_info[ADIS16505_3] },
--      { .compatible = "adi,adis16507-1",
--              .data = &adis16475_chip_info[ADIS16507_1] },
--      { .compatible = "adi,adis16507-2",
--              .data = &adis16475_chip_info[ADIS16507_2] },
--      { .compatible = "adi,adis16507-3",
--              .data = &adis16475_chip_info[ADIS16507_3] },
--      { },
--};
--MODULE_DEVICE_TABLE(of, adis16475_of_match);
- 
- static int adis16475_probe(struct spi_device *spi)
- {
-@@ -1300,7 +1256,7 @@ static int adis16475_probe(struct spi_de
- 
-       st = iio_priv(indio_dev);
- 
--      st->info = device_get_match_data(&spi->dev);
-+      st->info = spi_get_device_match_data(spi);
-       if (!st->info)
-               return -EINVAL;
- 
-@@ -1340,12 +1296,83 @@ static int adis16475_probe(struct spi_de
-       return 0;
- }
- 
-+static const struct of_device_id adis16475_of_match[] = {
-+      { .compatible = "adi,adis16470",
-+              .data = &adis16475_chip_info[ADIS16470] },
-+      { .compatible = "adi,adis16475-1",
-+              .data = &adis16475_chip_info[ADIS16475_1] },
-+      { .compatible = "adi,adis16475-2",
-+              .data = &adis16475_chip_info[ADIS16475_2] },
-+      { .compatible = "adi,adis16475-3",
-+              .data = &adis16475_chip_info[ADIS16475_3] },
-+      { .compatible = "adi,adis16477-1",
-+              .data = &adis16475_chip_info[ADIS16477_1] },
-+      { .compatible = "adi,adis16477-2",
-+              .data = &adis16475_chip_info[ADIS16477_2] },
-+      { .compatible = "adi,adis16477-3",
-+              .data = &adis16475_chip_info[ADIS16477_3] },
-+      { .compatible = "adi,adis16465-1",
-+              .data = &adis16475_chip_info[ADIS16465_1] },
-+      { .compatible = "adi,adis16465-2",
-+              .data = &adis16475_chip_info[ADIS16465_2] },
-+      { .compatible = "adi,adis16465-3",
-+              .data = &adis16475_chip_info[ADIS16465_3] },
-+      { .compatible = "adi,adis16467-1",
-+              .data = &adis16475_chip_info[ADIS16467_1] },
-+      { .compatible = "adi,adis16467-2",
-+              .data = &adis16475_chip_info[ADIS16467_2] },
-+      { .compatible = "adi,adis16467-3",
-+              .data = &adis16475_chip_info[ADIS16467_3] },
-+      { .compatible = "adi,adis16500",
-+              .data = &adis16475_chip_info[ADIS16500] },
-+      { .compatible = "adi,adis16505-1",
-+              .data = &adis16475_chip_info[ADIS16505_1] },
-+      { .compatible = "adi,adis16505-2",
-+              .data = &adis16475_chip_info[ADIS16505_2] },
-+      { .compatible = "adi,adis16505-3",
-+              .data = &adis16475_chip_info[ADIS16505_3] },
-+      { .compatible = "adi,adis16507-1",
-+              .data = &adis16475_chip_info[ADIS16507_1] },
-+      { .compatible = "adi,adis16507-2",
-+              .data = &adis16475_chip_info[ADIS16507_2] },
-+      { .compatible = "adi,adis16507-3",
-+              .data = &adis16475_chip_info[ADIS16507_3] },
-+      { },
-+};
-+MODULE_DEVICE_TABLE(of, adis16475_of_match);
-+
-+static const struct spi_device_id adis16475_ids[] = {
-+      { "adis16470", (kernel_ulong_t)&adis16475_chip_info[ADIS16470] },
-+      { "adis16475-1", (kernel_ulong_t)&adis16475_chip_info[ADIS16475_1] },
-+      { "adis16475-2", (kernel_ulong_t)&adis16475_chip_info[ADIS16475_2] },
-+      { "adis16475-3", (kernel_ulong_t)&adis16475_chip_info[ADIS16475_3] },
-+      { "adis16477-1", (kernel_ulong_t)&adis16475_chip_info[ADIS16477_1] },
-+      { "adis16477-2", (kernel_ulong_t)&adis16475_chip_info[ADIS16477_2] },
-+      { "adis16477-3", (kernel_ulong_t)&adis16475_chip_info[ADIS16477_3] },
-+      { "adis16465-1", (kernel_ulong_t)&adis16475_chip_info[ADIS16465_1] },
-+      { "adis16465-2", (kernel_ulong_t)&adis16475_chip_info[ADIS16465_2] },
-+      { "adis16465-3", (kernel_ulong_t)&adis16475_chip_info[ADIS16465_3] },
-+      { "adis16467-1", (kernel_ulong_t)&adis16475_chip_info[ADIS16467_1] },
-+      { "adis16467-2", (kernel_ulong_t)&adis16475_chip_info[ADIS16467_2] },
-+      { "adis16467-3", (kernel_ulong_t)&adis16475_chip_info[ADIS16467_3] },
-+      { "adis16500", (kernel_ulong_t)&adis16475_chip_info[ADIS16500] },
-+      { "adis16505-1", (kernel_ulong_t)&adis16475_chip_info[ADIS16505_1] },
-+      { "adis16505-2", (kernel_ulong_t)&adis16475_chip_info[ADIS16505_2] },
-+      { "adis16505-3", (kernel_ulong_t)&adis16475_chip_info[ADIS16505_3] },
-+      { "adis16507-1", (kernel_ulong_t)&adis16475_chip_info[ADIS16507_1] },
-+      { "adis16507-2", (kernel_ulong_t)&adis16475_chip_info[ADIS16507_2] },
-+      { "adis16507-3", (kernel_ulong_t)&adis16475_chip_info[ADIS16507_3] },
-+      { }
-+};
-+MODULE_DEVICE_TABLE(spi, adis16475_ids);
-+
- static struct spi_driver adis16475_driver = {
-       .driver = {
-               .name = "adis16475",
-               .of_match_table = adis16475_of_match,
-       },
-       .probe = adis16475_probe,
-+      .id_table = adis16475_ids,
- };
- module_spi_driver(adis16475_driver);
- 

diff --git a/queue-6.1/series b/queue-6.1/series
index b1fc2c9b204ff77a0f0a123073a35dcd71a430a4..92f3bcd72ab800faa1c1f1090373981a051cc183 100644 (file)
--- a/queue-6.1/series
+++ b/queue-6.1/series
@@ -57,7 +57,6 @@ interconnect-qcom-sm8250-enable-sync_state.patch
 input-ipaq-micro-keys-add-error-handling-for-devm_km.patch
 scsi-bnx2fc-fix-skb-double-free-in-bnx2fc_rcv.patch
 iio-common-ms_sensors-ms_sensors_i2c-fix-humidity-conversion-time-table.patch
-iio-imu-adis16475-add-spi_device_id-table.patch
 iio-adc-ti_am335x_adc-fix-return-value-check-of-tiadc_request_dma.patch
 iio-triggered-buffer-prevent-possible-freeing-of-wrong-buffer.patch
 alsa-usb-audio-increase-delay-in-motu-m-quirk.patch