From patchwork Fri Jul 14 11:37:48 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: George Stark X-Patchwork-Id: 120440 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:a6b2:0:b0:3e4:2afc:c1 with SMTP id c18csp2460379vqm; Fri, 14 Jul 2023 05:15:32 -0700 (PDT) X-Google-Smtp-Source: APBJJlEsdiZbwbR/ULvoP0ytvxjIpE3TGXlO94Py3Hu43/dyvileL1s4nJoLM75oUqTZbJWC3l3E X-Received: by 2002:a05:6a20:42a2:b0:132:7eee:184 with SMTP id o34-20020a056a2042a200b001327eee0184mr4135791pzj.0.1689336931577; Fri, 14 Jul 2023 05:15:31 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1689336931; cv=none; d=google.com; s=arc-20160816; b=oShIBmBR6vdZZnKaBPbvCz//g/g/1oiYjBFnQmh3qOmWYR2yUSio/fwfPztAWMoz2N Lc+VeePNafhMLl+dW27urcxw6fE85etuW8FXRInL7YKXNAClNlxMS5H33dMx7gku0QbO zPYIUQBY1ltldB9W265+2Gchi9vxygw3vxV+4pvhFHu71vw4OmjXX1RPf9uIn6IPRpRX hmB6HeJ9DExduwVA4YQk5j6nCBEQ2SnOyjuFucmAGX6rl9EWB89fIoXpNipPgoiXC8Wv I3kX21kAhmHm9I4263RtdHOSMnNwr3Pkd88hGiVNEIG2mOG7cT4vWYZ09J9rRB4uvjI6 yf6A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature:dkim-filter; bh=g7845oI6wdimUizHDOc0NY6nPigRU3xLhORYGIPrDGo=; fh=Nkpk7VjQstRrk/SIKeFB2DsfhHIA7OANQWPD54Aly/o=; b=gVpsL+P9l9gEu/VfI0zfxQ94GhdWn+XRW4eTUxaG8EKwvTYRK/Vw7RQXr/dHGK3/an NHHBj/KsgQ24YHToChR957xNLOMBvdmLQdTxdNKmg/RiuTMHPdRR6OqvOtZ3NxWXaBiA nmJnd4Fvgl5tcLjB8rSn8xywFWKOORJvuThblZIJLhfseRhviIrmKY6hdYibH84do3MG WXKco8IiIR/55pGrmE9zcvL/CjXA5kso+h45GpRTzWIEdfbnWdcnGAWTjqK6W545tikb nWSZ0AoidVNC/HJMEKsEe0mM5CvFMkk/yXAEQ9fKWze/+6lqiVLXSXSCId0LunVb4iQv XBPg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@sberdevices.ru header.s=mail header.b=CsEHJDyn; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=sberdevices.ru Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id y26-20020a056a001c9a00b0066aa7b0e3c8si6836281pfw.322.2023.07.14.05.15.18; Fri, 14 Jul 2023 05:15:31 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@sberdevices.ru header.s=mail header.b=CsEHJDyn; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=sberdevices.ru Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S235515AbjGNLk3 (ORCPT + 99 others); Fri, 14 Jul 2023 07:40:29 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:42668 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229437AbjGNLk0 (ORCPT ); Fri, 14 Jul 2023 07:40:26 -0400 Received: from mx1.sberdevices.ru (mx1.sberdevices.ru [37.18.73.165]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 2C1D630CB; Fri, 14 Jul 2023 04:40:23 -0700 (PDT) Received: from p-infra-ksmg-sc-msk01 (localhost [127.0.0.1]) by mx1.sberdevices.ru (Postfix) with ESMTP id AE6A710000A; Fri, 14 Jul 2023 14:40:19 +0300 (MSK) DKIM-Filter: OpenDKIM Filter v2.11.0 mx1.sberdevices.ru AE6A710000A DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sberdevices.ru; s=mail; t=1689334819; bh=g7845oI6wdimUizHDOc0NY6nPigRU3xLhORYGIPrDGo=; h=From:To:Subject:Date:Message-ID:MIME-Version:Content-Type:From; b=CsEHJDynUY3CVZaG71ylx8ykmu0ryLy6nmqmj6HVcA5mrBkfx6JazsxJv2tyJkztH jhQQ98T+dKEWXlj2T81VKrEqaMlqcPo6Irrw7HieXoO/aszPfKHjzl8tcLZhRaJlVs vnCfNOD1dIiJvSgaqPWhy3XFeIB4UTPRwfB5/HVjswqyhqt0TqIrr6LbO84HPSsRXA EJG1VNhumrm78goGzpL9QhFPZ+RPh3YpREERpu1VbL9VgbuVH58mbRfidNCS5KU9Er u/ltcHis4tu4UeppSOzr85xrXYKnXHjSLQ4r1csbT4hxInzE/faS+H5L8fx/uosdJ6 Itn0YyGKBXEUw== Received: from p-i-exch-sc-m01.sberdevices.ru (p-i-exch-sc-m01.sberdevices.ru [172.16.192.107]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.sberdevices.ru (Postfix) with ESMTPS; Fri, 14 Jul 2023 14:40:19 +0300 (MSK) Received: from localhost.localdomain (100.64.160.123) by p-i-exch-sc-m01.sberdevices.ru (172.16.192.107) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.1118.30; Fri, 14 Jul 2023 14:39:47 +0300 From: George Stark To: , , , , , , , , CC: , , , , , George Stark Subject: [PATCH v7 1/6] iio: adc: meson: remove unused timestamp channel Date: Fri, 14 Jul 2023 14:37:48 +0300 Message-ID: <20230714114010.293440-2-gnstark@sberdevices.ru> X-Mailer: git-send-email 2.41.0 In-Reply-To: <20230714114010.293440-1-gnstark@sberdevices.ru> References: <20230714114010.293440-1-gnstark@sberdevices.ru> MIME-Version: 1.0 X-Originating-IP: [100.64.160.123] X-ClientProxiedBy: p-i-exch-sc-m02.sberdevices.ru (172.16.192.103) To p-i-exch-sc-m01.sberdevices.ru (172.16.192.107) X-KSMG-Rule-ID: 10 X-KSMG-Message-Action: clean X-KSMG-AntiSpam-Lua-Profiles: 178622 [Jul 14 2023] X-KSMG-AntiSpam-Version: 5.9.59.0 X-KSMG-AntiSpam-Envelope-From: GNStark@sberdevices.ru X-KSMG-AntiSpam-Rate: 0 X-KSMG-AntiSpam-Status: not_detected X-KSMG-AntiSpam-Method: none X-KSMG-AntiSpam-Auth: dkim=none X-KSMG-AntiSpam-Info: LuaCore: 523 523 523027ce26ed1d9067f7a52a4756a876e54db27c, {Tracking_from_domain_doesnt_match_to}, p-i-exch-sc-m01.sberdevices.ru:5.0.1,7.1.1;sberdevices.ru:5.0.1,7.1.1;100.64.160.123:7.1.2;127.0.0.199:7.1.2;d41d8cd98f00b204e9800998ecf8427e.com:7.1.1, FromAlignment: s, {Tracking_white_helo}, ApMailHostAddress: 100.64.160.123 X-MS-Exchange-Organization-SCL: -1 X-KSMG-AntiSpam-Interceptor-Info: scan successful X-KSMG-AntiPhishing: Clean X-KSMG-LinksScanning: Clean X-KSMG-AntiVirus: Kaspersky Secure Mail Gateway, version 2.0.1.6960, bases: 2023/07/14 02:46:00 #21611850 X-KSMG-AntiVirus-Status: Clean, skipped X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_BLOCKED, SPF_HELO_NONE,SPF_NONE,T_SCC_BODY_TEXT_LINE,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1771398162179811748 X-GMAIL-MSGID: 1771398162179811748 Remove IIO_CHAN_SOFT_TIMESTAMP channel because it's used only for buffering mode which is not implemented. Signed-off-by: George Stark Reviewed-by: Andy Shevchenko --- drivers/iio/adc/meson_saradc.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/drivers/iio/adc/meson_saradc.c b/drivers/iio/adc/meson_saradc.c index 18937a262af6..569ffc178935 100644 --- a/drivers/iio/adc/meson_saradc.c +++ b/drivers/iio/adc/meson_saradc.c @@ -211,7 +211,6 @@ static const struct iio_chan_spec meson_sar_adc_iio_channels[] = { MESON_SAR_ADC_CHAN(5), MESON_SAR_ADC_CHAN(6), MESON_SAR_ADC_CHAN(7), - IIO_CHAN_SOFT_TIMESTAMP(8), }; static const struct iio_chan_spec meson_sar_adc_and_temp_iio_channels[] = { @@ -224,7 +223,6 @@ static const struct iio_chan_spec meson_sar_adc_and_temp_iio_channels[] = { MESON_SAR_ADC_CHAN(6), MESON_SAR_ADC_CHAN(7), MESON_SAR_ADC_TEMP_CHAN(8), - IIO_CHAN_SOFT_TIMESTAMP(9), }; enum meson_sar_adc_avg_mode { From patchwork Fri Jul 14 11:37:49 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: George Stark X-Patchwork-Id: 120434 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:a6b2:0:b0:3e4:2afc:c1 with SMTP id c18csp2443327vqm; Fri, 14 Jul 2023 04:45:09 -0700 (PDT) X-Google-Smtp-Source: APBJJlG930hUz+5wjgBOpqjaCEXJRLcf/nf0EAT9sIJ3x+LsjlBRFZkERvG+mOmynjgjKHREFu0P X-Received: by 2002:a05:6a00:194e:b0:682:40e2:66c1 with SMTP id s14-20020a056a00194e00b0068240e266c1mr3831257pfk.21.1689335109399; Fri, 14 Jul 2023 04:45:09 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1689335109; cv=none; d=google.com; s=arc-20160816; b=Rq/2rdPDn3+BTKfkg/lHltgn+oYF6ToyHTxJHgIOScU1fT3x7GeP1tbOgbkfrh6cxa RHdwtmhxMTUpfD5w957Rrk7KpH2Xif9sN/BOxEDaV97hBaHezygl6PazXQn7uEjLIbtL jvEFz03TzfVvrP2k8m8kgh/PvX8QLfZoiUmxgITbwXiaZm9H8HGtrABhMU9ev2XtP86B AP0zHG4p5XQTzw704HNSqPOZ6L5jsg+3qFeA5a1r6qCQmbg78XzYWZJhBA3R/VOES+0Q rRbNWrhEIiTVWtEIaPAnSqBinTzirsrOoxH9RbJ9VK0ykWz+kvw18qP+RWu2ozqdorm4 nB+w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature:dkim-filter; bh=lAP+LiJAgofCoDTySJN73ZIOwR19lY9bnqhJJAzeg8M=; fh=Nkpk7VjQstRrk/SIKeFB2DsfhHIA7OANQWPD54Aly/o=; b=McPCEIUo5DGOqwSo7GusnBXNjOxVn2T37+NMQKYm6mE7TSriW+j2ZoDUHt5osQy1Yl ubdB6w60j+OeTBl+JLZqncpFGJSjrPsUGPHT4dN4/ATFGM6XesNN46rDr85mA16LcY6H cJYlsIhrBv2EfNIONUCF4u8ZS9hZDeSl8GE69Ywr8Z5fM4vqHdCbCVHPYGYFt5gqm1La aezJzJPwv+/IlfMAP9J1xPcvlxMU10l6HFoCpXLqOsQl7bNpntlLupDUWk6M7+PfPsuv pXYWcO05bA/j9E4cb4wFY3pdK6ANSbH0S+xohNoko9T7PWut5OCpBXrZwQe8Ia3rDW5/ i7gQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@sberdevices.ru header.s=mail header.b=Prz0aPwe; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=sberdevices.ru Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id s25-20020a656459000000b0055ad2d6c8aesi6647114pgv.772.2023.07.14.04.44.56; Fri, 14 Jul 2023 04:45:09 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@sberdevices.ru header.s=mail header.b=Prz0aPwe; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=sberdevices.ru Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S235526AbjGNLkh (ORCPT + 99 others); Fri, 14 Jul 2023 07:40:37 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:42674 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233758AbjGNLk0 (ORCPT ); Fri, 14 Jul 2023 07:40:26 -0400 Received: from mx1.sberdevices.ru (mx2.sberdevices.ru [45.89.224.132]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 2E97430CD; Fri, 14 Jul 2023 04:40:23 -0700 (PDT) Received: from p-infra-ksmg-sc-msk02 (localhost [127.0.0.1]) by mx1.sberdevices.ru (Postfix) with ESMTP id 0CA2E120011; Fri, 14 Jul 2023 14:40:20 +0300 (MSK) DKIM-Filter: OpenDKIM Filter v2.11.0 mx1.sberdevices.ru 0CA2E120011 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sberdevices.ru; s=mail; t=1689334820; bh=lAP+LiJAgofCoDTySJN73ZIOwR19lY9bnqhJJAzeg8M=; h=From:To:Subject:Date:Message-ID:MIME-Version:Content-Type:From; b=Prz0aPweWBDeOhxS/T4hcWkRocmfCcIJywOuXTg9aouegMSuKjTMN7MyG8uslJL80 HbDS16Wi/VwwSiEVwR/9XRQ/pYkjw/ohsogRZPft3zMrI/wx2jTWVY9YBvDVVXHapA UU1JMLBSkeAct4RM1wLmOJyl8oq6I9ySbzzZ9oi1zyKnAQnHK3xkivyaXirXbcH/K4 kRjeU7+qgxHkOL22DCJbceOvZDgs+/TfGQh0FIwggh8WLJGLrgZ/DZwxe5OZz0wJVI 8NoUHOA+joVBmUDztNULdqTKRJ+A/eOodcRpd6F3xbD4QnqjguJoIWm2MKWmccMnqQ E3QOmBL9hrh3A== Received: from p-i-exch-sc-m01.sberdevices.ru (p-i-exch-sc-m01.sberdevices.ru [172.16.192.107]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.sberdevices.ru (Postfix) with ESMTPS; Fri, 14 Jul 2023 14:40:19 +0300 (MSK) Received: from localhost.localdomain (100.64.160.123) by p-i-exch-sc-m01.sberdevices.ru (172.16.192.107) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.1118.30; Fri, 14 Jul 2023 14:39:47 +0300 From: George Stark To: , , , , , , , , CC: , , , , , George Stark Subject: [PATCH v7 2/6] iio: adc: meson: move enums declaration before variables declaration Date: Fri, 14 Jul 2023 14:37:49 +0300 Message-ID: <20230714114010.293440-3-gnstark@sberdevices.ru> X-Mailer: git-send-email 2.41.0 In-Reply-To: <20230714114010.293440-1-gnstark@sberdevices.ru> References: <20230714114010.293440-1-gnstark@sberdevices.ru> MIME-Version: 1.0 X-Originating-IP: [100.64.160.123] X-ClientProxiedBy: p-i-exch-sc-m02.sberdevices.ru (172.16.192.103) To p-i-exch-sc-m01.sberdevices.ru (172.16.192.107) X-KSMG-Rule-ID: 10 X-KSMG-Message-Action: clean X-KSMG-AntiSpam-Lua-Profiles: 178622 [Jul 14 2023] X-KSMG-AntiSpam-Version: 5.9.59.0 X-KSMG-AntiSpam-Envelope-From: GNStark@sberdevices.ru X-KSMG-AntiSpam-Rate: 0 X-KSMG-AntiSpam-Status: not_detected X-KSMG-AntiSpam-Method: none X-KSMG-AntiSpam-Auth: dkim=none X-KSMG-AntiSpam-Info: LuaCore: 523 523 523027ce26ed1d9067f7a52a4756a876e54db27c, {Tracking_from_domain_doesnt_match_to}, sberdevices.ru:5.0.1,7.1.1;p-i-exch-sc-m01.sberdevices.ru:5.0.1,7.1.1;127.0.0.199:7.1.2;d41d8cd98f00b204e9800998ecf8427e.com:7.1.1;100.64.160.123:7.1.2, FromAlignment: s, {Tracking_white_helo}, ApMailHostAddress: 100.64.160.123 X-MS-Exchange-Organization-SCL: -1 X-KSMG-AntiSpam-Interceptor-Info: scan successful X-KSMG-AntiPhishing: Clean X-KSMG-LinksScanning: Clean X-KSMG-AntiVirus: Kaspersky Secure Mail Gateway, version 2.0.1.6960, bases: 2023/07/14 02:46:00 #21611850 X-KSMG-AntiVirus-Status: Clean, skipped X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_BLOCKED, SPF_HELO_NONE,SPF_NONE,T_SCC_BODY_TEXT_LINE,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1771396251581930342 X-GMAIL-MSGID: 1771396251581930342 Allow to use enum items for variables initialization. For this, move enums upper in the code. Signed-off-by: George Stark Reviewed-by: Andy Shevchenko --- drivers/iio/adc/meson_saradc.c | 44 +++++++++++++++++----------------- 1 file changed, 22 insertions(+), 22 deletions(-) diff --git a/drivers/iio/adc/meson_saradc.c b/drivers/iio/adc/meson_saradc.c index 569ffc178935..98b6697a21f6 100644 --- a/drivers/iio/adc/meson_saradc.c +++ b/drivers/iio/adc/meson_saradc.c @@ -202,6 +202,28 @@ .datasheet_name = "TEMP_SENSOR", \ } +enum meson_sar_adc_avg_mode { + NO_AVERAGING = 0x0, + MEAN_AVERAGING = 0x1, + MEDIAN_AVERAGING = 0x2, +}; + +enum meson_sar_adc_num_samples { + ONE_SAMPLE = 0x0, + TWO_SAMPLES = 0x1, + FOUR_SAMPLES = 0x2, + EIGHT_SAMPLES = 0x3, +}; + +enum meson_sar_adc_chan7_mux_sel { + CHAN7_MUX_VSS = 0x0, + CHAN7_MUX_VDD_DIV4 = 0x1, + CHAN7_MUX_VDD_DIV2 = 0x2, + CHAN7_MUX_VDD_MUL3_DIV4 = 0x3, + CHAN7_MUX_VDD = 0x4, + CHAN7_MUX_CH7_INPUT = 0x7, +}; + static const struct iio_chan_spec meson_sar_adc_iio_channels[] = { MESON_SAR_ADC_CHAN(0), MESON_SAR_ADC_CHAN(1), @@ -225,28 +247,6 @@ static const struct iio_chan_spec meson_sar_adc_and_temp_iio_channels[] = { MESON_SAR_ADC_TEMP_CHAN(8), }; -enum meson_sar_adc_avg_mode { - NO_AVERAGING = 0x0, - MEAN_AVERAGING = 0x1, - MEDIAN_AVERAGING = 0x2, -}; - -enum meson_sar_adc_num_samples { - ONE_SAMPLE = 0x0, - TWO_SAMPLES = 0x1, - FOUR_SAMPLES = 0x2, - EIGHT_SAMPLES = 0x3, -}; - -enum meson_sar_adc_chan7_mux_sel { - CHAN7_MUX_VSS = 0x0, - CHAN7_MUX_VDD_DIV4 = 0x1, - CHAN7_MUX_VDD_DIV2 = 0x2, - CHAN7_MUX_VDD_MUL3_DIV4 = 0x3, - CHAN7_MUX_VDD = 0x4, - CHAN7_MUX_CH7_INPUT = 0x7, -}; - struct meson_sar_adc_param { bool has_bl30_integration; unsigned long clock_rate; From patchwork Fri Jul 14 11:37:50 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: George Stark X-Patchwork-Id: 120438 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:a6b2:0:b0:3e4:2afc:c1 with SMTP id c18csp2452603vqm; Fri, 14 Jul 2023 05:03:34 -0700 (PDT) X-Google-Smtp-Source: APBJJlGNrAMGpdh+rUrc2/ZU+Q5dysUx/eRmAGNlmCmF+NiLwvJMtLGlZwCPoNeHGsLG3YaEGhp7 X-Received: by 2002:a2e:9053:0:b0:2b5:9e51:2912 with SMTP id n19-20020a2e9053000000b002b59e512912mr4067493ljg.24.1689336214264; Fri, 14 Jul 2023 05:03:34 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1689336214; cv=none; d=google.com; s=arc-20160816; b=qgGaVC6TvI0q9yZOLwL/sJN+BBurEolH0xia9EvWFpChItaIsgh3cDFdKIUNtwEQip x/nhLf9HfTCumjKd9WQ2g2BbiI0zt6j/8ShEqjl4lgoxIkRT/G9ICb2Z3zeoK3cPBCgt bKjj15LTZ9kYlWBLbDW45AKob2619G2Ig6b8Ts1g4FE3qeyIGLrdOxPOALy/hh0CTQ3n AHoVyNXVlC4SAeSz2Dp2hISHkzWBKEt6M/7kbr7yASs8U4iA9H1h5qhtrTfEfGDUw++z B6E77i6dAe26FNNOZGiIbGtIRCQfOXXwX4RNtqTKJEYLOyUNLNbolKeuoRKNNl9BMpND fBew== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature:dkim-filter; bh=g3nghZBGDTNeQp+PCOR94djYNfXjY5y9b7dTwR9LJgk=; fh=Nkpk7VjQstRrk/SIKeFB2DsfhHIA7OANQWPD54Aly/o=; b=BAXleBpz0InXbApahbpRMrfyCziczJoXFpzzJ6CtBJ3Dl7skBaIg/lGw48eLsmmcbi JA8dTbRo4ENZggSSeHTClNItSGH074mLOw7NOz3P3slapTGrnzau+SovJnnRH50trlIo xVnQrVwLk+6MobdDXriPU/3Sc8ld53lbvKdn15iJgSfQi6/4yjoISD+COWhCOl1vxe52 HDEP0AOvHhjkFNsPWBv39ZGDfNG+sH/rUz3BKLOeDKjlEzwxJfG1xwAP1/gEZEYYcnxp P2KMRlmO/5/qTAwBQi/dwAK9TJlAftbWKx8gQrWj2UTLZ+zUKlki9C9BErYXwRAsvGbF 5psA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@sberdevices.ru header.s=mail header.b=JxtMs0n8; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=sberdevices.ru Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id b11-20020a170906490b00b0098922462edbsi1786165ejq.802.2023.07.14.05.03.05; Fri, 14 Jul 2023 05:03:34 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@sberdevices.ru header.s=mail header.b=JxtMs0n8; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=sberdevices.ru Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S235272AbjGNLkj (ORCPT + 99 others); Fri, 14 Jul 2023 07:40:39 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:42662 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S235315AbjGNLk0 (ORCPT ); Fri, 14 Jul 2023 07:40:26 -0400 Received: from mx1.sberdevices.ru (mx2.sberdevices.ru [45.89.224.132]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 21ACEE65; Fri, 14 Jul 2023 04:40:23 -0700 (PDT) Received: from p-infra-ksmg-sc-msk02 (localhost [127.0.0.1]) by mx1.sberdevices.ru (Postfix) with ESMTP id 4203A120029; Fri, 14 Jul 2023 14:40:20 +0300 (MSK) DKIM-Filter: OpenDKIM Filter v2.11.0 mx1.sberdevices.ru 4203A120029 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sberdevices.ru; s=mail; t=1689334820; bh=g3nghZBGDTNeQp+PCOR94djYNfXjY5y9b7dTwR9LJgk=; h=From:To:Subject:Date:Message-ID:MIME-Version:Content-Type:From; b=JxtMs0n8UDCOCTzBHF0qvvTO5W+ujdagBhSa1CMj86fqxO5Jm99VCQNnbW0q92TXV M0tdn5NFlU77tgvLVpLhKkZg6NDztUSIie6HH/JN8hwVQS8y2+1CSJ0PNA0FUhGEw7 cgrRzZf/HsAIoyZnDhjw+kcOMPdfpCI0BS4b4nKaO3XUJM5nyL4qY+CcxIJKMGXzdv gadHclpxFFVGgUCddPvVq/75tXbDBmBDeUj7UNQ7cYOc1Gxpuxvzkp/0Xd+n+EqQ33 cyfC9Hb6dMJVtB6JUL0qDC4fCAPgE6il7VyxtO/gVpeTesRUD2rXPgUzKYgm16G7dX ejC3NmXNSvAwA== Received: from p-i-exch-sc-m01.sberdevices.ru (p-i-exch-sc-m01.sberdevices.ru [172.16.192.107]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.sberdevices.ru (Postfix) with ESMTPS; Fri, 14 Jul 2023 14:40:20 +0300 (MSK) Received: from localhost.localdomain (100.64.160.123) by p-i-exch-sc-m01.sberdevices.ru (172.16.192.107) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.1118.30; Fri, 14 Jul 2023 14:39:48 +0300 From: George Stark To: , , , , , , , , CC: , , , , , George Stark Subject: [PATCH v7 3/6] iio: adc: meson: move meson_sar_adc_set_chan7_mux routine upper Date: Fri, 14 Jul 2023 14:37:50 +0300 Message-ID: <20230714114010.293440-4-gnstark@sberdevices.ru> X-Mailer: git-send-email 2.41.0 In-Reply-To: <20230714114010.293440-1-gnstark@sberdevices.ru> References: <20230714114010.293440-1-gnstark@sberdevices.ru> MIME-Version: 1.0 X-Originating-IP: [100.64.160.123] X-ClientProxiedBy: p-i-exch-sc-m02.sberdevices.ru (172.16.192.103) To p-i-exch-sc-m01.sberdevices.ru (172.16.192.107) X-KSMG-Rule-ID: 10 X-KSMG-Message-Action: clean X-KSMG-AntiSpam-Lua-Profiles: 178622 [Jul 14 2023] X-KSMG-AntiSpam-Version: 5.9.59.0 X-KSMG-AntiSpam-Envelope-From: GNStark@sberdevices.ru X-KSMG-AntiSpam-Rate: 0 X-KSMG-AntiSpam-Status: not_detected X-KSMG-AntiSpam-Method: none X-KSMG-AntiSpam-Auth: dkim=none X-KSMG-AntiSpam-Info: LuaCore: 523 523 523027ce26ed1d9067f7a52a4756a876e54db27c, {Tracking_from_domain_doesnt_match_to}, sberdevices.ru:5.0.1,7.1.1;p-i-exch-sc-m01.sberdevices.ru:5.0.1,7.1.1;127.0.0.199:7.1.2;d41d8cd98f00b204e9800998ecf8427e.com:7.1.1;100.64.160.123:7.1.2, FromAlignment: s, {Tracking_white_helo}, ApMailHostAddress: 100.64.160.123 X-MS-Exchange-Organization-SCL: -1 X-KSMG-AntiSpam-Interceptor-Info: scan successful X-KSMG-AntiPhishing: Clean X-KSMG-LinksScanning: Clean X-KSMG-AntiVirus: Kaspersky Secure Mail Gateway, version 2.0.1.6960, bases: 2023/07/14 02:46:00 #21611850 X-KSMG-AntiVirus-Status: Clean, skipped X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_BLOCKED, SPF_HELO_NONE,SPF_NONE,T_SCC_BODY_TEXT_LINE,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1771397410318785509 X-GMAIL-MSGID: 1771397410318785509 meson_sar_adc_set_chan7_mux is a basic func() for writing single register, defined as static. Moved it up so it could be used in more places. Signed-off-by: George Stark Reviewed-by: Andy Shevchenko --- drivers/iio/adc/meson_saradc.c | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/drivers/iio/adc/meson_saradc.c b/drivers/iio/adc/meson_saradc.c index 98b6697a21f6..44ac6ce5e3aa 100644 --- a/drivers/iio/adc/meson_saradc.c +++ b/drivers/iio/adc/meson_saradc.c @@ -336,6 +336,19 @@ static int meson_sar_adc_wait_busy_clear(struct iio_dev *indio_dev) 1, 10000); } +static void meson_sar_adc_set_chan7_mux(struct iio_dev *indio_dev, + enum meson_sar_adc_chan7_mux_sel sel) +{ + struct meson_sar_adc_priv *priv = iio_priv(indio_dev); + u32 regval; + + regval = FIELD_PREP(MESON_SAR_ADC_REG3_CTRL_CHAN7_MUX_SEL_MASK, sel); + regmap_update_bits(priv->regmap, MESON_SAR_ADC_REG3, + MESON_SAR_ADC_REG3_CTRL_CHAN7_MUX_SEL_MASK, regval); + + usleep_range(10, 20); +} + static int meson_sar_adc_read_raw_sample(struct iio_dev *indio_dev, const struct iio_chan_spec *chan, int *val) @@ -432,19 +445,6 @@ static void meson_sar_adc_enable_channel(struct iio_dev *indio_dev, } } -static void meson_sar_adc_set_chan7_mux(struct iio_dev *indio_dev, - enum meson_sar_adc_chan7_mux_sel sel) -{ - struct meson_sar_adc_priv *priv = iio_priv(indio_dev); - u32 regval; - - regval = FIELD_PREP(MESON_SAR_ADC_REG3_CTRL_CHAN7_MUX_SEL_MASK, sel); - regmap_update_bits(priv->regmap, MESON_SAR_ADC_REG3, - MESON_SAR_ADC_REG3_CTRL_CHAN7_MUX_SEL_MASK, regval); - - usleep_range(10, 20); -} - static void meson_sar_adc_start_sample_engine(struct iio_dev *indio_dev) { struct meson_sar_adc_priv *priv = iio_priv(indio_dev); From patchwork Fri Jul 14 11:37:51 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: George Stark X-Patchwork-Id: 120433 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:a6b2:0:b0:3e4:2afc:c1 with SMTP id c18csp2443232vqm; Fri, 14 Jul 2023 04:45:00 -0700 (PDT) X-Google-Smtp-Source: APBJJlECXt7oD5xqvFU5X3OT7Cz5Sz9mEC90oq/N2CbYzDC0mjhBjtfsQY2t2qPgApDTuhqX+Fl2 X-Received: by 2002:aa7:8891:0:b0:681:3ed2:b493 with SMTP id z17-20020aa78891000000b006813ed2b493mr3716567pfe.26.1689335099848; Fri, 14 Jul 2023 04:44:59 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1689335099; cv=none; d=google.com; s=arc-20160816; b=pCY4/HdMcJnduT9rJVlpFNC00mNFIvWGLFbY09uUpmTk7PUHCAyhIXZTJKv4DIGXeZ YDyTkmYvEysb0B93DM8+o/NXYtutiMdkUJCf2j3NW6OoDRcblSjU6XxbUsN+cjvlMCjy Q1ZFvwtQwGn2AAtuLGGlVJ+bBMc2E6cILex3k6XBxnqwgRS/Xxrwrwl7E+wIWFgfNaq/ 1iW533Fw/VMtUvSG1vxeQMmqLn0EEm3luva8wHx39y9+JT/NpMNAK6GGlZQBumm1o5Ni r9PmIDVoDC5EJY2/hLT4jPzPKaQ3R8rl+5p3xQJtCQXbXSTpAi1LUrQtj4oQJJP1n4ND gOuw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature:dkim-filter; bh=qI+dhZoH7dgK2bjBwYVEfP02B9JIWORpc43EybybUrY=; fh=Nkpk7VjQstRrk/SIKeFB2DsfhHIA7OANQWPD54Aly/o=; b=N5rkpiZPMchx5WFNV6uKdJMI6ncaNcsp0EWQteFGpEfEtaAfr8n4MgKYuMHrqn0ETw OiQ2npyj6tv8jsnDOwaIUvsolEd0Ksaq99gDLYUHURQnqzdr/z7jcPNsFmWTlV3eiOji cmKyZDBb+BBH3GIv4qBQt1CUftUCsASbcPUBnQIo0EZsHZp4BzMNxEi25imLGeZqnqwA G9H+JF66ZnZVq2LMgYHcXn0CZ7BcL1/wjkcSnAcYchTQhnLCcHUkA4I5rne/XqAXFBVF UlWDXA6ES3auBmFuG/R+ApfnXQJcxigoPLiIpEJp0d9PbBJF2cEM7yZk9ShmONjXs6Ao FXBA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@sberdevices.ru header.s=mail header.b=FuDgA2S2; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=sberdevices.ru Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id b9-20020a63d809000000b0050bd71e8618si6922296pgh.848.2023.07.14.04.44.47; Fri, 14 Jul 2023 04:44:59 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@sberdevices.ru header.s=mail header.b=FuDgA2S2; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=sberdevices.ru Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S235539AbjGNLkf (ORCPT + 99 others); Fri, 14 Jul 2023 07:40:35 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:42664 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S235308AbjGNLk0 (ORCPT ); Fri, 14 Jul 2023 07:40:26 -0400 Received: from mx1.sberdevices.ru (mx2.sberdevices.ru [45.89.224.132]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 2BDEF210A; Fri, 14 Jul 2023 04:40:23 -0700 (PDT) Received: from p-infra-ksmg-sc-msk02 (localhost [127.0.0.1]) by mx1.sberdevices.ru (Postfix) with ESMTP id 6A7DB12002A; Fri, 14 Jul 2023 14:40:20 +0300 (MSK) DKIM-Filter: OpenDKIM Filter v2.11.0 mx1.sberdevices.ru 6A7DB12002A DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sberdevices.ru; s=mail; t=1689334820; bh=qI+dhZoH7dgK2bjBwYVEfP02B9JIWORpc43EybybUrY=; h=From:To:Subject:Date:Message-ID:MIME-Version:Content-Type:From; b=FuDgA2S2lryH1KQQt51ezhzxkOIdcWmoNMsWNvgqPNgtCjHdbQ7l4Ym27NfNjscSW 7Q94r9YRNWrvHTC3f3i6bYeILRqFeUN2VETzmvJ2rXYkK/wAZqH+Fmyp2ylP9nOYJq lmoM93GMt5PpoyGToexxmrjGwHDwgOgDN00DipFEkE1lOqKGAE4NZkKoBUs4wcKo3s Dtty1cx8o2+J2y2peFwj4NRkx+xgeGKwoPhk6re6sGwF7+2LybDaxbWWa6siLxRl1g 47lX/ETalpfEW6F2lPIt+0Ep7LWQDGKfbkWsmCwW8yYKUG84aTsFDqszmKhcJDS//y TvSEZtIQcTaEg== Received: from p-i-exch-sc-m01.sberdevices.ru (p-i-exch-sc-m01.sberdevices.ru [172.16.192.107]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.sberdevices.ru (Postfix) with ESMTPS; Fri, 14 Jul 2023 14:40:20 +0300 (MSK) Received: from localhost.localdomain (100.64.160.123) by p-i-exch-sc-m01.sberdevices.ru (172.16.192.107) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.1118.30; Fri, 14 Jul 2023 14:39:48 +0300 From: George Stark To: , , , , , , , , CC: , , , , , George Stark Subject: [PATCH v7 4/6] iio: adc: meson: add enum for iio channel numbers Date: Fri, 14 Jul 2023 14:37:51 +0300 Message-ID: <20230714114010.293440-5-gnstark@sberdevices.ru> X-Mailer: git-send-email 2.41.0 In-Reply-To: <20230714114010.293440-1-gnstark@sberdevices.ru> References: <20230714114010.293440-1-gnstark@sberdevices.ru> MIME-Version: 1.0 X-Originating-IP: [100.64.160.123] X-ClientProxiedBy: p-i-exch-sc-m02.sberdevices.ru (172.16.192.103) To p-i-exch-sc-m01.sberdevices.ru (172.16.192.107) X-KSMG-Rule-ID: 10 X-KSMG-Message-Action: clean X-KSMG-AntiSpam-Lua-Profiles: 178622 [Jul 14 2023] X-KSMG-AntiSpam-Version: 5.9.59.0 X-KSMG-AntiSpam-Envelope-From: GNStark@sberdevices.ru X-KSMG-AntiSpam-Rate: 0 X-KSMG-AntiSpam-Status: not_detected X-KSMG-AntiSpam-Method: none X-KSMG-AntiSpam-Auth: dkim=none X-KSMG-AntiSpam-Info: LuaCore: 523 523 523027ce26ed1d9067f7a52a4756a876e54db27c, {Tracking_from_domain_doesnt_match_to}, sberdevices.ru:5.0.1,7.1.1;p-i-exch-sc-m01.sberdevices.ru:5.0.1,7.1.1;127.0.0.199:7.1.2;d41d8cd98f00b204e9800998ecf8427e.com:7.1.1;100.64.160.123:7.1.2, FromAlignment: s, {Tracking_white_helo}, ApMailHostAddress: 100.64.160.123 X-MS-Exchange-Organization-SCL: -1 X-KSMG-AntiSpam-Interceptor-Info: scan successful X-KSMG-AntiPhishing: Clean X-KSMG-LinksScanning: Clean X-KSMG-AntiVirus: Kaspersky Secure Mail Gateway, version 2.0.1.6960, bases: 2023/07/14 02:46:00 #21611850 X-KSMG-AntiVirus-Status: Clean, skipped X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_BLOCKED, SPF_HELO_NONE,SPF_NONE,T_SCC_BODY_TEXT_LINE,UPPERCASE_50_75, URIBL_BLOCKED autolearn=no autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1771396241536170158 X-GMAIL-MSGID: 1771396241536170158 Channels could be referenced in the driver code and using enum allows to make it more robust. Signed-off-by: George Stark Reviewed-by: Andy Shevchenko --- drivers/iio/adc/meson_saradc.c | 46 +++++++++++++++++++++------------- 1 file changed, 29 insertions(+), 17 deletions(-) diff --git a/drivers/iio/adc/meson_saradc.c b/drivers/iio/adc/meson_saradc.c index 44ac6ce5e3aa..b14c66656bcc 100644 --- a/drivers/iio/adc/meson_saradc.c +++ b/drivers/iio/adc/meson_saradc.c @@ -224,27 +224,39 @@ enum meson_sar_adc_chan7_mux_sel { CHAN7_MUX_CH7_INPUT = 0x7, }; +enum meson_sar_adc_channel_index { + NUM_CHAN_0, + NUM_CHAN_1, + NUM_CHAN_2, + NUM_CHAN_3, + NUM_CHAN_4, + NUM_CHAN_5, + NUM_CHAN_6, + NUM_CHAN_7, + NUM_CHAN_TEMP, +}; + static const struct iio_chan_spec meson_sar_adc_iio_channels[] = { - MESON_SAR_ADC_CHAN(0), - MESON_SAR_ADC_CHAN(1), - MESON_SAR_ADC_CHAN(2), - MESON_SAR_ADC_CHAN(3), - MESON_SAR_ADC_CHAN(4), - MESON_SAR_ADC_CHAN(5), - MESON_SAR_ADC_CHAN(6), - MESON_SAR_ADC_CHAN(7), + MESON_SAR_ADC_CHAN(NUM_CHAN_0), + MESON_SAR_ADC_CHAN(NUM_CHAN_1), + MESON_SAR_ADC_CHAN(NUM_CHAN_2), + MESON_SAR_ADC_CHAN(NUM_CHAN_3), + MESON_SAR_ADC_CHAN(NUM_CHAN_4), + MESON_SAR_ADC_CHAN(NUM_CHAN_5), + MESON_SAR_ADC_CHAN(NUM_CHAN_6), + MESON_SAR_ADC_CHAN(NUM_CHAN_7), }; static const struct iio_chan_spec meson_sar_adc_and_temp_iio_channels[] = { - MESON_SAR_ADC_CHAN(0), - MESON_SAR_ADC_CHAN(1), - MESON_SAR_ADC_CHAN(2), - MESON_SAR_ADC_CHAN(3), - MESON_SAR_ADC_CHAN(4), - MESON_SAR_ADC_CHAN(5), - MESON_SAR_ADC_CHAN(6), - MESON_SAR_ADC_CHAN(7), - MESON_SAR_ADC_TEMP_CHAN(8), + MESON_SAR_ADC_CHAN(NUM_CHAN_0), + MESON_SAR_ADC_CHAN(NUM_CHAN_1), + MESON_SAR_ADC_CHAN(NUM_CHAN_2), + MESON_SAR_ADC_CHAN(NUM_CHAN_3), + MESON_SAR_ADC_CHAN(NUM_CHAN_4), + MESON_SAR_ADC_CHAN(NUM_CHAN_5), + MESON_SAR_ADC_CHAN(NUM_CHAN_6), + MESON_SAR_ADC_CHAN(NUM_CHAN_7), + MESON_SAR_ADC_TEMP_CHAN(NUM_CHAN_TEMP), }; struct meson_sar_adc_param { From patchwork Fri Jul 14 11:37:52 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: George Stark X-Patchwork-Id: 120435 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:a6b2:0:b0:3e4:2afc:c1 with SMTP id c18csp2443331vqm; Fri, 14 Jul 2023 04:45:10 -0700 (PDT) X-Google-Smtp-Source: APBJJlHjvj1pCg0DmUf0hr/W13ch87s5D2d6fJJ3z4CngQvPUGLf0LgdBxTEyfDDb/BHLqClGb5H X-Received: by 2002:a05:6a00:194c:b0:657:1fe5:eb63 with SMTP id s12-20020a056a00194c00b006571fe5eb63mr3313335pfk.7.1689335109869; Fri, 14 Jul 2023 04:45:09 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1689335109; cv=none; d=google.com; s=arc-20160816; b=AERh/UAswGwnjIHKZ1vpxEP4c39zoFByxhw1oiCkbjCzqelPscLLDHHppL/Ot3ncuL MtwyMiA5JdCVO0Kpff9CFtxqkqz+TTO2rCNI/jNTksZlFRgX5MXGkerKh4wxCa1UeNwI pVN4o/2fRKfTFHDyPw/0E2QNs8QCxYnb4VTgb7kyNLL0goHUveTNxJfOpkt+E6PSa1J6 rRzU0YN/U13wh7ng1IRFvizDcmDOEhukWXgQomnGWxBIR8YkDirViVFbsWYN57wVI0a0 K8joZFBVtfelY8upm4mY1oXXc+Py2jx3qMDaT6FdWbEPZiNlOq28h7jnjiH3BZY0MCek ibPQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature:dkim-filter; bh=8XVeudn2UdF5oaJ8pkhcnvk8RE4GczGedzmn9OVBnW4=; fh=Nkpk7VjQstRrk/SIKeFB2DsfhHIA7OANQWPD54Aly/o=; b=Q85uiHxuamvd+AQGh34YILcth0xctCifv6STjzt4C+R6O10uUdI3fIpgoTo4zYNvhQ xucTQj6eRFdLgZ9x26GGy9J2B6p3eVTBYuHrCtyJOgHY1cLlSHgH9/uiPgIMT2JCjN/z j4lO3fQGamfvMamaCWJwCZpUiSqq5miF3xww3NQkIKlPHqQJECzHb6xJMl64ylBKXgfs yf4qBGL7ifGAPWhHM5go383jox5x//tZ6WWRS3GTQmKXtImqv6gdiIFzq7rs+WmO7VH0 o+smSShVKChMWnGC6mbF0qsShVFrSzLNbRUnnnej6FJ0N3vDm65jVsPuq+bO55B/eyzj cdlQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@sberdevices.ru header.s=mail header.b=qWU3A6K3; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=sberdevices.ru Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id e24-20020a635018000000b00553ebb05d13si6831225pgb.65.2023.07.14.04.44.57; Fri, 14 Jul 2023 04:45:09 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@sberdevices.ru header.s=mail header.b=qWU3A6K3; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=sberdevices.ru Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S235525AbjGNLkb (ORCPT + 99 others); Fri, 14 Jul 2023 07:40:31 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:42672 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233017AbjGNLk0 (ORCPT ); Fri, 14 Jul 2023 07:40:26 -0400 Received: from mx1.sberdevices.ru (mx2.sberdevices.ru [45.89.224.132]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 2EB4C30E8; Fri, 14 Jul 2023 04:40:23 -0700 (PDT) Received: from p-infra-ksmg-sc-msk02 (localhost [127.0.0.1]) by mx1.sberdevices.ru (Postfix) with ESMTP id 9119712002B; Fri, 14 Jul 2023 14:40:20 +0300 (MSK) DKIM-Filter: OpenDKIM Filter v2.11.0 mx1.sberdevices.ru 9119712002B DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sberdevices.ru; s=mail; t=1689334820; bh=8XVeudn2UdF5oaJ8pkhcnvk8RE4GczGedzmn9OVBnW4=; h=From:To:Subject:Date:Message-ID:MIME-Version:Content-Type:From; b=qWU3A6K3lk6vE5wM/dvlxM7eGucuhvzuQ7yvf4pvp0wM+er0a5LTipzFoY9tixX5C SGUiKGtAemmqyg2FqvTPq+cH5/RnGexIRV8CBPMl+5vpZRRFp0oCwq5nr4UlRMshfS hZf2bA9xfQwzwO/qGNlSuhMDFjWlyNxhdJoudMndgaLqGlJ4WjRKisgJcPUBGAVr3f JJ4YLgbNY8T9Z1FVhpTOOv7HGFnhnzO1p1O065yAhJAESHYmrfvfXJFrsmVz3erYOq gYzuiZoLh//cXPhXJbcGOACznO+D6+t1vVRWkWEgz5jv5E1Gqp3fVKvsDwa+hdKw16 nH6eQH99PYDKw== Received: from p-i-exch-sc-m01.sberdevices.ru (p-i-exch-sc-m01.sberdevices.ru [172.16.192.107]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.sberdevices.ru (Postfix) with ESMTPS; Fri, 14 Jul 2023 14:40:20 +0300 (MSK) Received: from localhost.localdomain (100.64.160.123) by p-i-exch-sc-m01.sberdevices.ru (172.16.192.107) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.1118.30; Fri, 14 Jul 2023 14:39:48 +0300 From: George Stark To: , , , , , , , , CC: , , , , , George Stark Subject: [PATCH v7 5/6] iio: adc: meson: add channel labels Date: Fri, 14 Jul 2023 14:37:52 +0300 Message-ID: <20230714114010.293440-6-gnstark@sberdevices.ru> X-Mailer: git-send-email 2.41.0 In-Reply-To: <20230714114010.293440-1-gnstark@sberdevices.ru> References: <20230714114010.293440-1-gnstark@sberdevices.ru> MIME-Version: 1.0 X-Originating-IP: [100.64.160.123] X-ClientProxiedBy: p-i-exch-sc-m02.sberdevices.ru (172.16.192.103) To p-i-exch-sc-m01.sberdevices.ru (172.16.192.107) X-KSMG-Rule-ID: 10 X-KSMG-Message-Action: clean X-KSMG-AntiSpam-Lua-Profiles: 178622 [Jul 14 2023] X-KSMG-AntiSpam-Version: 5.9.59.0 X-KSMG-AntiSpam-Envelope-From: GNStark@sberdevices.ru X-KSMG-AntiSpam-Rate: 0 X-KSMG-AntiSpam-Status: not_detected X-KSMG-AntiSpam-Method: none X-KSMG-AntiSpam-Auth: dkim=none X-KSMG-AntiSpam-Info: LuaCore: 523 523 523027ce26ed1d9067f7a52a4756a876e54db27c, {Tracking_from_domain_doesnt_match_to}, sberdevices.ru:5.0.1,7.1.1;p-i-exch-sc-m01.sberdevices.ru:5.0.1,7.1.1;127.0.0.199:7.1.2;d41d8cd98f00b204e9800998ecf8427e.com:7.1.1;100.64.160.123:7.1.2, FromAlignment: s, {Tracking_white_helo}, ApMailHostAddress: 100.64.160.123 X-MS-Exchange-Organization-SCL: -1 X-KSMG-AntiSpam-Interceptor-Info: scan successful X-KSMG-AntiPhishing: Clean X-KSMG-LinksScanning: Clean X-KSMG-AntiVirus: Kaspersky Secure Mail Gateway, version 2.0.1.6960, bases: 2023/07/14 02:46:00 #21611850 X-KSMG-AntiVirus-Status: Clean, skipped X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_BLOCKED, SPF_HELO_NONE,SPF_NONE,T_SCC_BODY_TEXT_LINE,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1771396251931569717 X-GMAIL-MSGID: 1771396251931569717 Add channel labels to provide human-readable names for the inputs. Signed-off-by: George Stark Reviewed-by: Andy Shevchenko --- drivers/iio/adc/meson_saradc.c | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/drivers/iio/adc/meson_saradc.c b/drivers/iio/adc/meson_saradc.c index b14c66656bcc..918bd5da3605 100644 --- a/drivers/iio/adc/meson_saradc.c +++ b/drivers/iio/adc/meson_saradc.c @@ -1055,8 +1055,20 @@ static int meson_sar_adc_calib(struct iio_dev *indio_dev) return ret; } +static int read_label(struct iio_dev *indio_dev, + struct iio_chan_spec const *chan, + char *label) +{ + if (chan->type == IIO_TEMP) + return sprintf(label, "temp-sensor\n"); + if (chan->type == IIO_VOLTAGE) + return sprintf(label, "channel-%d\n", chan->channel); + return 0; +} + static const struct iio_info meson_sar_adc_iio_info = { .read_raw = meson_sar_adc_iio_info_read_raw, + .read_label = read_label, }; static const struct meson_sar_adc_param meson_sar_adc_meson8_param = { From patchwork Fri Jul 14 11:37:53 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: George Stark X-Patchwork-Id: 120436 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:a6b2:0:b0:3e4:2afc:c1 with SMTP id c18csp2445469vqm; Fri, 14 Jul 2023 04:49:48 -0700 (PDT) X-Google-Smtp-Source: APBJJlF5tCd43Hh0WUSyqH6Oj/g5smUHzGjOyoACiOz5xf+jEGEFNdooygfe+nzDPtEMC6pVwz8b X-Received: by 2002:a17:906:7a14:b0:994:28ab:2903 with SMTP id d20-20020a1709067a1400b0099428ab2903mr3814380ejo.5.1689335388269; Fri, 14 Jul 2023 04:49:48 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1689335388; cv=none; d=google.com; s=arc-20160816; b=03qAhBEsqS1ZY3oBa7Dmp6/qm7Ai3B6MaqiVtikj7KgrFKIu+oMwo3Iyf5SW/yvxgF F1LYxsOuMCe5ok76fHusBlvLzH4Y/z1ix3LcCUcrfYKBpnHpUm/AwOftum3UVwdV0OYW 0bBNhGy96wWbDAhi5YPxG6+Qn/VDZjilEyFGdDVu+ErfN6c726M4n1T844vSgcygLCX/ Ui0O354GpD6+en9N0UpW0q2IOkstbfFGQ4E/rsVlqrebYjcEYS07aON6WBiq3htrfhBS xQrY4usKXTNG61iXMxLCb9KP81Q2ZKimRdgInLZVxWXLevKBxAG9Vxg4UQxEKZ1XN2AC 1ZAw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature:dkim-filter; bh=DUoJ7Kz/Gz66Cj78PQrVxUZhQIjyk7yxvMD9K4/3Im4=; fh=Nkpk7VjQstRrk/SIKeFB2DsfhHIA7OANQWPD54Aly/o=; b=jhSGWyEhebk+mlipvmk2qvUxC1MJy+F0wrjiqT2624tliF8yUXIUGPv2p5eQbwI1k2 Pnm5L3flVNtavB2m4gJvcvDhmFWincWcP29kn6S8gdShSyb+a2BNNf98Z1nl1d8feGEc IgFFfvcdQ8ABl42ujzpnPvj3Vq+A0e+8Jr2/kNC7mN03XiZJEeEMQ36R+H+K5HvrTcaU 7aJLOG0OgAx0UcqgiNR+S0VkvfdqjN3HCYssvUyzReOiNgYeCFe9mQxd/rxFq/B10plT zojVI8gBkurdS/YOHFSYcdaShzBzAaiZWZPWaCnTdSTLhTl72gjpFYxoWBmm8SQRBr2Q pKVA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@sberdevices.ru header.s=mail header.b=gJohVWnn; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=sberdevices.ru Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id b22-20020a17090636d600b00993398bcae2si8986208ejc.122.2023.07.14.04.49.24; Fri, 14 Jul 2023 04:49:48 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@sberdevices.ru header.s=mail header.b=gJohVWnn; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=sberdevices.ru Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S235586AbjGNLko (ORCPT + 99 others); Fri, 14 Jul 2023 07:40:44 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:42678 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S235393AbjGNLk0 (ORCPT ); Fri, 14 Jul 2023 07:40:26 -0400 Received: from mx1.sberdevices.ru (mx1.sberdevices.ru [37.18.73.165]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 2EC3530F8; Fri, 14 Jul 2023 04:40:23 -0700 (PDT) Received: from p-infra-ksmg-sc-msk01 (localhost [127.0.0.1]) by mx1.sberdevices.ru (Postfix) with ESMTP id C91DF10000B; Fri, 14 Jul 2023 14:40:20 +0300 (MSK) DKIM-Filter: OpenDKIM Filter v2.11.0 mx1.sberdevices.ru C91DF10000B DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sberdevices.ru; s=mail; t=1689334820; bh=DUoJ7Kz/Gz66Cj78PQrVxUZhQIjyk7yxvMD9K4/3Im4=; h=From:To:Subject:Date:Message-ID:MIME-Version:Content-Type:From; b=gJohVWnny6GUOKaFk7TMzAVWEu0JbAoY3bTrTfZ0wa4vUhWt3oSyPDNiL13ek09M+ KrZLLLEnlc/QSvrAwz7id7/ly+q1pealcjSYsg4RySC0jc5Rlya91e7NDmQPSft6ms Qwg73E2B3CiDBcXkqWdoN+4FsJbPWlJD7q68OqukfnccJvZZEBS8Jk+vm8XqJg7ahc oEKdzlN1hg8jKiZivHB9O6nejGeVlgg+l5MCG539L97nprm+FrAghkGmV9qjFR9ieI PpZ0IO6g8GN0Ob40IfT1wH9QOdOBuh/uX3JIWQi/Tu4hAeUOto0g615JVQ1S/uBz9r /3ykpolOT6Asg== Received: from p-i-exch-sc-m01.sberdevices.ru (p-i-exch-sc-m01.sberdevices.ru [172.16.192.107]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.sberdevices.ru (Postfix) with ESMTPS; Fri, 14 Jul 2023 14:40:20 +0300 (MSK) Received: from localhost.localdomain (100.64.160.123) by p-i-exch-sc-m01.sberdevices.ru (172.16.192.107) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.1118.30; Fri, 14 Jul 2023 14:39:48 +0300 From: George Stark To: , , , , , , , , CC: , , , , , George Stark Subject: [PATCH v7 6/6] iio: adc: meson: support reading from channel 7 mux inputs Date: Fri, 14 Jul 2023 14:37:53 +0300 Message-ID: <20230714114010.293440-7-gnstark@sberdevices.ru> X-Mailer: git-send-email 2.41.0 In-Reply-To: <20230714114010.293440-1-gnstark@sberdevices.ru> References: <20230714114010.293440-1-gnstark@sberdevices.ru> MIME-Version: 1.0 X-Originating-IP: [100.64.160.123] X-ClientProxiedBy: p-i-exch-sc-m02.sberdevices.ru (172.16.192.103) To p-i-exch-sc-m01.sberdevices.ru (172.16.192.107) X-KSMG-Rule-ID: 10 X-KSMG-Message-Action: clean X-KSMG-AntiSpam-Lua-Profiles: 178622 [Jul 14 2023] X-KSMG-AntiSpam-Version: 5.9.59.0 X-KSMG-AntiSpam-Envelope-From: GNStark@sberdevices.ru X-KSMG-AntiSpam-Rate: 0 X-KSMG-AntiSpam-Status: not_detected X-KSMG-AntiSpam-Method: none X-KSMG-AntiSpam-Auth: dkim=none X-KSMG-AntiSpam-Info: LuaCore: 523 523 523027ce26ed1d9067f7a52a4756a876e54db27c, {Tracking_from_domain_doesnt_match_to}, p-i-exch-sc-m01.sberdevices.ru:5.0.1,7.1.1;sberdevices.ru:5.0.1,7.1.1;100.64.160.123:7.1.2;127.0.0.199:7.1.2;d41d8cd98f00b204e9800998ecf8427e.com:7.1.1, FromAlignment: s, {Tracking_white_helo}, ApMailHostAddress: 100.64.160.123 X-MS-Exchange-Organization-SCL: -1 X-KSMG-AntiSpam-Interceptor-Info: scan successful X-KSMG-AntiPhishing: Clean X-KSMG-LinksScanning: Clean X-KSMG-AntiVirus: Kaspersky Secure Mail Gateway, version 2.0.1.6960, bases: 2023/07/14 02:46:00 #21611850 X-KSMG-AntiVirus-Status: Clean, skipped X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_BLOCKED, SPF_HELO_NONE,SPF_NONE,T_SCC_BODY_TEXT_LINE,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1771396544429489173 X-GMAIL-MSGID: 1771396544429489173 Add IIO channel for all muxed inputs of channel 7. Meson saradc channel 7 is connected to a mux that can switch input to well-known sources like Vdd, GND and several Vdd dividers. Signed-off-by: George Stark Reviewed-by: Andy Shevchenko --- drivers/iio/adc/meson_saradc.c | 77 +++++++++++++++++++++++++++++++++- 1 file changed, 75 insertions(+), 2 deletions(-) diff --git a/drivers/iio/adc/meson_saradc.c b/drivers/iio/adc/meson_saradc.c index 918bd5da3605..2411cc864ccd 100644 --- a/drivers/iio/adc/meson_saradc.c +++ b/drivers/iio/adc/meson_saradc.c @@ -163,6 +163,7 @@ #define MESON_SAR_ADC_MAX_FIFO_SIZE 32 #define MESON_SAR_ADC_TIMEOUT 100 /* ms */ #define MESON_SAR_ADC_VOLTAGE_AND_TEMP_CHANNEL 6 +#define MESON_SAR_ADC_VOLTAGE_AND_MUX_CHANNEL 7 #define MESON_SAR_ADC_TEMP_OFFSET 27 /* temperature sensor calibration information in eFuse */ @@ -202,6 +203,19 @@ .datasheet_name = "TEMP_SENSOR", \ } +#define MESON_SAR_ADC_MUX(_chan, _sel) { \ + .type = IIO_VOLTAGE, \ + .channel = _chan, \ + .indexed = 1, \ + .address = MESON_SAR_ADC_VOLTAGE_AND_MUX_CHANNEL, \ + .info_mask_separate = BIT(IIO_CHAN_INFO_RAW) | \ + BIT(IIO_CHAN_INFO_AVERAGE_RAW), \ + .info_mask_shared_by_type = BIT(IIO_CHAN_INFO_SCALE), \ + .info_mask_shared_by_all = BIT(IIO_CHAN_INFO_CALIBBIAS) | \ + BIT(IIO_CHAN_INFO_CALIBSCALE), \ + .datasheet_name = "SAR_ADC_MUX_"#_sel, \ +} + enum meson_sar_adc_avg_mode { NO_AVERAGING = 0x0, MEAN_AVERAGING = 0x1, @@ -234,6 +248,27 @@ enum meson_sar_adc_channel_index { NUM_CHAN_6, NUM_CHAN_7, NUM_CHAN_TEMP, + NUM_MUX_0_VSS, + NUM_MUX_1_VDD_DIV4, + NUM_MUX_2_VDD_DIV2, + NUM_MUX_3_VDD_MUL3_DIV4, + NUM_MUX_4_VDD, +}; + +static enum meson_sar_adc_chan7_mux_sel chan7_mux_values[] = { + CHAN7_MUX_VSS, + CHAN7_MUX_VDD_DIV4, + CHAN7_MUX_VDD_DIV2, + CHAN7_MUX_VDD_MUL3_DIV4, + CHAN7_MUX_VDD, +}; + +static const char * const chan7_mux_names[] = { + [CHAN7_MUX_VSS] = "gnd", + [CHAN7_MUX_VDD_DIV4] = "0.25vdd", + [CHAN7_MUX_VDD_DIV2] = "0.5vdd", + [CHAN7_MUX_VDD_MUL3_DIV4] = "0.75vdd", + [CHAN7_MUX_VDD] = "vdd", }; static const struct iio_chan_spec meson_sar_adc_iio_channels[] = { @@ -245,6 +280,11 @@ static const struct iio_chan_spec meson_sar_adc_iio_channels[] = { MESON_SAR_ADC_CHAN(NUM_CHAN_5), MESON_SAR_ADC_CHAN(NUM_CHAN_6), MESON_SAR_ADC_CHAN(NUM_CHAN_7), + MESON_SAR_ADC_MUX(NUM_MUX_0_VSS, 0), + MESON_SAR_ADC_MUX(NUM_MUX_1_VDD_DIV4, 1), + MESON_SAR_ADC_MUX(NUM_MUX_2_VDD_DIV2, 2), + MESON_SAR_ADC_MUX(NUM_MUX_3_VDD_MUL3_DIV4, 3), + MESON_SAR_ADC_MUX(NUM_MUX_4_VDD, 4), }; static const struct iio_chan_spec meson_sar_adc_and_temp_iio_channels[] = { @@ -257,6 +297,11 @@ static const struct iio_chan_spec meson_sar_adc_and_temp_iio_channels[] = { MESON_SAR_ADC_CHAN(NUM_CHAN_6), MESON_SAR_ADC_CHAN(NUM_CHAN_7), MESON_SAR_ADC_TEMP_CHAN(NUM_CHAN_TEMP), + MESON_SAR_ADC_MUX(NUM_MUX_0_VSS, 0), + MESON_SAR_ADC_MUX(NUM_MUX_1_VDD_DIV4, 1), + MESON_SAR_ADC_MUX(NUM_MUX_2_VDD_DIV2, 2), + MESON_SAR_ADC_MUX(NUM_MUX_3_VDD_MUL3_DIV4, 3), + MESON_SAR_ADC_MUX(NUM_MUX_4_VDD, 4), }; struct meson_sar_adc_param { @@ -295,6 +340,7 @@ struct meson_sar_adc_priv { bool temperature_sensor_calibrated; u8 temperature_sensor_coefficient; u16 temperature_sensor_adc_val; + enum meson_sar_adc_chan7_mux_sel chan7_mux_sel; }; static const struct regmap_config meson_sar_adc_regmap_config_gxbb = { @@ -311,6 +357,17 @@ static const struct regmap_config meson_sar_adc_regmap_config_meson8 = { .max_register = MESON_SAR_ADC_DELTA_10, }; +static const struct iio_chan_spec * +find_channel_by_num(struct iio_dev *indio_dev, int num) +{ + int i; + + for (i = 0; i < indio_dev->num_channels; i++) + if (indio_dev->channels[i].channel == num) + return &indio_dev->channels[i]; + return NULL; +} + static unsigned int meson_sar_adc_get_fifo_count(struct iio_dev *indio_dev) { struct meson_sar_adc_priv *priv = iio_priv(indio_dev); @@ -359,6 +416,8 @@ static void meson_sar_adc_set_chan7_mux(struct iio_dev *indio_dev, MESON_SAR_ADC_REG3_CTRL_CHAN7_MUX_SEL_MASK, regval); usleep_range(10, 20); + + priv->chan7_mux_sel = sel; } static int meson_sar_adc_read_raw_sample(struct iio_dev *indio_dev, @@ -454,6 +513,15 @@ static void meson_sar_adc_enable_channel(struct iio_dev *indio_dev, regmap_update_bits(priv->regmap, MESON_SAR_ADC_DELTA_10, MESON_SAR_ADC_DELTA_10_TEMP_SEL, regval); + } else if (chan->address == MESON_SAR_ADC_VOLTAGE_AND_MUX_CHANNEL) { + enum meson_sar_adc_chan7_mux_sel sel; + + if (chan->channel == NUM_CHAN_7) + sel = CHAN7_MUX_CH7_INPUT; + else + sel = chan7_mux_values[chan->channel - NUM_MUX_0_VSS]; + if (sel != priv->chan7_mux_sel) + meson_sar_adc_set_chan7_mux(indio_dev, sel); } } @@ -1026,7 +1094,8 @@ static int meson_sar_adc_calib(struct iio_dev *indio_dev) meson_sar_adc_set_chan7_mux(indio_dev, CHAN7_MUX_VDD_DIV4); usleep_range(10, 20); ret = meson_sar_adc_get_sample(indio_dev, - &indio_dev->channels[7], + find_channel_by_num(indio_dev, + NUM_MUX_1_VDD_DIV4), MEAN_AVERAGING, EIGHT_SAMPLES, &value0); if (ret < 0) goto out; @@ -1034,7 +1103,8 @@ static int meson_sar_adc_calib(struct iio_dev *indio_dev) meson_sar_adc_set_chan7_mux(indio_dev, CHAN7_MUX_VDD_MUL3_DIV4); usleep_range(10, 20); ret = meson_sar_adc_get_sample(indio_dev, - &indio_dev->channels[7], + find_channel_by_num(indio_dev, + NUM_MUX_3_VDD_MUL3_DIV4), MEAN_AVERAGING, EIGHT_SAMPLES, &value1); if (ret < 0) goto out; @@ -1061,6 +1131,9 @@ static int read_label(struct iio_dev *indio_dev, { if (chan->type == IIO_TEMP) return sprintf(label, "temp-sensor\n"); + if (chan->type == IIO_VOLTAGE && chan->channel >= NUM_MUX_0_VSS) + return sprintf(label, "%s\n", + chan7_mux_names[chan->channel - NUM_MUX_0_VSS]); if (chan->type == IIO_VOLTAGE) return sprintf(label, "channel-%d\n", chan->channel); return 0;