From: Javier Arteaga <javier@emutex.com> To: Jonathan Cameron <jic23@kernel.org> Cc: Javier Arteaga <javier@emutex.com>, Hartmut Knaack <knaack.h@gmx.de>, Lars-Peter Clausen <lars@metafoo.de>, Peter Meerwald-Stadler <pmeerw@pmeerw.net>, "Dan O'Donovan" <dan@emutex.com>, linux-iio@vger.kernel.org, linux-kernel@vger.kernel.org, Nicola Lunghi <nicola.lunghi@emutex.com> Subject: [PATCH v2 2/3] iio: adc128s052: add ACPI _HID AANT1280 Date: Mon, 23 Apr 2018 22:38:04 +0100 [thread overview] Message-ID: <20180423213805.12591-3-javier@emutex.com> (raw) In-Reply-To: <20180423213805.12591-1-javier@emutex.com> From: Nicola Lunghi <nicola.lunghi@emutex.com> 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> --- 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
next prev parent reply other threads:[~2018-04-23 21:41 UTC|newest] Thread overview: 20+ messages / expand[flat|nested] mbox.gz Atom feed top 2018-04-23 21:38 [PATCH v2 0/3] iio: adc128s052: add matching options Javier Arteaga 2018-04-23 21:38 ` [PATCH v2 1/3] iio: adc128s052: Add pin-compatible IDs Javier Arteaga 2018-04-23 21:38 ` Javier Arteaga [this message] 2018-04-23 22:08 ` [PATCH v2 2/3] iio: adc128s052: add ACPI _HID AANT1280 Andy Shevchenko 2018-04-24 10:51 ` Javier Arteaga 2018-04-23 21:38 ` [PATCH v2 3/3] iio: adc128s052: reuse "compatible" for ACPI _DSD Javier Arteaga 2018-10-25 15:35 ` [PATCH v3 0/3] iio: adc128s052: add matching options Dan O'Donovan 2018-10-25 15:35 ` [PATCH v3 1/3] iio: adc128s052: Add pin-compatible IDs Dan O'Donovan 2018-10-28 15:35 ` Jonathan Cameron 2018-10-30 19:37 ` Rob Herring 2018-10-25 15:35 ` [PATCH v3 2/3] iio: adc128s052: add ACPI _HID AANT1280 Dan O'Donovan 2018-10-25 17:46 ` Andy Shevchenko 2018-10-26 10:13 ` Dan O'Donovan 2018-10-26 12:12 ` Andy Shevchenko 2018-10-27 17:14 ` Himanshu Jha 2018-10-28 11:42 ` Jonathan Cameron 2018-10-28 11:56 ` Jonathan Cameron 2018-10-25 15:35 ` [PATCH v3 3/3] iio: adc128s052: use SPDX-License-Identifier Dan O'Donovan 2018-10-28 11:58 ` Jonathan Cameron 2018-10-25 17:49 ` [PATCH v3 0/3] iio: adc128s052: add matching options Andy Shevchenko
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=20180423213805.12591-3-javier@emutex.com \ --to=javier@emutex.com \ --cc=dan@emutex.com \ --cc=jic23@kernel.org \ --cc=knaack.h@gmx.de \ --cc=lars@metafoo.de \ --cc=linux-iio@vger.kernel.org \ --cc=linux-kernel@vger.kernel.org \ --cc=nicola.lunghi@emutex.com \ --cc=pmeerw@pmeerw.net \ --subject='Re: [PATCH v2 2/3] iio: adc128s052: add ACPI _HID AANT1280' \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: link
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox; as well as URLs for NNTP newsgroup(s).