From patchwork Fri Jul 7 15:27:38 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: George Stark X-Patchwork-Id: 117195 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:9f45:0:b0:3ea:f831:8777 with SMTP id v5csp3354348vqx; Fri, 7 Jul 2023 08:35:57 -0700 (PDT) X-Google-Smtp-Source: APBJJlECH5t8zhkD6NdSnMgcNuyMFRS2nlIDhEVgCn5KfU6ylTC30bKFfz3v5zTXKLkbR9+h76l1 X-Received: by 2002:a2e:7c09:0:b0:2b6:e7b7:a163 with SMTP id x9-20020a2e7c09000000b002b6e7b7a163mr4002987ljc.27.1688744156981; Fri, 07 Jul 2023 08:35:56 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1688744156; cv=none; d=google.com; s=arc-20160816; b=S0DK+p0U5LZlxJm6FTWFjGTPkMe0/kZ/aOpFsAqgVU3i1Lvmi9bRTw0KKCSqpwK8F4 veXg9eqw7Pa9PV49SdL7wUlbxeYOY8mqx7OBWVWynurTUiHzBgAwAderHLzsEgA4ERX7 lZvuSIFntV4sTnLgctZ6AZlegz4UckOv7WU9c9IYHJYs+qkKl1axDEISHSWaQrSp5c+o OybN1MojzAdtLoVo/SZ9detPnnW5iejEW81rs9ryPckABW/s19loyuOJ2ryU46UK4Qhl uO/NJFQdETflRZSxz9Vh7n/HROUifAUZwIQ4GklGGjph2o068pV2cI3Q2EC1PQZkpR5V NU9g== 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=m3UMUUxQmGpFqfZrTXPJiSCifxETsKYb/UHHJV0Y7yo=; fh=Nkpk7VjQstRrk/SIKeFB2DsfhHIA7OANQWPD54Aly/o=; b=smsrJ9HzyXpb5oQB0svboV1BMdnD0m77CuOEit8NlEIYNW4u+LZJF6taYquQleXVaS TI5PFG+3jX3iYqK7ZVqiiOeNYx6hY78+p2+MOGh6csV2e5zwgwXFbgL6YlJ5rzM7bV/b hC9F8qyR69LweTI7JqXMKPc5CK/utclem40FU00ng6nZJBlPUM8R0TR65ocv1vYAkP0H cpIFcy09bkSF4dFDlTmhWzO13p2S13KL5SjVRcF7TCvGjMLi37K9gDeU4orVbAKkYfbs HBZepUG5Dd6fq+lMpzAq+C/fdRbxSL4im3y5tSxdV4j30VJ34/w4V8kpWenMgBktUxIi xOUw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@sberdevices.ru header.s=mail header.b=lo0qSycr; 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 rh25-20020a17090720f900b009937e7c4e4fsi1584534ejb.80.2023.07.07.08.35.33; Fri, 07 Jul 2023 08:35:56 -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=lo0qSycr; 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 S232938AbjGGPdz (ORCPT + 99 others); Fri, 7 Jul 2023 11:33:55 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:34716 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230429AbjGGPdj (ORCPT ); Fri, 7 Jul 2023 11:33:39 -0400 Received: from mx1.sberdevices.ru (mx2.sberdevices.ru [45.89.224.132]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 7E49A10EA; Fri, 7 Jul 2023 08:33:35 -0700 (PDT) Received: from p-infra-ksmg-sc-msk02 (localhost [127.0.0.1]) by mx1.sberdevices.ru (Postfix) with ESMTP id C505A120011; Fri, 7 Jul 2023 18:33:32 +0300 (MSK) DKIM-Filter: OpenDKIM Filter v2.11.0 mx1.sberdevices.ru C505A120011 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sberdevices.ru; s=mail; t=1688744012; bh=m3UMUUxQmGpFqfZrTXPJiSCifxETsKYb/UHHJV0Y7yo=; h=From:To:Subject:Date:Message-ID:MIME-Version:Content-Type:From; b=lo0qSycrN05qvwzNFemorzEPjKxdYu6putorNqL6aG+I28Ay2MKmMFr/VRq1PUxW1 WPziVn47UOS8mziO9FL5spXex/4zN4WTLvZEdZbMPQPpCMqpxEDwe8DkN3M0Swz0BT Um2Jeqk8Sg6M3twhxeUG19AjJyMoUeZlKgHVXMx7KSvgh8ZhZcRViXSBICpew61mMy mR+YvGPuv9ZAilJhcqY3GqIg/hPaxFWieVP+/PtzR3vPYGYZkgCBN2S0PTylnL78Vg y8GFiUm2tDUgiKf4oxfI38OXYKIumpH3mAicwGzN5br80XD8BnefWADNI5fS15QhKk 1AqUNlRcm2a8Q== 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, 7 Jul 2023 18:33:32 +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, 7 Jul 2023 18:33:15 +0300 From: George Stark To: , , , , , , , , CC: , , , , , George Stark Subject: [PATCH v4 1/6] iio: adc: meson: remove unused timestamp channel Date: Fri, 7 Jul 2023 18:27:38 +0300 Message-ID: <20230707153322.114302-2-gnstark@sberdevices.ru> X-Mailer: git-send-email 2.41.0 In-Reply-To: <20230707153322.114302-1-gnstark@sberdevices.ru> References: <20230707153322.114302-1-gnstark@sberdevices.ru> MIME-Version: 1.0 X-Originating-IP: [100.64.160.123] X-ClientProxiedBy: p-i-exch-sc-m01.sberdevices.ru (172.16.192.107) 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: 178491 [Jul 07 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: 520 520 ccb018a655251011855942a2571029252d3d69a2, {Tracking_from_domain_doesnt_match_to}, d41d8cd98f00b204e9800998ecf8427e.com:7.1.1;127.0.0.199:7.1.2;sberdevices.ru:5.0.1,7.1.1;p-i-exch-sc-m01.sberdevices.ru:5.0.1,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/07 03:24:00 #21575635 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,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: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1770776593171879782?= X-GMAIL-MSGID: =?utf-8?q?1770776593171879782?= Remove IIO_CHAN_SOFT_TIMESTAMP channel because it's used only for buffering mode which is not implemented. Signed-off-by: George Stark --- 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 7 15:27:39 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: George Stark X-Patchwork-Id: 117191 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:9f45:0:b0:3ea:f831:8777 with SMTP id v5csp3353903vqx; Fri, 7 Jul 2023 08:35:17 -0700 (PDT) X-Google-Smtp-Source: APBJJlFyLcO82SXZnPPkVeQFSZiXUQgZazz5tQUo9WgUYvxsL0b0i4KFPlVrd6Rs4alaBT6lXuIh X-Received: by 2002:a05:6808:23c6:b0:3a1:ec14:cd7e with SMTP id bq6-20020a05680823c600b003a1ec14cd7emr6216357oib.36.1688744117054; Fri, 07 Jul 2023 08:35:17 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1688744116; cv=none; d=google.com; s=arc-20160816; b=CxrebTzC6m8MLeWDlpIakSSXPp5q7KWmoAfhcEGtUbFZ1s2vjJHiieIVR/TxrK/u+l tb753Z8/vQTC0B5h/+Y7nwwazZclakGnlp4MNaR7VC6+udevNfT/pOwT3MEb6n9idj6+ ygmEHiQADTGdrMnCcliOE1s3RjrVdYvwow9m+S+XcS+AbAOnwVWAwkJBCzIkNobBwGp1 zufyGT4LgbMTrGhE3V166VtglPvF2BHUjbfmtnreQqPUVe6WhVHURUD8WjJ7latgyqDO YY0kUqwUNTKXneQJVMiBEEjMQAsY+nz/DvTZaxzUzZ+VX3VnOifW28GVvudcVbdmIjUp unGg== 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=tCMbygVvzzTlGs7JB7+8QzsC2hT2UeK/Y0nWbTcHLKY=; fh=Nkpk7VjQstRrk/SIKeFB2DsfhHIA7OANQWPD54Aly/o=; b=lQehH5enqnZ3DPzz3ViiJm3RpWwBYMdqDg3n6LuUcOPf+Hqc7kPu1718wZeJAuoS5L 5u4rJdTEpbK0hjgQHTEFgx0AqYepFej10ilJS3uismtqJHI8ur6W8zbX8FW8GtnfBDzQ V7argDTSjZNJ1Y+Edp1zrH1ICgGLAMW3NGYO6z9szNOS2THjhUowvGoEoVdOWis1zBWB gMZDFY22NNfDknuodpIb51JxMovOuus0RqY6UdB7aRoS8ZHH+PMbSozp58pD+7RfEMa9 o5nOQqPEzsAAFNmllsNbS16QmLNiN1P+339ksbZLNe1lsuj0n59zIcSIKlrpoJ+kywNw h1aw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@sberdevices.ru header.s=mail header.b=eL5SJO37; 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 38-20020a630e66000000b00543a6ce8c33si2883746pgo.78.2023.07.07.08.35.01; Fri, 07 Jul 2023 08:35:16 -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=eL5SJO37; 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 S232778AbjGGPdq (ORCPT + 99 others); Fri, 7 Jul 2023 11:33:46 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:34714 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229846AbjGGPdj (ORCPT ); Fri, 7 Jul 2023 11:33:39 -0400 Received: from mx1.sberdevices.ru (mx1.sberdevices.ru [37.18.73.165]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 81A0F212C; Fri, 7 Jul 2023 08:33:35 -0700 (PDT) Received: from p-infra-ksmg-sc-msk01 (localhost [127.0.0.1]) by mx1.sberdevices.ru (Postfix) with ESMTP id 05C63100006; Fri, 7 Jul 2023 18:33:33 +0300 (MSK) DKIM-Filter: OpenDKIM Filter v2.11.0 mx1.sberdevices.ru 05C63100006 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sberdevices.ru; s=mail; t=1688744013; bh=tCMbygVvzzTlGs7JB7+8QzsC2hT2UeK/Y0nWbTcHLKY=; h=From:To:Subject:Date:Message-ID:MIME-Version:Content-Type:From; b=eL5SJO37CM3Rp/aK5YMYCsCq+3s7z9keggDmpdPdehRTn4Tq0LE4feTh3X4Z2Mq6x oa3F1s3gOuq5z5C4zLpAy9o3VirKG91zeiRm/mnfi+uK+iDUuotzSTqa4IH+5lm1Rx LlRUEDnExZrzAsHddNGxt6Ilfbpq5tLmdfEy3CI24XlwGLLh9Vvipw5bx2rxNOs3qj A9Hkj88IIFkxhLd4aAbq4GrLgT/UuJQxtHAFvXagc/Uy6FUqfLB4ywUNj5+FU42x/z sm7FdcgP8nts790nmZrqdUDXXgv4VK02t0ZU3obZmxDPNBvq7++H/Aa324nc3cXe1q nu3yRV9x219xg== 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, 7 Jul 2023 18:33:32 +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, 7 Jul 2023 18:33:15 +0300 From: George Stark To: , , , , , , , , CC: , , , , , George Stark Subject: [PATCH v4 2/6] iio: adc: meson: move enums declaration before variables declaration Date: Fri, 7 Jul 2023 18:27:39 +0300 Message-ID: <20230707153322.114302-3-gnstark@sberdevices.ru> X-Mailer: git-send-email 2.41.0 In-Reply-To: <20230707153322.114302-1-gnstark@sberdevices.ru> References: <20230707153322.114302-1-gnstark@sberdevices.ru> MIME-Version: 1.0 X-Originating-IP: [100.64.160.123] X-ClientProxiedBy: p-i-exch-sc-m01.sberdevices.ru (172.16.192.107) 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: 178491 [Jul 07 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: 520 520 ccb018a655251011855942a2571029252d3d69a2, {Tracking_from_domain_doesnt_match_to}, d41d8cd98f00b204e9800998ecf8427e.com:7.1.1;100.64.160.123:7.1.2;sberdevices.ru:7.1.1,5.0.1;127.0.0.199:7.1.2;p-i-exch-sc-m01.sberdevices.ru:7.1.1,5.0.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/07 03:24:00 #21575635 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,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: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1770776550986063706?= X-GMAIL-MSGID: =?utf-8?q?1770776550986063706?= Allow to use enum items for variables initialization. Signed-off-by: George Stark --- 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 7 15:27:40 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: George Stark X-Patchwork-Id: 117193 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:9f45:0:b0:3ea:f831:8777 with SMTP id v5csp3354000vqx; Fri, 7 Jul 2023 08:35:27 -0700 (PDT) X-Google-Smtp-Source: APBJJlExzEaCC1x9wqTJtbRo1OGxFqw78wxCz8KlxIhsvCF+imDdKp/W59MktuCGdnBSYJCXovsp X-Received: by 2002:a05:6a21:32a7:b0:12f:301e:10b7 with SMTP id yt39-20020a056a2132a700b0012f301e10b7mr6171075pzb.60.1688744127288; Fri, 07 Jul 2023 08:35:27 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1688744127; cv=none; d=google.com; s=arc-20160816; b=NwEZaEezIIIwQhbCtOFf6dRe6T8j/NLZW2Fii8Q5BiGUE4lDfgiujdC2MnDkikCbO9 +Md0Tb+nQFJQK2RoSF8OVuG2FQo+VNBWaRvpxPK1/o3oDGgZ9MfdxuHgK7YjfYlLv+Gf 3Tk6KC2aPY0gu1t8yEAUFf2nXpF6CC9bNXRPGhZTxZJsToLC57lF9hdLRmDxMpt/xS2d wiOCouKwdf1iGb2TWpMOfXUc5Ev/L53kt2GLuFA0qm3QIBszFoJdWP+PBlJt5i7Gl+zt wo6tnheDBKeDaeqJ7O4oV+5p8v0YwXoHbGZezXhe2XLbrM/601wD7DjreZu1mTK6yVeY aRlQ== 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=8ZeVjecoiDZe3BH4mSNmHTEIC2R2jlW0LpKNRUnkZFA=; fh=Nkpk7VjQstRrk/SIKeFB2DsfhHIA7OANQWPD54Aly/o=; b=f84Qe1ITt8Za+AIumNo9LTelbeAyK9E1aj+wfctWNrwWNj3slpWpYjzkFUqf1PQsOk tyjSeqKokyo20w4yA9+/QhCbBWmWh/kufjfO886TlSlNPHTW5q+97Tot9N0dASpx9LC2 WfND9RXV8Z8bYAwxj+FwmGxb3nGhJK+rqKV4X6m8SSdd81GRwrHdGmTOM3dozInptu/i VKjaWUgAeqldiIMMLiYW20vgVqks/Vjyxn1nn87Nqzaf5HmhefQF/j2O8Ln4fVI6fhvR LLJTtZ2c4rJTnWllN4GVMCMkDWYtGNhPyzflFmzMM3fYxt4GvSnrSel47QJtdEhIklQH 219Q== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@sberdevices.ru header.s=mail header.b=O24jlAhJ; 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 e12-20020a056a001a8c00b0066e4ceca38fsi3986656pfv.283.2023.07.07.08.35.14; Fri, 07 Jul 2023 08:35:27 -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=O24jlAhJ; 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 S232680AbjGGPdu (ORCPT + 99 others); Fri, 7 Jul 2023 11:33:50 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:34718 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230104AbjGGPdj (ORCPT ); Fri, 7 Jul 2023 11:33:39 -0400 Received: from mx1.sberdevices.ru (mx2.sberdevices.ru [45.89.224.132]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 8009A2121; Fri, 7 Jul 2023 08:33:35 -0700 (PDT) Received: from p-infra-ksmg-sc-msk02 (localhost [127.0.0.1]) by mx1.sberdevices.ru (Postfix) with ESMTP id 2DB0C120012; Fri, 7 Jul 2023 18:33:33 +0300 (MSK) DKIM-Filter: OpenDKIM Filter v2.11.0 mx1.sberdevices.ru 2DB0C120012 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sberdevices.ru; s=mail; t=1688744013; bh=8ZeVjecoiDZe3BH4mSNmHTEIC2R2jlW0LpKNRUnkZFA=; h=From:To:Subject:Date:Message-ID:MIME-Version:Content-Type:From; b=O24jlAhJBvjySXv63R99h0F+kJOJPIUR9EkG+UTrtFZqUY+HYvmujMfqCwpkIrtUq 8bSri5K9l+uCXp2zESVvRsRnXtog4wA43xGbq6ij19moSw0kjRMqe0qNMbY4/E0gaO IlsImZgnrVUUfpNqzJvgrlc1FoukU3i51MXt2slhgIOJ+v40w+mJLCPHBdKnzDxtb7 SKAvpG5WJbTiuPR/IpujVHq3qQqo1jKUdNzEIiJPzaqGYLZAMzUnYqmGIske8N6XQT jxOcYloAmm72NXHgK8yF1uJF37WGrexEBgzTIo9Z4zshzxoZTX6rxzuLjAorPQN8WV LWlrMz6gcy3+w== 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, 7 Jul 2023 18:33:33 +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, 7 Jul 2023 18:33:15 +0300 From: George Stark To: , , , , , , , , CC: , , , , , George Stark Subject: [PATCH v4 3/6] iio: adc: meson: move meson_sar_adc_set_chan7_mux routine upper Date: Fri, 7 Jul 2023 18:27:40 +0300 Message-ID: <20230707153322.114302-4-gnstark@sberdevices.ru> X-Mailer: git-send-email 2.41.0 In-Reply-To: <20230707153322.114302-1-gnstark@sberdevices.ru> References: <20230707153322.114302-1-gnstark@sberdevices.ru> MIME-Version: 1.0 X-Originating-IP: [100.64.160.123] X-ClientProxiedBy: p-i-exch-sc-m01.sberdevices.ru (172.16.192.107) 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: 178491 [Jul 07 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: 520 520 ccb018a655251011855942a2571029252d3d69a2, {Tracking_from_domain_doesnt_match_to}, d41d8cd98f00b204e9800998ecf8427e.com:7.1.1;127.0.0.199:7.1.2;sberdevices.ru:5.0.1,7.1.1;p-i-exch-sc-m01.sberdevices.ru:5.0.1,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/07 03:24:00 #21575635 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,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: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1770776561741150895?= X-GMAIL-MSGID: =?utf-8?q?1770776561741150895?= meson_sar_adc_set_chan7_mux is a basic routine writing single register, and defined as static. It moved up so it could be used in more places. Signed-off-by: George Stark --- 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 7 15:27:41 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: George Stark X-Patchwork-Id: 117196 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:9f45:0:b0:3ea:f831:8777 with SMTP id v5csp3360745vqx; Fri, 7 Jul 2023 08:47:16 -0700 (PDT) X-Google-Smtp-Source: APBJJlEmfIjYyxw998O5wIneWDZBH4vzPDoAydcKYHxJxkoh4ED1bisFkNhjOvJamJAJ3tXQeHYa X-Received: by 2002:a17:907:4d0:b0:98e:1deb:caf8 with SMTP id vz16-20020a17090704d000b0098e1debcaf8mr3983459ejb.57.1688744836668; Fri, 07 Jul 2023 08:47:16 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1688744836; cv=none; d=google.com; s=arc-20160816; b=mUIPZ/X2he9EBCy1EJsyDyuGtnaaHa3flx9gNXBG9+vnM9o3gnC6DwVVc1Y+jerA22 yYeWIVNb0/F0gSZa1drA6WW6xtffmvWhb9Eabyhcjj4E2AMpGpVIKZxSAgkPWds9SzMQ gcpwfsbSrBoIkInInTKh4EoQyBHgPLxqnOp2CqDG7MOghrfj73xWjTUpZiQuTHwdhHcl ihesq//Tx+Bcia0vpN3TNB2XO4q2hMdXHWGYDRvTK/eyvytakF0spK9alu7XFN3iT7tj 1xNCnA+pYWFTZDoSpRUuC31F6hxdShN0AMKzebqhfd7Qg5exuw4kCHhQW1rC8HZEBMty eQ1Q== 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=98khYn1fztt12eqMcHqL5Q5p7BU+eCOCeF+HxCxX/Ck=; fh=Nkpk7VjQstRrk/SIKeFB2DsfhHIA7OANQWPD54Aly/o=; b=JvcAhbVuk+NlrXvq8MVfVurlpMmW3Ye8l58Y3FOnY4kcRWRqU/TYYCE8sxn585ro70 wbTPPOzPKJMBf3IgWKmItrmEajbg0KgTR9p6PYsmCA3h5JEvDErAv531+99xnaBSkV58 EQ8MybnweLduMoHxvxEe36rUMlkWTJdXfTNdUo/swY38IF4CyvRI5gmhl0KGC+GZHL0N KYDz5dwqrSm83MpdjhDfVz7auB4c5k+APxTW/zaWlu+toeIp2E/Mfe5GLeGQBjMQmzag 8PzK8H09Aeogy3l11P6tPv6wKqPi1b084NyNSkbhoM4iFrza3orKzRgwfIRkNewHVqrD IxUA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@sberdevices.ru header.s=mail header.b="l/K0w/d7"; 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 ot41-20020a170906cce900b0098e1efaafc5si2306362ejb.195.2023.07.07.08.46.52; Fri, 07 Jul 2023 08:47:16 -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="l/K0w/d7"; 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 S232327AbjGGPdj (ORCPT + 99 others); Fri, 7 Jul 2023 11:33:39 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:34698 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229573AbjGGPdi (ORCPT ); Fri, 7 Jul 2023 11:33:38 -0400 Received: from mx1.sberdevices.ru (mx1.sberdevices.ru [37.18.73.165]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 809302128; Fri, 7 Jul 2023 08:33:35 -0700 (PDT) Received: from p-infra-ksmg-sc-msk01 (localhost [127.0.0.1]) by mx1.sberdevices.ru (Postfix) with ESMTP id 6792F100007; Fri, 7 Jul 2023 18:33:33 +0300 (MSK) DKIM-Filter: OpenDKIM Filter v2.11.0 mx1.sberdevices.ru 6792F100007 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sberdevices.ru; s=mail; t=1688744013; bh=98khYn1fztt12eqMcHqL5Q5p7BU+eCOCeF+HxCxX/Ck=; h=From:To:Subject:Date:Message-ID:MIME-Version:Content-Type:From; b=l/K0w/d78W6uXjsLoQ+yc9m6fvIkgXMbSm5zs7x4Bj13VZi69Z0O8txSl1KUu70Py sa6H/JEGFXZeTpGzKfZ20eFx4RbwhlBWBYXGP8s6/ecnT/ecSoVs4mYH3lIVazW0Hw rM2G86DJ+OL2YnOtwnbnR+VS0kD+Mcf03BfOtXNezluqMGgWLMmXHJiA/bBDMferM7 qTNC/97FAnuGZW+1FL4x2UfLD5z+iQa6ma4Ifm57SxYex3Y4oyAca43mlGTDNB1FF3 dz8CwoZ7lM1ucRq76FPrtEtaowNP17c7TSQ/UEND+Ii8iGp8ekS4WgTxfEDb9C91VT 7Ie1q/Jq29Dgg== 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, 7 Jul 2023 18:33:33 +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, 7 Jul 2023 18:33:15 +0300 From: George Stark To: , , , , , , , , CC: , , , , , George Stark Subject: [PATCH v4 4/6] iio: adc: meson: add enum for iio channel numbers Date: Fri, 7 Jul 2023 18:27:41 +0300 Message-ID: <20230707153322.114302-5-gnstark@sberdevices.ru> X-Mailer: git-send-email 2.41.0 In-Reply-To: <20230707153322.114302-1-gnstark@sberdevices.ru> References: <20230707153322.114302-1-gnstark@sberdevices.ru> MIME-Version: 1.0 X-Originating-IP: [100.64.160.123] X-ClientProxiedBy: p-i-exch-sc-m01.sberdevices.ru (172.16.192.107) 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: 178491 [Jul 07 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: 520 520 ccb018a655251011855942a2571029252d3d69a2, {Tracking_from_domain_doesnt_match_to}, d41d8cd98f00b204e9800998ecf8427e.com:7.1.1;100.64.160.123:7.1.2;sberdevices.ru:7.1.1,5.0.1;127.0.0.199:7.1.2;p-i-exch-sc-m01.sberdevices.ru:7.1.1,5.0.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/07 03:24:00 #21575635 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,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: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1770777306017282579?= X-GMAIL-MSGID: =?utf-8?q?1770777306017282579?= Channels could be referenced in the driver code and using enum allows to make it more robust. Signed-off-by: George Stark --- 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 7 15:27:42 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: George Stark X-Patchwork-Id: 117194 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:9f45:0:b0:3ea:f831:8777 with SMTP id v5csp3354047vqx; Fri, 7 Jul 2023 08:35:32 -0700 (PDT) X-Google-Smtp-Source: APBJJlFd62zZ3e45tCxKy3C9NwWIJ4DDmoC49OEOCcGP/U/UwK3mZdbbiH7nYHiKxtR+F4suZOQp X-Received: by 2002:a05:6a20:914d:b0:12e:3d1c:4ba9 with SMTP id x13-20020a056a20914d00b0012e3d1c4ba9mr11404542pzc.30.1688744131936; Fri, 07 Jul 2023 08:35:31 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1688744131; cv=none; d=google.com; s=arc-20160816; b=fQf9dKYL2mN7HSE2QAvcbQvaXxcnzniz1wtoFuAlplyBd1HbS5K4d3E0Vgjtgp245w Bex9yJi1dB/75NZgQHzS67G6vUWYRM4Xp2L4m0eOrAXJ4hQvKoI9nfvRSqL5mTxRLJDQ gtCBpxJpuKc4JM4LVqkZX6EPQYvMQC8uYrU5IVN+A3tE7Eog+OZb4fAIgpJMm/eHi1du aVnMi2tPJQXan8kWPZCFsoSn7AJNzTjZJt4wS3ajGs5MLd34lLrBQgXLqlgwDEyuREhH 7zX+zB7dg5HuQAJ9ndoyvlDKp0iN6QF/0bYd6WodeuXcowLrkuMR5nNDZvRtTcRknl0H lgpg== 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=bR8FnX/9XRC4vMvfDnvlv/teLgjirSG0432OVMhUoms=; fh=Nkpk7VjQstRrk/SIKeFB2DsfhHIA7OANQWPD54Aly/o=; b=Em8tS7mcf4+NJARivAgIYtlWoyPelRBbWdCwRGt/tlSSPtbfS1Gmdj3gTtPVFtmZem L6GAW48A7lT+4A7sCC2Q/rwCG9UyGVf+REdNnJEUF+OTi9s/+rRe/7eLXE3ltLjC1KW8 g49ccfr+VyK28xpFF5NznnpiEntDNrQCq1M8itVyHJo/Wxzd7kfPxIZ0bCKmOdOYbx0I GK3RMbe0Scbv4pbIjBB67ciRZwDjLuEMqX/kMxIu+yQmJ5ZqfFcvodj4nv0494DMMvJx xBiXWLzmqngiTSfUm3MTHOlErHQuYdsIKDscRQOvpSRaaPiCUH9+WcocQLkc40aAs6Dy gV8A== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@sberdevices.ru header.s=mail header.b=kvtMOA1M; 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 i2-20020a63e442000000b0055baeced15esi4194542pgk.549.2023.07.07.08.35.18; Fri, 07 Jul 2023 08:35: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=kvtMOA1M; 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 S232818AbjGGPdw (ORCPT + 99 others); Fri, 7 Jul 2023 11:33:52 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:34720 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230289AbjGGPdj (ORCPT ); Fri, 7 Jul 2023 11:33:39 -0400 Received: from mx1.sberdevices.ru (mx1.sberdevices.ru [37.18.73.165]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 806132127; Fri, 7 Jul 2023 08:33:35 -0700 (PDT) Received: from p-infra-ksmg-sc-msk01 (localhost [127.0.0.1]) by mx1.sberdevices.ru (Postfix) with ESMTP id 96E60100008; Fri, 7 Jul 2023 18:33:33 +0300 (MSK) DKIM-Filter: OpenDKIM Filter v2.11.0 mx1.sberdevices.ru 96E60100008 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sberdevices.ru; s=mail; t=1688744013; bh=bR8FnX/9XRC4vMvfDnvlv/teLgjirSG0432OVMhUoms=; h=From:To:Subject:Date:Message-ID:MIME-Version:Content-Type:From; b=kvtMOA1MwenjVmqyzk2Q4zuUvCHZH402eH3fBTIimcpV/NC2r5tXsPK50UQJGWm1h yudJQzU6mElvveLuyS0shFecNzsnYYHTiuG85lGycwx9gXIU9JYrCbe2dn4v8S6KwJ vx2hhQOOsTe/YibOOec3023Dr3fevZ8STqMsrNTC06zynay1x+ANs4YA5pVlVsjXiw qBq9bblqOVaSl/nchwKx09V16eAlkveUxsUxyN9MKIJTERUjAsNGh4YUZNI+h4xNNq 73M3S//riQEy0NEBCbAizXd0Y9j2I1OiyI5u9KqkXBwQmpWUEDXVu9UiqBKks1oppP dlevyoAgpB9AQ== 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, 7 Jul 2023 18:33:33 +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, 7 Jul 2023 18:33:16 +0300 From: George Stark To: , , , , , , , , CC: , , , , , George Stark Subject: [PATCH v4 5/6] iio: adc: meson: add channel labels Date: Fri, 7 Jul 2023 18:27:42 +0300 Message-ID: <20230707153322.114302-6-gnstark@sberdevices.ru> X-Mailer: git-send-email 2.41.0 In-Reply-To: <20230707153322.114302-1-gnstark@sberdevices.ru> References: <20230707153322.114302-1-gnstark@sberdevices.ru> MIME-Version: 1.0 X-Originating-IP: [100.64.160.123] X-ClientProxiedBy: p-i-exch-sc-m01.sberdevices.ru (172.16.192.107) 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: 178491 [Jul 07 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: 520 520 ccb018a655251011855942a2571029252d3d69a2, {Tracking_from_domain_doesnt_match_to}, d41d8cd98f00b204e9800998ecf8427e.com:7.1.1;100.64.160.123:7.1.2;sberdevices.ru:7.1.1,5.0.1;127.0.0.199:7.1.2;p-i-exch-sc-m01.sberdevices.ru:7.1.1,5.0.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/07 03:24:00 #21575635 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,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: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1770776566981468059?= X-GMAIL-MSGID: =?utf-8?q?1770776566981468059?= Add channel labels to provide human-readable names for the channles. Signed-off-by: George Stark --- 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 7 15:27:43 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: George Stark X-Patchwork-Id: 117192 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:9f45:0:b0:3ea:f831:8777 with SMTP id v5csp3353941vqx; Fri, 7 Jul 2023 08:35:21 -0700 (PDT) X-Google-Smtp-Source: APBJJlGacY4UAytjrPU36DB3Lwky3ZUcvwbJFzGRGybHn438zlb0HfY/gEWc7v81i/BV5sfF1gQb X-Received: by 2002:a2e:a0d7:0:b0:2b6:fe3c:c3af with SMTP id f23-20020a2ea0d7000000b002b6fe3cc3afmr2633747ljm.27.1688744121357; Fri, 07 Jul 2023 08:35:21 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1688744121; cv=none; d=google.com; s=arc-20160816; b=zpM0j8KpKZ/byOKixPhjaRUq1NMshbGyPHZ286PnQZttxMTSnUXL9BfWvmFkxtrlGr k9F7HRMIpsK//oTVYfJYfx42v2Zdy15224UPEO9InTOqoHcc40KymeI0FBpV9Y5RLvNW otToOFSCOz8iplaqNnThJlBeihQUEz590n7aV9Ida8XgYvExfk50eupjb0y2S2CvUXuE /OjZ3rppzykyjlrFWM7r+I8avYHv2fgh2Fok16EAaZlTJAQMTp8OnO7s+ePHSwDLKxHM 4jkWKTM9h3GM2SEmp+792wHUosdTiAFFoCx12zMr2OuGzL9Ez9De/fkTQR65TKiEVKMq LKzw== 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=JSydivd3FU78noI+uH9qQ/p74cncRISu8zSqHemHcXk=; fh=Nkpk7VjQstRrk/SIKeFB2DsfhHIA7OANQWPD54Aly/o=; b=eag2UMQPIdg8tvjoceh4jMPRAF5AoNxX/+yz+Fk4JPm4Ayxveq5lK6hgRd/LRrncV+ mgGSELzgiI9aTxU2nUoalydO0ifwABb7B4AEOrPKH7Jx0n+I3iIjHk+Mgn6jALGA6coo SCMh0fJLWqPokGQBN42mWKPyL2VBnN69nVzfXiDMBAXdp6+pOto+1uqafVJ3E6ld47fq n2SmoYofTl+SoIBAuLTNPUnnTCOk49W5XZwJ/N8mSt8Ii+hGOQzOWmA0gLfjre03e2yJ wKpCI2vB40i+p1icyT4Zcwtysv8oHkJTToRF91BCUgXJ1AknGrdb2k7TqghJ3dSie2I7 1BWg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@sberdevices.ru header.s=mail header.b=BJW6yjGM; 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 cb12-20020a170906a44c00b009934728f33bsi2353207ejb.533.2023.07.07.08.34.58; Fri, 07 Jul 2023 08:35:21 -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=BJW6yjGM; 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 S232662AbjGGPdn (ORCPT + 99 others); Fri, 7 Jul 2023 11:33:43 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:34712 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229729AbjGGPdi (ORCPT ); Fri, 7 Jul 2023 11:33:38 -0400 Received: from mx1.sberdevices.ru (mx2.sberdevices.ru [45.89.224.132]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 7D40DE6E; Fri, 7 Jul 2023 08:33:35 -0700 (PDT) Received: from p-infra-ksmg-sc-msk02 (localhost [127.0.0.1]) by mx1.sberdevices.ru (Postfix) with ESMTP id C746A120013; Fri, 7 Jul 2023 18:33:33 +0300 (MSK) DKIM-Filter: OpenDKIM Filter v2.11.0 mx1.sberdevices.ru C746A120013 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sberdevices.ru; s=mail; t=1688744013; bh=JSydivd3FU78noI+uH9qQ/p74cncRISu8zSqHemHcXk=; h=From:To:Subject:Date:Message-ID:MIME-Version:Content-Type:From; b=BJW6yjGM3mqSgeU+EEDM4eu0apnv5NXb2IHQQvPMus408rWdkN/KG8aiL+uIEeVqB S+uRkDcgZcaX4xDwgK9U3mRP1uBlzQfwk7di3vJF7oQuQsD7ag48h5p5fWvjy3YtGg pSxhrpH7n8qbrR7ap3cB/aLGjmkx832HdNoaKfqDMeoCkwz0FhPv2/hV5fNKaMrID6 d1De3nF+IytfepSfrzxnHrzTbYwdXN3dff0SjX9IrLWpvWyfjedsh/9RQm6jBhPLyz Ifkep7RHgYdnbmgvZljd8erl1G64iijZ2yRb1BDCGhrQy6kl2v55Ufk+fpFMGCG9qy 5Qc6MCDz2UmPA== 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, 7 Jul 2023 18:33:33 +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, 7 Jul 2023 18:33:16 +0300 From: George Stark To: , , , , , , , , CC: , , , , , George Stark Subject: [PATCH v4 6/6] iio: adc: meson: support reading from channel 7 mux inputs Date: Fri, 7 Jul 2023 18:27:43 +0300 Message-ID: <20230707153322.114302-7-gnstark@sberdevices.ru> X-Mailer: git-send-email 2.41.0 In-Reply-To: <20230707153322.114302-1-gnstark@sberdevices.ru> References: <20230707153322.114302-1-gnstark@sberdevices.ru> MIME-Version: 1.0 X-Originating-IP: [100.64.160.123] X-ClientProxiedBy: p-i-exch-sc-m01.sberdevices.ru (172.16.192.107) 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: 178491 [Jul 07 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: 520 520 ccb018a655251011855942a2571029252d3d69a2, {Tracking_from_domain_doesnt_match_to}, d41d8cd98f00b204e9800998ecf8427e.com:7.1.1;127.0.0.199:7.1.2;sberdevices.ru:5.0.1,7.1.1;p-i-exch-sc-m01.sberdevices.ru:5.0.1,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/07 03:24:00 #21575635 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,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: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1770776555770834534?= X-GMAIL-MSGID: =?utf-8?q?1770776555770834534?= Add iio channel for every channel 7 mux input. Meson saradc channel 7 is connected to a mux that can switch channel input to well-known sources like Vdd, GND and several Vdd dividers. Signed-off-by: George Stark --- 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;