iio: adc128s052: add proper .data members in adc128_of_match table

commit e2af60f5900c6ade53477b494ffb54690eee11f5 upstream.

Prior to commit bd5d54e4d49d ("iio: adc128s052: add ACPI _HID
AANT1280"), the driver unconditionally used spi_get_device_id() to get
the index into the adc128_config array.

However, with that commit, OF-based boards now incorrectly treat all
supported sensors as if they are an adc128s052, because all the .data
members of the adc128_of_match table are implicitly 0. Our board,
which has an adc122s021, thus exposes 8 channels whereas it really
only has two.

Fixes: bd5d54e4d49d ("iio: adc128s052: add ACPI _HID AANT1280")
Signed-off-by: Rasmus Villemoes <linux@rasmusvillemoes.dk>
Reviewed-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
Link: https://lore.kernel.org/r/20221115132324.1078169-1-linux@rasmusvillemoes.dk
Cc: <Stable@vger.kernel.org>
Signed-off-by: Jonathan Cameron <Jonathan.Cameron@huawei.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/iio/adc/ti-adc128s052.c b/drivers/iio/adc/ti-adc128s052.c
index 83c1ae07b3e9a1c7db56921f14c91c0f2c40c9d8..8618ae7bc06714ac427dc3279d928b15ff090062 100644 (file)
--- a/drivers/iio/adc/ti-adc128s052.c
+++ b/drivers/iio/adc/ti-adc128s052.c
@@ -193,13 +193,13 @@ static int adc128_remove(struct spi_device *spi)
 }
 
 static const struct of_device_id adc128_of_match[] = {
-       { .compatible = "ti,adc128s052", },
-       { .compatible = "ti,adc122s021", },
-       { .compatible = "ti,adc122s051", },
-       { .compatible = "ti,adc122s101", },
-       { .compatible = "ti,adc124s021", },
-       { .compatible = "ti,adc124s051", },
-       { .compatible = "ti,adc124s101", },
+       { .compatible = "ti,adc128s052", .data = (void*)0L, },
+       { .compatible = "ti,adc122s021", .data = (void*)1L, },
+       { .compatible = "ti,adc122s051", .data = (void*)1L, },
+       { .compatible = "ti,adc122s101", .data = (void*)1L, },
+       { .compatible = "ti,adc124s021", .data = (void*)2L, },
+       { .compatible = "ti,adc124s051", .data = (void*)2L, },
+       { .compatible = "ti,adc124s101", .data = (void*)2L, },
        { /* sentinel */ },
 };
 MODULE_DEVICE_TABLE(of, adc128_of_match);