From patchwork Tue Jul 11 20:00:17 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: George Stark X-Patchwork-Id: 118705 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:a6b2:0:b0:3e4:2afc:c1 with SMTP id c18csp719572vqm; Tue, 11 Jul 2023 13:16:08 -0700 (PDT) X-Google-Smtp-Source: APBJJlFST4Jym7lVwwYflfklkXwGfrsZtYPH7//Tx/h7M8UoDhoAzBMxElZ7JNiEENdZ/T7cTb0w X-Received: by 2002:a05:6a21:9985:b0:132:87ab:42d5 with SMTP id ve5-20020a056a21998500b0013287ab42d5mr1810932pzb.35.1689106567901; Tue, 11 Jul 2023 13:16:07 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1689106567; cv=none; d=google.com; s=arc-20160816; b=UTGSWfO+/PlfdjCuNuucRyLMFbrNH/GT+cmwnhqyqN4U2cpJT9VBNFDql5iereKqaC lvQ5E8WDGfOGTwCndP0OxVO7tYCy/9BScSlK8Hz2kF1rQte293UyuDWrHbEHkTitqz+D Fv5rLAE8AkcQeu2QZfXNq6v3abzTvob+QQYufvocD6k/wHcg3rnuJRhivE7bad70ckaq yq8ltMYiUjmDvTeEgZRK9iG0peCpszvtfUIOAgrLosTSrSfj00MYyQEF765CTDbj0vLb 0e/kX98hOi5zKEqaH0UVOZfRzQdsnrAn2iJVJzOiREvue7LiGLPAJ943hhYZizQJDsQD HkSA== 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=uqmfqL41FEAszRxbCGyOaC4N/hyRLUnRZJJ87k9epCopI5sX5gWZsVZXbKoYD/9J1T Ly915gi3ZVxOiN/ENeptpHBu+L+WU0CN5CT6T3wQW3VOkD6IvEBpDhawosnABQJHOGYy ATr8jDqzchnCAdymiFwwqLsatPU82a8AQv2WPWTmkbzKkf92fy3J6YwF4O23gtEhDgmG NLqIhcxOuhbome5xQ07OhHBx5cEBBxxtZP8P/LBloGYpFHjTSZN380m7DnyiJmrTLoPi dCTx1xB6xuzQIWNTgcsmYIVUnQEhF6/TbimXZor48h1ltyDNtI387EiG5zL2Qcb7M7A6 xKSw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@sberdevices.ru header.s=mail header.b=T5LT+5h1; 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 u9-20020a056a00098900b00650cabb6e66si1973066pfg.370.2023.07.11.13.15.53; Tue, 11 Jul 2023 13:16:07 -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=T5LT+5h1; 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 S231613AbjGKUB5 (ORCPT + 99 others); Tue, 11 Jul 2023 16:01:57 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:33094 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231512AbjGKUBz (ORCPT ); Tue, 11 Jul 2023 16:01:55 -0400 Received: from mx1.sberdevices.ru (mx1.sberdevices.ru [37.18.73.165]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 0CE4712E; Tue, 11 Jul 2023 13:01:53 -0700 (PDT) Received: from p-infra-ksmg-sc-msk01 (localhost [127.0.0.1]) by mx1.sberdevices.ru (Postfix) with ESMTP id 9688C100012; Tue, 11 Jul 2023 23:01:50 +0300 (MSK) DKIM-Filter: OpenDKIM Filter v2.11.0 mx1.sberdevices.ru 9688C100012 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sberdevices.ru; s=mail; t=1689105710; bh=m3UMUUxQmGpFqfZrTXPJiSCifxETsKYb/UHHJV0Y7yo=; h=From:To:Subject:Date:Message-ID:MIME-Version:Content-Type:From; b=T5LT+5h1IzwH9bqtteGDSRbs3PfCFGeiwiGyYsAaM03N/ewvzeYphUknpY9yKkWqo jQhi2M4C87NHIiS7mWuh2n7t33x43nPcchUa2egGXmYAFSr/Z9b/MKQmI8+qB6uJdy cY9mPYRSgNiFPsIPqtDW1PMUxbbrZjbi32B9ue+uaXTbzakqoC5CCxFnziHvC7P3ar s/G+sdmIYBLNqUq1UiXj9CTcIqJQT/NPkGZoyT+pGCcnbfkQcxfivlsZ7/+VGEa8Dg C14xRoiXNVXd956OrwU/01ArCI8KEnG5GoKUMbpqtOeltjkIaTR2BgNyZJFdczf2tI GVOL1r1G48axg== 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; Tue, 11 Jul 2023 23:01:50 +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; Tue, 11 Jul 2023 23:01:39 +0300 From: George Stark To: , , , , , , , , CC: , , , , , George Stark Subject: [PATCH v5 1/6] iio: adc: meson: remove unused timestamp channel Date: Tue, 11 Jul 2023 23:00:17 +0300 Message-ID: <20230711200141.239025-2-gnstark@sberdevices.ru> X-Mailer: git-send-email 2.41.0 In-Reply-To: <20230711200141.239025-1-gnstark@sberdevices.ru> References: <20230711200141.239025-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: 178558 [Jul 11 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: 521 521 0c3391dd6036774f2e1052158c81e48587b96e95, {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;d41d8cd98f00b204e9800998ecf8427e.com:7.1.1;127.0.0.199:7.1.2;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/11 13:07:00 #21597915 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: 1771156608778634968 X-GMAIL-MSGID: 1771156608778634968 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 Tue Jul 11 20:00:18 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: George Stark X-Patchwork-Id: 118704 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:a6b2:0:b0:3e4:2afc:c1 with SMTP id c18csp719256vqm; Tue, 11 Jul 2023 13:15:38 -0700 (PDT) X-Google-Smtp-Source: APBJJlG2CCa9lYJxcuov9MR5oueDL2/bjJr76pFOJ8aea3sPcXxtzJPuEXCFagmpej/HKgxlmmBn X-Received: by 2002:a05:6a20:8f0c:b0:131:47f7:e80d with SMTP id b12-20020a056a208f0c00b0013147f7e80dmr11195190pzk.23.1689106537783; Tue, 11 Jul 2023 13:15:37 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1689106537; cv=none; d=google.com; s=arc-20160816; b=AGaJ+bfp60BlCeEFVMgfvnbg6CPWO0J5kvDWPrqJUFqcppTs+Q/RVpI1CNLOJ/jhSp ew09h0yKu2BKeH/J1HtIXnag8ZtdTLPL0OS+2CcAkvQvomeTBVrVifP63PfLBpZ75FS4 JpdKzdIJlO7ZZmlVgD+Olh6/Sb0k5/uwRbgz7QsURqtfnZGYY7RNONfRvqxsw/iFSF9N kIaEy5Jmz3SkXRfuaB40AxWyhpwwLrho2evEuwVYJbou4TxyHzGn7OJjwrbBs8JQeZRf 0VNlkbT73gHlxwbUB8LannlxbOJHVql2OFe+zSMWD622ga/F1rUmag+7+awRx2Fy5lox qcKQ== 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=m9C1KL5cCkterbhi7MeVtxjNf/UJZRZoiiyKbjEZRt0=; fh=Nkpk7VjQstRrk/SIKeFB2DsfhHIA7OANQWPD54Aly/o=; b=f/iFwPx3VzfhAtFY/TL8aXoMGF9NsXqyWXNZimIeqg7sTLuj7fNRmASGlRspdjlroi BurrZVuPHBeBWYFZO/8yMxcxZ6EQJDUi1xHR8dPAQg5s6H+KztAX6egR0tUbeoreAqpu MvYDg2uppiEjiF59bqlwWqKV9pMUGmnnfTyuz1MtDW8FngmSVg2s13dB4+4kNZEA/xpz E6uLu4k0ulBjnafIle9fWgIC7/7r6jIj8LjWJslW+D6LMEfwUBspu9FX0ukxYP1S8cQi cDoXJZMjtJ2MLPiWh7WPaloI/oulTgrSJqx+IXEbJ3Jg+62IlIlwvPmhKimZI+huP/H/ lapA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@sberdevices.ru header.s=mail header.b=dhfBdqp0; 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 q10-20020a056a00150a00b00682d2ab09dbsi1964951pfu.306.2023.07.11.13.15.25; Tue, 11 Jul 2023 13:15:37 -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=dhfBdqp0; 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 S230490AbjGKUCK (ORCPT + 99 others); Tue, 11 Jul 2023 16:02:10 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:33090 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231532AbjGKUB4 (ORCPT ); Tue, 11 Jul 2023 16:01:56 -0400 Received: from mx1.sberdevices.ru (mx2.sberdevices.ru [45.89.224.132]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id E16C51710; Tue, 11 Jul 2023 13:01:53 -0700 (PDT) Received: from p-infra-ksmg-sc-msk02 (localhost [127.0.0.1]) by mx1.sberdevices.ru (Postfix) with ESMTP id CEF2E12000D; Tue, 11 Jul 2023 23:01:50 +0300 (MSK) DKIM-Filter: OpenDKIM Filter v2.11.0 mx1.sberdevices.ru CEF2E12000D DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sberdevices.ru; s=mail; t=1689105710; bh=m9C1KL5cCkterbhi7MeVtxjNf/UJZRZoiiyKbjEZRt0=; h=From:To:Subject:Date:Message-ID:MIME-Version:Content-Type:From; b=dhfBdqp0x9seZw2TSC7QnjYSH3Ide6WpYd3rpFCQRhLcXuQN7DbZpj9/195/066Bh 10lo4lKpw5lYmUYNyOKOKtzlTXXTjCVEqjD2BbHqykvgwK+5gtxVE5uPqj/tRROrVH hv+R0qyCAYxViChxCkoSk5tRHaJHL9n2wzcCvLgghiClxgE0HbVFhaVFpcTnKMIa/4 4/PRuHBWCj9S5/29JSGg5VVVINO82a3uqLTE3LVEag2gs87g4ylmd7THUPbWtlif2R MLeAUp9hqT01XCRIX4pculOkC4RRHWOGaPudM57qheCmCkJu/AcH83bzYo5BAV2iyD H2ki+ZUeoUACA== 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; Tue, 11 Jul 2023 23:01:50 +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; Tue, 11 Jul 2023 23:01:40 +0300 From: George Stark To: , , , , , , , , CC: , , , , , George Stark Subject: [PATCH v5 2/6] iio: adc: meson: move enums declaration before variables declaration Date: Tue, 11 Jul 2023 23:00:18 +0300 Message-ID: <20230711200141.239025-3-gnstark@sberdevices.ru> X-Mailer: git-send-email 2.41.0 In-Reply-To: <20230711200141.239025-1-gnstark@sberdevices.ru> References: <20230711200141.239025-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: 178558 [Jul 11 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: 521 521 0c3391dd6036774f2e1052158c81e48587b96e95, {Tracking_from_domain_doesnt_match_to}, 100.64.160.123:7.1.2;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;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/11 13:07:00 #21597915 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: 1771156576804498755 X-GMAIL-MSGID: 1771156576804498755 Allows to use enum items for variables initialization. For this, move enums upper in the code. 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 Tue Jul 11 20:00:19 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: George Stark X-Patchwork-Id: 118698 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:a6b2:0:b0:3e4:2afc:c1 with SMTP id c18csp714177vqm; Tue, 11 Jul 2023 13:05:51 -0700 (PDT) X-Google-Smtp-Source: APBJJlHKpgNUOfspUcD3eNroP8bseRqF6th8mBFTqAlwimmnb6ioETKtpWqYDSfeuN4XKIxr93Wd X-Received: by 2002:a17:902:bd8a:b0:1b7:eebc:884 with SMTP id q10-20020a170902bd8a00b001b7eebc0884mr11967428pls.64.1689105951611; Tue, 11 Jul 2023 13:05:51 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1689105951; cv=none; d=google.com; s=arc-20160816; b=UfPCQRvdSuUtV/IARz6ekdxQ1f1xlpzig2IShMOr6K55VHZW5hrXSBHoSERVcWZWM/ 8LB+w50xXoyFQ3DbUMLhy7o5YfC2Azbuby6OqaXg1XTj3wc4DBBhDuPwstxN5p9w+5yr 5R5CAC31ze8qvTjXreSQ2j2pfLmlT2RaHdqLtQe3VbShHVOetuMpcC6PF2UUM8tnsWj4 7Sw0PvR0aYAVpTa0VZZPzDw+BXCvWPYdTvpULgitWFZtT2RHckIqoQZlouNuBR/s81Lq czhYXNQWeTmzNa45Gflbu0elqCFBtxo6yC5fUkBtjorlMZSlo++6XB0E9jBKl8DDhM/H Gfzw== 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=BW0LhoktQjd1yLzKVj4vIDJ70H41UmFQeJnemJvz31k=; fh=Nkpk7VjQstRrk/SIKeFB2DsfhHIA7OANQWPD54Aly/o=; b=rrSzr8HshGIDLNHw3WS9EfdHtu0PudblPPlqTD+0xhBSFHVFkOQbXX5UKg5bpHEtwD xqcOmn3zMRGRw4zh+iqgsDi6da8APnK7H0SMIYqn7D6YXRlidLbSwc+S6xsAtQUkDSpC CRTM8b5SsiLYqWGj+HdBqsXj8XEgFX/IX8hl2aeZMRktI4ixZIpxAtfh7odMeNLCIVDv ePh40JTnhQXq7yhi2LQ3iva8Fq4hqeyF/L3YOSA3w6l+LjRKfNjr1q9pvYNzfaMsz4so /p4uz9/v0zJCFQ4jl1e2l6TIL5bndnRx1d+NwhQUaTL24NvloMQ9PIcR/bD2KyMctnmp YLNg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@sberdevices.ru header.s=mail header.b=SDjoNJKs; 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 io12-20020a17090312cc00b001b85ca73574si1923815plb.285.2023.07.11.13.05.37; Tue, 11 Jul 2023 13:05:51 -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=SDjoNJKs; 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 S231676AbjGKUB7 (ORCPT + 99 others); Tue, 11 Jul 2023 16:01:59 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:33090 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231395AbjGKUBz (ORCPT ); Tue, 11 Jul 2023 16:01:55 -0400 Received: from mx1.sberdevices.ru (mx1.sberdevices.ru [37.18.73.165]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 0BC5F11D; Tue, 11 Jul 2023 13:01:53 -0700 (PDT) Received: from p-infra-ksmg-sc-msk01 (localhost [127.0.0.1]) by mx1.sberdevices.ru (Postfix) with ESMTP id 06CFC100015; Tue, 11 Jul 2023 23:01:51 +0300 (MSK) DKIM-Filter: OpenDKIM Filter v2.11.0 mx1.sberdevices.ru 06CFC100015 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sberdevices.ru; s=mail; t=1689105711; bh=BW0LhoktQjd1yLzKVj4vIDJ70H41UmFQeJnemJvz31k=; h=From:To:Subject:Date:Message-ID:MIME-Version:Content-Type:From; b=SDjoNJKsxw1ckBI1gK5M9gWePZ021xzZbOEbbCQD91TG2Wdegrdzy4QxENlmgkRZy 9/j/EiMPHbZ5KfNCVAvUJVm4j16q9mZsCkXbASrs8DYf6Bs8/4DcuKQjVYxS6YnDF4 bHYroHgDscSm7LqqotACr0fzmAkO4o51Hd6dFwc56mwihUOddT1nxmjpsTFo8AvLIw E0qB6HeoPHVTRk2FNRUNs4fs3AvllAQpoNcN6RbmzGHfYE4gw98FGdx8uyGaEF5sI/ imSU2mgHtY8huXKT77M53v7dmM9r5dJjAdSnryShoaFI3kwdTDfQaijEwjxKUXqu2v 5NiJhMvwfTzEQ== 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; Tue, 11 Jul 2023 23:01:50 +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; Tue, 11 Jul 2023 23:01:40 +0300 From: George Stark To: , , , , , , , , CC: , , , , , George Stark Subject: [PATCH v5 3/6] iio: adc: meson: move meson_sar_adc_set_chan7_mux routine upper Date: Tue, 11 Jul 2023 23:00:19 +0300 Message-ID: <20230711200141.239025-4-gnstark@sberdevices.ru> X-Mailer: git-send-email 2.41.0 In-Reply-To: <20230711200141.239025-1-gnstark@sberdevices.ru> References: <20230711200141.239025-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: 178558 [Jul 11 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: 521 521 0c3391dd6036774f2e1052158c81e48587b96e95, {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;d41d8cd98f00b204e9800998ecf8427e.com:7.1.1;127.0.0.199:7.1.2;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/11 13:07:00 #21597915 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: 1771155962366615428 X-GMAIL-MSGID: 1771155962366615428 meson_sar_adc_set_chan7_mux is a basic func() for writing single register, and defined as static. Moved it 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 Tue Jul 11 20:00:20 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: George Stark X-Patchwork-Id: 118701 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:a6b2:0:b0:3e4:2afc:c1 with SMTP id c18csp714754vqm; Tue, 11 Jul 2023 13:07:04 -0700 (PDT) X-Google-Smtp-Source: APBJJlHwpVchkEqdBmxMiZDA2BkI7Mim+C3BYvuJECPrlg+gyF9gycrncgGyKPeW8XGmqRrKtori X-Received: by 2002:a5d:45d1:0:b0:314:321a:4bc7 with SMTP id b17-20020a5d45d1000000b00314321a4bc7mr14909908wrs.15.1689106023864; Tue, 11 Jul 2023 13:07:03 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1689106023; cv=none; d=google.com; s=arc-20160816; b=AIhGXCMHHRAY+HUtWUeiEvYR5GAw4K3BHurfwwu0YUuxFXlGNGnsSVbSiBWUYyIl9M xubUeoem50LfVoNAmFtWOXV4H/P2qJJNFPoNmvGwn20B3FFGMvH6TqNW0UsWcJASDOuU 3ADJFs3JeFlrbQtGfo8/jUiphp2LtMbaApvLqRDZ6MUdBmdempxZH/fId97NDKWoi9Nn /4qYz2VnLGutTKggQeI+BnPYjaYHN2TqqRSa4T8LAmrc8xJuxW9il1udk6xYH+x8dExx l1xywAV9JMLPMn/B6jkdlGZmtUwj/K7edffXZVETJ8sHMTYSRjDofqhCoJnLqPGoXQ8d P6eA== 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=ep01T2EI5m6b19XGnZKBQ0Dlpp+OmG7l7te+ceFlix+1IJdVJRmyxlRN8j7KRsqop+ KXq14bkb05SF/sWqGfFjy/uk+xipqSYCbRaSOByyFb2qW8UBbV4p77T8emOM9Ad5TLyq zFBssa56Gasm2gw2qffabEuEWrQDcuX11bWHVOtao1qP+pl52DLS8lVYgC3oycYcWR7i mfHOtwqso5y3A6zO9CxxR/7dqDa4yRLhi/NnmWTr1Z1A+2S7HiqaWSnceJ/rMvgBKIfV LVspthRKS4syKHbj283ChYwWKiZSYSyjZ+QbTfK3uEpGtxC8zDmaaFurdlZFadn6Yw/o gTaA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@sberdevices.ru header.s=mail header.b=hHOi9GoS; 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 r25-20020a170906281900b0098652857e36si2343924ejc.282.2023.07.11.13.06.39; Tue, 11 Jul 2023 13:07:03 -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=hHOi9GoS; 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 S231776AbjGKUCR (ORCPT + 99 others); Tue, 11 Jul 2023 16:02:17 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:33136 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231571AbjGKUB4 (ORCPT ); Tue, 11 Jul 2023 16:01:56 -0400 Received: from mx1.sberdevices.ru (mx2.sberdevices.ru [45.89.224.132]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 367EF170C; Tue, 11 Jul 2023 13:01:53 -0700 (PDT) Received: from p-infra-ksmg-sc-msk02 (localhost [127.0.0.1]) by mx1.sberdevices.ru (Postfix) with ESMTP id 4493E120013; Tue, 11 Jul 2023 23:01:51 +0300 (MSK) DKIM-Filter: OpenDKIM Filter v2.11.0 mx1.sberdevices.ru 4493E120013 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sberdevices.ru; s=mail; t=1689105711; bh=98khYn1fztt12eqMcHqL5Q5p7BU+eCOCeF+HxCxX/Ck=; h=From:To:Subject:Date:Message-ID:MIME-Version:Content-Type:From; b=hHOi9GoShhHHW3AUYgngf7AKRqifvZSKrVQzFkRLNSJl1x9OTelxk0azcBreVaz1O 9aGUzYb4xoFcmY7FfpAY6ucHL40Uz/i/uAojP1zQmwUfe1d/UyOc/FGk9zQomK5g9x YtK3lxw2LYaCcyNffyEtjb/SgoRUExcIJvkCmn5uXgtvzVq4teaONNTHnGxKnf1AvZ 3vQVoxOMweRFgcv2cKH1Ei+jVjT8k+97laoQKcpQtZUfE7frNzwYPpRE/Quwh7rGDk qsyGnaUdJOv2Msxw/eUHthgcUrqVbRsvlRrP3ZiiRE8P4hJNV5/JOPpF/8OJ6BjQa8 90VaphuPaV/dQ== 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; Tue, 11 Jul 2023 23:01:51 +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; Tue, 11 Jul 2023 23:01:40 +0300 From: George Stark To: , , , , , , , , CC: , , , , , George Stark Subject: [PATCH v5 4/6] iio: adc: meson: add enum for iio channel numbers Date: Tue, 11 Jul 2023 23:00:20 +0300 Message-ID: <20230711200141.239025-5-gnstark@sberdevices.ru> X-Mailer: git-send-email 2.41.0 In-Reply-To: <20230711200141.239025-1-gnstark@sberdevices.ru> References: <20230711200141.239025-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: 178558 [Jul 11 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: 521 521 0c3391dd6036774f2e1052158c81e48587b96e95, {Tracking_from_domain_doesnt_match_to}, 100.64.160.123:7.1.2;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;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/11 13:07:00 #21597915 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: 1771156037731725266 X-GMAIL-MSGID: 1771156037731725266 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 Tue Jul 11 20:00:21 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: George Stark X-Patchwork-Id: 118700 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:a6b2:0:b0:3e4:2afc:c1 with SMTP id c18csp714651vqm; Tue, 11 Jul 2023 13:06:52 -0700 (PDT) X-Google-Smtp-Source: APBJJlGSrEGGMYH8ja7RCfzFeDRrA8Wu7RRDCL3XDp1Cky2R9PKWd0EfVDfGSOVkHTqk+rmml6fI X-Received: by 2002:a05:6a20:a114:b0:132:86ea:4725 with SMTP id q20-20020a056a20a11400b0013286ea4725mr1625430pzk.45.1689106011660; Tue, 11 Jul 2023 13:06:51 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1689106011; cv=none; d=google.com; s=arc-20160816; b=mcsfoms+IcW6X8/7VT9GJ+BFkINxzlxfzMJ8VWU0tcMUl3Cod0mUY1yUh0G0g2MRH4 nR84XuIE0yPa7aTBaV5vgHgob9TVG4z4/mxrpo+DZIR/pJbXlBuz7Hu5IcMIF4nEoUVm y3tVs2iT7/5cdauCIH4jKnTueNfI+RKoZO6n/jLJCEogR7vrIlkoCLzyccqbpGS467H4 OB/Pdv8PN1aSRSB7VWw4VSZ7w8xsALXhTiLnbe6RtESNRBp93ZhGXl1w7RMjXS91hnl3 9+6ovrj1YuEadCi6DKUVgsWLjGcu4sfRlMRBauR33zoPe4CUwRPzAJZq3/VzcilwH3jl IM7Q== 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=g/m3jgQvRqComsOjcKXElElHR44H0s8Y7oshWvPitXo=; fh=Nkpk7VjQstRrk/SIKeFB2DsfhHIA7OANQWPD54Aly/o=; b=ayA60LKsksw+if2t95gE4pbaGGMzFPM5i/5FIcaLXCirLtn/9DcZnIy+SqeyqCbyc0 ZD8PbB9RsUC2CIFckYKUsSPhG8gl0hnyuG6ULE6QmKqgIfBLGhOTfBZRHMEieR8+gMaJ I0u+rUnkJnOfxwSsNyNOgnBrvMMzTfm7AjWz3C9MWJ7r0/vFUpK9heBRnfyCr5yHK3Hy wVQEWxoi1wEazdj0FRMvegMAakrYrY6sY9JmH2CgsuqoE/kkhD1zB+DaIkx2Dc9icaj4 yx9OlLhC+sAcal9p5+k4eH+prfVi0lu/lwPtwCeBaqYe662+wYtYfvqonCRVakL1HZFe oe5A== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@sberdevices.ru header.s=mail header.b=pjVwo0uy; 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 c11-20020a056a000acb00b006826f3512fbsi1960409pfl.253.2023.07.11.13.06.38; Tue, 11 Jul 2023 13:06:51 -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=pjVwo0uy; 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 S231674AbjGKUCI (ORCPT + 99 others); Tue, 11 Jul 2023 16:02:08 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:33150 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230490AbjGKUBz (ORCPT ); Tue, 11 Jul 2023 16:01:55 -0400 Received: from mx1.sberdevices.ru (mx2.sberdevices.ru [45.89.224.132]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id C73AA170F; Tue, 11 Jul 2023 13:01:53 -0700 (PDT) Received: from p-infra-ksmg-sc-msk02 (localhost [127.0.0.1]) by mx1.sberdevices.ru (Postfix) with ESMTP id 68913120014; Tue, 11 Jul 2023 23:01:51 +0300 (MSK) DKIM-Filter: OpenDKIM Filter v2.11.0 mx1.sberdevices.ru 68913120014 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sberdevices.ru; s=mail; t=1689105711; bh=g/m3jgQvRqComsOjcKXElElHR44H0s8Y7oshWvPitXo=; h=From:To:Subject:Date:Message-ID:MIME-Version:Content-Type:From; b=pjVwo0uyubwPbkRc0FHCf5A8xiVRcZGanUGf6Q3/OvyDZFJ/ztTvabSkQLzGhwHur u74kN/5ZsqdNhw2vSdnEwIgFVb96DZuJTPFmsALcGv7BxMVbkLXAu3JNQDAW/4i506 KdyrIXLXd3aCVSWKvUGqMEYWFp3jhQLfAVk0JOcDUe6sluaXbVXuylVAZ+cvm8Ll/4 t4TkebQ4wJ3NC+UGoqlJLRnHWmqPy0xzY+XHJ2SmZt6AJVJAQ1ASVAmaQiQtybPdFx fcPNYnw5HWMRiozRIXT8UQCl0yOFWdN1bzC6sll1UjIBkbqd8V+NJrAeA2HFS0biss 0ugSvtx9s4lVQ== 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; Tue, 11 Jul 2023 23:01:51 +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; Tue, 11 Jul 2023 23:01:40 +0300 From: George Stark To: , , , , , , , , CC: , , , , , George Stark Subject: [PATCH v5 5/6] iio: adc: meson: add channel labels Date: Tue, 11 Jul 2023 23:00:21 +0300 Message-ID: <20230711200141.239025-6-gnstark@sberdevices.ru> X-Mailer: git-send-email 2.41.0 In-Reply-To: <20230711200141.239025-1-gnstark@sberdevices.ru> References: <20230711200141.239025-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: 178558 [Jul 11 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: 521 521 0c3391dd6036774f2e1052158c81e48587b96e95, {Tracking_from_domain_doesnt_match_to}, 100.64.160.123:7.1.2;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;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/11 13:07:00 #21597915 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: 1771156024896386658 X-GMAIL-MSGID: 1771156024896386658 Add channel labels to provide human-readable names for the inputs. 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 Tue Jul 11 20:00:22 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: George Stark X-Patchwork-Id: 118699 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:a6b2:0:b0:3e4:2afc:c1 with SMTP id c18csp714274vqm; Tue, 11 Jul 2023 13:06:07 -0700 (PDT) X-Google-Smtp-Source: APBJJlHgnxrooWfjyYTtulq2/yGRUsihHAThAxCnuvaXSFe0mBEJIHkZUwoXAf5BTJ53XqUY6NPJ X-Received: by 2002:a05:6a00:23d2:b0:664:9579:d31c with SMTP id g18-20020a056a0023d200b006649579d31cmr21687134pfc.8.1689105966844; Tue, 11 Jul 2023 13:06:06 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1689105966; cv=none; d=google.com; s=arc-20160816; b=ImAifrubvKkNivoRReUBlN7oIREmlwpSIOtgFHD51lz5Wy1PWm1kVG4FVgIT71Cqcs RXUZnQ7zY+AsKmV2HrZ30VG4NmlnQ9V8PU2uH7wc6vo9H6dzLZOjhqwxCeLBp/Ea1Goe WHANmZj6AH/6EW78WCwWHmivpxwC1kcD1p3+wEHHkHBguiwNlOcs1W0aQGt2azlNSq0n aGG1d4CiEqGIdfZwYrBNWagkr0hj48RhOm4G7Cj+WURK5n8w9qi1YeEUr69W+DzMtMI2 56oFDuZTk409B8U0gGhEOEIvfGYEm3oVXxP5tajxCTJcf8nHqQD+mAHLc5PZQc+ub1NE NaTA== 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=8BKw71OeD52lP2HyAH4lqIfE/i2/ZjMijw07hUa9c9c=; fh=Nkpk7VjQstRrk/SIKeFB2DsfhHIA7OANQWPD54Aly/o=; b=TY4NfgejAkTtgrXemD6OcScyc2+SnZeT7I8LHPknivN42hLFLDx6+FMvZOJs6S/F7J 8FEQsPyvCDb8Glfx4RvkuBl7s6qbLAP0nRYNKFs7mcFPlwCB0BO48FGT4gtYoLC5yEvh t/BUp00Xd/ZfmsVbLpkenQEVLoZGC+g3exIY56aVtwDT051SUO+Szc5MIov6QYkwW9Xa SZGPVEVtR20dKKeK6swPRO5grW/QaQqi17e/heZFJ8Hb0KxuQQDjkCUHFuzO3HA1Wm37 oACpoiFNN2dUA9QLOWeGXQVPUW/PdLBRCo9nkVfZnMndFtTaS7b7dxy56nMjwUx31JLl AVHA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@sberdevices.ru header.s=mail header.b=GAfwTWoP; 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 a62-20020a639041000000b0055c3f915b0asi1917736pge.733.2023.07.11.13.05.51; Tue, 11 Jul 2023 13:06:06 -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=GAfwTWoP; 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 S231703AbjGKUCC (ORCPT + 99 others); Tue, 11 Jul 2023 16:02:02 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:33146 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231455AbjGKUB4 (ORCPT ); Tue, 11 Jul 2023 16:01:56 -0400 Received: from mx1.sberdevices.ru (mx1.sberdevices.ru [37.18.73.165]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 0CF52139; Tue, 11 Jul 2023 13:01:53 -0700 (PDT) Received: from p-infra-ksmg-sc-msk01 (localhost [127.0.0.1]) by mx1.sberdevices.ru (Postfix) with ESMTP id 9D200100016; Tue, 11 Jul 2023 23:01:51 +0300 (MSK) DKIM-Filter: OpenDKIM Filter v2.11.0 mx1.sberdevices.ru 9D200100016 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sberdevices.ru; s=mail; t=1689105711; bh=8BKw71OeD52lP2HyAH4lqIfE/i2/ZjMijw07hUa9c9c=; h=From:To:Subject:Date:Message-ID:MIME-Version:Content-Type:From; b=GAfwTWoPOOJfQBsZs6Q+3MROuawWY/ILpCe0SC9q6uwG1sQKoa4ow7t0qVIfQGPJf fThiKTForGiO9n6YUEAmS8xAn5rvjxZnjrwE946odU0pX3U3lU0dUVYRhgyXny8+Bu 2kTz9848+e2CJ+K82A05tEluvL7i4nGJs79Y9FxzxeDBjkuZlNmAc+yMPniwIU9PO/ 1JtRIFloC2iwRt13IDu4ZUQ7BVYzlKp9jGe0EmQuQEqskKPA2kf73mxSvvsEUMx6zw YUWXHDRuUAUF5YCjgaRtyWcJvVUkVaFlXWmeZSukJr1qAehxOoZoJdxwH74XpSRreB 9lUjXjl5xk6Fg== 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; Tue, 11 Jul 2023 23:01:51 +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; Tue, 11 Jul 2023 23:01:40 +0300 From: George Stark To: , , , , , , , , CC: , , , , , George Stark Subject: [PATCH v5 6/6] iio: adc: meson: support reading from channel 7 mux inputs Date: Tue, 11 Jul 2023 23:00:22 +0300 Message-ID: <20230711200141.239025-7-gnstark@sberdevices.ru> X-Mailer: git-send-email 2.41.0 In-Reply-To: <20230711200141.239025-1-gnstark@sberdevices.ru> References: <20230711200141.239025-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: 178558 [Jul 11 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: 521 521 0c3391dd6036774f2e1052158c81e48587b96e95, {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;d41d8cd98f00b204e9800998ecf8427e.com:7.1.1;127.0.0.199:7.1.2;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/11 13:07:00 #21597915 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: 1771155978158448500 X-GMAIL-MSGID: 1771155978158448500 Meson saradc channel 7 is connected to a mux that can switch input to well-known sources like Vdd, GND and several Vdd dividers. Add IIO channel for every channel 7 mux input. 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;