iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

iio: adc128s052: add ACPI _HID AANT1280

Browse Source 
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@emutex.com>
[javier@emutex.com: fix up commit message and one checkpatch warning]
Signed-off-by: Javier Arteaga <javier@emutex.com>
Signed-off-by: Dan O'Donovan <dan@emutex.com>
Reviewed-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
Signed-off-by: Jonathan Cameron <Jonathan.Cameron@huawei.com>
This commit is contained in:
Nicola Lunghi 2018-10-25 16:35:41 +01:00 committed by Jonathan Cameron
parent 37cd3c8768
commit bd5d54e4d4
1 changed files with 17 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
drivers/iio/adc/ti-adc128s052.c
View File

@ -12,10 +12,12 @@
* published by the Free Software Foundation. * published by the Free Software Foundation.
*/ */
#include <linux/acpi.h>
#include <linux/err.h> #include <linux/err.h>
#include <linux/spi/spi.h> #include <linux/spi/spi.h>
#include <linux/module.h> #include <linux/module.h>
#include <linux/iio/iio.h> #include <linux/iio/iio.h>
#include <linux/property.h>
#include <linux/regulator/consumer.h> #include <linux/regulator/consumer.h>
struct adc128_configuration { struct adc128_configuration {
@ -135,10 +137,15 @@ static const struct iio_info adc128_info = {
static int adc128_probe(struct spi_device *spi) static int adc128_probe(struct spi_device *spi)
{ {
struct iio_dev *indio_dev; struct iio_dev *indio_dev;
unsigned int config;
struct adc128 *adc; struct adc128 *adc;
int config = spi_get_device_id(spi)->driver_data;
int ret; int ret;
if (dev_fwnode(&spi->dev))
config = (unsigned long) device_get_match_data(&spi->dev);
else
config = spi_get_device_id(spi)->driver_data;
indio_dev = devm_iio_device_alloc(&spi->dev, sizeof(*adc)); indio_dev = devm_iio_device_alloc(&spi->dev, sizeof(*adc));
if (!indio_dev) if (!indio_dev)
return -ENOMEM; return -ENOMEM;
@ -207,10 +214,19 @@ static const struct spi_device_id adc128_id[] = {
}; };
MODULE_DEVICE_TABLE(spi, 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 = { static struct spi_driver adc128_driver = {
.driver = { .driver = {
.name = "adc128s052", .name = "adc128s052",
.of_match_table = of_match_ptr(adc128_of_match), .of_match_table = of_match_ptr(adc128_of_match),
.acpi_match_table = ACPI_PTR(adc128_acpi_match),
}, },
.probe = adc128_probe, .probe = adc128_probe,
.remove = adc128_remove, .remove = adc128_remove,