From patchwork Thu Jul 18 06:27:30 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Beniamin Bia X-Patchwork-Id: 11048529 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 0A6EB138D for ; Thu, 18 Jul 2019 06:28:04 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id EF16D2864E for ; Thu, 18 Jul 2019 06:28:03 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id E30AA2872F; Thu, 18 Jul 2019 06:28:03 +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 EF5D52864E for ; Thu, 18 Jul 2019 06:28:01 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726649AbfGRG2B (ORCPT ); Thu, 18 Jul 2019 02:28:01 -0400 Received: from mx0a-00128a01.pphosted.com ([148.163.135.77]:19324 "EHLO mx0a-00128a01.pphosted.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726383AbfGRG2B (ORCPT ); Thu, 18 Jul 2019 02:28:01 -0400 Received: from pps.filterd (m0167089.ppops.net [127.0.0.1]) by mx0a-00128a01.pphosted.com (8.16.0.27/8.16.0.27) with SMTP id x6I6NsA0008860; Thu, 18 Jul 2019 02:27:56 -0400 Received: from nam02-bl2-obe.outbound.protection.outlook.com (mail-bl2nam02lp2051.outbound.protection.outlook.com [104.47.38.51]) by mx0a-00128a01.pphosted.com with ESMTP id 2tt0q7u4wp-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Thu, 18 Jul 2019 02:27:55 -0400 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=FjWx1GuWAtNa0K0MiX64tmSOrOuCXaDMMbROKHk4mBrPwMqOT/GwcOFRKble4mUEGJQ5hb4eeAiFa+jXVkRb3NYjeiXEYVWK8KPLVeL3gbKh1TCbFDCU0bnvCp3yjAYUhjIfaznWY/bWudEB9/x1vPnl+6/TwyZXArJMJLLo66F9bJngby3Ec6b+974lPfnChGY1rNzofgtLe2fFHEeuHVULDQRcPX/moJntTxBRRPSNNrRTzOP7FmPinspVke0ELpiIYw7/BEJ4Sagq22mKrt6wZlEbE4q+PDqhOV75Kc/eAbN0aGxPS27DSEHiadgrs366K7Re8So8B0VlXiVyYw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=p5m3DIBnGSakN+9XEutiKkkuZTjFRdwUEw7oqEPCzIM=; b=DdRoxkcGCSttdNz1rPbO5wnuJlE/Mh4zhFqxn5gQSPYaTL9wWKe2m4JzwsFVWFrhBuTTz5gagi78M/XDiRqA4C/swGwFA36pplZhAn32dNpl1lFQgJa6P2xtzax/DLOSx1ahTuv78by6swF3mzEKGVleRt0oIcoEZV4/lYxLQz6UlVFfFAMcb8A72qttZy8NC2/V0dPo49wjkRES9ULnmMGNyPZIVyZm5Du0g6SxAA/EnI2OMZxZbCDcXFq+qUj8rRwLHw7aDzj/lpb/wqWQVhbJw69Lyg/hh3ug5fWvfcp9OIDPaeXX0KWQYQWzguggbdYCD52bEbtNeB6F7xjvlg== ARC-Authentication-Results: i=1; mx.microsoft.com 1;spf=pass (sender ip is 137.71.25.57) smtp.rcpttodomain=vger.kernel.org smtp.mailfrom=analog.com;dmarc=bestguesspass action=none header.from=analog.com;dkim=none (message not signed);arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=analog.onmicrosoft.com; s=selector1-analog-onmicrosoft-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=p5m3DIBnGSakN+9XEutiKkkuZTjFRdwUEw7oqEPCzIM=; b=iewfSRHYZrf+1Ruy4TlbuYwYxx9bLveAEaeEiCy9K0ulhvBmP+4LM+XvHHLwkpu+QVVllsOft7Beu6e0+F+sbiiGp00P+2NmLzW22pBzN9zFjI2dqFValU+zeNDhQMkkX2BmkuYdj6UxQ+HuJL+iuV+LpcRAN9qacwZ8sT5O8Mo= Received: from CY4PR03CA0090.namprd03.prod.outlook.com (2603:10b6:910:4d::31) by MWHPR03MB3279.namprd03.prod.outlook.com (2603:10b6:301:42::35) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.2073.13; Thu, 18 Jul 2019 06:27:53 +0000 Received: from BL2NAM02FT062.eop-nam02.prod.protection.outlook.com (2a01:111:f400:7e46::206) by CY4PR03CA0090.outlook.office365.com (2603:10b6:910:4d::31) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.2073.11 via Frontend Transport; Thu, 18 Jul 2019 06:27:53 +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=nwd2mta2.analog.com; Received: from nwd2mta2.analog.com (137.71.25.57) by BL2NAM02FT062.mail.protection.outlook.com (10.152.77.57) with Microsoft SMTP Server (version=TLS1_0, cipher=TLS_RSA_WITH_AES_256_CBC_SHA) id 15.20.2052.25 via Frontend Transport; Thu, 18 Jul 2019 06:27:53 +0000 Received: from NWD2HUBCAS7.ad.analog.com (nwd2hubcas7.ad.analog.com [10.64.69.107]) by nwd2mta2.analog.com (8.13.8/8.13.8) with ESMTP id x6I6RqqE015202 (version=TLSv1/SSLv3 cipher=AES256-SHA bits=256 verify=OK); Wed, 17 Jul 2019 23:27:52 -0700 Received: from ben-Latitude-E6540.ad.analog.com (10.48.65.163) by NWD2HUBCAS7.ad.analog.com (10.64.69.107) with Microsoft SMTP Server id 14.3.408.0; Thu, 18 Jul 2019 02:27:52 -0400 From: Beniamin Bia To: CC: , , Beniamin Bia Subject: [PATCH 1/5] iio: adc: ad7606: Move common channel definition to header Date: Thu, 18 Jul 2019 09:27:30 +0300 Message-ID: <20190718062734.17306-1-beniamin.bia@analog.com> X-Mailer: git-send-email 2.17.1 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)(136003)(346002)(396003)(376002)(39860400002)(2980300002)(199004)(189003)(8936002)(48376002)(6916009)(107886003)(50466002)(1076003)(316002)(5660300002)(50226002)(4326008)(70586007)(70206006)(356004)(6666004)(336012)(86362001)(44832011)(2616005)(36756003)(476003)(426003)(54906003)(2906002)(478600001)(16586007)(2351001)(106002)(486006)(8676002)(305945005)(7696005)(51416003)(246002)(186003)(126002)(47776003)(7636002)(26005);DIR:OUT;SFP:1101;SCL:1;SRVR:MWHPR03MB3279;H:nwd2mta2.analog.com;FPR:;SPF:Pass;LANG:en;PTR:nwd2mail11.analog.com;A:1;MX:1; X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: d5db390f-2ecc-4b0f-09f1-08d70b491072 X-Microsoft-Antispam: BCL:0;PCL:0;RULEID:(2390118)(7020095)(4652040)(8989299)(4534185)(4627221)(201703031133081)(201702281549075)(8990200)(5600148)(711020)(4605104)(4709080)(1401327)(2017052603328);SRVR:MWHPR03MB3279; X-MS-TrafficTypeDiagnostic: MWHPR03MB3279: X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:6790; X-Forefront-PRVS: 01026E1310 X-MS-Exchange-SenderADCheck: 1 X-Microsoft-Antispam-Message-Info: J+ncbzz2UfJbYuu04se/o80Fpx6vanuy0iK1cOF96vRg4wMkeVxazaToi+qtX6QZUiSyn78TM/b083bSoSRtjpUntDJ2hB1FtYW3/eMIzGPRHJ5aorni0rbTMLWziYFLoNaI8L0akeL75k4gurlzXSNZFu6EqwEb+KJ8NY48v3SYSu53HC+oo/9bNF19DNdVftFxpvmXXXGkJOJD97/Ax7KZa7N+I4ksLwJv+MdUST9vvhV77pX9QL5kSHtmsw+t5Hyn3HCEUl/EvQbZMGyAHL1AyXZuDWVXX0AUALAnxtuVJvakebiJmrbWkPAv/P7Kqmp6V43iaO9r5R0EsREHoNWbpilZbCUAVUdHOpz0oHfIdjPXsbG7K/D6hISf5LVVsAQpwqikOtQsy/+Swl5w6rh/QCb1ugt3F0W2DUBwWSc= X-OriginatorOrg: analog.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 18 Jul 2019 06:27:53.1698 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: d5db390f-2ecc-4b0f-09f1-08d70b491072 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=[nwd2mta2.analog.com] X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: MWHPR03MB3279 X-Proofpoint-Virus-Version: vendor=fsecure engine=2.50.10434:,, definitions=2019-07-18_02:,, signatures=0 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 priorityscore=1501 malwarescore=0 suspectscore=1 phishscore=0 bulkscore=0 spamscore=0 clxscore=1011 lowpriorityscore=0 mlxscore=0 impostorscore=0 mlxlogscore=999 adultscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.0.1-1810050000 definitions=main-1907180072 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 common channel definition which are going to be used by both core file but also spi file, were moved in header file. Some devices have different channel definitions when are used in software mode, feature available only with spi, and those definitions will be added in spi file. Signed-off-by: Beniamin Bia Acked-by: Jonathan Cameron --- Changes in v2: -nothing changed drivers/iio/adc/ad7606.c | 23 ----------------------- drivers/iio/adc/ad7606.h | 23 +++++++++++++++++++++++ 2 files changed, 23 insertions(+), 23 deletions(-) diff --git a/drivers/iio/adc/ad7606.c b/drivers/iio/adc/ad7606.c index aba0fd123a51..a49dc106a21c 100644 --- a/drivers/iio/adc/ad7606.c +++ b/drivers/iio/adc/ad7606.c @@ -308,29 +308,6 @@ static const struct attribute_group ad7606_attribute_group_range = { .attrs = ad7606_attributes_range, }; -#define AD760X_CHANNEL(num, mask) { \ - .type = IIO_VOLTAGE, \ - .indexed = 1, \ - .channel = num, \ - .address = num, \ - .info_mask_separate = BIT(IIO_CHAN_INFO_RAW), \ - .info_mask_shared_by_type = BIT(IIO_CHAN_INFO_SCALE),\ - .info_mask_shared_by_all = mask, \ - .scan_index = num, \ - .scan_type = { \ - .sign = 's', \ - .realbits = 16, \ - .storagebits = 16, \ - .endianness = IIO_CPU, \ - }, \ -} - -#define AD7605_CHANNEL(num) \ - AD760X_CHANNEL(num, 0) - -#define AD7606_CHANNEL(num) \ - AD760X_CHANNEL(num, BIT(IIO_CHAN_INFO_OVERSAMPLING_RATIO)) - static const struct iio_chan_spec ad7605_channels[] = { IIO_CHAN_SOFT_TIMESTAMP(4), AD7605_CHANNEL(0), diff --git a/drivers/iio/adc/ad7606.h b/drivers/iio/adc/ad7606.h index d8a509c2c428..d547e88f4c9d 100644 --- a/drivers/iio/adc/ad7606.h +++ b/drivers/iio/adc/ad7606.h @@ -8,6 +8,29 @@ #ifndef IIO_ADC_AD7606_H_ #define IIO_ADC_AD7606_H_ +#define AD760X_CHANNEL(num, mask) { \ + .type = IIO_VOLTAGE, \ + .indexed = 1, \ + .channel = num, \ + .address = num, \ + .info_mask_separate = BIT(IIO_CHAN_INFO_RAW), \ + .info_mask_shared_by_type = BIT(IIO_CHAN_INFO_SCALE),\ + .info_mask_shared_by_all = mask, \ + .scan_index = num, \ + .scan_type = { \ + .sign = 's', \ + .realbits = 16, \ + .storagebits = 16, \ + .endianness = IIO_CPU, \ + }, \ +} + +#define AD7605_CHANNEL(num) \ + AD760X_CHANNEL(num, 0) + +#define AD7606_CHANNEL(num) \ + AD760X_CHANNEL(num, BIT(IIO_CHAN_INFO_OVERSAMPLING_RATIO)) + /** * struct ad7606_chip_info - chip specific information * @channels: channel specification From patchwork Thu Jul 18 06:27:31 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Beniamin Bia X-Patchwork-Id: 11048531 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 B2D3614DB for ; Thu, 18 Jul 2019 06:28:12 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id A2AB32864E for ; Thu, 18 Jul 2019 06:28:12 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 96A582872F; Thu, 18 Jul 2019 06:28:12 +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 0A7F72864E for ; Thu, 18 Jul 2019 06:28:12 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726485AbfGRG2L (ORCPT ); Thu, 18 Jul 2019 02:28:11 -0400 Received: from mx0a-00128a01.pphosted.com ([148.163.135.77]:26822 "EHLO mx0a-00128a01.pphosted.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726383AbfGRG2L (ORCPT ); Thu, 18 Jul 2019 02:28:11 -0400 Received: from pps.filterd (m0167088.ppops.net [127.0.0.1]) by mx0a-00128a01.pphosted.com (8.16.0.27/8.16.0.27) with SMTP id x6I6OdZe018641; Thu, 18 Jul 2019 02:28:06 -0400 Received: from nam02-cy1-obe.outbound.protection.outlook.com (mail-cys01nam02lp2053.outbound.protection.outlook.com [104.47.37.53]) by mx0a-00128a01.pphosted.com with ESMTP id 2tsf0g66vw-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Thu, 18 Jul 2019 02:28:05 -0400 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=ZOXQflhPpfXEDEPM9avkvoHH3ZiVw7/UdoZ+DnzKhkMIDtVptFeGOx7HH0eWoieKRbbiIgHse2VBtYdJ9pUOhS8+L8R/PY2K+U5EZnA4oSzP6YD+wz6kJd9u9aMfO9it8RgceVtrNswho/KOaucifNulXjQnshBrK+IWlSbPlA1KzRtTeq0pF/j2+mjzSh863WNo6v9fIzyCUGpBJ7WfMi2t0HnYU/7rxJpk6A7op1AfRXwYUQQcaUQcwTmgQ010wIs1QV1jBR+P362ks1xmZJ1KSnXfwliI2fgWeyUjUwt9idd38qcSwXmmXkWgTAWrgs5rJRMJcep2Wy19Nf3O/w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=g8XhzroSSOOsgVr8dl7Oi/JwMT/LDbaBl6kO3iAECSk=; b=aoaS4tImTTXYQkrJab5Ghphz1a0Nq69kBZ0prDRbMmuYgfidLF16Rfsp4ZBrGqdDBbx59pn3Wd9fRZ2lZIZZfSfv7xK5UbOYGvJk7DrTtvNGGmxdzciF31D/p2KG6UL4WRqrLDb0e95Lc2nlYTv/jetLYqEhh0vyUBsgkhNmHxPLaLcvG79gkdBXvYqrqVUGPOQxT5H7x/yir63CRO/C0z2FqIO7qMLJ8eimpuC7CBX6d4FmrGXRgQ3WtQvNFklGxc3E1vZKoK4glQgzYyow+Q/WA2aLJChvFxZoRJPc3D4UKajFE3p8SyzjCghxHXu/triiD4z9YqgJfbV++6yuFA== ARC-Authentication-Results: i=1; mx.microsoft.com 1;spf=pass (sender ip is 137.71.25.57) smtp.rcpttodomain=vger.kernel.org smtp.mailfrom=analog.com;dmarc=bestguesspass action=none header.from=analog.com;dkim=none (message not signed);arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=analog.onmicrosoft.com; s=selector1-analog-onmicrosoft-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=g8XhzroSSOOsgVr8dl7Oi/JwMT/LDbaBl6kO3iAECSk=; b=TxTfiUOGri63YPG5nZ0oxKzoWtpvKglLHs9EjBvrbkxfqZYlMDbBSBlIgv1M3ctyrgZGgh95+Nj/TrQw8Z1EwlVx0swi2H7ld/Rd+zYpG8GITeI/7RU3ByqqbIEekk+WAi6wZNmMOSZpwLNtspYyubN0MSWNEiicOhPXcHUktJw= Received: from MWHPR03CA0018.namprd03.prod.outlook.com (2603:10b6:300:117::28) by BYAPR03MB4710.namprd03.prod.outlook.com (2603:10b6:a03:131::23) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.2073.14; Thu, 18 Jul 2019 06:28:04 +0000 Received: from SN1NAM02FT060.eop-nam02.prod.protection.outlook.com (2a01:111:f400:7e44::202) by MWHPR03CA0018.outlook.office365.com (2603:10b6:300:117::28) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.2073.11 via Frontend Transport; Thu, 18 Jul 2019 06:28:04 +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=nwd2mta2.analog.com; Received: from nwd2mta2.analog.com (137.71.25.57) by SN1NAM02FT060.mail.protection.outlook.com (10.152.72.192) with Microsoft SMTP Server (version=TLS1_0, cipher=TLS_RSA_WITH_AES_256_CBC_SHA) id 15.20.2052.25 via Frontend Transport; Thu, 18 Jul 2019 06:28:03 +0000 Received: from NWD2HUBCAS7.ad.analog.com (nwd2hubcas7.ad.analog.com [10.64.69.107]) by nwd2mta2.analog.com (8.13.8/8.13.8) with ESMTP id x6I6S29c015272 (version=TLSv1/SSLv3 cipher=AES256-SHA bits=256 verify=OK); Wed, 17 Jul 2019 23:28:02 -0700 Received: from ben-Latitude-E6540.ad.analog.com (10.48.65.163) by NWD2HUBCAS7.ad.analog.com (10.64.69.107) with Microsoft SMTP Server id 14.3.408.0; Thu, 18 Jul 2019 02:28:02 -0400 From: Beniamin Bia To: CC: , , Beniamin Bia Subject: [PATCH 2/5] iio: adc: ad7606: Move spi dependent features to spi file Date: Thu, 18 Jul 2019 09:27:31 +0300 Message-ID: <20190718062734.17306-2-beniamin.bia@analog.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20190718062734.17306-1-beniamin.bia@analog.com> References: <20190718062734.17306-1-beniamin.bia@analog.com> 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)(136003)(39860400002)(396003)(346002)(2980300002)(199004)(189003)(316002)(426003)(16586007)(2616005)(26005)(186003)(11346002)(446003)(54906003)(44832011)(5660300002)(2906002)(2351001)(106002)(336012)(70586007)(6916009)(486006)(70206006)(14444005)(7636002)(476003)(47776003)(36756003)(356004)(126002)(6666004)(8936002)(50466002)(1076003)(48376002)(107886003)(76176011)(51416003)(7696005)(8676002)(246002)(305945005)(50226002)(86362001)(4326008)(478600001)(969003)(989001)(999001)(1009001)(1019001);DIR:OUT;SFP:1101;SCL:1;SRVR:BYAPR03MB4710;H:nwd2mta2.analog.com;FPR:;SPF:Pass;LANG:en;PTR:nwd2mail11.analog.com;A:1;MX:1; X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 60dd3c86-2a2c-47dc-f083-08d70b49167d X-Microsoft-Antispam: BCL:0;PCL:0;RULEID:(2390118)(7020095)(4652040)(8989299)(4534185)(4627221)(201703031133081)(201702281549075)(8990200)(5600148)(711020)(4605104)(4709080)(1401327)(2017052603328);SRVR:BYAPR03MB4710; X-MS-TrafficTypeDiagnostic: BYAPR03MB4710: X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:7691; X-Forefront-PRVS: 01026E1310 X-MS-Exchange-SenderADCheck: 1 X-Microsoft-Antispam-Message-Info: o/bjtuzhu39YJOmdBjA1LBcxTfNhfptjwTZsOMuUS2XqQMrC8mwWGOMJWH4fGB7wcKhGRAYDSafB8Ivt/dqUVkCl342zpFyi4ZlpoXC/kF23MGlz2oyqRlCrncUkoe15lXZIpjiVQJUjuep8ZdsKwrOYRSxaYozKfu2qtGAYtCiyF+SvY+sfQ8ePt/eAEwI1wOZCIPra10+RQy2QZfJUvYkT+bPI2dX1WX1CtNEYWAeGHtKEzBb2iS7Dbx7j0nmPc3ev+YNEWM9+CJW6ZpFBfssYErlqJf3G3Tu+g51vUMqU5LtnyK+DiQiFzuJGdwmJvEzgpk/mh+QBencvGMtGD+cOAO1LWvwvMZ5Gi4TjPz7uzMPLbHQN8uow6YhD4YVQ6FlStTup2a8GZ7sWQRGIQhuhMn1Etwzap6MZdJD0scg= X-OriginatorOrg: analog.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 18 Jul 2019 06:28:03.1833 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 60dd3c86-2a2c-47dc-f083-08d70b49167d 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=[nwd2mta2.analog.com] X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: BYAPR03MB4710 X-Proofpoint-Virus-Version: vendor=fsecure engine=2.50.10434:,, definitions=2019-07-18_02:,, signatures=0 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 priorityscore=1501 malwarescore=0 suspectscore=1 phishscore=0 bulkscore=0 spamscore=0 clxscore=1015 lowpriorityscore=0 mlxscore=0 impostorscore=0 mlxlogscore=907 adultscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.0.1-1810050000 definitions=main-1907180072 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 Because software mode and register access are only available in spi, they were moved in spi file and are accessbile via bops structure. The write_os/scale will be overwritten by sw_mode_config function. This patch was made in order to support devices in software mode without making the driver dependent to spi and increase the abstraction of the core. Signed-off-by: Beniamin Bia Acked-by: Jonathan Cameron --- Changes in v2: -nothing changed drivers/iio/adc/ad7606.c | 20 ++------------------ drivers/iio/adc/ad7606.h | 12 +++--------- 2 files changed, 5 insertions(+), 27 deletions(-) diff --git a/drivers/iio/adc/ad7606.c b/drivers/iio/adc/ad7606.c index a49dc106a21c..9eec3db01a17 100644 --- a/drivers/iio/adc/ad7606.c +++ b/drivers/iio/adc/ad7606.c @@ -597,7 +597,7 @@ int ad7606_probe(struct device *dev, int irq, void __iomem *base_address, st->write_scale = ad7606_write_scale_hw; st->write_os = ad7606_write_os_hw; - if (st->chip_info->sw_mode_config) + if (st->bops->sw_mode_config) st->sw_mode_en = device_property_present(st->dev, "adi,sw-mode"); @@ -606,23 +606,7 @@ int ad7606_probe(struct device *dev, int irq, void __iomem *base_address, memset32(st->range, 2, ARRAY_SIZE(st->range)); indio_dev->info = &ad7606_info_os_and_range; - /* - * In software mode, the range gpio has no longer its function. - * Instead, the scale can be configured individually for each - * channel from the range registers. - */ - if (st->chip_info->write_scale_sw) - st->write_scale = st->chip_info->write_scale_sw; - - /* - * In software mode, the oversampling is no longer configured - * with GPIO pins. Instead, the oversampling can be configured - * in configuratiion register. - */ - if (st->chip_info->write_os_sw) - st->write_os = st->chip_info->write_os_sw; - - ret = st->chip_info->sw_mode_config(indio_dev); + ret = st->bops->sw_mode_config(indio_dev); if (ret < 0) return ret; } diff --git a/drivers/iio/adc/ad7606.h b/drivers/iio/adc/ad7606.h index d547e88f4c9d..a6aac33aa33c 100644 --- a/drivers/iio/adc/ad7606.h +++ b/drivers/iio/adc/ad7606.h @@ -39,12 +39,6 @@ * oversampling ratios. * @oversampling_num number of elements stored in oversampling_avail array * @os_req_reset some devices require a reset to update oversampling - * @write_scale_sw pointer to the function which writes the scale via spi - in software mode - * @write_os_sw pointer to the function which writes the os via spi - in software mode - * @sw_mode_config: pointer to a function which configured the device - * for software mode */ struct ad7606_chip_info { const struct iio_chan_spec *channels; @@ -52,9 +46,6 @@ struct ad7606_chip_info { const unsigned int *oversampling_avail; unsigned int oversampling_num; bool os_req_reset; - int (*write_scale_sw)(struct iio_dev *indio_dev, int ch, int val); - int (*write_os_sw)(struct iio_dev *indio_dev, int val); - int (*sw_mode_config)(struct iio_dev *indio_dev); }; /** @@ -124,10 +115,13 @@ struct ad7606_state { /** * struct ad7606_bus_ops - driver bus operations * @read_block function pointer for reading blocks of data + * @sw_mode_config: pointer to a function which configured the device + * for software mode */ struct ad7606_bus_ops { /* more methods added in future? */ int (*read_block)(struct device *dev, int num, void *data); + int (*sw_mode_config)(struct iio_dev *indio_dev); }; int ad7606_probe(struct device *dev, int irq, void __iomem *base_address, From patchwork Thu Jul 18 06:27:32 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Beniamin Bia X-Patchwork-Id: 11048533 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 076F614DB for ; Thu, 18 Jul 2019 06:28:15 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id EB2442864E for ; Thu, 18 Jul 2019 06:28:14 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id DF25F2872F; Thu, 18 Jul 2019 06:28:14 +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 719012864E for ; Thu, 18 Jul 2019 06:28:14 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727705AbfGRG2O (ORCPT ); Thu, 18 Jul 2019 02:28:14 -0400 Received: from mx0b-00128a01.pphosted.com ([148.163.139.77]:12968 "EHLO mx0b-00128a01.pphosted.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726383AbfGRG2N (ORCPT ); Thu, 18 Jul 2019 02:28:13 -0400 Received: from pps.filterd (m0167091.ppops.net [127.0.0.1]) by mx0b-00128a01.pphosted.com (8.16.0.27/8.16.0.27) with SMTP id x6I6OC7G009140; Thu, 18 Jul 2019 02:28:10 -0400 Received: from nam01-sn1-obe.outbound.protection.outlook.com (mail-sn1nam01lp2059.outbound.protection.outlook.com [104.47.32.59]) by mx0b-00128a01.pphosted.com with ESMTP id 2ttgdmrat2-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-SHA384 bits=256 verify=NOT); Thu, 18 Jul 2019 02:28:10 -0400 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=Hii51OQ2dhZQrHVduJ67Te4BZV/0UwWdFAGogb3B8h6bNxGxMl8DfrLaRGBS+WoGjAOvewmPtmuj7bxEOwWM8FYFcAWho/wjfpSYWXEft7R1JAXmn4jGWWL0oF2G9IITYxpMu6vvc3nuxidHEoFa6xw4CCHiO2qqlG5GtEJwiavy/Jwwa8LDsUqBSRDCJw/Fy30QRPOxwujZZjrmNaJNDVmm1BH96JqHxRHB/3bPwbW1o3Irs2cvqnADnEoE/w4vpvxa7E41JsRuG3Zhz0RK6bICYXTh7jHYSqHDJMqoCwXdNm2lpDbVW/xYgLMBFEBmVBXEyfy17L5kktq0NCqEAA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=KrkcNtU19aLFi+4It6RQoQTYYGIhk0yhWFfMlZ7v0qg=; b=TkmvJPqm9j9Kr9MbsPUToka9hYuuKeh27/2mygYZAP3SAgVBEVy1HrRVVYMpXOaM7GhYiVIwOW0VZaFU087UFCojGF5fulOCIKOoW8Qfi8DK71AcqlnvlPnyu7/bZk7CLAe3BUBTebtD6gTZ/O7JeZ1QXmU04FyRxJKJx+rjPv2lVKRiCDAHBBody1q+c/B2hD8jnPWcyTpLrktyzfvryRsERMG86ULiZ6clH3kb2aWCRyzc/pm8fCmizumjFICUUUfhjOjR1OFb5SU/49OsI5tq+ukPKSgkSTxzvTzEelWDb5FAYdc3KtRvx8fqXl8oIQOfAfeZXcmUYwZkk3o6ow== ARC-Authentication-Results: i=1; mx.microsoft.com 1;spf=pass (sender ip is 137.71.25.57) smtp.rcpttodomain=vger.kernel.org smtp.mailfrom=analog.com;dmarc=bestguesspass action=none header.from=analog.com;dkim=none (message not signed);arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=analog.onmicrosoft.com; s=selector1-analog-onmicrosoft-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=KrkcNtU19aLFi+4It6RQoQTYYGIhk0yhWFfMlZ7v0qg=; b=lSOnM9KYWqvZgzzzI241OREp4l0i9oqBfx1Ded+wucEJDNToHynRJifBYkomiEFirGvkvP9us+2ztDc6nUtmW7glcwlAfhplL8uiRG3p+lm99lXN0fSnRJytZYWL13kDB0L9E2qbbQ5Lz0o84Rbhhyrf4Lx4Kad+AMaAfdOASIA= Received: from BL0PR03CA0018.namprd03.prod.outlook.com (2603:10b6:208:2d::31) by BN8PR03MB4707.namprd03.prod.outlook.com (2603:10b6:408:6c::12) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.2073.14; Thu, 18 Jul 2019 06:28:08 +0000 Received: from CY1NAM02FT025.eop-nam02.prod.protection.outlook.com (2a01:111:f400:7e45::200) by BL0PR03CA0018.outlook.office365.com (2603:10b6:208:2d::31) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.2073.10 via Frontend Transport; Thu, 18 Jul 2019 06:28: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=nwd2mta2.analog.com; Received: from nwd2mta2.analog.com (137.71.25.57) by CY1NAM02FT025.mail.protection.outlook.com (10.152.75.148) with Microsoft SMTP Server (version=TLS1_0, cipher=TLS_RSA_WITH_AES_256_CBC_SHA) id 15.20.2052.25 via Frontend Transport; Thu, 18 Jul 2019 06:28:07 +0000 Received: from NWD2HUBCAS7.ad.analog.com (nwd2hubcas7.ad.analog.com [10.64.69.107]) by nwd2mta2.analog.com (8.13.8/8.13.8) with ESMTP id x6I6S7dW015287 (version=TLSv1/SSLv3 cipher=AES256-SHA bits=256 verify=OK); Wed, 17 Jul 2019 23:28:07 -0700 Received: from ben-Latitude-E6540.ad.analog.com (10.48.65.163) by NWD2HUBCAS7.ad.analog.com (10.64.69.107) with Microsoft SMTP Server id 14.3.408.0; Thu, 18 Jul 2019 02:28:06 -0400 From: Beniamin Bia To: CC: , , Beniamin Bia Subject: [PATCH 3/5] iio: adc: ad7606: Allow reconfigration after reset Date: Thu, 18 Jul 2019 09:27:32 +0300 Message-ID: <20190718062734.17306-3-beniamin.bia@analog.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20190718062734.17306-1-beniamin.bia@analog.com> References: <20190718062734.17306-1-beniamin.bia@analog.com> 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)(396003)(136003)(376002)(2980300002)(199004)(189003)(316002)(486006)(4744005)(16586007)(54906003)(48376002)(44832011)(8936002)(2351001)(4326008)(50466002)(6916009)(106002)(107886003)(1076003)(5660300002)(86362001)(70586007)(70206006)(6666004)(51416003)(50226002)(356004)(246002)(76176011)(478600001)(47776003)(336012)(426003)(26005)(305945005)(11346002)(36756003)(126002)(446003)(186003)(476003)(2616005)(7636002)(8676002)(7696005)(2906002);DIR:OUT;SFP:1101;SCL:1;SRVR:BN8PR03MB4707;H:nwd2mta2.analog.com;FPR:;SPF:Pass;LANG:en;PTR:nwd2mail11.analog.com;A:1;MX:1; X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: c8661706-5519-42b9-b780-08d70b491951 X-Microsoft-Antispam: BCL:0;PCL:0;RULEID:(2390118)(7020095)(4652040)(8989299)(4534185)(4627221)(201703031133081)(201702281549075)(8990200)(5600148)(711020)(4605104)(4709080)(1401327)(2017052603328);SRVR:BN8PR03MB4707; X-MS-TrafficTypeDiagnostic: BN8PR03MB4707: X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:2958; X-Forefront-PRVS: 01026E1310 X-MS-Exchange-SenderADCheck: 1 X-Microsoft-Antispam-Message-Info: M7z+1sRGnPMkuRwPur03KfmwQfHE9JXTkRD4KNxrZyb3meIxJFbypRNJZkYAUunFQ0MUPsljRlfy8LvlMEDquV/35BY6wwmvaslcgfKNccsbZmCXhsNEuLHJ/7lzpnU+npLpYo+FdW3+eVqZLVYqa1E8r1Ed0qELVZGFVet8/14zyLKEFQssFEwHvyMP9Kfdo8Whnyu6ey48TpMcjzJWX8WfnHfmIXowyEGHq81WcAikAwOwkS/cnYLBd7BGZ20DGcfE5iFBNr9LWKmSMsWoKGPGze8dIUINC4rJlguSal3RJ0KX+v1O6FZYScWseNRTOWD8KC1RlNf6i8eeK5nhn/dG1r6ZM1mp7moTwNq/8buCnr/ZfYnTzg9QXhqH8+kWmLizw8vIamNhxRjaSMvrk9Xr060ZCz4RTMY5d1QfxpE= X-OriginatorOrg: analog.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 18 Jul 2019 06:28:07.7995 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: c8661706-5519-42b9-b780-08d70b491951 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=[nwd2mta2.analog.com] X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: BN8PR03MB4707 X-Proofpoint-Virus-Version: vendor=fsecure engine=2.50.10434:,, definitions=2019-07-18_02:,, signatures=0 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 priorityscore=1501 malwarescore=0 suspectscore=1 phishscore=0 bulkscore=0 spamscore=0 clxscore=1015 lowpriorityscore=0 mlxscore=0 impostorscore=0 mlxlogscore=694 adultscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.0.1-1810050000 definitions=main-1907180072 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 According to datasheet, ad7616 require at least 15ms after a restart to fully reconfigure and being able to receive new commands via spi. Signed-off-by: Beniamin Bia Acked-by: Jonathan Cameron --- Changes in v2: -nothing changed drivers/iio/adc/ad7606.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/drivers/iio/adc/ad7606.c b/drivers/iio/adc/ad7606.c index 9eec3db01a17..a6034cf7238a 100644 --- a/drivers/iio/adc/ad7606.c +++ b/drivers/iio/adc/ad7606.c @@ -594,6 +594,10 @@ int ad7606_probe(struct device *dev, int irq, void __iomem *base_address, if (ret) dev_warn(st->dev, "failed to RESET: no RESET GPIO specified\n"); + /* AD7616 requires al least 15ms to reconfigure after a reset */ + if (msleep_interruptible(15)) + return -ERESTARTSYS; + st->write_scale = ad7606_write_scale_hw; st->write_os = ad7606_write_os_hw; From patchwork Thu Jul 18 06:27:33 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Beniamin Bia X-Patchwork-Id: 11048537 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 A213B138D for ; Thu, 18 Jul 2019 06:28:23 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 8FD7D2864E for ; Thu, 18 Jul 2019 06:28:23 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 83A922872F; Thu, 18 Jul 2019 06:28:23 +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 A03892864E for ; Thu, 18 Jul 2019 06:28:22 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727787AbfGRG2W (ORCPT ); Thu, 18 Jul 2019 02:28:22 -0400 Received: from mx0a-00128a01.pphosted.com ([148.163.135.77]:32394 "EHLO mx0a-00128a01.pphosted.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728103AbfGRG2W (ORCPT ); Thu, 18 Jul 2019 02:28:22 -0400 Received: from pps.filterd (m0167089.ppops.net [127.0.0.1]) by mx0a-00128a01.pphosted.com (8.16.0.27/8.16.0.27) with SMTP id x6I6NsA3008860; Thu, 18 Jul 2019 02:28:16 -0400 Received: from nam01-sn1-obe.outbound.protection.outlook.com (mail-sn1nam01lp2057.outbound.protection.outlook.com [104.47.32.57]) by mx0a-00128a01.pphosted.com with ESMTP id 2tt0q7u4xe-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-SHA384 bits=256 verify=NOT); Thu, 18 Jul 2019 02:28:16 -0400 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=EPou0lkd+dKizZRoPdP3uW08J1bIjYnWBFS1kZtauh/lxj5Pp1+abftJkhcGSzjHyDfFe5yzcS2AM7uflYxAEEK4EIN1dRqSYdl3AqxzGOeFX+9qF2IfSLMeItPlLlQZ3azGDklr7hTmAbBqQID4rFc0yQxvCQ3RatmKpK7bM8yyzAgXYZiRkTkiluth7QcT3SAJvjsT1hgb/81jbTsC0aG1y0DqIDomm6QAm2oh21KYAG+9ikhk1eNZT4eQrU/k8MFcvAHx9gJadGENSWlB4uBSMkjRdhGQYSxq08gZ8H1J8HvJ3hvt4sAgU/dYnp50Z0ZInJy0NWrnMCULHcn6pw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=z7ir+aW7G+bJUz8t8gaHRHG4yrB7iJxbvtChOSZ/lc0=; b=lN9uf/hzkHW8Tr+LS/BYvyes95iCsOkGP44cM1O7buGNmYoDjs9mF3SHsNSdvPLVqbN/iJlHy728TKDKYrqA+AqRFITy9E2aNv2Cw+c5kgJ7eppThNHQCVwT+3bVMsGgUj8Pd2Fp4T3zxEYZb4UU/rhu2FmUwnFn/prxIXcOLHc1POgyr5j5602gvdx8rFFQPvsvND4UFTnd/nSmqFyGMDeXcRMoxJycKnK4yGV93HM8StxG0wuKKUPZC/d8gfHME4mm2116Jn4o7t+5/W41BlanPh/fJV7RSAp7ukn4Enm8JBdnwfWSXiR4ZafBiA781TIqOhoo475sLUR5nF5+Og== ARC-Authentication-Results: i=1; mx.microsoft.com 1;spf=pass (sender ip is 137.71.25.57) smtp.rcpttodomain=vger.kernel.org smtp.mailfrom=analog.com;dmarc=bestguesspass action=none header.from=analog.com;dkim=none (message not signed);arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=analog.onmicrosoft.com; s=selector1-analog-onmicrosoft-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=z7ir+aW7G+bJUz8t8gaHRHG4yrB7iJxbvtChOSZ/lc0=; b=d7VB2oWnZr75700yLGCt4h/OwcRbprdVEkck1C7wqCltsBt4yfBqkhnh1NwVZqtlfTuw5qE6H+k5Qkk3Ww6xLEQSlQ5JTmAO4YIv7WopZyqzAvuXui0UmLMrNwsDfXZxnUBjRGtkN0FNGlP09bH6LoO38q2NBGOcoUXTAEDFclM= Received: from DM6PR03CA0017.namprd03.prod.outlook.com (2603:10b6:5:40::30) by BYAPR03MB3832.namprd03.prod.outlook.com (2603:10b6:a03:6e::13) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.2094.12; Thu, 18 Jul 2019 06:28:12 +0000 Received: from CY1NAM02FT063.eop-nam02.prod.protection.outlook.com (2a01:111:f400:7e45::204) by DM6PR03CA0017.outlook.office365.com (2603:10b6:5:40::30) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.2073.14 via Frontend Transport; Thu, 18 Jul 2019 06:28:12 +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=nwd2mta2.analog.com; Received: from nwd2mta2.analog.com (137.71.25.57) by CY1NAM02FT063.mail.protection.outlook.com (10.152.75.161) with Microsoft SMTP Server (version=TLS1_0, cipher=TLS_RSA_WITH_AES_256_CBC_SHA) id 15.20.2052.25 via Frontend Transport; Thu, 18 Jul 2019 06:28:10 +0000 Received: from NWD2HUBCAS7.ad.analog.com (nwd2hubcas7.ad.analog.com [10.64.69.107]) by nwd2mta2.analog.com (8.13.8/8.13.8) with ESMTP id x6I6SAQN015291 (version=TLSv1/SSLv3 cipher=AES256-SHA bits=256 verify=OK); Wed, 17 Jul 2019 23:28:10 -0700 Received: from ben-Latitude-E6540.ad.analog.com (10.48.65.163) by NWD2HUBCAS7.ad.analog.com (10.64.69.107) with Microsoft SMTP Server id 14.3.408.0; Thu, 18 Jul 2019 02:28:09 -0400 From: Beniamin Bia To: CC: , , Beniamin Bia Subject: [PATCH 4/5] iio: adc: ad7606: Add support for software mode for ad7616 Date: Thu, 18 Jul 2019 09:27:33 +0300 Message-ID: <20190718062734.17306-4-beniamin.bia@analog.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20190718062734.17306-1-beniamin.bia@analog.com> References: <20190718062734.17306-1-beniamin.bia@analog.com> 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)(136003)(376002)(39860400002)(396003)(346002)(2980300002)(199004)(189003)(5820100001)(30864003)(8936002)(70206006)(26005)(476003)(126002)(2616005)(446003)(186003)(2870700001)(11346002)(2906002)(86362001)(1076003)(356004)(305945005)(6666004)(478600001)(70586007)(47776003)(50226002)(246002)(8676002)(106002)(54906003)(316002)(5660300002)(7636002)(107886003)(486006)(44832011)(14444005)(76176011)(50466002)(6916009)(23676004)(36756003)(426003)(7696005)(4326008)(2351001)(336012);DIR:OUT;SFP:1101;SCL:1;SRVR:BYAPR03MB3832;H:nwd2mta2.analog.com;FPR:;SPF:Pass;LANG:en;PTR:nwd2mail11.analog.com;A:1;MX:1; X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: bda84914-e726-4436-d223-08d70b491b3e X-Microsoft-Antispam: BCL:0;PCL:0;RULEID:(2390118)(7020095)(4652040)(8989299)(4534185)(4627221)(201703031133081)(201702281549075)(8990200)(5600148)(711020)(4605104)(4709080)(1401327)(2017052603328);SRVR:BYAPR03MB3832; X-MS-TrafficTypeDiagnostic: BYAPR03MB3832: X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:7691; X-Forefront-PRVS: 01026E1310 X-MS-Exchange-SenderADCheck: 1 X-Microsoft-Antispam-Message-Info: rawg9S8B2idLlwra85LfziqnuhL/yYtj/VY5DPsSVGzpiR0wgI4uQ5qSToUh0crhOuBUkPvT4HiJ8UQuFQTRaMs9jKEGtqRICe5oEQInAiagrKImwnvPj/msvcExlFbVaqExPtUKL2f0Os38RQBBWykF/XpYdDIDtQBFY7XTFY7dIqZUCBcN58dRaJ4FzTF7FvNJbq2k1uiEafQTKcc5Re1lS1/I7uJEkTWYaVTQ4uI6F++8UEMiFV4lHA91eV4KVxqD+j0PRc25sEPn9b4AlKb5P4aAExnecTFc5dr6LdbRllFXU+3pTllepHQII0CsCK3AJeTd2OlWobGFV3PB3RvwQAGmpOKfArnJI84qVSRATBjO3qXYkTo0s3GuZMfCc8R1Ocg5jE7BGvCj30dOrx4KUDwVclppt2tPFzdn7gE= X-OriginatorOrg: analog.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 18 Jul 2019 06:28:10.7389 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: bda84914-e726-4436-d223-08d70b491b3e 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=[nwd2mta2.analog.com] X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: BYAPR03MB3832 X-Proofpoint-Virus-Version: vendor=fsecure engine=2.50.10434:,, definitions=2019-07-18_02:,, signatures=0 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 priorityscore=1501 malwarescore=0 suspectscore=1 phishscore=0 bulkscore=0 spamscore=0 clxscore=1015 lowpriorityscore=0 mlxscore=0 impostorscore=0 mlxlogscore=999 adultscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.0.1-1810050000 definitions=main-1907180072 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 Support for ad7616 running in software was added. In order to activate the software mode, HW_RNGSEL pins must be pulled low. Oversampling and input ranges are now configured in corresponding registers. Ad7616 has multiple scale options when it is configured in software mode. Also, in order to support multiple devices in software mode, the spi calculation of registers address must be generic. Because the length of address and bit which specifies the read/write operation is different for every device, calculation of address was made generic. Signed-off-by: Beniamin Bia --- Changes in v2: -aditional comments added to explain calculation of range register address -range macros were simplified drivers/iio/adc/ad7606.c | 9 ++ drivers/iio/adc/ad7606.h | 38 ++++++-- drivers/iio/adc/ad7606_spi.c | 175 ++++++++++++++++++++++++++++++++++- 3 files changed, 213 insertions(+), 9 deletions(-) diff --git a/drivers/iio/adc/ad7606.c b/drivers/iio/adc/ad7606.c index a6034cf7238a..be2330c8b277 100644 --- a/drivers/iio/adc/ad7606.c +++ b/drivers/iio/adc/ad7606.c @@ -35,6 +35,11 @@ static const unsigned int ad7606_scale_avail[2] = { 152588, 305176 }; + +static const unsigned int ad7616_sw_scale_avail[3] = { + 76293, 152588, 305176 +}; + static const unsigned int ad7606_oversampling_avail[7] = { 1, 2, 4, 8, 16, 32, 64, }; @@ -606,6 +611,10 @@ int ad7606_probe(struct device *dev, int irq, void __iomem *base_address, "adi,sw-mode"); if (st->sw_mode_en) { + /* Scale of 0.076293 is only available in sw mode */ + st->scale_avail = ad7616_sw_scale_avail; + st->num_scales = ARRAY_SIZE(ad7616_sw_scale_avail); + /* After reset, in software mode, ±10 V is set by default */ memset32(st->range, 2, ARRAY_SIZE(st->range)); indio_dev->info = &ad7606_info_os_and_range; diff --git a/drivers/iio/adc/ad7606.h b/drivers/iio/adc/ad7606.h index a6aac33aa33c..eeaaa8b905db 100644 --- a/drivers/iio/adc/ad7606.h +++ b/drivers/iio/adc/ad7606.h @@ -8,14 +8,14 @@ #ifndef IIO_ADC_AD7606_H_ #define IIO_ADC_AD7606_H_ -#define AD760X_CHANNEL(num, mask) { \ +#define AD760X_CHANNEL(num, mask_sep, mask_type, mask_all) { \ .type = IIO_VOLTAGE, \ .indexed = 1, \ .channel = num, \ .address = num, \ - .info_mask_separate = BIT(IIO_CHAN_INFO_RAW), \ - .info_mask_shared_by_type = BIT(IIO_CHAN_INFO_SCALE),\ - .info_mask_shared_by_all = mask, \ + .info_mask_separate = mask_sep, \ + .info_mask_shared_by_type = mask_type, \ + .info_mask_shared_by_all = mask_all, \ .scan_index = num, \ .scan_type = { \ .sign = 's', \ @@ -25,11 +25,18 @@ }, \ } -#define AD7605_CHANNEL(num) \ - AD760X_CHANNEL(num, 0) +#define AD7605_CHANNEL(num) \ + AD760X_CHANNEL(num, BIT(IIO_CHAN_INFO_RAW), \ + BIT(IIO_CHAN_INFO_SCALE), 0) -#define AD7606_CHANNEL(num) \ - AD760X_CHANNEL(num, BIT(IIO_CHAN_INFO_OVERSAMPLING_RATIO)) +#define AD7606_CHANNEL(num) \ + AD760X_CHANNEL(num, BIT(IIO_CHAN_INFO_RAW), \ + BIT(IIO_CHAN_INFO_SCALE), \ + BIT(IIO_CHAN_INFO_OVERSAMPLING_RATIO)) + +#define AD7616_CHANNEL(num) \ + AD760X_CHANNEL(num, BIT(IIO_CHAN_INFO_RAW) | BIT(IIO_CHAN_INFO_SCALE),\ + 0, BIT(IIO_CHAN_INFO_OVERSAMPLING_RATIO)) /** * struct ad7606_chip_info - chip specific information @@ -77,6 +84,7 @@ struct ad7606_chip_info { * @complete completion to indicate end of conversion * @trig The IIO trigger associated with the device. * @data buffer for reading data from the device + * @d16 be16 buffer for reading data from the device */ struct ad7606_state { struct device *dev; @@ -110,6 +118,7 @@ struct ad7606_state { * 16 * 16-bit samples + 64-bit timestamp */ unsigned short data[20] ____cacheline_aligned; + __be16 d16[2]; }; /** @@ -117,11 +126,24 @@ struct ad7606_state { * @read_block function pointer for reading blocks of data * @sw_mode_config: pointer to a function which configured the device * for software mode + * @reg_read function pointer for reading spi register + * @reg_write function pointer for writing spi register + * @write_mask function pointer for write spi register with mask + * @rd_wr_cmd pointer to the function which calculates the spi address */ struct ad7606_bus_ops { /* more methods added in future? */ int (*read_block)(struct device *dev, int num, void *data); int (*sw_mode_config)(struct iio_dev *indio_dev); + int (*reg_read)(struct ad7606_state *st, unsigned int addr); + int (*reg_write)(struct ad7606_state *st, + unsigned int addr, + unsigned int val); + int (*write_mask)(struct ad7606_state *st, + unsigned int addr, + unsigned long mask, + unsigned int val); + u16 (*rd_wr_cmd)(int addr, char isWriteOp); }; int ad7606_probe(struct device *dev, int irq, void __iomem *base_address, diff --git a/drivers/iio/adc/ad7606_spi.c b/drivers/iio/adc/ad7606_spi.c index b7faef69a58f..98ed52b74507 100644 --- a/drivers/iio/adc/ad7606_spi.c +++ b/drivers/iio/adc/ad7606_spi.c @@ -15,6 +15,51 @@ #define MAX_SPI_FREQ_HZ 23500000 /* VDRIVE above 4.75 V */ +#define AD7616_CONFIGURATION_REGISTER 0x02 +#define AD7616_OS_MASK GENMASK(4, 2) +#define AD7616_BURST_MODE BIT(6) +#define AD7616_SEQEN_MODE BIT(5) +#define AD7616_RANGE_CH_A_ADDR_OFF 0x04 +#define AD7616_RANGE_CH_B_ADDR_OFF 0x06 +/* + * Range of channels from a group are stored in 2 registers. + * 0, 1, 2, 3 in a register followed by 4, 5, 6, 7 in second register. + * For channels from second group(8-15) the order is the same, only with + * an offset of 2 for register address. + */ +#define AD7616_RANGE_CH_ADDR(ch) ((ch) >> 2) +/* The range of the channel is stored on 2 bits*/ +#define AD7616_RANGE_CH_MSK(ch) (0b11 << (((ch) & 0b11) * 2)) +#define AD7616_RANGE_CH_MODE(ch, mode) ((mode) << ((((ch) & 0b11)) * 2)) +static const struct iio_chan_spec ad7616_sw_channels[] = { + IIO_CHAN_SOFT_TIMESTAMP(16), + AD7616_CHANNEL(0), + AD7616_CHANNEL(1), + AD7616_CHANNEL(2), + AD7616_CHANNEL(3), + AD7616_CHANNEL(4), + AD7616_CHANNEL(5), + AD7616_CHANNEL(6), + AD7616_CHANNEL(7), + AD7616_CHANNEL(8), + AD7616_CHANNEL(9), + AD7616_CHANNEL(10), + AD7616_CHANNEL(11), + AD7616_CHANNEL(12), + AD7616_CHANNEL(13), + AD7616_CHANNEL(14), + AD7616_CHANNEL(15), +}; + +static u16 ad7616_spi_rd_wr_cmd(int addr, char isWriteOp) +{ + /* + * The address of register consist of one w/r bit + * 6 bits of address followed by one reserved bit. + */ + return ((addr & 0x7F) << 1) | ((isWriteOp & 0x1) << 7); +} + static int ad7606_spi_read_block(struct device *dev, int count, void *buf) { @@ -35,17 +80,145 @@ static int ad7606_spi_read_block(struct device *dev, return 0; } +static int ad7606_spi_reg_read(struct ad7606_state *st, unsigned int addr) +{ + struct spi_device *spi = to_spi_device(st->dev); + struct spi_transfer t[] = { + { + .tx_buf = &st->d16[0], + .len = 2, + .cs_change = 0, + }, { + .rx_buf = &st->d16[1], + .len = 2, + }, + }; + int ret; + + st->d16[0] = cpu_to_be16(st->bops->rd_wr_cmd(addr, 0) << 8); + + ret = spi_sync_transfer(spi, t, ARRAY_SIZE(t)); + if (ret < 0) + return ret; + + return be16_to_cpu(st->d16[1]); +} + +static int ad7606_spi_reg_write(struct ad7606_state *st, + unsigned int addr, + unsigned int val) +{ + struct spi_device *spi = to_spi_device(st->dev); + + st->d16[0] = cpu_to_be16((st->bops->rd_wr_cmd(addr, 1) << 8) | + (val & 0x1FF)); + + return spi_write(spi, &st->d16[0], sizeof(st->d16[0])); +} + +static int ad7606_spi_write_mask(struct ad7606_state *st, + unsigned int addr, + unsigned long mask, + unsigned int val) +{ + int readval; + + readval = st->bops->reg_read(st, addr); + if (readval < 0) + return readval; + + readval &= ~mask; + readval |= val; + + return st->bops->reg_write(st, addr, readval); +} + +static int ad7616_write_scale_sw(struct iio_dev *indio_dev, int ch, int val) +{ + struct ad7606_state *st = iio_priv(indio_dev); + unsigned int ch_addr, mode, ch_index; + + + /* + * Ad7616 has 16 channels divided in group A and group B. + * The range of channels from A are stored in registers with address 4 + * while channels from B are stored in register with address 6. + * The last bit from channels determines if it is from group A or B + * because the order of channels in iio is 0A, 0B, 1A, 1B... + */ + ch_index = ch >> 1; + + ch_addr = AD7616_RANGE_CH_ADDR(ch_index); + + if ((ch & 0x1) == 0) /* channel A */ + ch_addr += AD7616_RANGE_CH_A_ADDR_OFF; + else /* channel B */ + ch_addr += AD7616_RANGE_CH_B_ADDR_OFF; + + /* 0b01 for 2.5v, 0b10 for 5v and 0b11 for 10v */ + mode = AD7616_RANGE_CH_MODE(ch_index, ((val + 1) & 0b11)); + return st->bops->write_mask(st, ch_addr, AD7616_RANGE_CH_MSK(ch_index), + mode); +} + +static int ad7616_write_os_sw(struct iio_dev *indio_dev, int val) +{ + struct ad7606_state *st = iio_priv(indio_dev); + + return st->bops->write_mask(st, AD7616_CONFIGURATION_REGISTER, + AD7616_OS_MASK, val << 2); +} + +static int ad7616_sw_mode_config(struct iio_dev *indio_dev) +{ + struct ad7606_state *st = iio_priv(indio_dev); + + /* + * Scale can be configured individually for each channel + * in software mode. + */ + indio_dev->channels = ad7616_sw_channels; + + st->write_scale = ad7616_write_scale_sw; + st->write_os = &ad7616_write_os_sw; + + /* Activate Burst mode and SEQEN MODE */ + return st->bops->write_mask(st, + AD7616_CONFIGURATION_REGISTER, + AD7616_BURST_MODE | AD7616_SEQEN_MODE, + AD7616_BURST_MODE | AD7616_SEQEN_MODE); +} + static const struct ad7606_bus_ops ad7606_spi_bops = { .read_block = ad7606_spi_read_block, }; +static const struct ad7606_bus_ops ad7616_spi_bops = { + .read_block = ad7606_spi_read_block, + .reg_read = ad7606_spi_reg_read, + .reg_write = ad7606_spi_reg_write, + .write_mask = ad7606_spi_write_mask, + .rd_wr_cmd = ad7616_spi_rd_wr_cmd, + .sw_mode_config = ad7616_sw_mode_config, +}; + static int ad7606_spi_probe(struct spi_device *spi) { const struct spi_device_id *id = spi_get_device_id(spi); + const struct ad7606_bus_ops *bops; + + switch (id->driver_data) { + case ID_AD7616: + bops = &ad7616_spi_bops; + break; + default: + bops = &ad7606_spi_bops; + break; + } return ad7606_probe(&spi->dev, spi->irq, NULL, id->name, id->driver_data, - &ad7606_spi_bops); + bops); } static const struct spi_device_id ad7606_id_table[] = { From patchwork Thu Jul 18 06:27:34 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Beniamin Bia X-Patchwork-Id: 11048535 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 A18A9138D for ; Thu, 18 Jul 2019 06:28:20 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 9152E2864E for ; Thu, 18 Jul 2019 06:28:20 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 8502C2872F; Thu, 18 Jul 2019 06:28:20 +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 19A932864E for ; Thu, 18 Jul 2019 06:28:20 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728127AbfGRG2T (ORCPT ); Thu, 18 Jul 2019 02:28:19 -0400 Received: from mx0a-00128a01.pphosted.com ([148.163.135.77]:31728 "EHLO mx0a-00128a01.pphosted.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727787AbfGRG2T (ORCPT ); Thu, 18 Jul 2019 02:28:19 -0400 Received: from pps.filterd (m0167088.ppops.net [127.0.0.1]) by mx0a-00128a01.pphosted.com (8.16.0.27/8.16.0.27) with SMTP id x6I6OdB1018640; Thu, 18 Jul 2019 02:28:16 -0400 Received: from nam04-sn1-obe.outbound.protection.outlook.com (mail-sn1nam04lp2054.outbound.protection.outlook.com [104.47.44.54]) by mx0a-00128a01.pphosted.com with ESMTP id 2tsf0g66w7-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-SHA384 bits=256 verify=NOT); Thu, 18 Jul 2019 02:28:15 -0400 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=bUVTyEKIWKzLoF2XD+frQtBWL1PAVbkdUoxtO/dc0L9cbyCPwmKqRv9U98wgGENMbXdFSFAnJV/zMJerjePo5JLOvlLxYkl3ogEsUsuPhw2nBKHNHU+wJaFfwcsAUmrjtxjp3hB08ZFvCJgLPVe6/qgo5oFv1ti0zXU6krlLFhhNpsKEJgbYLahTp1Hnj5BL4USpNwuB5Zkab1cEFuETQG8939iWjDFWEjatXdggL/lz8GTMs0LffHVP1WTPKEfrVZFP/h3g9l+D5hBjzGSgcsZA3OW7fNRNftPD45a15HLVrdMEcNbRYYftUvtW+v0dj6GNRq0jB/BlkvG3DN0LJA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=8Ya2JbVne4s2xD77WZbAoCKmVVWNHM4pFd/rCPxz4Hg=; b=PRYjx2ma0femZRnv44CiQH77F7QcOp/5tiXPSZMiBhguo5givyKoF+748EKezA7yMtfrMB5kgEBev/3jvvGHEnvxOGWIokOUxoJqUFLJzM3DgpdroMNyVOhwEBTX01KMjnYF5XxGvNZn4MU2PKgg8OypUc7MMpF33OxZFfUKDDUA/egQ78r57qe8tWJKQyyfyIah6EL07kqSgSTH1RWOpFIlOqkurOjD+3HbEJKCHTj7j16i3ASqJ6ZuIH9dBQy++o7l5nm48JvDE6EvO4YF48YmCwWitZ3PRjLqJKlLK3csCqt+27AHvzoTiUuJgqA9nKQQ5xGBfMTnL7xpljURpA== ARC-Authentication-Results: i=1; mx.microsoft.com 1;spf=pass (sender ip is 137.71.25.57) smtp.rcpttodomain=vger.kernel.org smtp.mailfrom=analog.com;dmarc=bestguesspass action=none header.from=analog.com;dkim=none (message not signed);arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=analog.onmicrosoft.com; s=selector1-analog-onmicrosoft-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=8Ya2JbVne4s2xD77WZbAoCKmVVWNHM4pFd/rCPxz4Hg=; b=aJYz3Us+A+UjiHpy/j3MTD31ARaorgYC/gJXK8MMD9gPv483wwAI1GgiF1gYj5f0M4EfFM3usQTMKGylKSHYpJM6UOvCLc08CIBe5duijj8s7Xo57FM4NkSYUTaloT1PJCobDmeI/4OrN8frtQCCmz4bftYS77DzGJ+SX73ccG8= Received: from BN6PR03CA0003.namprd03.prod.outlook.com (2603:10b6:404:23::13) by BN8PR03MB4708.namprd03.prod.outlook.com (2603:10b6:408:6c::13) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.2073.14; Thu, 18 Jul 2019 06:28:14 +0000 Received: from CY1NAM02FT016.eop-nam02.prod.protection.outlook.com (2a01:111:f400:7e45::206) by BN6PR03CA0003.outlook.office365.com (2603:10b6:404:23::13) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.2073.11 via Frontend Transport; Thu, 18 Jul 2019 06:28:14 +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=nwd2mta2.analog.com; Received: from nwd2mta2.analog.com (137.71.25.57) by CY1NAM02FT016.mail.protection.outlook.com (10.152.75.164) with Microsoft SMTP Server (version=TLS1_0, cipher=TLS_RSA_WITH_AES_256_CBC_SHA) id 15.20.2052.25 via Frontend Transport; Thu, 18 Jul 2019 06:28:13 +0000 Received: from NWD2HUBCAS7.ad.analog.com (nwd2hubcas7.ad.analog.com [10.64.69.107]) by nwd2mta2.analog.com (8.13.8/8.13.8) with ESMTP id x6I6SChh015300 (version=TLSv1/SSLv3 cipher=AES256-SHA bits=256 verify=OK); Wed, 17 Jul 2019 23:28:12 -0700 Received: from ben-Latitude-E6540.ad.analog.com (10.48.65.163) by NWD2HUBCAS7.ad.analog.com (10.64.69.107) with Microsoft SMTP Server id 14.3.408.0; Thu, 18 Jul 2019 02:28:12 -0400 From: Beniamin Bia To: CC: , , Beniamin Bia Subject: [PATCH 5/5] iio: adc: ad7606: Add debug mode for ad7616 Date: Thu, 18 Jul 2019 09:27:34 +0300 Message-ID: <20190718062734.17306-5-beniamin.bia@analog.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20190718062734.17306-1-beniamin.bia@analog.com> References: <20190718062734.17306-1-beniamin.bia@analog.com> 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)(136003)(39860400002)(396003)(346002)(376002)(2980300002)(199004)(189003)(5660300002)(54906003)(246002)(446003)(5820100001)(26005)(305945005)(86362001)(2616005)(2870700001)(8676002)(1076003)(336012)(426003)(7636002)(11346002)(2351001)(70586007)(70206006)(4326008)(478600001)(14444005)(44832011)(36756003)(6666004)(356004)(47776003)(8936002)(7696005)(476003)(2906002)(126002)(50466002)(106002)(316002)(107886003)(186003)(486006)(23676004)(76176011)(50226002)(6916009);DIR:OUT;SFP:1101;SCL:1;SRVR:BN8PR03MB4708;H:nwd2mta2.analog.com;FPR:;SPF:Pass;LANG:en;PTR:nwd2mail11.analog.com;A:1;MX:1; X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 63ec50de-eaf3-4a06-ba1b-08d70b491c91 X-Microsoft-Antispam: BCL:0;PCL:0;RULEID:(2390118)(7020095)(4652040)(8989299)(4534185)(4627221)(201703031133081)(201702281549075)(8990200)(5600148)(711020)(4605104)(4709080)(1401327)(2017052603328);SRVR:BN8PR03MB4708; X-MS-TrafficTypeDiagnostic: BN8PR03MB4708: X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:2150; X-Forefront-PRVS: 01026E1310 X-MS-Exchange-SenderADCheck: 1 X-Microsoft-Antispam-Message-Info: SLWnLhFbz36+1tKK18qJQgXNnKHiAIlfGMABAKOTBNWxMt0IX9v4EwQ5Uh4o3zqyOarvryoc5ZVBDyCFpCyvIuZHNVJbZxN0pVX8O7AO2C1pLHpoFBThs0FsfHsYlWOwysEFJ0xcEokgdPd9IhWh7jsKd+YkpycIbn48xzfdpQpnK5FgOAbxd+nHk76BirPw13DI+J+HhRro4HedyQSP2lSdlNJ15ZQZLl6omc44OUP4DeZl/c7U7MuGJ+2u99/daTKDHU1LnuF0tCPrjWHOx8ddl20vMpQZiX6hYCnyglZ9wMN3LIvClYj7O+ii6NYyPCIZIGRzYj8zbZj4Kg5MiKxeGkervpSrI70YGtWkVXYZ4j6b6BQTInha0muWeDnV/mQ1WUNcpBgDfn6oIoNPKbrLk8PjxJwxrXQxUlmSEcQ= X-OriginatorOrg: analog.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 18 Jul 2019 06:28:13.3162 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 63ec50de-eaf3-4a06-ba1b-08d70b491c91 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=[nwd2mta2.analog.com] X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: BN8PR03MB4708 X-Proofpoint-Virus-Version: vendor=fsecure engine=2.50.10434:,, definitions=2019-07-18_02:,, signatures=0 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 priorityscore=1501 malwarescore=0 suspectscore=1 phishscore=0 bulkscore=0 spamscore=0 clxscore=1015 lowpriorityscore=0 mlxscore=0 impostorscore=0 mlxlogscore=928 adultscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.0.1-1810050000 definitions=main-1907180072 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 Support for register access was added for devices which have software mode. Signed-off-by: Beniamin Bia Acked-by: Jonathan Cameron --- Changes in v2: -nothing changed drivers/iio/adc/ad7606.c | 33 ++++++++++++++++++++++++++++++++- 1 file changed, 32 insertions(+), 1 deletion(-) diff --git a/drivers/iio/adc/ad7606.c b/drivers/iio/adc/ad7606.c index be2330c8b277..ed2d08437e5d 100644 --- a/drivers/iio/adc/ad7606.c +++ b/drivers/iio/adc/ad7606.c @@ -60,6 +60,29 @@ static int ad7606_reset(struct ad7606_state *st) return -ENODEV; } +static int ad7606_reg_access(struct iio_dev *indio_dev, + unsigned int reg, + unsigned int writeval, + unsigned int *readval) +{ + struct ad7606_state *st = iio_priv(indio_dev); + int ret; + + mutex_lock(&st->lock); + if (readval) { + ret = st->bops->reg_read(st, reg); + if (ret < 0) + goto err_unlock; + *readval = ret; + ret = 0; + } else { + ret = st->bops->reg_write(st, reg, writeval); + } +err_unlock: + mutex_unlock(&st->lock); + return ret; +} + static int ad7606_read_samples(struct ad7606_state *st) { unsigned int num = st->chip_info->num_channels; @@ -501,6 +524,14 @@ static const struct iio_info ad7606_info_os_and_range = { .validate_trigger = &ad7606_validate_trigger, }; +static const struct iio_info ad7606_info_os_range_and_debug = { + .read_raw = &ad7606_read_raw, + .write_raw = &ad7606_write_raw, + .debugfs_reg_access = &ad7606_reg_access, + .attrs = &ad7606_attribute_group_os_and_range, + .validate_trigger = &ad7606_validate_trigger, +}; + static const struct iio_info ad7606_info_os = { .read_raw = &ad7606_read_raw, .write_raw = &ad7606_write_raw, @@ -617,7 +648,7 @@ int ad7606_probe(struct device *dev, int irq, void __iomem *base_address, /* After reset, in software mode, ±10 V is set by default */ memset32(st->range, 2, ARRAY_SIZE(st->range)); - indio_dev->info = &ad7606_info_os_and_range; + indio_dev->info = &ad7606_info_os_range_and_debug; ret = st->bops->sw_mode_config(indio_dev); if (ret < 0)