From patchwork Mon Oct 29 16:36:52 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stefan Popa X-Patchwork-Id: 10659685 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id DC79913B5 for ; Mon, 29 Oct 2018 16:37:22 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id BDF2E2967A for ; Mon, 29 Oct 2018 16:37:22 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id ADB6929C45; Mon, 29 Oct 2018 16:37:22 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-7.9 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,MAILING_LIST_MULTI,RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 076A42967A for ; Mon, 29 Oct 2018 16:37:22 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727699AbeJ3B0m (ORCPT ); Mon, 29 Oct 2018 21:26:42 -0400 Received: from mail-sn1nam02on0064.outbound.protection.outlook.com ([104.47.36.64]:28569 "EHLO NAM02-SN1-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1727694AbeJ3B0l (ORCPT ); Mon, 29 Oct 2018 21:26:41 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=analog.onmicrosoft.com; s=selector1-analog-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=oicB9Qr+LOr7lpn0JdAiIfIMbK4TJboZDMN5+F5PtVY=; b=rN5N4TesVFJUwhFkSxBwTGQvnS6ldKumyfCYN2loPWE1Uc3wTR7Ev/9ylkxMfPMXyybh49h3bLHspPw6wDI3nuBi1s8wyXAVoglCDPv6VpLyYz9EQRs1XAFakLbLr8No2iSarV/aV1a+xIdhpgPXKGU8HtA63E6Mijt7zWwExQY= Received: from BN6PR03CA0049.namprd03.prod.outlook.com (2603:10b6:404:4c::11) by DM5PR03MB3130.namprd03.prod.outlook.com (2603:10b6:4:3c::27) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.1273.27; Mon, 29 Oct 2018 16:37:14 +0000 Received: from BN1AFFO11FD022.protection.gbl (2a01:111:f400:7c10::102) by BN6PR03CA0049.outlook.office365.com (2603:10b6:404:4c::11) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384) id 15.20.1273.26 via Frontend Transport; Mon, 29 Oct 2018 16:37:14 +0000 Authentication-Results: spf=pass (sender IP is 137.71.25.57) smtp.mailfrom=analog.com; gmx.de; dkim=none (message not signed) header.d=none;gmx.de; dmarc=bestguesspass action=none header.from=analog.com; Received-SPF: Pass (protection.outlook.com: domain of analog.com designates 137.71.25.57 as permitted sender) receiver=protection.outlook.com; client-ip=137.71.25.57; helo=nwd2mta4.analog.com; Received: from nwd2mta4.analog.com (137.71.25.57) by BN1AFFO11FD022.mail.protection.outlook.com (10.58.52.82) with Microsoft SMTP Server (version=TLS1_0, cipher=TLS_RSA_WITH_AES_256_CBC_SHA) id 15.20.1294.14 via Frontend Transport; Mon, 29 Oct 2018 16:37:13 +0000 Received: from NWD2HUBCAS7.ad.analog.com (nwd2hubcas7.ad.analog.com [10.64.69.107]) by nwd2mta4.analog.com (8.13.8/8.13.8) with ESMTP id w9TGbDSq009284 (version=TLSv1/SSLv3 cipher=AES256-SHA bits=256 verify=OK); Mon, 29 Oct 2018 09:37:13 -0700 Received: from linux.analog.com (10.50.1.118) by NWD2HUBCAS7.ad.analog.com (10.64.69.107) with Microsoft SMTP Server id 14.3.301.0; Mon, 29 Oct 2018 12:37:12 -0400 From: Stefan Popa To: CC: , , , , , , , Subject: [PATCH v3 1/3] iio: ad_sigma_delta: Allow to provide custom data register address Date: Mon, 29 Oct 2018 18:36:52 +0200 Message-ID: <1540831012-2758-1-git-send-email-stefan.popa@analog.com> X-Mailer: git-send-email 2.7.4 MIME-Version: 1.0 X-ADIRoutedOnPrem: True X-EOPAttributedMessage: 0 X-MS-Office365-Filtering-HT: Tenant X-Forefront-Antispam-Report: CIP:137.71.25.57;IPV:NLI;CTRY:US;EFV:NLI;SFV:NSPM;SFS:(10009020)(346002)(376002)(136003)(396003)(39860400002)(2980300002)(438002)(199004)(189003)(8676002)(107886003)(50226002)(356004)(6666004)(6916009)(8936002)(7696005)(47776003)(54906003)(2906002)(316002)(26005)(16586007)(51416003)(5660300001)(106002)(478600001)(48376002)(476003)(72206003)(186003)(53416004)(126002)(50466002)(426003)(4326008)(486006)(336012)(2351001)(246002)(106466001)(305945005)(7636002)(2616005)(36756003)(77096007)(44832011);DIR:OUT;SFP:1101;SCL:1;SRVR:DM5PR03MB3130;H:nwd2mta4.analog.com;FPR:;SPF:Pass;LANG:en;PTR:nwd2mail11.analog.com;A:1;MX:1; X-Microsoft-Exchange-Diagnostics: 1;BN1AFFO11FD022;1:ni6L0o4XsjLAC1he5uHJGlxAlGoJ+EdyVsBoIHKj+SmjEFA0Na4SHANRkxOA4FZPnQTU0mSw+C76CoYj5kc7z9V6CG9oWKT8LopwkZMJVSp1LK1ot2msn0KgGfejvhZx X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 7ea74237-bb39-4399-6b92-08d63dbcc87b X-Microsoft-Antispam: BCL:0;PCL:0;RULEID:(7020095)(4652040)(8989299)(5600074)(711020)(4608076)(4534185)(4627221)(201703031133081)(201702281549075)(8990200)(2017052603328)(7153060);SRVR:DM5PR03MB3130; X-Microsoft-Exchange-Diagnostics: 1;DM5PR03MB3130;3:XCb0WwVHgDWvcaUiMTQ3UsicAPgttltp0IZWRWO1/UbGkHJIye/FKjGoStqyRrOgOjvV9WjXEAGQMQiaYSWhvFDJg20G4j1x24KoQcq6+3/LsJBXmob5J9IlEl4gqBFblYelDOHL/KSk8y7fU/bltlGAd1f1Vvz/zLV0MADrlVTzNoVwk+GSMehZXRNvSMvhTXtWfLW4CbyfRWYld+LdywENrRXm+ggp+1+IInvcKcVADftFypykK0vBIJO6K8WAsjpjOcWNV54j1WXDbLZdk1hv79a/Y3XwtD/ASeGfXYtNz2k5KC10Rq3e3XyaZXDX6S2nfqhXuwV+++56nQqxsSAADnX3RZgiqIgFoOXI4cA=;25:IcfRwq7yiEQ57VZ4RooJRROrO2WV+2TDKg3ZU0LFhgy+Z/hFU4JTCezhF8SBStFRsgRumS7YQ1Wj/9MTqIVdNV1jNnsciMFeSp69muy6U/yAVlPgdj6yCogDoOE7rSfjc+RFHZTmG5vspCJIBhbdGZuGX07OtmuDt0VHOoe7kepmh2J4Nyt2C4msGtS7j2BZvkqzO8BWc+G/kFl+ewgU+Q6OKwlD3SSx0XCHjYhW94noZB+JY5Hu50VnP9KCpjlAy1zUZ9qx2qizT6A3asbJkncc03BwtGm9F5+RConMPQMTfdGMO++Esg0vnokI5Ldgbu05LZsKXvqWMbz4lv2AOA== X-MS-TrafficTypeDiagnostic: DM5PR03MB3130: X-Microsoft-Exchange-Diagnostics: 1;DM5PR03MB3130;31:uKcmyxG90IvvMvKFWdwPiiYpRKiz/IgEFls3rlcSSc107ed5vKsG673t1uwNoB/w/sFXmDBx/RBf8Ne8wwzB3Nd315yQM00UMe/Z/3DnMjilsPXM90KxN5EQO0x4+JFKi+98njwSSTdf9isoBguU3M4ylhVKaaV10+tEYRzKtCaG+4D2lly+QT8r2YPk8bzj8aoo6v/UUD+H6izJqVU3NciUNdqAud/YN5QXQhYDjLI=;20:RBnOtoP7fX1n7cKCRZGpgoFp6A29pD593/NRzr2be2XE2ADrDmWoJGFVbsBfLYBjbZIdr9BsmaSSkjnUF1GdsPuXaJPqGI3ctvxeXQxDhTkVP2kM4A90OUfdwpcYo+NmWXOmQdg09fSVP1z/let4Oa+fURe4JRznsYb/3m3P+fZ361OZMDcuYq5hpvbltcnpAF4bPGln7G/RTyTGxRWBy+K2LXZK4LNyivT6URrQWC0J+Ls2IaY6p2mBuLLfp/Gw6ipDaI3vDi+tI0cAzTOug5dyVQBO7iGZnFLetEnCEPYZbbkU4L9+sPJN8+oybGIYe+KZWPuOe2h48gcVIh/CxO7MVS/poAITC9pYdCFrMHMxMMe5RAjctNwLb3TJKKRlqo1emzJvHRYVEYISxzTdPSrGORBOA9nRG1eRz3kRtE8ArDdXwCW/d0m53MUm7FAyX1PA1df8Leq8ZWh7/1Y0eKLOcWSgCn3Uvvk2ZDZd7ijbS1RtYRzPbGFFl13PINEY X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:(232431446821674); X-MS-Exchange-SenderADCheck: 1 X-Exchange-Antispam-Report-CFA-Test: BCL:0;PCL:0;RULEID:(8211001083)(6040522)(2401047)(5005006)(8121501046)(3231382)(944501410)(52105095)(93006095)(93004095)(3002001)(10201501046)(6055026)(148016)(149066)(150057)(6041310)(20161123560045)(20161123564045)(20161123562045)(20161123558120)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(201708071742011)(7699051)(76991095);SRVR:DM5PR03MB3130;BCL:0;PCL:0;RULEID:;SRVR:DM5PR03MB3130; X-Microsoft-Exchange-Diagnostics: 1;DM5PR03MB3130;4:X7OQfDRKaiqpBuiiVn8BWWXN2CZn1cGA+Yzzpu4aInKSpG53D0lxOPuHTq/6JySqqEDP48H21TwEVcV0AAdNALC8kaU7+UhurCMuZDJhBwKfaavar5t7xM6XB0RuuPeJnGKfaDgcvEbPpt6ESrO1RLc8Gy6qZi9RVcSmo/1oKLxiNIQjI5LXfu+Si3vdJDTGdp/taQTptvxWvc4OlvEgjv/DcfZ2azIMyS3nrMDrVpm5Cz6Y2tZ6vaYVIdpeH+db8O0Y8bx5HjetOaU+dGbD/bVhCTfYlryWP4dmPOWJRNo7yY6blYWpYtDRYByFzb7x X-Forefront-PRVS: 084080FC15 X-Microsoft-Exchange-Diagnostics: 1;DM5PR03MB3130;23:q1SADiSqwhfSyZN41k8N6q1MSDD/O8/iYXX6sfKP7Cud4Eknwq6oIa5XXenwEUAv1t0dD/aa+omcY0fh28y6G+LN3UQeb8eVYkmViDNBZdzuohVPqRsrCGiNQFWO+ghPVQ+VI4zYSuuiLTDSoWb0jlJZS7Ws0s8b3Df8v00T7twMq1/VtWfww6GaGTlMULRS4OF5Pht5cNcOMjKRmDUpeB0tR3fajZotb8OuV5+qmcVZHQQNYuFCcVSR4G/3mbFhsNHhu14uJUwoOpcRatmXWiaoNa4H43TIpHzrlF/2QI0QPn6iTwbT/WjuwHmKFoFOc+Yy3E4zpo0l66Lk0K4dOS0bpc8A3qlvNxXzb6k0ATdg6kuK1f3u3+P89To5bTg1Rp4z6GRAaVXB+Vdhb1i7bcVmDObyYXvzFg//XVTYqy0WLavtKDTbomYDAOR5W9fCgNlH+NsyUnPvaUtOOmehoYeF0QdSe7p4HitOfPobYBRWc5GXeBYsREzfVaT3mckDnMaI9gBp+K9QYObh5/3J5j270AvAOO6LHSEZAwM+mxNWmmYnHZ/Ba57mADh8TNOREIc3ZjWQcMyovfmWpxW0H0RN+qmVr/98a5sE9ksMD75BYHMCg4KgD+acsba9RXOepJEoSZ7SCsGO+Z7lI07fp6AZwRR51H56i/aOcsp5pPLxWHM5nPvUPEfD3jX2osfy1s4dzksJE7eiJjRyOI+OAhKgwPnw1NhRgYZfv07HcluHyLMEVAzA6yYHJ5VCmCPxRN3b0YMiuvjpHKMLZ4BaZn/HqCrIH6NlOIlBMUkDhZ3ZzWX/kagp120f5dNA3kHsEtPZU1c2ZBVAGZERiOFBpgrCg/yugR23S948x8WVyqDQfGTO5bG9YBjevjyfx/ExOaPTSEOe+/j1M1KrzeLM4X9GhmEgKBpXnvcp/Qwwx+6/997qbjB7tR5U3JuPwBqo50x3fJqy9/58kFp3hBbsoNZ8/1DWRDBRL0LhXRZIwDdsGQE1WJ5F/xbujWyvCAUaZvyIWv5WypzkVqoNQeDyiA== X-Microsoft-Antispam-Message-Info: OGxVU18gc8sJeMRNcjuKHmeAflV8l130jl5OtvUysnT1cbJgsKZ2GB7MaGfrle9Sje78ZZEdp3VbXY0W6377O/9N3rHxMpXyhZCK7qPIG6YkXYiTwWwfHggxQHulIEMF+qozewUPgR09hNnKA9/97hwO1zL2/bvNwLPHIEMwcAWp5eM16J5S3CS8sZRKc+HNxrcNqw2IlCTcF67gCm/s5FQV9C42XryZ/4oVxHju0MTGqn8lncmWzuUcJ/NywtWQZatmPWiUPqFCPNWJ6kAOoZ6xannZykrWXsY5fMz6gDPNOasUDknOdhb6ihry2I+tlO+LhuG+6G6smd+xfRG/fl369oSTtj/RisjW2od2VsU= X-Microsoft-Exchange-Diagnostics: 1;DM5PR03MB3130;6:I0LrU7BPkv0AUz7cJ6sKPSRGUirbQZ3Fr6Y/R5Uhyr5ToSgbuX0iUuqWymY+z2P+ye1zv6BEXlf+qZSsyzCTkPdznqZNl1DyXFHTVSWDILFgC5NdXdaucP64mc8eiO/EPvTCwHwpay1nCC5xcmpHo36WI5oeOB5q+yHjIc1WoXmv4WUvtC2Nu9DAcYXkW4wAnxl5BXKWb2opE+gmk2jrzHm33auFI+xVJutKbRSEziF2fG49B2i52C4me85moep8sC4P0a25s5/aWmPE3NAjJ9wAubZ0CaPrSv5cHs0sjUHpH1pQ1L/JEzArjhkaemzwrkukdJ8Z8tMjOzO14R78cLNQIbzLDAj+hPgegIHT5zvJoAXd4bxp2Qz9LTKL0AxL1bxvG+0Yxw3QcEAyoGzcySo8ovfU/6JjGu14XV0NAk9U1r0tQjSpgfvSy5tBJRnHjlWE4XgZeRstrowTiT/K4w==;5:xFEzAvyHaqu+5YrvQBdFfPMXbq4wEXiTQNxzGTVHOHeC4MpIsReOYYvzHzGytHSwt6HrRQofWdnIqdkNbEyMV60V75AFzSNHEPxM31Kq5QqdFQjPbhSYhpEvqcI/rrMSww4btJcLezEPXbEuuzhMh9K8WBs/2IE7yQCgBhtG8So=;7:Ms/Uzh1s5mUdFi9fOwSvJ1ygihUm/SP6NR3fwxVsNxKLhWg4aBogXGnEDyHevrofp9G85T6euOeZN6yB/BKi0ph05sWTDrexDJcCxPl8/kH8AjkT/4WBlBUOZbojLxEXv6VHPqu5yV14tw8W4F73dw== SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-OriginatorOrg: analog.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 29 Oct 2018 16:37:13.8212 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 7ea74237-bb39-4399-6b92-08d63dbcc87b X-MS-Exchange-CrossTenant-Id: eaa689b4-8f87-40e0-9c6f-7228de4d754a X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=eaa689b4-8f87-40e0-9c6f-7228de4d754a;Ip=[137.71.25.57];Helo=[nwd2mta4.analog.com] X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM5PR03MB3130 Sender: linux-iio-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-iio@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP From: Lars-Peter Clausen Some newer devices from the Sigma-Delta ADC family do have their data register at a different address than the current default address. Add a parameter to the ad_sigma_delta_info struct which allows to override the default address. Signed-off-by: Lars-Peter Clausen Signed-off-by: Stefan Popa --- Changes in v2: - Added this commit. Changes in v3: - Nothing changed. drivers/iio/adc/ad_sigma_delta.c | 22 +++++++++++++++++----- include/linux/iio/adc/ad_sigma_delta.h | 3 +++ 2 files changed, 20 insertions(+), 5 deletions(-) diff --git a/drivers/iio/adc/ad_sigma_delta.c b/drivers/iio/adc/ad_sigma_delta.c index fc95107..ff5f2da 100644 --- a/drivers/iio/adc/ad_sigma_delta.c +++ b/drivers/iio/adc/ad_sigma_delta.c @@ -278,6 +278,7 @@ int ad_sigma_delta_single_conversion(struct iio_dev *indio_dev, { struct ad_sigma_delta *sigma_delta = iio_device_get_drvdata(indio_dev); unsigned int sample, raw_sample; + unsigned int data_reg; int ret = 0; if (iio_buffer_enabled(indio_dev)) @@ -305,7 +306,12 @@ int ad_sigma_delta_single_conversion(struct iio_dev *indio_dev, if (ret < 0) goto out; - ret = ad_sd_read_reg(sigma_delta, AD_SD_REG_DATA, + if (sigma_delta->info->data_reg != 0) + data_reg = sigma_delta->info->data_reg; + else + data_reg = AD_SD_REG_DATA; + + ret = ad_sd_read_reg(sigma_delta, data_reg, DIV_ROUND_UP(chan->scan_type.realbits + chan->scan_type.shift, 8), &raw_sample); @@ -392,6 +398,7 @@ static irqreturn_t ad_sd_trigger_handler(int irq, void *p) struct iio_dev *indio_dev = pf->indio_dev; struct ad_sigma_delta *sigma_delta = iio_device_get_drvdata(indio_dev); unsigned int reg_size; + unsigned int data_reg; uint8_t data[16]; int ret; @@ -401,18 +408,23 @@ static irqreturn_t ad_sd_trigger_handler(int irq, void *p) indio_dev->channels[0].scan_type.shift; reg_size = DIV_ROUND_UP(reg_size, 8); + if (sigma_delta->info->data_reg != 0) + data_reg = sigma_delta->info->data_reg; + else + data_reg = AD_SD_REG_DATA; + switch (reg_size) { case 4: case 2: case 1: - ret = ad_sd_read_reg_raw(sigma_delta, AD_SD_REG_DATA, - reg_size, &data[0]); + ret = ad_sd_read_reg_raw(sigma_delta, data_reg, reg_size, + &data[0]); break; case 3: /* We store 24 bit samples in a 32 bit word. Keep the upper * byte set to zero. */ - ret = ad_sd_read_reg_raw(sigma_delta, AD_SD_REG_DATA, - reg_size, &data[1]); + ret = ad_sd_read_reg_raw(sigma_delta, data_reg, reg_size, + &data[1]); break; } diff --git a/include/linux/iio/adc/ad_sigma_delta.h b/include/linux/iio/adc/ad_sigma_delta.h index 730ead1..7e84351 100644 --- a/include/linux/iio/adc/ad_sigma_delta.h +++ b/include/linux/iio/adc/ad_sigma_delta.h @@ -39,6 +39,8 @@ struct iio_dev; * if there is just one read-only sample data shift register. * @addr_shift: Shift of the register address in the communications register. * @read_mask: Mask for the communications register having the read bit set. + * @data_reg: Address of the data register, if 0 the default address of 0x3 will + * be used. */ struct ad_sigma_delta_info { int (*set_channel)(struct ad_sigma_delta *, unsigned int channel); @@ -47,6 +49,7 @@ struct ad_sigma_delta_info { bool has_registers; unsigned int addr_shift; unsigned int read_mask; + unsigned int data_reg; }; /** From patchwork Mon Oct 29 16:38:31 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Stefan Popa X-Patchwork-Id: 10659743 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 7F91113B5 for ; Mon, 29 Oct 2018 16:39:19 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 63DC629BC1 for ; Mon, 29 Oct 2018 16:39:19 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 5802A29BCA; Mon, 29 Oct 2018 16:39:19 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-7.9 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,MAILING_LIST_MULTI,RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id E14F629BC1 for ; Mon, 29 Oct 2018 16:39:17 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728086AbeJ3B2g (ORCPT ); Mon, 29 Oct 2018 21:28:36 -0400 Received: from mail-dm3nam03on0067.outbound.protection.outlook.com ([104.47.41.67]:13011 "EHLO NAM03-DM3-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1728022AbeJ3B2f (ORCPT ); Mon, 29 Oct 2018 21:28:35 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=analog.onmicrosoft.com; s=selector1-analog-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=P4OVagrIYfDN0rU5jyTGjV06MpvDPVPPvLnXauSNFgM=; b=inijTAvid7qtR5sJbvgZn16B11l2+vGQcELug8UyZ8IH52bcwzReKZcjV5JaZQXDVdzICrlevegURl835L3/bi+VF3iCeSdNJx3Byg8Vwk20GX9J6zcx0R5hHDum0s0H5VvRZgsjqp274yFEnoEI4Ksg23EWS1gpdNxTCDfuZQU= Received: from CY4PR03CA0076.namprd03.prod.outlook.com (2603:10b6:910:4d::17) by BLUPR03MB550.namprd03.prod.outlook.com (2a01:111:e400:880::28) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.1273.24; Mon, 29 Oct 2018 16:39:09 +0000 Received: from BL2FFO11FD023.protection.gbl (2a01:111:f400:7c09::199) by CY4PR03CA0076.outlook.office365.com (2603:10b6:910:4d::17) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384) id 15.20.1273.21 via Frontend Transport; Mon, 29 Oct 2018 16:39:08 +0000 Received-SPF: Pass (protection.outlook.com: domain of analog.com designates 137.71.25.57 as permitted sender) receiver=protection.outlook.com; client-ip=137.71.25.57; helo=nwd2mta4.analog.com; Received: from nwd2mta4.analog.com (137.71.25.57) by BL2FFO11FD023.mail.protection.outlook.com (10.173.161.102) with Microsoft SMTP Server (version=TLS1_0, cipher=TLS_RSA_WITH_AES_256_CBC_SHA) id 15.20.1294.14 via Frontend Transport; Mon, 29 Oct 2018 16:39:08 +0000 Received: from NWD2HUBCAS7.ad.analog.com (nwd2hubcas7.ad.analog.com [10.64.69.107]) by nwd2mta4.analog.com (8.13.8/8.13.8) with ESMTP id w9TGd8e5009747 (version=TLSv1/SSLv3 cipher=AES256-SHA bits=256 verify=OK); Mon, 29 Oct 2018 09:39:08 -0700 Received: from linux.analog.com (10.50.1.118) by NWD2HUBCAS7.ad.analog.com (10.64.69.107) with Microsoft SMTP Server id 14.3.301.0; Mon, 29 Oct 2018 12:39:07 -0400 From: Stefan Popa To: CC: , , , , , , , Subject: [PATCH v3 2/3] iio: adc: Add ad7124 support Date: Mon, 29 Oct 2018 18:38:31 +0200 Message-ID: <1540831111-3040-1-git-send-email-stefan.popa@analog.com> X-Mailer: git-send-email 2.7.4 MIME-Version: 1.0 X-ADIRoutedOnPrem: True X-EOPAttributedMessage: 0 X-MS-Office365-Filtering-HT: Tenant X-Forefront-Antispam-Report: CIP:137.71.25.57;IPV:NLI;CTRY:US;EFV:NLI;SFV:NSPM;SFS:(10009020)(979002)(376002)(39860400002)(136003)(396003)(346002)(2980300002)(438002)(189003)(199004)(37524003)(5660300001)(26005)(1720100001)(4744004)(6666004)(356004)(305945005)(7636002)(186003)(426003)(336012)(14444005)(6306002)(4326008)(6346003)(107886003)(77096007)(7696005)(478600001)(23676004)(966005)(5820100001)(53416004)(2906002)(8676002)(106466001)(575784001)(476003)(126002)(486006)(316002)(2351001)(106002)(54906003)(72206003)(47776003)(36756003)(2870700001)(50466002)(246002)(50226002)(8936002)(2616005)(44832011)(6916009)(969003)(989001)(999001)(1009001)(1019001);DIR:OUT;SFP:1101;SCL:1;SRVR:BLUPR03MB550;H:nwd2mta4.analog.com;FPR:;SPF:Pass;LANG:en;PTR:nwd2mail11.analog.com;MX:1;A:1; X-Microsoft-Exchange-Diagnostics: 1;BL2FFO11FD023;1:aO90HDSZRn+2th+RIjqt0FSlr7SUznDj7o8O6w6bZsvFqETOvP4QrO4Mfc86zkLtnSwiwGlRXDf5s89Hf6hL5/cCd0WliYdHL82n685g5ofJxUdhEIZEXfb0iEqeNiwK X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 82cf870a-0a51-423b-48c5-08d63dbd0c7b X-Microsoft-Antispam: BCL:0;PCL:0;RULEID:(7020095)(4652040)(8989299)(4534185)(4627221)(201703031133081)(201702281549075)(8990200)(5600074)(711020)(4608076)(2017052603328)(7153060);SRVR:BLUPR03MB550; X-Microsoft-Exchange-Diagnostics: 1;BLUPR03MB550;3:fXbmlBfOs5BrIe6fBfmwFy0BDHtU5DjCELnmIU0nOyQMqLF2dn/Pz50KSSf572defK11rKb6hkeJSBLynEg7ldusqWgMZcLezh+Gwpik/t2Ek7g56j7zn6sH+zbDgUoZ0YwdAiU3Y//CDT68OvjlTwVqIm1cq6OLAeEIwU3wvj3vWG0H1NLq9k5MuYDxHL0iMrZUiHaiVYRmRZL1lYJt2yVaHKb57rhOMyrlUYL4sLYfD0BETHhVCZ+KZCzxYD8xpdKhfbsPNJ60fmdWQ5AvmXuoiX5cy7cz/oJHIakQuEq6qBglYbhulGYCItXWMBw48SMhqKshCf41dJYQ2FRAEBW+Qph+le2fo6kflYbYz7g=;25:+Phhjje72Z1z6n6g6o5NEVqdlEQyMUW8Ji0muDx+YpuJktJkzHnJ3Z/J5h36tkTenKh7zc22FutdD/myU9YxPmHVsW8a1+p8ovcFjDx7firNpNoPLFpRL6e4c1E30riUP5sSHbVM79HWNESgh4uRPU0gSqQCu3pGdL7jv0+kom4H8/8TEvVNJfxTcNOuPCNvIXiPV2VirENoYnQsjyyY5bjbnTMaYgx4K9ll9u0RLxrppjmif485I2DSi4afrVAiTxpbvEkUoinx6mZiAB38x2U3pD8VaBEM6xclInxqKkcDA2kqSR+RV1UNHPrCgm967QxHAKKb9JwIvBAGeKgMYQ== X-MS-TrafficTypeDiagnostic: BLUPR03MB550: X-Microsoft-Exchange-Diagnostics: 1;BLUPR03MB550;31:WVvbz3WZXzC4ozj/e7HcmFL18ZPQG/IvTa/3VZZUJxhGhYvFPdEw9X63uCf6WBUOGnnjlHQGX+tUaJf5qX7soO7OkFTk+feBvr/PUqK6R+aAcNe7lh4KaiWKSIkNBEX/8YNrrjexHXO9Jr9sQenFFJ37b5LkMD/a8rYZsL+ZTA5T/0Blu48hYE6FYJLxWkn88sPFOkkZdSi4rEdM06tJHt+AWqo5WTZ/AmmqXllyC78=;20:craFtu5cnnnfSJLzdimJS5B7kg/GJzz/H/x9yHr0Qs+x0P2+Ul85lzwsK0HjR/i3Jwq5VP8oYjeMuJoWH7hD2nxiEPiBHx6w0DHe1WvVj2/hSPjA6X2Lbk+oLNyiuZJukPB/CWD7pI4pxc0uc0IVuG/oVXxsaUBCD98XC8MgYaChrNajL+5wTfXZ4IR+xtpcd6NjcOAL6ERzk6xv1xW2mF2igxCHoijfmcrDhShPkbHVaxUkZIFwg+1UaOA3fOonss9sKQ7iDanhHRGCGlXZPytBfY4E7+vuDrL4zGmdFltUEXCbCsURyCUQk5dywZvjTNDb+/MB0wnyHHKcmrn8hv3ePkIaTtqb52+7ONluvBv5Y/yPTvDev0NB7tWC1MUfVS8LneTttVIAQoqRu1EJEAgDT1UAJUhMbAyH3mzU+Ytg9zaToTOFL1vtilPv9bYWsnXGadpJC2plbI8Hb5MU9O81V8FJqOjKs4Ndm8s0Sc514+FSiGWGCbuFJPvriCLM X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:(270121546159015)(232431446821674)(9452136761055)(170811661138872)(95692535739014); X-MS-Exchange-SenderADCheck: 1 X-Exchange-Antispam-Report-CFA-Test: BCL:0;PCL:0;RULEID:(8211001083)(6040522)(2401047)(8121501046)(5005006)(93006095)(93004095)(10201501046)(3002001)(3231382)(944501410)(4982022)(52105095)(6055026)(148016)(149066)(150057)(6041310)(20161123564045)(20161123560045)(20161123562045)(20161123558120)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(201708071742011)(7699051)(76991095);SRVR:BLUPR03MB550;BCL:0;PCL:0;RULEID:;SRVR:BLUPR03MB550; X-Microsoft-Exchange-Diagnostics: 1;BLUPR03MB550;4:4kNH5O3cvxDB6DQP87Ctt3BoEOSBps546P3xw61gt1VSBZo7V9GuJ0qKm+pcIEwRYKubCI2xa4YlC5bylLmbr2r4wcVTieYRm2Q/SWY6GvPzv10XoqHBxHG5u+JUbh0PPV06sEmiAWjnDCpK1nguz/ZaGjVe+YSTDx+OtJUO9uW9tFGg7EwLgcRUpIPr3wsSla9N8yKqnmgU/YtguAjuNlsbS5JXzW3Ow1ItiHDNzNlciN5/bHSNoeyGoJ9SjbTGiKnjpUJRYl4sHa8lAZZn7pcQ8an9HXgCyRUp3ISCU5kjGJ6XO94gtbYayk32ttHjhFrSpltcAiONPW3neGtgTW+vbnCGKBJCQwJELXTRUefmXLxKX/ESGVrZArim4Y/WPW9fGp5v0pcOyrBtbdoiYEzto/3CsirH4EIpx2W8Qh3e5h4OZDqDXgokW+E4lLP2I4UPLWnc2Q08Bp9jQdeZWA== X-Forefront-PRVS: 084080FC15 X-Microsoft-Exchange-Diagnostics: =?utf-8?q?1=3BBLUPR03MB550=3B23=3APba2mlN9?= =?utf-8?q?l8yL3V6ILTLcHCcyUXnUVkYg+SnvLCHtcojYD+nxcYDPoGJogtv1j5EX+GmHKrWdS?= =?utf-8?q?3yHbH5Gg9cLkydHWenMRn7dt/DhMz9Q8Cf4hFGuL4MS4Ju4Eg38566SWGq9bqtvT/?= =?utf-8?q?fkQkU1ularjyviG4ax8rrvWijo0GKOFTdFmcsmJ8GJekIQ6e/S4FJMXNDrtxQ2NLf?= =?utf-8?q?4h6NaYbw4dh+z1kRN4C+Pqu0Yo1LQ9JSn+aUXlZfg/ybwuu/iVaBqQymfWEkCSYvT?= =?utf-8?q?61JRu8W5J0+hm3K4c1sSOgHCV3ZrC8lGLf7e2N02q7ajx/JE5nHnoOI6QBNo899p7?= =?utf-8?q?ElTZaASC62dxzMHml+JVw51qAeF4BbazKT3aGt4OG/f0ol1Wh6hzlDhXG4EPBf0eg?= =?utf-8?q?fMYMP0HesiOo0LvSri3KEQwUT7GUf2U6X2FYyrDabG9zbKP8bxyhgwhEfNb+0dg+/?= =?utf-8?q?liXDzD4pEF88vXZhkdZBtoPHlXj2l9Z1MBpQB+vmY+KjE/70zhyGVrJM01eUiRcrP?= =?utf-8?q?Eo92A/z8SvABHB5a2rBUNSI3FN8kWOEA2bEj0wnCSiH13loUY7NM846h/FBnlJ/Ya?= =?utf-8?q?zkwe9u1v9gwsptTbh4lxGm7bCcMqttrqbiahjm3/0yBQrJ3lKnG/igoglDWN4trXF?= =?utf-8?q?U9NQa6rZ/dwyv+XnJD8zM/LVUdmKJK2iuGllixcluynO5cWPzDnSFptL3KIe4TJhK?= =?utf-8?q?2IAxM5jLf9fgCjEeGgiyx8Dy0HzltZKL113AEjrSwBBHndyCHGxKdTr6/lHbGWjoM?= =?utf-8?q?lc2iFaKwUL5XFcpKswkjWPYEBtlOwEqJPjfxMoA6EdiHQm780bDnEtLUPhVkTP96C?= =?utf-8?q?S/djNqx3njqXQ3njeDv50vskWjfADImAFXnSGI5EVWS/Ol92yOo0UUbYghIa1LZxS?= =?utf-8?q?1pb7Yogo/qpe0I2QPquty3+SACXhxSUunMNeSFNrUmJa3WkOtRvwAcMqllMEz+7pU?= =?utf-8?q?PhtDt6nXiAqevwHeMMY0Uz9touoCZIxTOV1W0WanNykQxb2X3tLJbNXzuI963VlAs?= =?utf-8?q?tGdBV8vLqmz7dyLyRkir15ph1bJJ90omAO/+ROzPfvCNiq+n7Vm5V9CQ+Q/xbRL0H?= =?utf-8?q?tVZjmUWDtyNz5Sg1Upe825TDSzoBs5rEqoFrkjIABT/d1VOou3QDuZX1yw8NMZJvU?= =?utf-8?q?oIiollKuETV0WIKAIdtL7ydHF0u3Scgv/BhOYjFsNqA956ljfAj4jCzlAoR6BfX3L?= =?utf-8?q?T4RmNgoNKLzWrmM8pgS7eF1gu9tyygZ66KHOrVXu7y+uYgHAlgTvXU5jkDKr9lj8t?= =?utf-8?q?Scra+koJJb+EYfA=3D?= X-Microsoft-Antispam-Message-Info: ZISdo1xTFtKvFg3Ps/xTLuIReh/fz3NfpHLoQAZVnw5OJWAoywUn+gYOM+CtXu2SH4lxplXQKFaD+KYmYHu7HQFtuez+X3wgTZJuhgzrZiStzZc7s1Bjx8JuXQ5APJJVAyeEi9+Vw8tsHOc/daH0715I9RANjY1GFfTTtCmaz9lSwD/ohmQUW63cKaL6H+VC3N5bC7eBg+nNvXp/g/aLshq0Bt9l2gCBO4JevZwJJF+7oYqdUPyWakpVvV4WDSjbkwzt6kuCtGEIpYQR2IrAKQbH9VUVzc1np5JRo8MkNTiDdKhxH3x8npkDUGJrTmaFplwz6016lk6KbalHjWsISkfAxrCnWJ9B/pMYh2VD4tM= X-Microsoft-Exchange-Diagnostics: 1;BLUPR03MB550;6:L9oB8tXunOSn1ie2AhzX1Iu11YL2Eo2W4pD5umbqgQXGuiWyP6DHEPeKFChcrMC9ZGwmJm/CgrEn4U8N6jj2RyExobVa4myOWbaVm0UfjnHXG/uAhCymqWvNmiZ6ld6Key+L3ssTAt+mcbCPsSHAvSHsXi34cEnJ8qXGRtJ61TRhFO/3P4pGKwo8qykEkXmuOKjs5tDBqbWr5B9dWmnBQnOOcggDq06srZ14pO8TZFwz5EFdffFVYZXYJDREVQefyefxPbpZcB1RT1JYsFEiUoW216fOnzA7daFNX3Pbh9VEVfvk4AuKUaVoaVJRJGYro/G+gVS3jfIVKjdPcVMu7rJyMIZrN6FAOPDTJkUPK8snGRvlBGfY+P9CBKWUnsGs6u1dxuDW4Esj0ixv3jBlGBdarCjZDEXAAccH/zX2Afv33Q7DKCjyWwnDJa8OMxnY/t7oZdDsjPi1A+8AAGPNeg==;5:+mVQz7PVghgR11z5RsHdAFBl8irt68FGwORbXpHVTpsSpykH4RA/cLjyt5Qv5cJQ13BLXg6837Dl55SqGtV9oaiQAwaHAkO+fm5MFuziTuFy4bluXlPAJ0SwBWwZyJrdhJ9OsCvX3qo3hzBlVk403s7AdBMtxowraYxRrpQMTM8=;7:pTq7h/A20VyrrU9fxyUcyzPoY/jc8W6QDYVV4+cGbFJQnqGa0wQ2QwYVAog3cMDU8HMZeAS0n7+vTEqsa6M4W7tqe8+oT6k0UlSdpA2P+gOxaErgz4Hg65pLaJzi1BF3B0r9h9Lm4mP2KWb2i/WYqA== SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-OriginatorOrg: analog.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 29 Oct 2018 16:39:08.5930 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 82cf870a-0a51-423b-48c5-08d63dbd0c7b X-MS-Exchange-CrossTenant-Id: eaa689b4-8f87-40e0-9c6f-7228de4d754a X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=eaa689b4-8f87-40e0-9c6f-7228de4d754a;Ip=[137.71.25.57];Helo=[nwd2mta4.analog.com] X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: BLUPR03MB550 Sender: linux-iio-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-iio@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP The ad7124-4 and ad7124-8 are a family of 4 and 8 channel sigma-delta ADCs with 24-bit precision and reference. Three power modes are available which in turn affect the output data rate: * Full power: 9.38 SPS to 19,200 SPS * Mid power: 2.34 SPS to 4800 SPS * Low power: 1.17 SPS to 2400 SPS The ad7124-4 can be configured to have four differential inputs, while ad7124-8 can have 8. Moreover, ad7124 also supports per channel configuration. Each configuration consists of gain, reference source, output data rate and bipolar/unipolar configuration. Datasheets: Link: http://www.analog.com/media/en/technical-documentation/data-sheets/AD7124-4.pdf Link: http://www.analog.com/media/en/technical-documentation/data-sheets/ad7124-8.pdf Signed-off-by: Stefan Popa --- Changes in v2: - Added this commit. Changes in v3: - Removed channel, address, scan_index and shift fields from ad7124_channel_template. - Added a sanity check for val2 in ad7124_write_raw(). - Used the "reg" property to get the channel address and "adi,diff-channels" for the differential pins. The "adi,channel-number" property was removed. - When calling regulator_get_optional, the probe is given up in case of error, but continues in case of -ENODEV. - clk_disable_unprepare() is called before ad_sd_cleanup_buffer_and_trigger in ad7124_remove(). MAINTAINERS | 7 + drivers/iio/adc/Kconfig | 11 + drivers/iio/adc/Makefile | 1 + drivers/iio/adc/ad7124.c | 648 +++++++++++++++++++++++++++++++++++++++++++++++ 4 files changed, 667 insertions(+) create mode 100644 drivers/iio/adc/ad7124.c diff --git a/MAINTAINERS b/MAINTAINERS index f642044..3a1bfcb 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -839,6 +839,13 @@ S: Supported F: drivers/iio/dac/ad5758.c F: Documentation/devicetree/bindings/iio/dac/ad5758.txt +ANALOG DEVICES INC AD7124 DRIVER +M: Stefan Popa +L: linux-iio@vger.kernel.org +W: http://ez.analog.com/community/linux-device-drivers +S: Supported +F: drivers/iio/adc/ad7124.c + ANALOG DEVICES INC AD9389B DRIVER M: Hans Verkuil L: linux-media@vger.kernel.org diff --git a/drivers/iio/adc/Kconfig b/drivers/iio/adc/Kconfig index a52fea8..148a10f 100644 --- a/drivers/iio/adc/Kconfig +++ b/drivers/iio/adc/Kconfig @@ -10,6 +10,17 @@ config AD_SIGMA_DELTA select IIO_BUFFER select IIO_TRIGGERED_BUFFER +config AD7124 + tristate "Analog Devices AD7124 and similar sigma-delta ADCs driver" + depends on SPI_MASTER + select AD_SIGMA_DELTA + help + Say yes here to build support for Analog Devices AD7124-4 and AD7124-8 + SPI analog to digital converters (ADC). + + To compile this driver as a module, choose M here: the module will be + called ad7124. + config AD7266 tristate "Analog Devices AD7265/AD7266 ADC driver" depends on SPI_MASTER diff --git a/drivers/iio/adc/Makefile b/drivers/iio/adc/Makefile index a6e6a0b..76168b2 100644 --- a/drivers/iio/adc/Makefile +++ b/drivers/iio/adc/Makefile @@ -5,6 +5,7 @@ # When adding new entries keep the list in alphabetical order obj-$(CONFIG_AD_SIGMA_DELTA) += ad_sigma_delta.o +obj-$(CONFIG_AD7124) += ad7124.o obj-$(CONFIG_AD7266) += ad7266.o obj-$(CONFIG_AD7291) += ad7291.o obj-$(CONFIG_AD7298) += ad7298.o diff --git a/drivers/iio/adc/ad7124.c b/drivers/iio/adc/ad7124.c new file mode 100644 index 0000000..0660135 --- /dev/null +++ b/drivers/iio/adc/ad7124.c @@ -0,0 +1,648 @@ +// SPDX-License-Identifier: GPL-2.0+ +/* + * AD7124 SPI ADC driver + * + * Copyright 2018 Analog Devices Inc. + */ +#include +#include +#include +#include +#include +#include +#include +#include +#include + +#include +#include +#include + +/* AD7124 registers */ +#define AD7124_COMMS 0x00 +#define AD7124_STATUS 0x00 +#define AD7124_ADC_CONTROL 0x01 +#define AD7124_DATA 0x02 +#define AD7124_IO_CONTROL_1 0x03 +#define AD7124_IO_CONTROL_2 0x04 +#define AD7124_ID 0x05 +#define AD7124_ERROR 0x06 +#define AD7124_ERROR_EN 0x07 +#define AD7124_MCLK_COUNT 0x08 +#define AD7124_CHANNEL(x) (0x09 + (x)) +#define AD7124_CONFIG(x) (0x19 + (x)) +#define AD7124_FILTER(x) (0x21 + (x)) +#define AD7124_OFFSET(x) (0x29 + (x)) +#define AD7124_GAIN(x) (0x31 + (x)) + +/* AD7124_STATUS */ +#define AD7124_STATUS_POR_FLAG_MSK BIT(4) + +/* AD7124_ADC_CONTROL */ +#define AD7124_ADC_CTRL_PWR_MSK GENMASK(7, 6) +#define AD7124_ADC_CTRL_PWR(x) FIELD_PREP(AD7124_ADC_CTRL_PWR_MSK, x) +#define AD7124_ADC_CTRL_MODE_MSK GENMASK(5, 2) +#define AD7124_ADC_CTRL_MODE(x) FIELD_PREP(AD7124_ADC_CTRL_MODE_MSK, x) + +/* AD7124_CHANNEL_X */ +#define AD7124_CHANNEL_EN_MSK BIT(15) +#define AD7124_CHANNEL_EN(x) FIELD_PREP(AD7124_CHANNEL_EN_MSK, x) +#define AD7124_CHANNEL_SETUP_MSK GENMASK(14, 12) +#define AD7124_CHANNEL_SETUP(x) FIELD_PREP(AD7124_CHANNEL_SETUP_MSK, x) +#define AD7124_CHANNEL_AINP_MSK GENMASK(9, 5) +#define AD7124_CHANNEL_AINP(x) FIELD_PREP(AD7124_CHANNEL_AINP_MSK, x) +#define AD7124_CHANNEL_AINM_MSK GENMASK(4, 0) +#define AD7124_CHANNEL_AINM(x) FIELD_PREP(AD7124_CHANNEL_AINM_MSK, x) + +/* AD7124_CONFIG_X */ +#define AD7124_CONFIG_BIPOLAR_MSK BIT(11) +#define AD7124_CONFIG_BIPOLAR(x) FIELD_PREP(AD7124_CONFIG_BIPOLAR_MSK, x) +#define AD7124_CONFIG_REF_SEL_MSK GENMASK(4, 3) +#define AD7124_CONFIG_REF_SEL(x) FIELD_PREP(AD7124_CONFIG_REF_SEL_MSK, x) +#define AD7124_CONFIG_PGA_MSK GENMASK(2, 0) +#define AD7124_CONFIG_PGA(x) FIELD_PREP(AD7124_CONFIG_PGA_MSK, x) + +/* AD7124_FILTER_X */ +#define AD7124_FILTER_FS_MSK GENMASK(10, 0) +#define AD7124_FILTER_FS(x) FIELD_PREP(AD7124_FILTER_FS_MSK, x) + +enum ad7124_ids { + ID_AD7124_4, + ID_AD7124_8, +}; + +enum ad7124_ref_sel { + AD7124_REFIN1, + AD7124_REFIN2, + AD7124_INT_REF, + AD7124_AVDD_REF, +}; + +enum ad7124_power_mode { + AD7124_LOW_POWER, + AD7124_MID_POWER, + AD7124_FULL_POWER, +}; + +static const unsigned int ad7124_gain[8] = { + 1, 2, 4, 8, 16, 32, 64, 128 +}; + +static const int ad7124_master_clk_freq_hz[3] = { + [AD7124_LOW_POWER] = 76800, + [AD7124_MID_POWER] = 153600, + [AD7124_FULL_POWER] = 614400, +}; + +static const char * const ad7124_ref_names[] = { + [AD7124_REFIN1] = "refin1", + [AD7124_REFIN2] = "refin2", + [AD7124_INT_REF] = "int", + [AD7124_AVDD_REF] = "avdd", +}; + +struct ad7124_chip_info { + unsigned int num_inputs; +}; + +struct ad7124_channel_config { + enum ad7124_ref_sel refsel; + bool bipolar; + unsigned int ain; + unsigned int vref_mv; + unsigned int pga_bits; + unsigned int odr; +}; + +struct ad7124_state { + const struct ad7124_chip_info *chip_info; + struct ad_sigma_delta sd; + struct ad7124_channel_config channel_config[4]; + struct regulator *vref[4]; + struct clk *mclk; + unsigned int adc_control; + unsigned int num_channels; +}; + +static const struct iio_chan_spec ad7124_channel_template = { + .type = IIO_VOLTAGE, + .indexed = 1, + .differential = 1, + .info_mask_separate = BIT(IIO_CHAN_INFO_RAW) | + BIT(IIO_CHAN_INFO_SCALE) | + BIT(IIO_CHAN_INFO_OFFSET) | + BIT(IIO_CHAN_INFO_SAMP_FREQ), + .scan_type = { + .sign = 'u', + .realbits = 24, + .storagebits = 32, + }, +}; + +static struct ad7124_chip_info ad7124_chip_info_tbl[] = { + [ID_AD7124_4] = { + .num_inputs = 8, + }, + [ID_AD7124_8] = { + .num_inputs = 16, + }, +}; + +static int ad7124_find_closest_match(const int *array, + unsigned int size, int val) +{ + int i; + + for (i = 0; i < size; i++) { + if (val <= array[i]) + return i; + } + + return size - 1; +} + +static int ad7124_spi_write_mask(struct ad7124_state *st, + unsigned int addr, + unsigned long mask, + unsigned int val, + unsigned int bytes) +{ + unsigned int readval; + int ret; + + ret = ad_sd_read_reg(&st->sd, addr, bytes, &readval); + if (ret < 0) + return ret; + + readval &= ~mask; + readval |= val; + + return ad_sd_write_reg(&st->sd, addr, bytes, readval); +} + +static int ad7124_set_mode(struct ad_sigma_delta *sd, + enum ad_sigma_delta_mode mode) +{ + struct ad7124_state *st = container_of(sd, struct ad7124_state, sd); + + st->adc_control &= ~AD7124_ADC_CTRL_MODE_MSK; + st->adc_control |= AD7124_ADC_CTRL_MODE(mode); + + return ad_sd_write_reg(&st->sd, AD7124_ADC_CONTROL, 2, st->adc_control); +} + +static int ad7124_set_channel(struct ad_sigma_delta *sd, unsigned int channel) +{ + struct ad7124_state *st = container_of(sd, struct ad7124_state, sd); + unsigned int val; + + val = st->channel_config[channel].ain | AD7124_CHANNEL_EN(1) | + AD7124_CHANNEL_SETUP(channel); + + return ad_sd_write_reg(&st->sd, AD7124_CHANNEL(channel), 2, val); +} + +static const struct ad_sigma_delta_info ad7124_sigma_delta_info = { + .set_channel = ad7124_set_channel, + .set_mode = ad7124_set_mode, + .has_registers = true, + .addr_shift = 0, + .read_mask = BIT(6), + .data_reg = AD7124_DATA, +}; + +static int ad7124_set_channel_odr(struct ad7124_state *st, + unsigned int channel, + unsigned int odr) +{ + unsigned int fclk, odr_sel_bits; + int ret; + + fclk = clk_get_rate(st->mclk); + /* + * FS[10:0] = fCLK / (fADC x 32) where: + * fADC is the output data rate + * fCLK is the master clock frequency + * FS[10:0] are the bits in the filter register + * FS[10:0] can have a value from 1 to 2047 + */ + odr_sel_bits = DIV_ROUND_CLOSEST(fclk, odr * 32); + if (odr_sel_bits < 1) + odr_sel_bits = 1; + else if (odr_sel_bits > 2047) + odr_sel_bits = 2047; + + ret = ad7124_spi_write_mask(st, AD7124_FILTER(channel), + AD7124_FILTER_FS_MSK, + AD7124_FILTER_FS(odr_sel_bits), 3); + if (ret < 0) + return ret; + /* fADC = fCLK / (FS[10:0] x 32) */ + st->channel_config[channel].odr = + DIV_ROUND_CLOSEST(fclk, odr_sel_bits * 32); + + return 0; +} + +static int ad7124_read_raw(struct iio_dev *indio_dev, + struct iio_chan_spec const *chan, + int *val, int *val2, long info) +{ + struct ad7124_state *st = iio_priv(indio_dev); + int idx, ret; + + switch (info) { + case IIO_CHAN_INFO_RAW: + ret = ad_sigma_delta_single_conversion(indio_dev, chan, val); + if (ret < 0) + return ret; + + /* After the conversion is performed, disable the channel */ + ret = ad_sd_write_reg(&st->sd, + AD7124_CHANNEL(chan->address), 2, + st->channel_config[chan->address].ain | + AD7124_CHANNEL_EN(0)); + if (ret < 0) + return ret; + + return IIO_VAL_INT; + case IIO_CHAN_INFO_SCALE: + idx = st->channel_config[chan->address].pga_bits; + *val = st->channel_config[chan->address].vref_mv / + ad7124_gain[idx]; + if (st->channel_config[chan->address].bipolar) + *val2 = chan->scan_type.realbits - 1; + else + *val2 = chan->scan_type.realbits; + + return IIO_VAL_FRACTIONAL_LOG2; + case IIO_CHAN_INFO_OFFSET: + if (st->channel_config[chan->address].bipolar) { + /* Code = 2^(n − 1) × ((Ain × Gain / Vref) + 1) */ + idx = st->channel_config[chan->address].pga_bits; + *val = -(st->channel_config[chan->address].vref_mv / + ad7124_gain[idx]); + } else { + *val = 0; + } + + return IIO_VAL_INT; + case IIO_CHAN_INFO_SAMP_FREQ: + *val = st->channel_config[chan->address].odr; + + return IIO_VAL_INT; + default: + return -EINVAL; + } +} + +static int ad7124_write_raw(struct iio_dev *indio_dev, + struct iio_chan_spec const *chan, + int val, int val2, long info) +{ + struct ad7124_state *st = iio_priv(indio_dev); + + switch (info) { + case IIO_CHAN_INFO_SAMP_FREQ: + if (val2 != 0) + return -EINVAL; + + return ad7124_set_channel_odr(st, chan->address, val); + default: + return -EINVAL; + } +} + +static const struct iio_info ad7124_info = { + .read_raw = ad7124_read_raw, + .write_raw = ad7124_write_raw, +}; + +static int ad7124_soft_reset(struct ad7124_state *st) +{ + unsigned int readval, timeout; + int ret; + + ret = ad_sd_reset(&st->sd, 64); + if (ret < 0) + return ret; + + timeout = 100; + do { + ret = ad_sd_read_reg(&st->sd, AD7124_STATUS, 1, &readval); + if (ret < 0) + return ret; + + if (!(readval & AD7124_STATUS_POR_FLAG_MSK)) + return 0; + + /* The AD7124 requires typically 2ms to power up and settle */ + usleep_range(100, 2000); + } while (--timeout); + + dev_err(&st->sd.spi->dev, "Soft reset failed\n"); + + return -EIO; +} + +static int ad7124_init_channel_vref(struct ad7124_state *st, + unsigned int channel_number) +{ + unsigned int refsel = st->channel_config[channel_number].refsel; + + switch (refsel) { + case AD7124_REFIN1: + case AD7124_REFIN2: + case AD7124_AVDD_REF: + if (IS_ERR(st->vref[refsel])) { + dev_err(&st->sd.spi->dev, + "Error, trying to use external voltage reference without a %s regulator.", + ad7124_ref_names[refsel]); + return PTR_ERR(st->vref[refsel]); + } + st->channel_config[channel_number].vref_mv = + regulator_get_voltage(st->vref[refsel]); + /* Conversion from uV to mV */ + st->channel_config[channel_number].vref_mv /= 1000; + break; + case AD7124_INT_REF: + st->channel_config[channel_number].vref_mv = 2500; + break; + default: + dev_err(&st->sd.spi->dev, "Invalid reference %d\n", refsel); + return -EINVAL; + } + + return 0; +} + +static int ad7124_of_parse_channel_config(struct iio_dev *indio_dev, + struct device_node *np) +{ + struct ad7124_state *st = iio_priv(indio_dev); + struct device_node *child; + struct iio_chan_spec *chan; + unsigned int ain[2], channel = 0, tmp; + int ret, res; + + st->num_channels = of_get_available_child_count(np); + if (!st->num_channels) { + dev_err(indio_dev->dev.parent, "no channel children\n"); + return -ENODEV; + } + + chan = devm_kcalloc(indio_dev->dev.parent, st->num_channels, + sizeof(*chan), GFP_KERNEL); + if (!chan) + return -ENOMEM; + + indio_dev->channels = chan; + indio_dev->num_channels = st->num_channels; + + for_each_available_child_of_node(np, child) { + ret = of_property_read_u32(child, "reg", &channel); + if (ret) + goto err; + + ret = of_property_read_u32_array(child, "adi,diff-channels", + ain, 2); + if (ret) + goto err; + + if (ain[0] >= st->chip_info->num_inputs || + ain[1] >= st->chip_info->num_inputs) { + dev_err(indio_dev->dev.parent, + "Input pin number out of range.\n"); + ret = -EINVAL; + goto err; + } + st->channel_config[channel].ain = AD7124_CHANNEL_AINP(ain[0]) | + AD7124_CHANNEL_AINM(ain[1]); + st->channel_config[channel].bipolar = + of_property_read_bool(child, "adi,bipolar"); + + ret = of_property_read_u32(child, "adi,reference-select", &tmp); + if (ret) + st->channel_config[channel].refsel = AD7124_INT_REF; + else + st->channel_config[channel].refsel = tmp; + + ret = of_property_read_u32(child, "adi,gain", &tmp); + if (ret) { + st->channel_config[channel].pga_bits = 0; + } else { + res = ad7124_find_closest_match(ad7124_gain, + ARRAY_SIZE(ad7124_gain), tmp); + st->channel_config[channel].pga_bits = res; + } + + ret = of_property_read_u32(child, "adi,odr-hz", &tmp); + if (ret) + /* + * 9 SPS is the minimum output data rate supported + * regardless of the selected power mode. + */ + st->channel_config[channel].odr = 9; + else + st->channel_config[channel].odr = tmp; + + *chan = ad7124_channel_template; + chan->address = channel; + chan->scan_index = channel; + chan->channel = ain[0]; + chan->channel2 = ain[1]; + + chan++; + } + + return 0; +err: + of_node_put(child); + + return ret; +} + +static int ad7124_setup(struct ad7124_state *st) +{ + unsigned int val, fclk, power_mode; + int i, ret; + + fclk = clk_get_rate(st->mclk); + if (!fclk) + return -EINVAL; + + /* The power mode changes the master clock frequency */ + power_mode = ad7124_find_closest_match(ad7124_master_clk_freq_hz, + ARRAY_SIZE(ad7124_master_clk_freq_hz), + fclk); + if (fclk != ad7124_master_clk_freq_hz[power_mode]) { + ret = clk_set_rate(st->mclk, fclk); + if (ret) + return ret; + } + + /* Set the power mode */ + st->adc_control &= ~AD7124_ADC_CTRL_PWR_MSK; + st->adc_control |= AD7124_ADC_CTRL_PWR(power_mode); + ret = ad_sd_write_reg(&st->sd, AD7124_ADC_CONTROL, 2, st->adc_control); + if (ret < 0) + return ret; + + for (i = 0; i < st->num_channels; i++) { + val = st->channel_config[i].ain | AD7124_CHANNEL_SETUP(i); + ret = ad_sd_write_reg(&st->sd, AD7124_CHANNEL(i), 2, val); + if (ret < 0) + return ret; + + ret = ad7124_init_channel_vref(st, i); + if (ret < 0) + return ret; + + val = AD7124_CONFIG_BIPOLAR(st->channel_config[i].bipolar) | + AD7124_CONFIG_REF_SEL(st->channel_config[i].refsel) | + AD7124_CONFIG_PGA(st->channel_config[i].pga_bits); + ret = ad_sd_write_reg(&st->sd, AD7124_CONFIG(i), 2, val); + if (ret < 0) + return ret; + + ret = ad7124_set_channel_odr(st, i, st->channel_config[i].odr); + if (ret < 0) + return ret; + } + + return ret; +} + +static int ad7124_probe(struct spi_device *spi) +{ + const struct spi_device_id *id; + struct ad7124_state *st; + struct iio_dev *indio_dev; + int i, ret; + + indio_dev = devm_iio_device_alloc(&spi->dev, sizeof(*st)); + if (!indio_dev) + return -ENOMEM; + + st = iio_priv(indio_dev); + + id = spi_get_device_id(spi); + st->chip_info = &ad7124_chip_info_tbl[id->driver_data]; + + ad_sd_init(&st->sd, indio_dev, spi, &ad7124_sigma_delta_info); + + spi_set_drvdata(spi, indio_dev); + + indio_dev->dev.parent = &spi->dev; + indio_dev->name = spi_get_device_id(spi)->name; + indio_dev->modes = INDIO_DIRECT_MODE; + indio_dev->info = &ad7124_info; + + ret = ad7124_of_parse_channel_config(indio_dev, spi->dev.of_node); + if (ret < 0) + return ret; + + for (i = 0; i < ARRAY_SIZE(st->vref); i++) { + if (i != AD7124_INT_REF) { + st->vref[i] = devm_regulator_get_optional(&spi->dev, + ad7124_ref_names[i]); + if (PTR_ERR(st->vref[i]) == -ENODEV) + continue; + else if (IS_ERR(st->vref[i])) + return PTR_ERR(st->vref[i]); + + ret = regulator_enable(st->vref[i]); + if (ret) + return ret; + } + } + + st->mclk = devm_clk_get(&spi->dev, "mclk"); + if (IS_ERR(st->mclk)) { + ret = PTR_ERR(st->mclk); + goto error_regulator_disable; + } + + ret = clk_prepare_enable(st->mclk); + if (ret < 0) + goto error_regulator_disable; + + ret = ad7124_soft_reset(st); + if (ret < 0) + goto error_clk_disable_unprepare; + + ret = ad7124_setup(st); + if (ret < 0) + goto error_clk_disable_unprepare; + + ret = ad_sd_setup_buffer_and_trigger(indio_dev); + if (ret < 0) + goto error_clk_disable_unprepare; + + ret = iio_device_register(indio_dev); + if (ret < 0) { + dev_err(&spi->dev, "Failed to register iio device\n"); + goto error_remove_trigger; + } + + return 0; + +error_remove_trigger: + ad_sd_cleanup_buffer_and_trigger(indio_dev); +error_clk_disable_unprepare: + clk_disable_unprepare(st->mclk); +error_regulator_disable: + for (i = ARRAY_SIZE(st->vref) - 1; i >= 0; i--) { + if (!IS_ERR_OR_NULL(st->vref[i])) + regulator_disable(st->vref[i]); + } + + return ret; +} + +static int ad7124_remove(struct spi_device *spi) +{ + struct iio_dev *indio_dev = spi_get_drvdata(spi); + struct ad7124_state *st = iio_priv(indio_dev); + int i; + + iio_device_unregister(indio_dev); + clk_disable_unprepare(st->mclk); + ad_sd_cleanup_buffer_and_trigger(indio_dev); + + for (i = ARRAY_SIZE(st->vref) - 1; i >= 0; i--) { + if (!IS_ERR_OR_NULL(st->vref[i])) + regulator_disable(st->vref[i]); + } + + return 0; +} + +static const struct spi_device_id ad7124_id_table[] = { + { "ad7124-4", ID_AD7124_4 }, + { "ad7124-8", ID_AD7124_8 }, + {} +}; +MODULE_DEVICE_TABLE(spi, ad7124_id_table); + +static const struct of_device_id ad7124_of_match[] = { + { .compatible = "adi,ad7124-4" }, + { .compatible = "adi,ad7124-8" }, + { }, +}; +MODULE_DEVICE_TABLE(of, ad7124_of_match); + +static struct spi_driver ad71124_driver = { + .driver = { + .name = "ad7124", + .of_match_table = ad7124_of_match, + }, + .probe = ad7124_probe, + .remove = ad7124_remove, + .id_table = ad7124_id_table, +}; +module_spi_driver(ad71124_driver); + +MODULE_AUTHOR("Stefan Popa "); +MODULE_DESCRIPTION("Analog Devices AD7124 SPI driver"); +MODULE_LICENSE("GPL"); From patchwork Mon Oct 29 16:39:30 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Stefan Popa X-Patchwork-Id: 10659755 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 92CA71751 for ; Mon, 29 Oct 2018 16:40:18 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 76EA329BBB for ; Mon, 29 Oct 2018 16:40:18 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 74F2F29C46; Mon, 29 Oct 2018 16:40:18 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-7.9 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,MAILING_LIST_MULTI,RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 8F3C229BBB for ; Mon, 29 Oct 2018 16:40:17 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727835AbeJ3B3i (ORCPT ); Mon, 29 Oct 2018 21:29:38 -0400 Received: from mail-co1nam03on0069.outbound.protection.outlook.com ([104.47.40.69]:1785 "EHLO NAM03-CO1-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1727690AbeJ3B3i (ORCPT ); Mon, 29 Oct 2018 21:29:38 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=analog.onmicrosoft.com; s=selector1-analog-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=oPZn+pFxSuFChW52tb24nx4/HXOBetDO0NaJC6CSwl8=; b=WczuDeRnPlCZISY8I7dfEdQE6C94Wz9V7fTnoYqoBolpvQ5NwZeQqo54geQJTwT8ryXShQ92HVYTl86b+N5glcFXuuJXbcB3O2zgNd153chELscZ4iSlh9dxbYC7aceANv1BFf2n1vn72IYKoCAz904IM5YeQIkl4P96QBA2NBY= Received: from DM6PR03CA0041.namprd03.prod.outlook.com (2603:10b6:5:100::18) by BL2PR03MB547.namprd03.prod.outlook.com (2a01:111:e400:c23::20) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.1273.27; Mon, 29 Oct 2018 16:40:09 +0000 Received: from BY2FFO11FD020.protection.gbl (2a01:111:f400:7c0c::126) by DM6PR03CA0041.outlook.office365.com (2603:10b6:5:100::18) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384) id 15.20.1273.19 via Frontend Transport; Mon, 29 Oct 2018 16:40:08 +0000 Authentication-Results: spf=pass (sender IP is 137.71.25.57) smtp.mailfrom=analog.com; gmx.de; dkim=none (message not signed) header.d=none;gmx.de; dmarc=bestguesspass action=none header.from=analog.com; Received-SPF: Pass (protection.outlook.com: domain of analog.com designates 137.71.25.57 as permitted sender) receiver=protection.outlook.com; client-ip=137.71.25.57; helo=nwd2mta4.analog.com; Received: from nwd2mta4.analog.com (137.71.25.57) by BY2FFO11FD020.mail.protection.outlook.com (10.1.14.137) with Microsoft SMTP Server (version=TLS1_0, cipher=TLS_RSA_WITH_AES_256_CBC_SHA) id 15.20.1294.14 via Frontend Transport; Mon, 29 Oct 2018 16:40:08 +0000 Received: from NWD2HUBCAS7.ad.analog.com (nwd2hubcas7.ad.analog.com [10.64.69.107]) by nwd2mta4.analog.com (8.13.8/8.13.8) with ESMTP id w9TGe7bI009971 (version=TLSv1/SSLv3 cipher=AES256-SHA bits=256 verify=OK); Mon, 29 Oct 2018 09:40:07 -0700 Received: from linux.analog.com (10.50.1.118) by NWD2HUBCAS7.ad.analog.com (10.64.69.107) with Microsoft SMTP Server id 14.3.301.0; Mon, 29 Oct 2018 12:40:06 -0400 From: Stefan Popa To: , , CC: , , , , , , , , Subject: [PATCH v3 3/3] dt-bindings: iio: adc: Add docs for ad7124 Date: Mon, 29 Oct 2018 18:39:30 +0200 Message-ID: <1540831170-3150-1-git-send-email-stefan.popa@analog.com> X-Mailer: git-send-email 2.7.4 MIME-Version: 1.0 X-ADIRoutedOnPrem: True X-EOPAttributedMessage: 0 X-MS-Office365-Filtering-HT: Tenant X-Forefront-Antispam-Report: CIP:137.71.25.57;IPV:NLI;CTRY:US;EFV:NLI;SFV:NSPM;SFS:(10009020)(39860400002)(346002)(376002)(396003)(136003)(2980300002)(438002)(189003)(199004)(50226002)(186003)(7636002)(44832011)(305945005)(246002)(106002)(53416004)(26005)(8676002)(4326008)(77096007)(316002)(8936002)(106466001)(110136005)(126002)(476003)(486006)(426003)(2616005)(54906003)(336012)(36756003)(478600001)(1720100001)(72206003)(6306002)(47776003)(2870700001)(7696005)(50466002)(5820100001)(23676004)(7416002)(356004)(6666004)(5660300001)(107886003)(2906002)(966005);DIR:OUT;SFP:1101;SCL:1;SRVR:BL2PR03MB547;H:nwd2mta4.analog.com;FPR:;SPF:Pass;LANG:en;PTR:nwd2mail11.analog.com;MX:1;A:1; X-Microsoft-Exchange-Diagnostics: 1;BY2FFO11FD020;1:WheJDKfZeCvSOQDscebM7s1k9v5jOFn8a9RuHNUWcu/RMSdM/HXlO7QQXbceqaFy+fwIFsltG7wVY/JpuPcqgqghsJ2sJF4KLYVTWD5vAEiXDzuVfsAmg00VuWfzQTx9 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: f9f8a040-4d93-4350-1711-08d63dbd3005 X-Microsoft-Antispam: BCL:0;PCL:0;RULEID:(7020095)(4652040)(8989299)(4534185)(4627221)(201703031133081)(201702281549075)(8990200)(5600074)(711020)(4608076)(2017052603328)(7153060);SRVR:BL2PR03MB547; X-Microsoft-Exchange-Diagnostics: 1;BL2PR03MB547;3:HwgcnZa6ouiVoBjln1gONrWdahLEyeir4+jQkNNAohSzFQDJYr8nnxs4feYbhm1+nnZ3nIhghZFfxMUl3bX6dWMyxFWYyuK+MbRgwYl39LSlC6Jesz6ds+e5jW7TP4O0w0be9QAeEPxGr+751mTyXOOQ0razuiJzpX6AVdvbXGEaMtR/qutbHn3LIH+CBr7Mq8bGd8YXo7gMGJtPc0oVndzDCHk2zYFGKRV0B8NwhbZGXfuMxpiGcWG5f9KBhhibVcLx2Q0WLssOB8ERbaFNHUHL73FkdzadWCh00FiwyHkeDwuGPiOvxdnF8z7KBqllIo+xq+EPOMtDxwEbgGlif+Mvcump6y//nQqQR+xWBPQ=;25:4bQRFlHebLq1EtQQwF6ldoDW7t8t6+GK6fQADPZJ2AZD5kmOXJ4/mNw+6IlJxyV39lkh9yESFLVZuJiiQ6imoUCgznUvA0icMID06ooYPBi/anOQrdImPBP9kNA7F92xZgWySeMaPyZIOr8SbNhy2V28cOP4umTZnOdvD5FshQPsSCsEpQLENtvESCtOkjLvK9IPckrov0zbh7x+QD1XgBgPHULJTUFsGj/EJUaMKL4Q/sxN+4gV4Nd9I2qUckjYi4aVz0JuFpayeadaEa6x1dtmKNpQ/JA7gtldaQ76RbHRWW/ZcHLDv7mU6KTm21I/49H2VCTZevBtZICvNPhtGc2GU766+d4zTsiKTG8x8OM= X-MS-TrafficTypeDiagnostic: BL2PR03MB547: X-Microsoft-Exchange-Diagnostics: 1;BL2PR03MB547;31:KnSNY2LPS7EMCWxwgq4Mc3CkiFTaX6oSQSP/yXeKkhPHbEDuM7KFXfVTutLZIzIYKIZkjA8pSyGazXnYe61GcDrWzyLrm2zVtT7LlFCfBDIU8n4h9M95/izLpJCrg/sUeiDbaA7bC6snfNkVOtr+wg1GBudSoZfIPSOLCXPgEYjDCO5ydEmb2WRJbPco/bM5Q2afSIcC20SaERPEge7EZ0xAPwUKZ+QUMozkX5ro6q8=;20:nxW5DEx6j/GHJJ3SFxHGneDsdvWBYvcAx9PEyB3ZbkgybnYIRptIwKOKO/WUNMiCObO41Fdvx1/cZpokLwq5Ozob6bQ/zkLBaAdHRAltZR4RaU/jVe5K2sSwA5ftv3Bxn6v5SNPbfJaEPIjRV96YY4J087+yp+8nA3Qt5dCKgLs/4JSQfoG/ZRtsAVbcNxsYPK5kGHx+xAthi8ESaQOw9qCtoRSMqp9PcF6yUcjod0fm/UxVnICd2CmXnAMD1HafRvfVWODBACRDhZJKeBpEOqCvbPwv2o1ydXRcZmLLkT3m9qRf0Ofam+S1+oV1cAFFhwvWl6dyxg6gp6KEfN0i+aL0WEPIegbZfml2rEtwPcdOoR3/+sf6aqvt52941t30FlyOB3uTFgZRDOzHknC3RiHT6gext6yyOpxuRyDeWJYA5E+yhsK1It2DxzrTw47LFzpwoJ0HkTsmCsqhme+OPxxVqcLHYjiIFdYjhLBKlEI9Vfz8Ex6LpHy7KqVkK+Ba X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:(232431446821674)(9452136761055)(170811661138872)(95692535739014); X-MS-Exchange-SenderADCheck: 1 X-Exchange-Antispam-Report-CFA-Test: BCL:0;PCL:0;RULEID:(8211001083)(6040522)(2401047)(5005006)(8121501046)(3231382)(944501410)(4982022)(52105095)(93006095)(93004095)(3002001)(10201501046)(6055026)(148016)(149066)(150057)(6041310)(20161123560045)(20161123564045)(20161123558120)(20161123562045)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(201708071742011)(7699051)(76991095);SRVR:BL2PR03MB547;BCL:0;PCL:0;RULEID:;SRVR:BL2PR03MB547; X-Microsoft-Exchange-Diagnostics: 1;BL2PR03MB547;4:1FKA+fcct0jirkzUIzxdO35uZFbZ80xze4bodsLMluxrs3XgQPBUHxTlDMmGIDKEHhip+Bsphj56+y129b/VXt1TNJuPbKqYRx2Jl7nigxvF+KRRewOlCPdbxDPdOCmwInnhjC1xb8RdOiUSRpU+2MP1C8fFkOC5mV8MNIz5du1jDEeMnMcFCqNuyQw7zejPfS5rF4CApfp77wg5p8XNniWMnkTCvwlXHdKJ0ZRipz6sQ5Tnu395JDTYDGBVybdqAsdWOD/CN1t2nEfcaYd7tyNy0WQS08BvAHHVN7yM6k3n/PPPN8xMggNrDosYelOv74k4j8tTYr+hYtNwbVSnkymc1ZZ1nE8rssDpNBRwfu2Qw9VgPkw+cQ7X5L+zxN9Hg8cL2XbRwkCrnhvy8PpuldjHJClhgbNXnyeMfhMhzOY= X-Forefront-PRVS: 084080FC15 X-Microsoft-Exchange-Diagnostics: =?utf-8?q?1=3BBL2PR03MB547=3B23=3AtR6RHTzc?= =?utf-8?q?2vNpPrzKGW2pd1LnoFfMejbSUK7wrs1HLGCjwJkGIuyeCtvJ9Q3fy2raOx1yjd+OO?= =?utf-8?q?S7uoQn74DuSS36A5/OyX++e/8zy/maCvCCmhZR4RZDeaqk5DSUeJ9GTCHmdrg1H8h?= =?utf-8?q?sggP++oUOQnD3s10dRH3MwuCrHNHuxXcr8TIXyTQ/RUt3wdYoY7CVPoH8SlkRspXS?= =?utf-8?q?yVrTONZJVHuEMQDdiB8yAnGGnn/Oq7wzDZtGGK3zRkaF/jAgg97/zYvJH303PkGJ1?= =?utf-8?q?6ytX6qj3hF208QiSksbOLb2ebXghr++G7F94Tp33Wc3T3VMZu6vGuO2c0I2sfAmKw?= =?utf-8?q?Xzj9wPE34YXE4zIG5R0+yGMnnLtAPPenVBuEhHjw/kLiEosUxgiuwWsjMJAPdI1Sp?= =?utf-8?q?E/8hLtC90kbIKovn56QLqyPeOA3d4NTiUhNcajgAsV4MDcf+uwjGfYi7+VrO5+3ch?= =?utf-8?q?jStnj472PtSmkd+oydXnLgH8fERxYjRZ8rjZ0T3Oc/pcd+DFxjwfZ+GugnWGhmxzS?= =?utf-8?q?Ng0yCDErumAGwDdvceTyttm9bmv05SofuAqH1kcHuJedFPHRg24yf2OvJNehG4wUR?= =?utf-8?q?yKQl8k7x2qOfO+/MhCEz2QSKa2c/NEp6bEZasH9zCeh8JHPSjBN97GlIjACJ8frXI?= =?utf-8?q?9FYK10N9dAGPVRB8php4suUiijinNt2+nOeOVI3p8/QiSwmK1zhxD9aKOpDOmvfVv?= =?utf-8?q?BKQ5p50mgAWCec5D0OWwj6B0h7/sEHuwVb+uli6fSjxLXR19U8mwHg0fRSk8bjRmn?= =?utf-8?q?xIX22RJqIYDUvhqp06YJgVl1Lk0mtu497QwiPtR4cGOBPVALfY+kCrNJxGm52cAki?= =?utf-8?q?kWOrzgu7Hev96Ge8oh8o2M4/jHB7OS/lR77CtXazMJnSUAqz7qq8KvV0OQ3vYWkbk?= =?utf-8?q?8Vlt5FanGKGmfwyKzVdHWeQELpklv+oIuGKt6JN85PECQGL4/9hUtUQXls6iZG8kq?= =?utf-8?q?c9J0QmwsSPiL+RxaZIDDJkBKF6IP6SicGN02YQ54FcYdijHv3/2xt+c2Mum6ri2mu?= =?utf-8?q?v+w4OeFygIkt1XaR9BLKwU0axJrKNmsxiuxgkDwJsRH4SF4z/hIqjdEo1z0ejbKcW?= =?utf-8?q?k2kmPd6yW7Ct+g8UkE=3D?= X-Microsoft-Antispam-Message-Info: +/FVnltAhcJJ72MrkkI7+l5wg+BRszsNj6/C4dI6XpgxNXmRYMGNG883wR5CWCKAM7bp+XghFITPRaKD4v4A7idYjnu81h8jCgtiDloXIwypIInLW4ma0TdbUXMW8SPbmTmMd14u64baWDZLFESCw4QU24o79eh0jPZ0Zc+QplVAIcUuAcqfyOrBQ5nHJI4QLStO9w+z5rMyIyTIzhAVEebWCHy4joy/2byMAw4zTZ3mnlI5+fjyWXRxMeGT7r2hgTMzYT8X6AquHL6zCuamQ0aoRvqfREhZiSZDsFuLJYYutQuStrmI8S7FO9uOGURydDUjeo3ESsR+ArT3TEfMA5p1wm29TVmizxg19SqN/fw= X-Microsoft-Exchange-Diagnostics: 1;BL2PR03MB547;6:TkidKppOP3oV2ONjMXahHITnEuxr5uTuWgWCo17P31mcayb44CGAB/1Hy4+dkecyhmsWNnP437+RWyv3Vxug9czqqfB4pMoPjhWWRjkQy6VgbKP5P94T4TUmNiFzDMv0Cup8I4v1QoTeOis/Hr8iSX2eHceNUMB0xIP6OZp8WBM1v5pglGy1tK0rFKKOQp+09kKc0K2Vr05NgfXha3OpQIomXyttinfeY4n+reOZ2Gjb3S4kwTttoi16g8xzzeNrmM7VLHvkCIfU9fYOYoMdetl9CJxlgaBiq+EHcH6zFBxQ5UGIuaHcxz5BVzPWjkuooJ4u5yLUjv5DSzR5CE2rAmcuieTqaWedPj9Njv7km2G7g+JaJ72aVudmZH95C3hIKzY1i1X+HVhF2bmNZd+JSnTaL/4K2LzqVcA1BDqN4fu/pCyg4JxjspJ/lQPqaQ4nZRuzSeGBlekLkFNKCHjo1Q==;5:vULdEUgOAq8nbv0MQUeFz0Mt2sEKYhlZi7WFbrSSUXUwnKWhBmjfkErGhp/HoEsX7O8cqB3LhLq0cHohiebo2fRvApNcB0WAp/X3KW9cy8Fvw8RQOTnISDUGMoyiWSISbfEZW1S89XO3eMLP5iWHrffEt6dpMiDqfKkMThRB1+s=;7:3HJjw/hv7tu2UV0yebwPR9pf+m9E5C/zS7e/Zy76tmTeh4gXk5vmyG3Vz25/Jhovvx3Hz2QklRy7WWNMPbm2+M46IkWTs/fraRwK8iQIF7c1ea9++f0CIynmPnYUSWFEW/BMbG7eFdZR85G0Kanwpw== SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-OriginatorOrg: analog.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 29 Oct 2018 16:40:08.0288 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: f9f8a040-4d93-4350-1711-08d63dbd3005 X-MS-Exchange-CrossTenant-Id: eaa689b4-8f87-40e0-9c6f-7228de4d754a X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=eaa689b4-8f87-40e0-9c6f-7228de4d754a;Ip=[137.71.25.57];Helo=[nwd2mta4.analog.com] X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: BL2PR03MB547 Sender: linux-iio-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-iio@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Add support for Analog Devices AD7124 4-channels and 8-channels ADC. Signed-off-by: Stefan Popa --- Changes in v2: - Nothing changed. Changes in v3: - Removed the "adi,channels" property. - Used the "reg" property to get the channel number and "adi,diff-channels" for the differential pins. The "adi,channel-number" property was removed. - adi,bipolar is of boolean type. .../devicetree/bindings/iio/adc/adi,ad7124.txt | 90 ++++++++++++++++++++++ MAINTAINERS | 1 + 2 files changed, 91 insertions(+) create mode 100644 Documentation/devicetree/bindings/iio/adc/adi,ad7124.txt diff --git a/Documentation/devicetree/bindings/iio/adc/adi,ad7124.txt b/Documentation/devicetree/bindings/iio/adc/adi,ad7124.txt new file mode 100644 index 0000000..46a9b71 --- /dev/null +++ b/Documentation/devicetree/bindings/iio/adc/adi,ad7124.txt @@ -0,0 +1,90 @@ +Analog Devices AD7124 ADC device driver + +Required properties for the AD7124: + - compatible: Must be one of "adi,ad7124-4" or "adi,ad7124-8" + - reg: SPI chip select number for the device + - spi-max-frequency: Max SPI frequency to use + see: Documentation/devicetree/bindings/spi/spi-bus.txt + - clocks: phandle to the master clock (mclk) + see: Documentation/devicetree/bindings/clock/clock-bindings.txt + - clock-names: Must be "mclk". + - interrupts: IRQ line for the ADC + see: Documentation/devicetree/bindings/interrupt-controller/interrupts.txt + + Required properties: + * #address-cells: Must be 1. + * #size-cells: Must be 0. + + Subnode(s) represent the external channels which are connected to the ADC. + Each subnode represents one channel and has the following properties: + Required properties: + * reg: The channel number. It can have up to 4 channels on ad7124-4 + and 8 channels on ad7124-8, numbered from 0 to 15. + * adi,diff-channels: Pins the channel is connected to. The first value + specifies the positive input pin, the second value the negative input pin. + + Optional properties: + * adi,bipolar: Boolean, if set the channel is used in bipolar mode. + * adi,reference-select: Select the reference source to use when + converting on the the specific channel. Valid values are: + 0: REFIN1(+)/REFIN1(−). + 1: REFIN2(+)/REFIN2(−). + 3: AVDD + If this field is left empty, internal reference is selected. + * adi,gain: Select the gain when converting on the specific channel. + Valid values are: 1, 2, 4, 8, 16, 32, 64, 128. + If this field is left empty, gain of 1 is selected. + * adi,odr-hz: The output data rate can be programmed from: + 9 to 19200 for full power mode (when the master clock is 614.4 kHz) + 2 to 4800 for mid power mode (when the master clock is 153.6 kHz) + 1 to 2400 for low power mode (when the master clock is 76.8 kHz) + If this field is left empty, odr of 9 is selected. + +Optional properties: + - refin1-supply: refin1 supply can be used as reference for conversion. + - refin2-supply: refin2 supply can be used as reference for conversion. + - avdd-supply: avdd supply can be used as reference for conversion. + +Example: + adc@0 { + compatible = "adi,ad7124-4"; + reg = <0>; + spi-max-frequency = <5000000>; + interrupts = <25 2>; + interrupt-parent = <&gpio>; + refin1-supply = <&adc_vref>; + clocks = <&ad7124_mclk>; + clock-names = "mclk"; + + #address-cells = <1>; + #size-cells = <0>; + + channel@0 { + reg = <0>; + adi,diff-channels = <0 1>; + adi,reference-select = <0>; + adi,gain = <2>; + adi,odr-hz = <10>; + }; + + channel@1 { + reg = <1>; + adi,bipolar; + adi,diff-channels = <2 3>; + adi,reference-select = <0>; + adi,gain = <4>; + adi,odr-hz = <50>; + }; + + channel@2 { + reg = <2>; + adi,diff-channels = <4 5>; + adi,gain = <128>; + adi,odr-hz = <19200>; + }; + + channel@3 { + reg = <3>; + adi,diff-channels = <6 7>; + }; + }; diff --git a/MAINTAINERS b/MAINTAINERS index 3a1bfcb..f2fa508 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -845,6 +845,7 @@ L: linux-iio@vger.kernel.org W: http://ez.analog.com/community/linux-device-drivers S: Supported F: drivers/iio/adc/ad7124.c +F: Documentation/devicetree/bindings/iio/adc/adi,ad7124.txt ANALOG DEVICES INC AD9389B DRIVER M: Hans Verkuil