From patchwork Wed Jul 12 23:10: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: 119420 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:a6b2:0:b0:3e4:2afc:c1 with SMTP id c18csp1482211vqm; Wed, 12 Jul 2023 16:38:02 -0700 (PDT) X-Google-Smtp-Source: APBJJlEBQfEop0q90BuavHptPIo6x9ZSWyFkin3AOhWIgpzA6T+Qhe0gWtuixH0haKVB9AZxboQR X-Received: by 2002:a05:6358:2610:b0:134:d24d:86b with SMTP id l16-20020a056358261000b00134d24d086bmr457117rwc.16.1689205082631; Wed, 12 Jul 2023 16:38:02 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1689205082; cv=none; d=google.com; s=arc-20160816; b=E0CzUx2Jn71iE6mJ7QYTt9qlDJu3j2t1TniUdslwWjzh3TfgR2we0NTZJicGNB7znW bbZUzla3VD3fgi03HsSiCrflZ0OY7LTMVu8FWuIrAyqFboCkn9P/A8qvaAzm98RRW/IU cWcrtouP/jFqffK4VEmbpEvFBVqUzZyJ7FROKI+Jrv0elgC3WqD5YPv+/Q38KwweryE9 LwLuzwoJjPvdeHEglBr07z5eHnzylH3v1kyCLAGdKhKk9SQ3bJuCNdEayjD7k7t3FaIa 1ZctsAuMQA6nUpTz9msSHrLucsUsboiDQEuNEUBFm25GcdSNPmSlFAOqCp62I89H1CD/ w0lA== 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=XYGb6CroeS/tDcH0CS/bQBaTYwbRUNx3lpWuPLDd3LGJ6nXMKI0vc3HkqNxpeV0RCU m0NFyvei8R8VwGQhPNHp41e+pjZloc0SWlfjmGDasJ+yj0xFqxbQDaXZbmWBSXRLTcIh RGe5E7oZdsuqO8mPoEvsuQqm9PMH0SNhx1lwNjihvR0EOil/MqWvqa6B3R/T4ka4fVoD JFGXGHzKulje+TMhk/lEP3gS9Nvljqz+6jBaeveYSlvm1N6s21HCPJT4T/My9HqEtPAH 9vwRqcvz6ROSzGDz8JDO/I8RMz3tV2jEzvVLSH7jzYp61Rg14M2bFtTqyam4C1THvSoC SxJw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@sberdevices.ru header.s=mail header.b=Ck87GP39; 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 a192-20020a6390c9000000b0055c875d784dsi170910pge.374.2023.07.12.16.37.49; Wed, 12 Jul 2023 16:38:02 -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=Ck87GP39; 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 S233070AbjGLXMX (ORCPT + 99 others); Wed, 12 Jul 2023 19:12:23 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:59668 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232140AbjGLXML (ORCPT ); Wed, 12 Jul 2023 19:12:11 -0400 Received: from mx1.sberdevices.ru (mx2.sberdevices.ru [45.89.224.132]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id E5C1010D2; Wed, 12 Jul 2023 16:12:09 -0700 (PDT) Received: from p-infra-ksmg-sc-msk02 (localhost [127.0.0.1]) by mx1.sberdevices.ru (Postfix) with ESMTP id 7FEB1120025; Thu, 13 Jul 2023 02:12:07 +0300 (MSK) DKIM-Filter: OpenDKIM Filter v2.11.0 mx1.sberdevices.ru 7FEB1120025 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sberdevices.ru; s=mail; t=1689203527; bh=m3UMUUxQmGpFqfZrTXPJiSCifxETsKYb/UHHJV0Y7yo=; h=From:To:Subject:Date:Message-ID:MIME-Version:Content-Type:From; b=Ck87GP39hGj3h7T86NNXyrrjLcxNs6KmPSSRhmMvsb4mgY+v1zPJIWcSs901m/h9j RWEHiqcG56tv2vHzvZ2k9HOcXGb2DxT6JFssAoJVI6hj5qdquibdKK3wYsvcuTM47o DMwWeT6nojRHpGo8NO0eVRKEiNSX14AEM1jAseyeSnQ/E0O5GBthe01rxPwdj776wz g3Ff+ySIS5SeXHfdr/ofd+Q1kz7GeASUVwq8YQpdlIfucRHLHSiNoYWCoklsf3p4FY JbdBDsTjr8dD01qZAZ4EvMGEMeXzwmxNC7AfoLg0ZTt7pGMhGpWk6ZB0s0PGK/ZrXy HRIaAY6oDgDWg== 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; Thu, 13 Jul 2023 02:12:07 +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; Thu, 13 Jul 2023 02:11:47 +0300 From: George Stark To: , , , , , , , , CC: , , , , , George Stark Subject: [PATCH v6 1/6] iio: adc: meson: remove unused timestamp channel Date: Thu, 13 Jul 2023 02:10:42 +0300 Message-ID: <20230712231157.261245-2-gnstark@sberdevices.ru> X-Mailer: git-send-email 2.41.0 In-Reply-To: <20230712231157.261245-1-gnstark@sberdevices.ru> References: <20230712231157.261245-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: 178587 [Jul 12 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}, sberdevices.ru:7.1.1,5.0.1;p-i-exch-sc-m01.sberdevices.ru:7.1.1,5.0.1;100.64.160.123:7.1.2;127.0.0.199:7.1.2;d41d8cd98f00b204e9800998ecf8427e.com:7.1.1, FromAlignment: s, {Tracking_white_helo}, ApMailHostAddress: 100.64.160.123 X-MS-Exchange-Organization-SCL: -1 X-KSMG-AntiSpam-Interceptor-Info: scan successful X-KSMG-AntiPhishing: Clean X-KSMG-LinksScanning: Clean X-KSMG-AntiVirus: Kaspersky Secure Mail Gateway, version 2.0.1.6960, bases: 2023/07/12 10:49:00 #21602221 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: 1771259908309696011 X-GMAIL-MSGID: 1771259908309696011 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 Wed Jul 12 23:10: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: 119412 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:a6b2:0:b0:3e4:2afc:c1 with SMTP id c18csp1478766vqm; Wed, 12 Jul 2023 16:30:04 -0700 (PDT) X-Google-Smtp-Source: APBJJlGVFkwrQAVnICvCVxw1m7LP0pZi8BspJ0DBWOvPBF42WMyMRWo/CqWnCpv+9x0ZtN7BclIJ X-Received: by 2002:a05:6402:203a:b0:51d:e30b:f33a with SMTP id ay26-20020a056402203a00b0051de30bf33amr154107edb.34.1689204604129; Wed, 12 Jul 2023 16:30:04 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1689204604; cv=none; d=google.com; s=arc-20160816; b=tABiuI0BPPGrLQrpTYaSXufLko/+Pv5hGrxH8dNyPbX/i45JNdahifsvZE3FrQY8BY BL+Qi5Mb4gxUU3jLOYerATR+/9R5rmnSCA2kLJxf/Dnmpk7mtodil63wa4edsRS4bhYS m9owt3QNOaleexouLNrW6Oco9h56+VL8pcJBE/uJjy5ObccgQGdDdjfsA4tOT+Gdycaa p394fDSS+nOueXt/qVRXqMfyOjNaTZGVNhoyKlOSNGK3kAcEd9ds7rlZYTaBi7q8w2GS jUYipl3f53y/94kAdBpUXibbBHnRA+JCVLHBnK2azYRqEChgnywtUfKQaVSUAhhKOoCw /bZQ== 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=M+xtk+lt8C3i50VVIxE/S0SLHHbSuZneXMLbh20nk3k=; fh=Nkpk7VjQstRrk/SIKeFB2DsfhHIA7OANQWPD54Aly/o=; b=BbJHpCr22PWFjfhjTCQIMocXsjR/m32Y6wUubJr51lMrRsokW7gx3QBwUxBLw0s/kZ Keln5xtAEZsYqksM+0c/846fbVRM6+HUst9eFnTkxvV39IzNITLS8H7U5hrr+2vnK1UI T0LkYnOMFIa1g5zANYlhiHJICUPM8zufPYOtLktuaGl4KMQ7slnh0/uhJs2jJxj+ngyh 5Np85xl60Puaxb8hQB3avYqFKegqw9799MEP/+cvD3oazxCPrS7KmNMLMFjVkx9rXh2B 7cn4dlI3DGPuTV7pIHP2itVosY/zHwyAIlO25jMyVVBjrD5h7CBVzXvLxRJYAJu5tIMz 409Q== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@sberdevices.ru header.s=mail header.b=C5Z1CdMA; 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 w2-20020a50fa82000000b0051e166d65bdsi5687028edr.354.2023.07.12.16.29.40; Wed, 12 Jul 2023 16:30:04 -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=C5Z1CdMA; 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 S233190AbjGLXM1 (ORCPT + 99 others); Wed, 12 Jul 2023 19:12:27 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:59684 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232569AbjGLXML (ORCPT ); Wed, 12 Jul 2023 19:12:11 -0400 Received: from mx1.sberdevices.ru (mx2.sberdevices.ru [45.89.224.132]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id E8CDE10D4; Wed, 12 Jul 2023 16:12:09 -0700 (PDT) Received: from p-infra-ksmg-sc-msk02 (localhost [127.0.0.1]) by mx1.sberdevices.ru (Postfix) with ESMTP id A7660120026; Thu, 13 Jul 2023 02:12:07 +0300 (MSK) DKIM-Filter: OpenDKIM Filter v2.11.0 mx1.sberdevices.ru A7660120026 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sberdevices.ru; s=mail; t=1689203527; bh=M+xtk+lt8C3i50VVIxE/S0SLHHbSuZneXMLbh20nk3k=; h=From:To:Subject:Date:Message-ID:MIME-Version:Content-Type:From; b=C5Z1CdMAQuQxfHSr6PUbYPeR/z7ZeA8VRGyCPuqvbyD1PRBVc/rifiEUOit4fSzbA 2e+M1rptPpks33BkNyX6kpX7Ot+ydswfUuol71lVDqNrprvm86DqpYHorCdpR2X6AC FE3Pv7MJrwzvKAfDZ1Uy4p9WBHwQacxhwOvJkO0Hy1P9Jcje5JdtwqPFU23K3dxN5D nWFGN2oaxQLPRq4u8JhMqSrlHsuYcLX9KAx9gwI2eRiKZLsxVvzh+XbM7gboIsN0Fe ue/63njGaAefkNYftejeUGQoUz7QH+tjo2mchZDfMjgof7k96dD4jTW+S0PHKTlaXk KgTtge5+u0mPA== 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; Thu, 13 Jul 2023 02:12:07 +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; Thu, 13 Jul 2023 02:11:47 +0300 From: George Stark To: , , , , , , , , CC: , , , , , George Stark Subject: [PATCH v6 2/6] iio: adc: meson: move enums declaration before variables declaration Date: Thu, 13 Jul 2023 02:10:43 +0300 Message-ID: <20230712231157.261245-3-gnstark@sberdevices.ru> X-Mailer: git-send-email 2.41.0 In-Reply-To: <20230712231157.261245-1-gnstark@sberdevices.ru> References: <20230712231157.261245-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: 178587 [Jul 12 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}, sberdevices.ru:7.1.1,5.0.1;p-i-exch-sc-m01.sberdevices.ru:7.1.1,5.0.1;100.64.160.123:7.1.2;127.0.0.199:7.1.2;d41d8cd98f00b204e9800998ecf8427e.com:7.1.1, FromAlignment: s, {Tracking_white_helo}, ApMailHostAddress: 100.64.160.123 X-MS-Exchange-Organization-SCL: -1 X-KSMG-AntiSpam-Interceptor-Info: scan successful X-KSMG-AntiPhishing: Clean X-KSMG-LinksScanning: Clean X-KSMG-AntiVirus: Kaspersky Secure Mail Gateway, version 2.0.1.6960, bases: 2023/07/12 10:49:00 #21602221 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: 1771259407205627514 X-GMAIL-MSGID: 1771259407205627514 Allow 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 Wed Jul 12 23:10:44 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: George Stark X-Patchwork-Id: 119422 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:a6b2:0:b0:3e4:2afc:c1 with SMTP id c18csp1482314vqm; Wed, 12 Jul 2023 16:38:18 -0700 (PDT) X-Google-Smtp-Source: APBJJlHGHQzBzlwSc58itL4Z7swreeKcDnWmnm9p7UW1TfX5j8bFO/bGF6bph7pNjftPF1XcFMAK X-Received: by 2002:a92:cb0f:0:b0:345:aba5:3780 with SMTP id s15-20020a92cb0f000000b00345aba53780mr20778711ilo.22.1689205098514; Wed, 12 Jul 2023 16:38:18 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1689205098; cv=none; d=google.com; s=arc-20160816; b=0DNtwxZ9ZD6ZAJV+L2mTXbMd9PvEeHRgaT9qi5YWBobOftDVOa5+54lC/UKzsVNCR4 ylQ1E22JI8T8XwAWvNt3K8XFTZu3fLrknqMSVlb88QhJGK0qzLdbF8ZthSL5dxfB04vt JrLeUpqC8gvDEoYHuxy6QjLydezxWwYsxGB4XDzoaiUfvDZNq76RuLD47X9jmzj1f+8v v0nt6h1Y0UMZBTEe56Gcwo/GCXrlODnAKheAkZFNtaks4lB6xq0STIbplZ1hiX7z32sV W19MaLe6dg7A02HHyVzHMZN6C0v72aKORZ4nk5p8oLPejHh2pUXbi9U6KVO/Hgv3GRqG rZ0A== 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=zepCR8ivj1lp2ezam3ZGoENLF/V6fGJqXHQX5mB8FJc=; fh=Nkpk7VjQstRrk/SIKeFB2DsfhHIA7OANQWPD54Aly/o=; b=xgs0HsX9g3nIBhronWK0gm87opqMZETAlJ30k5Az1dxmmH8k33SFs8kghl/gDHy5Mi FDBdHLNFy4MjL/KtPRqdeNUYdHlxenBDKoZP8HvITXqiRthpmeVNEfSjEzU4LtuA6y4k BeDfad8ajZK/HDPmHVpKZGoj9NUKFXedtaHpF0KgZwiMrHWh/3Tc5TFXkXeb1IEe/4VY l4SHEgqsbKDdtpTY/Ag8U6g+lSKKdubC464foCrYs4AkfFyL8sqonZIi1HyuoUgWMaw2 HwcpyHFNVuakMzDDELIOMSK6WDWagr/LY4U3CHgA/VnNsCW93PzuIqbxHqBhvdY5Qgjr NF6Q== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@sberdevices.ru header.s=mail header.b=qg6f7uoh; 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 c1-20020a655a81000000b005572b563e65si3960137pgt.305.2023.07.12.16.38.04; Wed, 12 Jul 2023 16:38:18 -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=qg6f7uoh; 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 S232957AbjGLXMV (ORCPT + 99 others); Wed, 12 Jul 2023 19:12:21 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:59682 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232014AbjGLXML (ORCPT ); Wed, 12 Jul 2023 19:12:11 -0400 Received: from mx1.sberdevices.ru (mx2.sberdevices.ru [45.89.224.132]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id E9016173C; Wed, 12 Jul 2023 16:12:09 -0700 (PDT) Received: from p-infra-ksmg-sc-msk02 (localhost [127.0.0.1]) by mx1.sberdevices.ru (Postfix) with ESMTP id CFBD5120027; Thu, 13 Jul 2023 02:12:07 +0300 (MSK) DKIM-Filter: OpenDKIM Filter v2.11.0 mx1.sberdevices.ru CFBD5120027 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sberdevices.ru; s=mail; t=1689203527; bh=zepCR8ivj1lp2ezam3ZGoENLF/V6fGJqXHQX5mB8FJc=; h=From:To:Subject:Date:Message-ID:MIME-Version:Content-Type:From; b=qg6f7uohyYCVPJBW3RMqOj9zTBN+7Yx1qP/LfjRscSGd1CBfxDCc8HzEXwQpZPORJ qN9t+nJmekSb+Q0AW1OzGqFAj0irydtR/2NyCeEpObdddnU7GPp8EEqT+6k5cX8neD /RM7a1N1UCBOvf22NgjHK5UXqI3BmrocDYqpbCJmnSJ3rkPsqwv8GhhPvs3dI9k5i6 +KuTbbKXUDZTe7InAzSddQDXF8TKrygRzQ+Zf3aNhNnG7sByPLV8Gclnn1jFlhgBRM jDBOlcDhrpqhoF1Z7YDWaQvt93FXK8D/eN6LxQ9PO8vEA9O4ggLStZgspWB2QpKkWL mMURtcbyHs+XA== 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; Thu, 13 Jul 2023 02:12:07 +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; Thu, 13 Jul 2023 02:11:48 +0300 From: George Stark To: , , , , , , , , CC: , , , , , George Stark Subject: [PATCH v6 3/6] iio: adc: meson: move meson_sar_adc_set_chan7_mux routine upper Date: Thu, 13 Jul 2023 02:10:44 +0300 Message-ID: <20230712231157.261245-4-gnstark@sberdevices.ru> X-Mailer: git-send-email 2.41.0 In-Reply-To: <20230712231157.261245-1-gnstark@sberdevices.ru> References: <20230712231157.261245-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: 178587 [Jul 12 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}, sberdevices.ru:7.1.1,5.0.1;p-i-exch-sc-m01.sberdevices.ru:7.1.1,5.0.1;100.64.160.123:7.1.2;127.0.0.199:7.1.2;d41d8cd98f00b204e9800998ecf8427e.com:7.1.1, FromAlignment: s, {Tracking_white_helo}, ApMailHostAddress: 100.64.160.123 X-MS-Exchange-Organization-SCL: -1 X-KSMG-AntiSpam-Interceptor-Info: scan successful X-KSMG-AntiPhishing: Clean X-KSMG-LinksScanning: Clean X-KSMG-AntiVirus: Kaspersky Secure Mail Gateway, version 2.0.1.6960, bases: 2023/07/12 10:49:00 #21602221 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: 1771259925048253092 X-GMAIL-MSGID: 1771259925048253092 meson_sar_adc_set_chan7_mux is a basic func() for writing single register, defined as static. Moved it up so it could be used in more places. Signed-off-by: George Stark --- 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 Wed Jul 12 23:10:45 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: George Stark X-Patchwork-Id: 119402 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:a6b2:0:b0:3e4:2afc:c1 with SMTP id c18csp1474271vqm; Wed, 12 Jul 2023 16:20:00 -0700 (PDT) X-Google-Smtp-Source: APBJJlFtUEr8AHPhqPOJNa8kFh04AyGBXADUZhMXwSJRuhDH6QNzaHxQ1wzU6L+u8qJjIYpWp7GB X-Received: by 2002:a05:6358:5e1a:b0:134:ddad:2b4f with SMTP id q26-20020a0563585e1a00b00134ddad2b4fmr273707rwn.18.1689203999781; Wed, 12 Jul 2023 16:19:59 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1689203999; cv=none; d=google.com; s=arc-20160816; b=dq2qv35FJ1qJOqw9TlQqNkgs7kGF7M6yopVIL5M/E6MO0w189kqKY16STtjYA6VnEo E9pboL6PUU4X0gCvA5pXFLsWZjYjt8ZzLykTpUYJRmwWEhToMgvs9VmbxMSnWWUtPFXK WwwAM4AgxIwpVAa4cvtSiKscIq3GJBsMBke28y6azV2zVElRRykF2GU+J7Tsjo8jzuyB IxIDymZaLSNhSJWPGiG4xu2Lr7Fy0PKoOyiXtqLFIgh/SJjtFMxG/TT+4Jw1nKupnFwM 559DiW0thK7Zytd+zqIsUOUhPvRcycuu9Q7UNsuQj86EMhgZfg1KBU3lFaHh3xhLIvet CbMQ== 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=A/wtK/3tCNIQmZM0Ud52E2DtcHCYMdFm9aDSX8DmU5GYIgOFpeHCbA832EW56VFGH5 nKQrsb3yxKOcLLRdKw8M3IGO0mv5KdqTkFNtHHaahO66XhcPzJgwHeD/2a/ynwH0ystg Rl8S8JhH9n2CUHjw/Z4OifA4MbPyHKtpLae8oAzP4Q0g8K1XWNP/sHeKh6cLpjCzcMrb z2ISdcj99n/Gn9qU1nQamzHgKA5/1Lg4zD1Er8y6L9l8DgaRgUUepj5n3ygT1g2Xv81Z KAMPQmom4c/mO5W0Of7MqKxBtJBvF+weO4KdlplFsV+Vfyb6jRMigf4LaoSNE3C3v1fL jRiA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@sberdevices.ru header.s=mail header.b=HWUZo+0l; 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 k68-20020a633d47000000b0055793097dbesi3949690pga.469.2023.07.12.16.19.46; Wed, 12 Jul 2023 16:19:59 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@sberdevices.ru header.s=mail header.b=HWUZo+0l; 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 S233140AbjGLXMT (ORCPT + 99 others); Wed, 12 Jul 2023 19:12:19 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:59652 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231924AbjGLXML (ORCPT ); Wed, 12 Jul 2023 19:12:11 -0400 Received: from mx1.sberdevices.ru (mx1.sberdevices.ru [37.18.73.165]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 7C54B18E; Wed, 12 Jul 2023 16:12:09 -0700 (PDT) Received: from p-infra-ksmg-sc-msk01 (localhost [127.0.0.1]) by mx1.sberdevices.ru (Postfix) with ESMTP id 0C0CE100023; Thu, 13 Jul 2023 02:12:08 +0300 (MSK) DKIM-Filter: OpenDKIM Filter v2.11.0 mx1.sberdevices.ru 0C0CE100023 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sberdevices.ru; s=mail; t=1689203528; bh=98khYn1fztt12eqMcHqL5Q5p7BU+eCOCeF+HxCxX/Ck=; h=From:To:Subject:Date:Message-ID:MIME-Version:Content-Type:From; b=HWUZo+0l5D7O5Y4TTzYcYdQhy2ZAG2Zb6v4VKQ5ZAfmDke+XSOcGmsi8GN9eFMNdD zeA8G5hrxG5rEzVb0kGkC8FH9Ki5P6PanyASef7032Sr2+WOpuOJNnmW27TWPBhhTR 6NgTVn33MI8no7jiE8o5gTeH0LpGIJqpXj/sIVQ36BrlitkIVhR6VKZ3jkmJ6dNhAQ cU/2EWktWFy3RXZ9so2qZBkwLWtG6DsNECo7VfBCXx1p2ZQA0UrLg5WlpuiWExB8Mc teouz4xcwMZTamvd9Ix2Hg8ysMQtU95bKiiDC/5yINbds55/bPkbMHDyjOxZtaNpts 2TopbaZoKc0eg== 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; Thu, 13 Jul 2023 02:12:07 +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; Thu, 13 Jul 2023 02:11:48 +0300 From: George Stark To: , , , , , , , , CC: , , , , , George Stark Subject: [PATCH v6 4/6] iio: adc: meson: add enum for iio channel numbers Date: Thu, 13 Jul 2023 02:10:45 +0300 Message-ID: <20230712231157.261245-5-gnstark@sberdevices.ru> X-Mailer: git-send-email 2.41.0 In-Reply-To: <20230712231157.261245-1-gnstark@sberdevices.ru> References: <20230712231157.261245-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: 178587 [Jul 12 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:7.1.1,5.0.1;sberdevices.ru:7.1.1,5.0.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/12 10:49:00 #21602221 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: 1771258772698865743 X-GMAIL-MSGID: 1771258772698865743 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 Wed Jul 12 23:10:46 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: George Stark X-Patchwork-Id: 119409 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:a6b2:0:b0:3e4:2afc:c1 with SMTP id c18csp1478077vqm; Wed, 12 Jul 2023 16:28:30 -0700 (PDT) X-Google-Smtp-Source: APBJJlEGrjR/rAyF8nLV+BImGgCQKuX55g79s4H7hDfkUvXEnrp/2YDCWoI4rrM0b/6SjDM90fum X-Received: by 2002:aa7:c38a:0:b0:51d:9682:e30c with SMTP id k10-20020aa7c38a000000b0051d9682e30cmr239857edq.5.1689204510218; Wed, 12 Jul 2023 16:28:30 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1689204510; cv=none; d=google.com; s=arc-20160816; b=s2dt6lFAT/mPaKRh/izKnDLasoOjwCIg5fxYyY5zvRINeLKrFAKLE8w6AFLqLCFaw6 cfCjZ1at86GCuRDDV4Y1DsjlBMzZRYMn9c0k+CBqRg3OPjZKJtCCdnZ/+TNufy8w/wPy 32rYdVOowq1ELSCBh7MQkmlf7Db1s5l4UuBWzyZiDUP6oPzZ6ET2TiK9jSiXYFaLcebP vtS97wzPKMN4uQ1XimTPb+0o5St0femJqNV0UZiLPCknWy6zr8+jilttHbsEiw1kEzqi 9RpLj/YkpWCfVbqFPUlA16+eyj0bCEP9URJjR5yO+DeDOG1zI+23n+cJ2MGRElwn1fhT EnUg== 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=ZabDByjtD3T5dtkMFt9pp9PkYrbqcEUj4pptO8uD2cldvpqypqUU6Q3C37YJsr5gOJ ACbOg/C38SgEvOUfxzCN/VCZvs+eLtbnpy+S6+B4P5KXFgTCqMtZ/fH9zbSywrCPNXxM YNTugOSRDtB5Cgd+zhKGsspZqyax7duUkRM2O6vra49v/sQ6ZOyFpPpBBZIX2VraTFae /lrDD7lz9v9Uvac8ZbbakvDiuE13SA1ZP0idMIecG1MD9KP6ue+UgnUNX9kj6WZBVS2w DApxraya+zF2CNxqKq/wZ0j1JyD6dR6C4Oa/yhZKEtlBYLZiL1A9XYKauVZNQTFMDxMR PAkQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@sberdevices.ru header.s=mail header.b=C+T7Pni6; 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 bc14-20020a056402204e00b0051e2a15021asi5714277edb.340.2023.07.12.16.28.06; Wed, 12 Jul 2023 16:28:30 -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=C+T7Pni6; 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 S233165AbjGLXMQ (ORCPT + 99 others); Wed, 12 Jul 2023 19:12:16 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:59654 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231144AbjGLXML (ORCPT ); Wed, 12 Jul 2023 19:12:11 -0400 Received: from mx1.sberdevices.ru (mx1.sberdevices.ru [37.18.73.165]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 92FA719B; Wed, 12 Jul 2023 16:12:09 -0700 (PDT) Received: from p-infra-ksmg-sc-msk01 (localhost [127.0.0.1]) by mx1.sberdevices.ru (Postfix) with ESMTP id 30F37100024; Thu, 13 Jul 2023 02:12:08 +0300 (MSK) DKIM-Filter: OpenDKIM Filter v2.11.0 mx1.sberdevices.ru 30F37100024 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sberdevices.ru; s=mail; t=1689203528; bh=g/m3jgQvRqComsOjcKXElElHR44H0s8Y7oshWvPitXo=; h=From:To:Subject:Date:Message-ID:MIME-Version:Content-Type:From; b=C+T7Pni6qWHf6o9JtnUmSYhoS+/LO82dCsDZts3E+X/eMCeU+7+Noehdw/jnvFjuu rTnG9xkiOwSVCDlSsgcx7YIZE6PflGgBCjrpcWn/QhMyVtjk1/uLqUVUziWZILdkk8 h4wrzJuXyCZiPg5A4O/X3qerlIhJP5CoKiaYdYdeJFLDD4U4ITjInoTQE11rQStvFo eVhPIAhX78krZPEjJdnUc62ewqvXomIz6YpKjE3wxzM0CfMndVqKiWHRDAjxSx7kx1 I2dSRct+fjmXb5PhRCwKNePWorV0j7QqK1KkMprLu6m7ZKx2zvwFssVBRSu99H6pU2 1D9E1oHOGkbLQ== 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; Thu, 13 Jul 2023 02:12:08 +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; Thu, 13 Jul 2023 02:11:48 +0300 From: George Stark To: , , , , , , , , CC: , , , , , George Stark Subject: [PATCH v6 5/6] iio: adc: meson: add channel labels Date: Thu, 13 Jul 2023 02:10:46 +0300 Message-ID: <20230712231157.261245-6-gnstark@sberdevices.ru> X-Mailer: git-send-email 2.41.0 In-Reply-To: <20230712231157.261245-1-gnstark@sberdevices.ru> References: <20230712231157.261245-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: 178587 [Jul 12 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:7.1.1,5.0.1;sberdevices.ru:7.1.1,5.0.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/12 10:49:00 #21602221 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: 1771259308364274404 X-GMAIL-MSGID: 1771259308364274404 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 = {