From: Nicola Lunghi <nicola.lunghi@xxxxxxxxxx>
ACPI _HID AANT1280 matches an ADC124S101 present on E3940 SKUs of the UP
Squared board.
Add it to the driver.
Signed-off-by: Nicola Lunghi <nicola.lunghi@xxxxxxxxxx>
[javier@xxxxxxxxxx: fix up commit message and one checkpatch warning]
Signed-off-by: Javier Arteaga <javier@xxxxxxxxxx>
---
drivers/iio/adc/ti-adc128s052.c | 25 ++++++++++++++++++++++++-
1 file changed, 24 insertions(+), 1 deletion(-)
diff --git a/drivers/iio/adc/ti-adc128s052.c b/drivers/iio/adc/ti-adc128s052.c
index e6716c326c5e..bc5096e98900 100644
--- a/drivers/iio/adc/ti-adc128s052.c
+++ b/drivers/iio/adc/ti-adc128s052.c
@@ -12,6 +12,7 @@
* published by the Free Software Foundation.
*/
+#include <linux/acpi.h>
#include <linux/err.h>
#include <linux/spi/spi.h>
#include <linux/module.h>
@@ -136,9 +137,22 @@ static int adc128_probe(struct spi_device *spi)
{
struct iio_dev *indio_dev;
struct adc128 *adc;
- int config = spi_get_device_id(spi)->driver_data;
+ int config;
int ret;
+ if (ACPI_COMPANION(&spi->dev)) {
+ const struct acpi_device_id *ad_id;
+
+ ad_id = acpi_match_device(spi->dev.driver->acpi_match_table,
+ &spi->dev);
+ if (!ad_id)
+ return -ENODEV;
+
+ config = ad_id->driver_data;
+ } else {
+ config = spi_get_device_id(spi)->driver_data;
+ }
+
indio_dev = devm_iio_device_alloc(&spi->dev, sizeof(*adc));
if (!indio_dev)
return -ENOMEM;
@@ -207,10 +221,19 @@ static const struct spi_device_id adc128_id[] = {
};
MODULE_DEVICE_TABLE(spi, adc128_id);
+#ifdef CONFIG_ACPI
+static const struct acpi_device_id adc128_acpi_match[] = {
+ { "AANT1280", 2 }, /* ADC124S021 compatible ACPI ID */
+ { }
+};
+MODULE_DEVICE_TABLE(acpi, adc128_acpi_match);
+#endif
+
static struct spi_driver adc128_driver = {
.driver = {
.name = "adc128s052",
.of_match_table = of_match_ptr(adc128_of_match),
+ .acpi_match_table = ACPI_PTR(adc128_acpi_match),
},
.probe = adc128_probe,
.remove = adc128_remove,
--
2.17.0
--
To unsubscribe from this list: send the line "unsubscribe linux-iio" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
