From patchwork Sat Mar 23 23:13:07 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Martin Blumenstingl X-Patchwork-Id: 13600732 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 81135C54E58 for ; Sat, 23 Mar 2024 23:13:36 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To: Message-ID:Date:Subject:Cc:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=zUuGq5F+JILde6MOBOBiqzV2VAfJ+yLU5m6P0DlrGvw=; b=rpQELB4Q3AveJS 77R8RPbDDOe/AK26ka962A0KRmzHF3OJUOPmKGJ+iDuR0VxSm47hcLAigrfG7VAoE72wfounSwnrJ msmKBtPTV/tpXcSKG3Yfp+13wMOEbSrr0ankR1JaoCcBezzIUaBV0sLA33VE8frbNRt+CaGiUZB3U fML0SjcL1sP/vEfGdjT8GHFvj7u+CwleU/LGWKYRrq0ZrLX5jblXX6FTphzMxpFdYPGDrjaRlR8Db s+oy3pQQHEySdVg5v/u155VIVcUQ7reDnP6LdNvViSiESyL/MTbFD3O1Ywt2mMXJ9IlSQ51OvVAvM eCvtnpNkuJ5eHejXbtyQ==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.97.1 #2 (Red Hat Linux)) id 1roAYL-0000000BMqh-1An6; Sat, 23 Mar 2024 23:13:29 +0000 Received: from mail-ed1-x529.google.com ([2a00:1450:4864:20::529]) by bombadil.infradead.org with esmtps (Exim 4.97.1 #2 (Red Hat Linux)) id 1roAYF-0000000BMo8-3gVe; Sat, 23 Mar 2024 23:13:25 +0000 Received: by mail-ed1-x529.google.com with SMTP id 4fb4d7f45d1cf-56bf6591865so1225254a12.0; Sat, 23 Mar 2024 16:13:22 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=googlemail.com; s=20230601; t=1711235600; x=1711840400; darn=lists.infradead.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=xHLbndzNw6n0/nPPeX+nkHQjigbGF8h96E5IS2x3kqs=; b=dkv4VBOChvBS/ceyfhIi4C8LC2xuE45eyWRgLZaYBhJ2k350ROh8y1p4YYKUaQckZT 4ohzP9LSr+ylFsPy4VVguQHG/pctXMzMepnRAZ9cZu1Ka86vwz+ZalRO4zomWrA2hZty hz0UrHhjZKgobF0SC/l9BKuh064SYAJaeiiAPm9JhXQD4RccnUagynYvOLUMA23hPWrJ PsdxlFckcjz8jbTFJfJnLpVEjv1xvGzeAbcmfFeqwCSMPKehAiM8msSYPNGMxXokJ+MQ pY0jjZMHCkOsDbZVvIpsMUBGmAzu2p8S4r4l2PO1S68hZNfgFfCeiXhancc+Ugyl5gpk lsdg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1711235600; x=1711840400; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=xHLbndzNw6n0/nPPeX+nkHQjigbGF8h96E5IS2x3kqs=; b=vdEZuHak6bpcIDd7wnJsPlQskYpRf7vXGl9tXTUqS/eYA+D9a/+JRtr/P/Lj/aotui sPhWsHDTeCwk4bR+RlquKhdeASTXa5WHWt/8/nHZGIxKsJulpyUiKKULi5Z1NDMgCiXf H9YXNstk7piUaiTMTnSeA7G02H7qBXzXT9UZpJ+PALFdMDdFF8WJRjzJnMuQvfx2DcmC o2vaWsF4EKybVe4lc8ajRbHkRpQjhSt/jUuA2YcmoOZDLq84kIEihdmE9lBeIAxWbXIJ lnKn/Hy9py5u0gIlR12cNTyhSQHDbt4PkmHTbZuI2qEtqisX/8NaX+8C7MjNR8HL9xuB Gfgw== X-Gm-Message-State: AOJu0YzFqgVy0P8pjqpkxXUtr/jdvllkfhAFg1unbsAk9QhPk/n9iAAl n4D2edWS8+GtRtCpcYnDFfiqq1xafhzDDFxYmliEGT/e2sDwq71vOj2c8/t6 X-Google-Smtp-Source: AGHT+IGKgRWuPCIDQnTEsPJfYK+IWle8bUn2rzzxJVKVFHXQcHm8/BEUgXlEOTD90GzgyTG0xNxLUw== X-Received: by 2002:a17:906:d0d7:b0:a47:5265:9aac with SMTP id bq23-20020a170906d0d700b00a4752659aacmr52570ejb.55.1711235600176; Sat, 23 Mar 2024 16:13:20 -0700 (PDT) Received: from localhost.localdomain (dynamic-2a01-0c22-6fc3-1a00-0000-0000-0000-0e63.c22.pool.telefonica.de. [2a01:c22:6fc3:1a00::e63]) by smtp.googlemail.com with ESMTPSA id h10-20020a170906590a00b00a46196a7faesm1375116ejq.57.2024.03.23.16.13.19 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 23 Mar 2024 16:13:19 -0700 (PDT) From: Martin Blumenstingl To: linux-amlogic@lists.infradead.org Cc: linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, gnstark@salutedevices.com, neil.armstrong@linaro.org, lars@metafoo.de, jic23@kernel.org, Martin Blumenstingl Subject: [PATCH v1 1/3] iio: adc: meson: fix voltage reference selection field name typo Date: Sun, 24 Mar 2024 00:13:07 +0100 Message-ID: <20240323231309.415425-2-martin.blumenstingl@googlemail.com> X-Mailer: git-send-email 2.44.0 In-Reply-To: <20240323231309.415425-1-martin.blumenstingl@googlemail.com> References: <20240323231309.415425-1-martin.blumenstingl@googlemail.com> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20240323_161323_945628_16D7022E X-CRM114-Status: GOOD ( 12.80 ) X-BeenThere: linux-amlogic@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-amlogic" Errors-To: linux-amlogic-bounces+linux-amlogic=archiver.kernel.org@lists.infradead.org The field should be called "vref_voltage", without a typo in the word voltage. No functional changes intended. Signed-off-by: Martin Blumenstingl --- drivers/iio/adc/meson_saradc.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/drivers/iio/adc/meson_saradc.c b/drivers/iio/adc/meson_saradc.c index 13b473d8c6c7..2615d74534df 100644 --- a/drivers/iio/adc/meson_saradc.c +++ b/drivers/iio/adc/meson_saradc.c @@ -327,7 +327,7 @@ struct meson_sar_adc_param { u8 vref_select; u8 cmv_select; u8 adc_eoc; - enum meson_sar_adc_vref_sel vref_volatge; + enum meson_sar_adc_vref_sel vref_voltage; }; struct meson_sar_adc_data { @@ -1001,7 +1001,7 @@ static int meson_sar_adc_init(struct iio_dev *indio_dev) } regval = FIELD_PREP(MESON_SAR_ADC_REG11_VREF_VOLTAGE, - priv->param->vref_volatge); + priv->param->vref_voltage); regmap_update_bits(priv->regmap, MESON_SAR_ADC_REG11, MESON_SAR_ADC_REG11_VREF_VOLTAGE, regval); @@ -1225,7 +1225,7 @@ static const struct meson_sar_adc_param meson_sar_adc_gxbb_param = { .regmap_config = &meson_sar_adc_regmap_config_gxbb, .resolution = 10, .has_reg11 = true, - .vref_volatge = 1, + .vref_voltage = 1, .cmv_select = 1, }; @@ -1237,7 +1237,7 @@ static const struct meson_sar_adc_param meson_sar_adc_gxl_param = { .resolution = 12, .disable_ring_counter = 1, .has_reg11 = true, - .vref_volatge = 1, + .vref_voltage = 1, .cmv_select = 1, }; @@ -1249,7 +1249,7 @@ static const struct meson_sar_adc_param meson_sar_adc_axg_param = { .resolution = 12, .disable_ring_counter = 1, .has_reg11 = true, - .vref_volatge = 1, + .vref_voltage = 1, .has_vref_select = true, .vref_select = VREF_VDDA, .cmv_select = 1, From patchwork Sat Mar 23 23:13:08 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Martin Blumenstingl X-Patchwork-Id: 13600735 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 142B9CD11DB for ; Sat, 23 Mar 2024 23:13:38 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To: Message-ID:Date:Subject:Cc:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=Y2XepbfNTqZYfGiTJdH2pvzgLIkl9279m7FlKF+80us=; b=wRMVRkssjErZJT ByZbU4m4bjL7I1JaK+0rAYYlm81+FyQCdcTEmcYVAcgeujIxViN+uNk0tpc8g7FzXDMPkUxKDqndf ma1hg3TLohiFubnS7lem9yffQhvlG1FmegjNIgieL4aDjVqjnrTFVt4GdL/X3XFZfUAMB2pYWW/OF 2tI8D8FESbKvr7kiLX0JTDWpne2cqpdh5l36ahe23Mnq3KH+z7Cn604dn4GCExRc8P2rbzHDLEFww oNrnM0DI80Fwu+fqbMtRakS3/JXqsCH7P30CXFfw4MtigsJFiXkY6p7DVx84/+LG2SF75FDozSxzI Id8OpkSSn7WyB3TKeWGQ==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.97.1 #2 (Red Hat Linux)) id 1roAYJ-0000000BMpz-20GM; Sat, 23 Mar 2024 23:13:27 +0000 Received: from mail-ej1-x62c.google.com ([2a00:1450:4864:20::62c]) by bombadil.infradead.org with esmtps (Exim 4.97.1 #2 (Red Hat Linux)) id 1roAYF-0000000BMoA-2HQG; Sat, 23 Mar 2024 23:13:24 +0000 Received: by mail-ej1-x62c.google.com with SMTP id a640c23a62f3a-a4751063318so13391166b.0; Sat, 23 Mar 2024 16:13:23 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=googlemail.com; s=20230601; t=1711235601; x=1711840401; darn=lists.infradead.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=pl5FSLTmapATQPm5Ns2r32N7hJqg6smdpvXe4R0K3sc=; b=WQpBnHLePDWDFGbN/kaGXF7lYf4+tLyqe5xm/CAOG17sWspoZyBMt9qK4ViUmtp479 b1wVtr3vbci0kWbxEe2U7EsW4M4maYBxv7SUB4n292xY3OmheQvKfgi/3tJcsMZUZuew ucoDsMC94Tz9QiQdYcXh4xOGcKlh89V2T7sBc89/OXJRN6enbVSPD9XsqxM6ibAeGuHS +hvgdEvYPCxsW0TcngOpL79tSrhxlYh0kjDRh5E3zaPu68+GG/lgSYopOV3TOVqgTkJF ariOTc/H+ze/2FR8yJDuM3m1t53CxLDLjIvaXC08fPoS0cZbZqrX7qC2wagUYf3MYdgy YnAg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1711235601; x=1711840401; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=pl5FSLTmapATQPm5Ns2r32N7hJqg6smdpvXe4R0K3sc=; b=h4rfX/+kccWv3Gqnr/sJfwuWsTwEPVJwmZOSQOFL38SEacrLC7PpC72hll2aBWBIV8 2x0em0gIJ3+Qwd43iifvwJ2RdwaCFAzrEtFMErGD+LJZ08KThuEDquu5H8aPD4fwRR84 Vqule0aUhlgI+R7qNY8/qSdIFJRWYInlwjOdN4RaDsImvRgJcoP9GMh47K8E3KdN4x2j SEkW/RQaqtFW6bTCSLypxH61aP1Lqu0fJTjQFFE7GM11CakoO10HpzWiR4hpjjMQy6z9 lJR3Symmt4xqnEx/u6bHf/pWipVB/6YzJV4+CGTLQxJBQoQe6TDCa+qbwDsQG2/f/wI7 tSVw== X-Gm-Message-State: AOJu0YwJGTwSg5VbCCP+6wxi5RZJSpDvBrJlmpECFjuhX7LlysJtSHZm Om14IPMfd5+96HmO9/QwApuBoAzKcyMbWPb6dYiiFmeI2AwCXyJd/WJPZR/o X-Google-Smtp-Source: AGHT+IHkSp+Kp1Rin3dfE++TtJyWaSTFTXA0kMhD7ktC/2pkXCOs/6AXmhSKiWjCvHMi9cpI+ukKjw== X-Received: by 2002:a17:906:fa14:b0:a46:c8e3:c9b9 with SMTP id lo20-20020a170906fa1400b00a46c8e3c9b9mr2059741ejb.42.1711235601112; Sat, 23 Mar 2024 16:13:21 -0700 (PDT) Received: from localhost.localdomain (dynamic-2a01-0c22-6fc3-1a00-0000-0000-0000-0e63.c22.pool.telefonica.de. [2a01:c22:6fc3:1a00::e63]) by smtp.googlemail.com with ESMTPSA id h10-20020a170906590a00b00a46196a7faesm1375116ejq.57.2024.03.23.16.13.20 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 23 Mar 2024 16:13:20 -0700 (PDT) From: Martin Blumenstingl To: linux-amlogic@lists.infradead.org Cc: linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, gnstark@salutedevices.com, neil.armstrong@linaro.org, lars@metafoo.de, jic23@kernel.org, Martin Blumenstingl Subject: [PATCH v1 2/3] iio: adc: meson: consistently use bool/enum in struct meson_sar_adc_param Date: Sun, 24 Mar 2024 00:13:08 +0100 Message-ID: <20240323231309.415425-3-martin.blumenstingl@googlemail.com> X-Mailer: git-send-email 2.44.0 In-Reply-To: <20240323231309.415425-1-martin.blumenstingl@googlemail.com> References: <20240323231309.415425-1-martin.blumenstingl@googlemail.com> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20240323_161323_610773_BE6CCB3D X-CRM114-Status: GOOD ( 13.74 ) X-BeenThere: linux-amlogic@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-amlogic" Errors-To: linux-amlogic-bounces+linux-amlogic=archiver.kernel.org@lists.infradead.org Consistently use bool for any register bit that enables/disables functionality and enum for register values where there's a choice between different settings. The aim is to make the code easier to read and understand by being more consistent. No functional changes intended. Signed-off-by: Martin Blumenstingl --- drivers/iio/adc/meson_saradc.c | 47 +++++++++++++++++++--------------- 1 file changed, 27 insertions(+), 20 deletions(-) diff --git a/drivers/iio/adc/meson_saradc.c b/drivers/iio/adc/meson_saradc.c index 2615d74534df..6b2af0c2bbc7 100644 --- a/drivers/iio/adc/meson_saradc.c +++ b/drivers/iio/adc/meson_saradc.c @@ -156,9 +156,9 @@ #define MESON_SAR_ADC_REG11 0x2c #define MESON_SAR_ADC_REG11_BANDGAP_EN BIT(13) #define MESON_SAR_ADC_REG11_CMV_SEL BIT(6) - #define MESON_SAR_ADC_REG11_VREF_VOLTAGE BIT(5) - #define MESON_SAR_ADC_REG11_EOC BIT(1) - #define MESON_SAR_ADC_REG11_VREF_SEL BIT(0) + #define MESON_SAR_ADC_REG11_VREF_VOLTAGE BIT(5) + #define MESON_SAR_ADC_REG11_EOC BIT(1) + #define MESON_SAR_ADC_REG11_VREF_SEL BIT(0) #define MESON_SAR_ADC_REG13 0x34 #define MESON_SAR_ADC_REG13_12BIT_CALIBRATION_MASK GENMASK(13, 8) @@ -224,6 +224,11 @@ enum meson_sar_adc_vref_sel { VREF_VDDA = 1, }; +enum meson_sar_adc_vref_voltage { + VREF_VOLTAGE_0V9 = 0, + VREF_VOLTAGE_1V8 = 1, +}; + enum meson_sar_adc_avg_mode { NO_AVERAGING = 0x0, MEAN_AVERAGING = 0x1, @@ -321,13 +326,13 @@ struct meson_sar_adc_param { u8 temperature_trimming_bits; unsigned int temperature_multiplier; unsigned int temperature_divider; - u8 disable_ring_counter; + bool disable_ring_counter; bool has_reg11; bool has_vref_select; - u8 vref_select; - u8 cmv_select; - u8 adc_eoc; - enum meson_sar_adc_vref_sel vref_voltage; + bool cmv_select; + bool adc_eoc; + enum meson_sar_adc_vref_sel vref_select; + enum meson_sar_adc_vref_voltage vref_voltage; }; struct meson_sar_adc_data { @@ -982,14 +987,16 @@ static int meson_sar_adc_init(struct iio_dev *indio_dev) MESON_SAR_ADC_DELTA_10_TS_REVE0, 0); } - regval = FIELD_PREP(MESON_SAR_ADC_REG3_CTRL_CONT_RING_COUNTER_EN, - priv->param->disable_ring_counter); + if (priv->param->disable_ring_counter) + regval = MESON_SAR_ADC_REG3_CTRL_CONT_RING_COUNTER_EN; + else + regval = 0; regmap_update_bits(priv->regmap, MESON_SAR_ADC_REG3, MESON_SAR_ADC_REG3_CTRL_CONT_RING_COUNTER_EN, regval); if (priv->param->has_reg11) { - regval = FIELD_PREP(MESON_SAR_ADC_REG11_EOC, priv->param->adc_eoc); + regval = priv->param->adc_eoc ? MESON_SAR_ADC_REG11_EOC : 0; regmap_update_bits(priv->regmap, MESON_SAR_ADC_REG11, MESON_SAR_ADC_REG11_EOC, regval); @@ -1005,8 +1012,7 @@ static int meson_sar_adc_init(struct iio_dev *indio_dev) regmap_update_bits(priv->regmap, MESON_SAR_ADC_REG11, MESON_SAR_ADC_REG11_VREF_VOLTAGE, regval); - regval = FIELD_PREP(MESON_SAR_ADC_REG11_CMV_SEL, - priv->param->cmv_select); + regval = priv->param->cmv_select ? MESON_SAR_ADC_REG11_CMV_SEL : 0; regmap_update_bits(priv->regmap, MESON_SAR_ADC_REG11, MESON_SAR_ADC_REG11_CMV_SEL, regval); } @@ -1225,8 +1231,8 @@ static const struct meson_sar_adc_param meson_sar_adc_gxbb_param = { .regmap_config = &meson_sar_adc_regmap_config_gxbb, .resolution = 10, .has_reg11 = true, - .vref_voltage = 1, - .cmv_select = 1, + .vref_voltage = VREF_VOLTAGE_1V8, + .cmv_select = true, }; static const struct meson_sar_adc_param meson_sar_adc_gxl_param = { @@ -1237,8 +1243,8 @@ static const struct meson_sar_adc_param meson_sar_adc_gxl_param = { .resolution = 12, .disable_ring_counter = 1, .has_reg11 = true, - .vref_voltage = 1, - .cmv_select = 1, + .vref_voltage = VREF_VOLTAGE_1V8, + .cmv_select = true, }; static const struct meson_sar_adc_param meson_sar_adc_axg_param = { @@ -1249,10 +1255,10 @@ static const struct meson_sar_adc_param meson_sar_adc_axg_param = { .resolution = 12, .disable_ring_counter = 1, .has_reg11 = true, - .vref_voltage = 1, + .vref_voltage = VREF_VOLTAGE_1V8, .has_vref_select = true, .vref_select = VREF_VDDA, - .cmv_select = 1, + .cmv_select = true, }; static const struct meson_sar_adc_param meson_sar_adc_g12a_param = { @@ -1263,7 +1269,8 @@ static const struct meson_sar_adc_param meson_sar_adc_g12a_param = { .resolution = 12, .disable_ring_counter = 1, .has_reg11 = true, - .adc_eoc = 1, + .vref_voltage = VREF_VOLTAGE_0V9, + .adc_eoc = true, .has_vref_select = true, .vref_select = VREF_VDDA, }; From patchwork Sat Mar 23 23:13:09 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Martin Blumenstingl X-Patchwork-Id: 13600733 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 812A1C54E67 for ; Sat, 23 Mar 2024 23:13:38 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To: Message-ID:Date:Subject:Cc:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=x+2gVDh66dpUYng9jW4Wux8TkcXqgKm4ynDn1w8pVYE=; b=bf5tefcnvOHCNQ rUWV4xkRcYdD/H2vG2Gv7a5gW/e3Ve9gdX5XZf2vW8lJ7LZygbGRzG2h3L58OrjRB1GBsLzfslVeD yM7NUABkuiok7XzqeL0aErLa6h640s9ohbuVVw2CYZg//oL/7ZXaLScVZZU92vBqqGdIfiHvm+8D5 1k29mw3yIZiOFYNZvXjIiAlDag7YHYXhRYHIw1S4jBYTAZK04IXLVLU7urakVL5Ip7XtouWCL3Iiu YNFpGo1oaWuDktDJOWQT1bRD7YR4ANUZAD+94m4rXJcQ+cH6SDEI3anj0SNjGEa1OgNB3pckt9SP8 4CD14x8m65qfAc8wI3DA==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.97.1 #2 (Red Hat Linux)) id 1roAYM-0000000BMr7-21LN; Sat, 23 Mar 2024 23:13:30 +0000 Received: from mail-wr1-x436.google.com ([2a00:1450:4864:20::436]) by bombadil.infradead.org with esmtps (Exim 4.97.1 #2 (Red Hat Linux)) id 1roAYG-0000000BMoV-3Neh; Sat, 23 Mar 2024 23:13:26 +0000 Received: by mail-wr1-x436.google.com with SMTP id ffacd0b85a97d-341b01dbebbso1942184f8f.0; Sat, 23 Mar 2024 16:13:24 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=googlemail.com; s=20230601; t=1711235603; x=1711840403; darn=lists.infradead.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=a+wkttBX+iSKjpPSrwwLyAmpLqj+dv8BQ9EiIlhtH+A=; b=eBdjd3DcVk8tKUzXjQ4wmC5DVY2dSa3ASCDr15JaKXPYwCNLOJNLTi5CYqK7GM4wAn QrcJhs2xjN78b/fFWm+Yfm7ZTcUm53DtYKEAKB0LgGjQJyu7R8bwS8QoftGzYNYpjmYd q/pbi6HRTgmdPa6tNEV2w+GIJxYV8sFKY1o1SRk6iqHcOGiOgqbK2bQE73aVBAol0Qzs 9QkjLqJOpw1p+5lDmkuuahtkugGuBhzpzqdM/dC0ZQ8wZkwx+xTBebxuVCqRzwTINWug l/wVOwMs7bnkRS5G1/8g8nA0CKk5Zv76qkPESCGo4Oxb8pC4PLyaLsvNe4OU0NUwNsXM TDFQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1711235603; x=1711840403; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=a+wkttBX+iSKjpPSrwwLyAmpLqj+dv8BQ9EiIlhtH+A=; b=sBu1SciiEgQTOL3J6778kWpnkQEsXlJeoeDclJCPTm1Dzb/URaFPYccekpxpffd4CV Tccm6gJrPN4odNf7XarJ8Rx244I2awRHiS9d5cqGYuw5GSC+FkBoXAvhGTcN1Ugbc9Xs JScmBrJGDbZGAxj48oaDKjFPVDqDZT8XZLqA+E4VBLmWECNuKJxupa2K7wSYB+5Rj3l8 efm3B9HZ9XNyZkSpdV854WHyXan9NL/Czt6pqplqPBcIN2cAlQoF13hlp46xXBa1EvwG ctOX+85fbOd0b9manlviH848geVbU0A0DavZkyYDZCOE6KLKPk9CbXxFMN+f90ED1hRV jsvA== X-Gm-Message-State: AOJu0YwygEehMNzQ7GfNv6HNpycYCKLEBCmafphPFLYhDWY1ZteKvs+t S3AsVQcuFI94U4xA7nOVT6I53V1E0yixryxMbSiIl1cVYCvoqb7PRG2CiVk4 X-Google-Smtp-Source: AGHT+IGaGiJGJBEwz2g/fX8DIOJst2hHZiYa664cIHZgdBzahgfTDnPlGG/I/2i3Ze0ExnTcmGWGJw== X-Received: by 2002:a05:6000:1185:b0:33e:7a7c:a058 with SMTP id g5-20020a056000118500b0033e7a7ca058mr2551774wrx.18.1711235602417; Sat, 23 Mar 2024 16:13:22 -0700 (PDT) Received: from localhost.localdomain (dynamic-2a01-0c22-6fc3-1a00-0000-0000-0000-0e63.c22.pool.telefonica.de. [2a01:c22:6fc3:1a00::e63]) by smtp.googlemail.com with ESMTPSA id h10-20020a170906590a00b00a46196a7faesm1375116ejq.57.2024.03.23.16.13.21 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 23 Mar 2024 16:13:21 -0700 (PDT) From: Martin Blumenstingl To: linux-amlogic@lists.infradead.org Cc: linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, gnstark@salutedevices.com, neil.armstrong@linaro.org, lars@metafoo.de, jic23@kernel.org, Martin Blumenstingl Subject: [PATCH v1 3/3] iio: adc: meson: simplify MESON_SAR_ADC_REG11 register access Date: Sun, 24 Mar 2024 00:13:09 +0100 Message-ID: <20240323231309.415425-4-martin.blumenstingl@googlemail.com> X-Mailer: git-send-email 2.44.0 In-Reply-To: <20240323231309.415425-1-martin.blumenstingl@googlemail.com> References: <20240323231309.415425-1-martin.blumenstingl@googlemail.com> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20240323_161324_872801_D377E38F X-CRM114-Status: GOOD ( 13.23 ) X-BeenThere: linux-amlogic@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-amlogic" Errors-To: linux-amlogic-bounces+linux-amlogic=archiver.kernel.org@lists.infradead.org Simply check the max_register value to decide whether MESON_SAR_ADC_REG11 is present on the current IP revision. This allows dropping two additional bool fields from struct meson_sar_adc_param which previously had to be manually kept in sync. No functional changes intended. Signed-off-by: Martin Blumenstingl --- drivers/iio/adc/meson_saradc.c | 29 ++++++++--------------------- 1 file changed, 8 insertions(+), 21 deletions(-) diff --git a/drivers/iio/adc/meson_saradc.c b/drivers/iio/adc/meson_saradc.c index 6b2af0c2bbc7..8c1e542c0ab7 100644 --- a/drivers/iio/adc/meson_saradc.c +++ b/drivers/iio/adc/meson_saradc.c @@ -320,14 +320,12 @@ static const struct iio_chan_spec meson_sar_adc_and_temp_iio_channels[] = { struct meson_sar_adc_param { bool has_bl30_integration; unsigned long clock_rate; - u32 bandgap_reg; unsigned int resolution; const struct regmap_config *regmap_config; u8 temperature_trimming_bits; unsigned int temperature_multiplier; unsigned int temperature_divider; bool disable_ring_counter; - bool has_reg11; bool has_vref_select; bool cmv_select; bool adc_eoc; @@ -995,7 +993,7 @@ static int meson_sar_adc_init(struct iio_dev *indio_dev) MESON_SAR_ADC_REG3_CTRL_CONT_RING_COUNTER_EN, regval); - if (priv->param->has_reg11) { + if (priv->param->regmap_config->max_register >= MESON_SAR_ADC_REG11) { regval = priv->param->adc_eoc ? MESON_SAR_ADC_REG11_EOC : 0; regmap_update_bits(priv->regmap, MESON_SAR_ADC_REG11, MESON_SAR_ADC_REG11_EOC, regval); @@ -1031,16 +1029,15 @@ static int meson_sar_adc_init(struct iio_dev *indio_dev) static void meson_sar_adc_set_bandgap(struct iio_dev *indio_dev, bool on_off) { struct meson_sar_adc_priv *priv = iio_priv(indio_dev); - const struct meson_sar_adc_param *param = priv->param; - u32 enable_mask; - if (param->bandgap_reg == MESON_SAR_ADC_REG11) - enable_mask = MESON_SAR_ADC_REG11_BANDGAP_EN; + if (priv->param->regmap_config->max_register >= MESON_SAR_ADC_REG11) + regmap_update_bits(priv->regmap, MESON_SAR_ADC_REG11, + MESON_SAR_ADC_REG11_BANDGAP_EN, + on_off ? MESON_SAR_ADC_REG11_BANDGAP_EN : 0); else - enable_mask = MESON_SAR_ADC_DELTA_10_TS_VBG_EN; - - regmap_update_bits(priv->regmap, param->bandgap_reg, enable_mask, - on_off ? enable_mask : 0); + regmap_update_bits(priv->regmap, MESON_SAR_ADC_DELTA_10, + MESON_SAR_ADC_DELTA_10_TS_VBG_EN, + on_off ? MESON_SAR_ADC_DELTA_10_TS_VBG_EN : 0); } static int meson_sar_adc_hw_enable(struct iio_dev *indio_dev) @@ -1205,7 +1202,6 @@ static const struct iio_info meson_sar_adc_iio_info = { static const struct meson_sar_adc_param meson_sar_adc_meson8_param = { .has_bl30_integration = false, .clock_rate = 1150000, - .bandgap_reg = MESON_SAR_ADC_DELTA_10, .regmap_config = &meson_sar_adc_regmap_config_meson8, .resolution = 10, .temperature_trimming_bits = 4, @@ -1216,7 +1212,6 @@ static const struct meson_sar_adc_param meson_sar_adc_meson8_param = { static const struct meson_sar_adc_param meson_sar_adc_meson8b_param = { .has_bl30_integration = false, .clock_rate = 1150000, - .bandgap_reg = MESON_SAR_ADC_DELTA_10, .regmap_config = &meson_sar_adc_regmap_config_meson8, .resolution = 10, .temperature_trimming_bits = 5, @@ -1227,10 +1222,8 @@ static const struct meson_sar_adc_param meson_sar_adc_meson8b_param = { static const struct meson_sar_adc_param meson_sar_adc_gxbb_param = { .has_bl30_integration = true, .clock_rate = 1200000, - .bandgap_reg = MESON_SAR_ADC_REG11, .regmap_config = &meson_sar_adc_regmap_config_gxbb, .resolution = 10, - .has_reg11 = true, .vref_voltage = VREF_VOLTAGE_1V8, .cmv_select = true, }; @@ -1238,11 +1231,9 @@ static const struct meson_sar_adc_param meson_sar_adc_gxbb_param = { static const struct meson_sar_adc_param meson_sar_adc_gxl_param = { .has_bl30_integration = true, .clock_rate = 1200000, - .bandgap_reg = MESON_SAR_ADC_REG11, .regmap_config = &meson_sar_adc_regmap_config_gxbb, .resolution = 12, .disable_ring_counter = 1, - .has_reg11 = true, .vref_voltage = VREF_VOLTAGE_1V8, .cmv_select = true, }; @@ -1250,11 +1241,9 @@ static const struct meson_sar_adc_param meson_sar_adc_gxl_param = { static const struct meson_sar_adc_param meson_sar_adc_axg_param = { .has_bl30_integration = true, .clock_rate = 1200000, - .bandgap_reg = MESON_SAR_ADC_REG11, .regmap_config = &meson_sar_adc_regmap_config_gxbb, .resolution = 12, .disable_ring_counter = 1, - .has_reg11 = true, .vref_voltage = VREF_VOLTAGE_1V8, .has_vref_select = true, .vref_select = VREF_VDDA, @@ -1264,11 +1253,9 @@ static const struct meson_sar_adc_param meson_sar_adc_axg_param = { static const struct meson_sar_adc_param meson_sar_adc_g12a_param = { .has_bl30_integration = false, .clock_rate = 1200000, - .bandgap_reg = MESON_SAR_ADC_REG11, .regmap_config = &meson_sar_adc_regmap_config_gxbb, .resolution = 12, .disable_ring_counter = 1, - .has_reg11 = true, .vref_voltage = VREF_VOLTAGE_0V9, .adc_eoc = true, .has_vref_select = true,