From patchwork Tue Nov 17 07:52:52 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alexandru Ardelean X-Patchwork-Id: 11911659 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-12.7 required=3.0 tests=BAYES_00, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 3B331C63798 for ; Tue, 17 Nov 2020 07:47:46 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id E244524656 for ; Tue, 17 Nov 2020 07:47:45 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726732AbgKQHrp (ORCPT ); Tue, 17 Nov 2020 02:47:45 -0500 Received: from mx0a-00128a01.pphosted.com ([148.163.135.77]:41340 "EHLO mx0a-00128a01.pphosted.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1725792AbgKQHrp (ORCPT ); Tue, 17 Nov 2020 02:47:45 -0500 Received: from pps.filterd (m0167088.ppops.net [127.0.0.1]) by mx0a-00128a01.pphosted.com (8.16.0.42/8.16.0.42) with SMTP id 0AH7e4GW003060; Tue, 17 Nov 2020 02:47:43 -0500 Received: from nwd2mta4.analog.com ([137.71.173.58]) by mx0a-00128a01.pphosted.com with ESMTP id 34t9ybgt13-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Tue, 17 Nov 2020 02:47:43 -0500 Received: from ASHBMBX9.ad.analog.com (ashbmbx9.ad.analog.com [10.64.17.10]) by nwd2mta4.analog.com (8.14.7/8.14.7) with ESMTP id 0AH7lgfe033644 (version=TLSv1/SSLv3 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128 verify=FAIL); Tue, 17 Nov 2020 02:47:42 -0500 Received: from ASHBCASHYB4.ad.analog.com (10.64.17.132) by ASHBMBX9.ad.analog.com (10.64.17.10) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.1779.2; Tue, 17 Nov 2020 02:47:41 -0500 Received: from ASHBMBX8.ad.analog.com (10.64.17.5) by ASHBCASHYB4.ad.analog.com (10.64.17.132) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.1779.2; Tue, 17 Nov 2020 02:47:40 -0500 Received: from zeus.spd.analog.com (10.66.68.11) by ASHBMBX8.ad.analog.com (10.64.17.5) with Microsoft SMTP Server id 15.1.1779.2 via Frontend Transport; Tue, 17 Nov 2020 02:47:40 -0500 Received: from localhost.localdomain ([10.48.65.12]) by zeus.spd.analog.com (8.15.1/8.15.1) with ESMTP id 0AH7lbGJ002920; Tue, 17 Nov 2020 02:47:38 -0500 From: Alexandru Ardelean To: , , CC: , , Alexandru Ardelean Subject: [PATCH 1/3] iio: adc: ad7887: convert dual-channel mode to DT/ACPI Date: Tue, 17 Nov 2020 09:52:52 +0200 Message-ID: <20201117075254.4861-1-alexandru.ardelean@analog.com> X-Mailer: git-send-email 2.17.1 MIME-Version: 1.0 X-ADIRuleOP-NewSCL: Rule Triggered X-Proofpoint-Virus-Version: vendor=fsecure engine=2.50.10434:6.0.312,18.0.737 definitions=2020-11-17_02:2020-11-13,2020-11-17 signatures=0 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 malwarescore=0 mlxscore=0 priorityscore=1501 suspectscore=0 impostorscore=0 lowpriorityscore=0 bulkscore=0 clxscore=1015 spamscore=0 adultscore=0 mlxlogscore=999 phishscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2009150000 definitions=main-2011170055 Precedence: bulk List-ID: X-Mailing-List: linux-iio@vger.kernel.org This change converts the configuration of the dual-channel mode from the old platform-data, to the device_property_present() function, which supports both device-tree and ACPI configuration setups. With this change the old platform_data include of the driver can be removed. Signed-off-by: Alexandru Ardelean --- drivers/iio/adc/ad7887.c | 10 +++++----- include/linux/platform_data/ad7887.h | 21 --------------------- 2 files changed, 5 insertions(+), 26 deletions(-) delete mode 100644 include/linux/platform_data/ad7887.h diff --git a/drivers/iio/adc/ad7887.c b/drivers/iio/adc/ad7887.c index 4f6f0e0e03ee..06f684c053a0 100644 --- a/drivers/iio/adc/ad7887.c +++ b/drivers/iio/adc/ad7887.c @@ -23,8 +23,6 @@ #include #include -#include - #define AD7887_REF_DIS BIT(5) /* on-chip reference disable */ #define AD7887_DUAL BIT(4) /* dual-channel mode */ #define AD7887_CH_AIN1 BIT(3) /* convert on channel 1, DUAL=1 */ @@ -241,9 +239,9 @@ static void ad7887_reg_disable(void *data) static int ad7887_probe(struct spi_device *spi) { - struct ad7887_platform_data *pdata = spi->dev.platform_data; struct ad7887_state *st; struct iio_dev *indio_dev; + bool dual_mode; uint8_t mode; int ret; @@ -286,7 +284,9 @@ static int ad7887_probe(struct spi_device *spi) mode = AD7887_PM_MODE4; if (!st->reg) mode |= AD7887_REF_DIS; - if (pdata && pdata->en_dual) + + dual_mode = device_property_present(&spi->dev, "adi,dual-channel-mode"); + if (dual_mode) mode |= AD7887_DUAL; st->tx_cmd_buf[0] = AD7887_CH_AIN0 | mode; @@ -298,7 +298,7 @@ static int ad7887_probe(struct spi_device *spi) spi_message_init(&st->msg[AD7887_CH0]); spi_message_add_tail(&st->xfer[0], &st->msg[AD7887_CH0]); - if (pdata && pdata->en_dual) { + if (dual_mode) { st->tx_cmd_buf[2] = AD7887_CH_AIN1 | mode; st->xfer[1].rx_buf = &st->data[0]; diff --git a/include/linux/platform_data/ad7887.h b/include/linux/platform_data/ad7887.h deleted file mode 100644 index 9b4dca6ae70b..000000000000 --- a/include/linux/platform_data/ad7887.h +++ /dev/null @@ -1,21 +0,0 @@ -/* SPDX-License-Identifier: GPL-2.0-or-later */ -/* - * AD7887 SPI ADC driver - * - * Copyright 2010 Analog Devices Inc. - */ -#ifndef IIO_ADC_AD7887_H_ -#define IIO_ADC_AD7887_H_ - -/** - * struct ad7887_platform_data - AD7887 ADC driver platform data - * @en_dual: Whether to use dual channel mode. If set to true AIN1 becomes the - * second input channel, and Vref is internally connected to Vdd. If set to - * false the device is used in single channel mode and AIN1/Vref is used as - * VREF input. - */ -struct ad7887_platform_data { - bool en_dual; -}; - -#endif /* IIO_ADC_AD7887_H_ */ From patchwork Tue Nov 17 07:52:53 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alexandru Ardelean X-Patchwork-Id: 11911657 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-12.7 required=3.0 tests=BAYES_00, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 50B9DC6379F for ; Tue, 17 Nov 2020 07:48:13 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 067B624656 for ; Tue, 17 Nov 2020 07:48:12 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726982AbgKQHrr (ORCPT ); Tue, 17 Nov 2020 02:47:47 -0500 Received: from mx0a-00128a01.pphosted.com ([148.163.135.77]:42636 "EHLO mx0a-00128a01.pphosted.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1725792AbgKQHrq (ORCPT ); Tue, 17 Nov 2020 02:47:46 -0500 Received: from pps.filterd (m0167088.ppops.net [127.0.0.1]) by mx0a-00128a01.pphosted.com (8.16.0.42/8.16.0.42) with SMTP id 0AH7e4uU003064; Tue, 17 Nov 2020 02:47:45 -0500 Received: from nwd2mta3.analog.com ([137.71.173.56]) by mx0a-00128a01.pphosted.com with ESMTP id 34t9ybgt15-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Tue, 17 Nov 2020 02:47:45 -0500 Received: from SCSQMBX11.ad.analog.com (SCSQMBX11.ad.analog.com [10.77.17.10]) by nwd2mta3.analog.com (8.14.7/8.14.7) with ESMTP id 0AH7lhhu004565 (version=TLSv1/SSLv3 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128 verify=FAIL); Tue, 17 Nov 2020 02:47:44 -0500 Received: from SCSQMBX11.ad.analog.com (10.77.17.10) by SCSQMBX11.ad.analog.com (10.77.17.10) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.1779.2; Mon, 16 Nov 2020 23:47:42 -0800 Received: from zeus.spd.analog.com (10.66.68.11) by SCSQMBX11.ad.analog.com (10.77.17.10) with Microsoft SMTP Server id 15.1.1779.2 via Frontend Transport; Mon, 16 Nov 2020 23:47:41 -0800 Received: from localhost.localdomain ([10.48.65.12]) by zeus.spd.analog.com (8.15.1/8.15.1) with ESMTP id 0AH7lbGK002920; Tue, 17 Nov 2020 02:47:39 -0500 From: Alexandru Ardelean To: , , CC: , , Alexandru Ardelean Subject: [PATCH 2/3] iio: adc: ad7887: convert driver to full DT probing Date: Tue, 17 Nov 2020 09:52:53 +0200 Message-ID: <20201117075254.4861-2-alexandru.ardelean@analog.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20201117075254.4861-1-alexandru.ardelean@analog.com> References: <20201117075254.4861-1-alexandru.ardelean@analog.com> MIME-Version: 1.0 X-ADIRuleOP-NewSCL: Rule Triggered X-Proofpoint-Virus-Version: vendor=fsecure engine=2.50.10434:6.0.312,18.0.737 definitions=2020-11-17_02:2020-11-13,2020-11-17 signatures=0 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 malwarescore=0 mlxscore=0 priorityscore=1501 suspectscore=0 impostorscore=0 lowpriorityscore=0 bulkscore=0 clxscore=1015 spamscore=0 adultscore=0 mlxlogscore=931 phishscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2009150000 definitions=main-2011170055 Precedence: bulk List-ID: X-Mailing-List: linux-iio@vger.kernel.org This change removes the SPI device table, adds an OF device table instead. This should also be usable for ACPI via PRP0001. This device is usually probed via device-tree, so it makes more sense to use the OF device table. Signed-off-by: Alexandru Ardelean --- drivers/iio/adc/ad7887.c | 23 +++++++++++++++-------- 1 file changed, 15 insertions(+), 8 deletions(-) diff --git a/drivers/iio/adc/ad7887.c b/drivers/iio/adc/ad7887.c index 06f684c053a0..4f68a1b17ec8 100644 --- a/drivers/iio/adc/ad7887.c +++ b/drivers/iio/adc/ad7887.c @@ -40,6 +40,7 @@ enum ad7887_channels { /** * struct ad7887_chip_info - chip specifc information + * @name: the name of the part * @int_vref_mv: the internal reference voltage * @channels: channels specification * @num_channels: number of channels @@ -47,6 +48,7 @@ enum ad7887_channels { * @num_dual_channels: number of channels in dual mode */ struct ad7887_chip_info { + const char *name; u16 int_vref_mv; const struct iio_chan_spec *channels; unsigned int num_channels; @@ -218,6 +220,7 @@ static const struct ad7887_chip_info ad7887_chip_info_tbl[] = { * More devices added in future */ [ID_AD7887] = { + .name = "ad7887", .channels = ad7887_channels, .num_channels = ARRAY_SIZE(ad7887_channels), .dual_channels = ad7887_dual_channels, @@ -239,12 +242,17 @@ static void ad7887_reg_disable(void *data) static int ad7887_probe(struct spi_device *spi) { + const struct ad7887_chip_info *info; struct ad7887_state *st; struct iio_dev *indio_dev; bool dual_mode; uint8_t mode; int ret; + info = device_get_match_data(&spi->dev); + if (!info) + return -ENODEV; + indio_dev = devm_iio_device_alloc(&spi->dev, sizeof(*st)); if (indio_dev == NULL) return -ENOMEM; @@ -269,13 +277,12 @@ static int ad7887_probe(struct spi_device *spi) return ret; } - st->chip_info = - &ad7887_chip_info_tbl[spi_get_device_id(spi)->driver_data]; + st->chip_info = info; spi_set_drvdata(spi, indio_dev); st->spi = spi; - indio_dev->name = spi_get_device_id(spi)->name; + indio_dev->name = st->chip_info->name; indio_dev->info = &ad7887_info; indio_dev->modes = INDIO_DIRECT_MODE; @@ -336,18 +343,18 @@ static int ad7887_probe(struct spi_device *spi) return devm_iio_device_register(&spi->dev, indio_dev); } -static const struct spi_device_id ad7887_id[] = { - {"ad7887", ID_AD7887}, - {} +static const struct of_device_id ad7887_of_match[] = { + { .compatible = "adi,ad7887", .data = &ad7887_chip_info_tbl[ID_AD7887] }, + { } }; -MODULE_DEVICE_TABLE(spi, ad7887_id); +MODULE_DEVICE_TABLE(of, ad7887_of_match); static struct spi_driver ad7887_driver = { .driver = { .name = "ad7887", + .of_match_table = ad7887_of_match, }, .probe = ad7887_probe, - .id_table = ad7887_id, }; module_spi_driver(ad7887_driver); From patchwork Tue Nov 17 07:52:54 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alexandru Ardelean X-Patchwork-Id: 11911661 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-12.7 required=3.0 tests=BAYES_00, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 95487C64E69 for ; Tue, 17 Nov 2020 07:48:13 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 5D8CC24655 for ; Tue, 17 Nov 2020 07:48:13 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727044AbgKQHrs (ORCPT ); Tue, 17 Nov 2020 02:47:48 -0500 Received: from mx0a-00128a01.pphosted.com ([148.163.135.77]:43686 "EHLO mx0a-00128a01.pphosted.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727002AbgKQHrr (ORCPT ); Tue, 17 Nov 2020 02:47:47 -0500 Received: from pps.filterd (m0167088.ppops.net [127.0.0.1]) by mx0a-00128a01.pphosted.com (8.16.0.42/8.16.0.42) with SMTP id 0AH7e4eG003049; Tue, 17 Nov 2020 02:47:46 -0500 Received: from nwd2mta4.analog.com ([137.71.173.58]) by mx0a-00128a01.pphosted.com with ESMTP id 34t9ybgt16-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Tue, 17 Nov 2020 02:47:46 -0500 Received: from SCSQMBX10.ad.analog.com (SCSQMBX10.ad.analog.com [10.77.17.5]) by nwd2mta4.analog.com (8.14.7/8.14.7) with ESMTP id 0AH7liOI033647 (version=TLSv1/SSLv3 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128 verify=FAIL); Tue, 17 Nov 2020 02:47:45 -0500 Received: from SCSQMBX10.ad.analog.com (10.77.17.5) by SCSQMBX10.ad.analog.com (10.77.17.5) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.1779.2; Mon, 16 Nov 2020 23:47:43 -0800 Received: from zeus.spd.analog.com (10.66.68.11) by SCSQMBX10.ad.analog.com (10.77.17.5) with Microsoft SMTP Server id 15.1.1779.2 via Frontend Transport; Mon, 16 Nov 2020 23:47:43 -0800 Received: from localhost.localdomain ([10.48.65.12]) by zeus.spd.analog.com (8.15.1/8.15.1) with ESMTP id 0AH7lbGL002920; Tue, 17 Nov 2020 02:47:40 -0500 From: Alexandru Ardelean To: , , CC: , , Alexandru Ardelean Subject: [PATCH 3/3] dt-bindings: adc: ad7887: add binding doc for AD7887 Date: Tue, 17 Nov 2020 09:52:54 +0200 Message-ID: <20201117075254.4861-3-alexandru.ardelean@analog.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20201117075254.4861-1-alexandru.ardelean@analog.com> References: <20201117075254.4861-1-alexandru.ardelean@analog.com> MIME-Version: 1.0 X-ADIRuleOP-NewSCL: Rule Triggered X-Proofpoint-Virus-Version: vendor=fsecure engine=2.50.10434:6.0.312,18.0.737 definitions=2020-11-17_02:2020-11-13,2020-11-17 signatures=0 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 malwarescore=0 mlxscore=0 priorityscore=1501 suspectscore=0 impostorscore=0 lowpriorityscore=0 bulkscore=0 clxscore=1015 spamscore=0 adultscore=0 mlxlogscore=999 phishscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2009150000 definitions=main-2011170055 Precedence: bulk List-ID: X-Mailing-List: linux-iio@vger.kernel.org This change adds a simple device-tree binding for thhe Analog Devices AD7887 ADC. Signed-off-by: Alexandru Ardelean --- .../bindings/iio/adc/adi,ad7887.yaml | 70 +++++++++++++++++++ 1 file changed, 70 insertions(+) create mode 100644 Documentation/devicetree/bindings/iio/adc/adi,ad7887.yaml diff --git a/Documentation/devicetree/bindings/iio/adc/adi,ad7887.yaml b/Documentation/devicetree/bindings/iio/adc/adi,ad7887.yaml new file mode 100644 index 000000000000..9b30f4569b4e --- /dev/null +++ b/Documentation/devicetree/bindings/iio/adc/adi,ad7887.yaml @@ -0,0 +1,70 @@ +# SPDX-License-Identifier: GPL-2.0 +%YAML 1.2 +--- +$id: http://devicetree.org/schemas/iio/adc/adi,ad7887.yaml# +$schema: http://devicetree.org/meta-schemas/core.yaml# + +title: Analog Devices AD7887 low power, 12-bit ADC + +maintainers: + - Michael Hennerich + +description: | + Analog Devices AD7887 low power, 12-bit analog-to-digital converter (ADC) + that operates from a single 2.7 V to 5.25 V power supply. + +properties: + compatible: + enum: + - adi,ad7887 + + reg: + maxItems: 1 + + spi-cpha: true + + spi-cpol: true + + avcc-supply: true + + spi-max-frequency: true + + vref-supply: + description: + ADC reference voltage supply + + adi,dual-channel-mode: + description: + Configures dual-channel mode for the ADC. In dual-channel operation, + the AIN1/VREF pin assumes its AIN1 function, providing a second analog + input channel. In this case, he reference voltage for the part is provided + via the VDD pin. As a result, the input voltage range on both the AIN0 and + AIN1 inputs is 0 to VDD. + type: boolean + +additionalProperties: false + +required: + - compatible + - reg + - spi-cpha + - spi-cpol + +examples: + - | + spi0 { + #address-cells = <1>; + #size-cells = <0>; + + adc@0 { + compatible = "adi,ad7887"; + reg = <0>; + spi-max-frequency = <1000000>; + spi-cpol; + spi-cpha; + + avcc-supply = <&adc_supply>; + vref-supply = <&adc_vref>; + }; + }; +...