From nobody Sun Feb 8 17:46:37 2026 Received: from mail-ej1-f51.google.com (mail-ej1-f51.google.com [209.85.218.51]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 4261C5A11F for ; Sat, 23 Mar 2024 23:13:22 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.218.51 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1711235603; cv=none; b=r9eDwcv0A5DUOxcj+f2ipGkPwnVi/XOVTI2vEqb21/71GMOxiIFjzO5wsZ6nW82LLFjNjgogWKSCaMD3db98gx7rj4FCjBbmjbHvzyzG252Ha1z19w0jHOQlFjAcXNauCTaTWtZjHos6kcZQ9whCEAhDrbK9Lu4Jex8xTe0LKRo= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1711235603; c=relaxed/simple; bh=+for2EzUMdVVcB71pixcUcddliKFsRuVoSxMFntygCE=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=HIxHkDoMf6aPiJeC+HAA8e4NUJlrGDFuFYw2KgivutMkj6pnrpuKMMRFf3ynBXzPJNNgD7LTdVFKDSoVJNOIzTGsfPEJMzNzjZdh7KIRFGZCXwePvteoEh1ZU9iPhBpQR/uhMyu/xeR7xw4FLFHVWn7bhE5TYA4awRt8+wtutyA= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=googlemail.com; spf=pass smtp.mailfrom=googlemail.com; dkim=pass (2048-bit key) header.d=googlemail.com header.i=@googlemail.com header.b=j6Wbfuok; arc=none smtp.client-ip=209.85.218.51 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=googlemail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=googlemail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=googlemail.com header.i=@googlemail.com header.b="j6Wbfuok" Received: by mail-ej1-f51.google.com with SMTP id a640c23a62f3a-a466fc8fcccso435284066b.1 for ; Sat, 23 Mar 2024 16:13:21 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=googlemail.com; s=20230601; t=1711235600; x=1711840400; darn=vger.kernel.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=j6WbfuokTtH49pB95m5tkhJkSsfIMrTqR1ymvGSLanqnR5nUmG2PFVtbXmHq+xOyb8 fLfyCOEGjmfDn2g77IVBl9UftW3EaPBnzVvjdiDCFsE4CKAcNLHtHqScp1DtrflAyLzX kit9SyTgpz5ayQAXgmdwIacW0VulwfpoHwvVvLwTytyTlLvfbdT0xOHKYGavI3+Rs+68 Npw9ep1ehZw6PhIzCC60FBTfgv6iVsxwmHcmZugzzUidaXvRTTRxWaOMyszUSOPNNcy/ NUB06v2i0ufJIbHGuBxq1bSy8/yfdKlEdpwSySw7OuSpgSOSU9WU7tPfIyOfi30epGWK p05w== 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=j16QLkOXraM2akDeBJbZvFpRljxbOXMklKyWMOIkKwK2PXa/D8I6mVC4yLA+m46EkW i5Bod6igztyUcMIMhSy2H04m+Mjx2le32/9+8fKiGH4LLKiubyGAVSY7yxYMakQzSmFe PRD8xc4XxXoH9xKQe/UnUebaeDLbmvfeWtR9Us4jzsVEbTHSg4ZCSzeMOOUuCPWZjh7T cDtYEP2/ESNISh4ZHKSAc8IihdbL+CK+WQgk+K9I71YGHvL6ts7td2ph4QND3LiVPIvu fBbRqArSLztz3fb64fqJlRDZ146ogS6s8tmhreXswLN4KvtFYqUzi0pHx2lG245MQJ98 /dFQ== X-Forwarded-Encrypted: i=1; AJvYcCXWa5clCPoV0uAlI21vt8VuHGSk7yeJ8QhJrPhSpMk31myF+LOOqCUfH4cqnU6XHXokVJpDB7uT1U2e71YDjxyG3hDjEbsBXyHPMBL+ X-Gm-Message-State: AOJu0YxgVMBMp+SZJcYmjoMgWebsmn9f5paDj9s2lc0RVrudVnQzoILE Ij467ZReFh5L/JNYNM5cn8f19U172By9e9WCbKGjlr7lt5FUT1QZNUqw8OTV 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> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" 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; }; =20 struct meson_sar_adc_data { @@ -1001,7 +1001,7 @@ static int meson_sar_adc_init(struct iio_dev *indio_d= ev) } =20 regval =3D 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); =20 @@ -1225,7 +1225,7 @@ static const struct meson_sar_adc_param meson_sar_adc= _gxbb_param =3D { .regmap_config =3D &meson_sar_adc_regmap_config_gxbb, .resolution =3D 10, .has_reg11 =3D true, - .vref_volatge =3D 1, + .vref_voltage =3D 1, .cmv_select =3D 1, }; =20 @@ -1237,7 +1237,7 @@ static const struct meson_sar_adc_param meson_sar_adc= _gxl_param =3D { .resolution =3D 12, .disable_ring_counter =3D 1, .has_reg11 =3D true, - .vref_volatge =3D 1, + .vref_voltage =3D 1, .cmv_select =3D 1, }; =20 @@ -1249,7 +1249,7 @@ static const struct meson_sar_adc_param meson_sar_adc= _axg_param =3D { .resolution =3D 12, .disable_ring_counter =3D 1, .has_reg11 =3D true, - .vref_volatge =3D 1, + .vref_voltage =3D 1, .has_vref_select =3D true, .vref_select =3D VREF_VDDA, .cmv_select =3D 1, --=20 2.44.0 From nobody Sun Feb 8 17:46:37 2026 Received: from mail-ej1-f41.google.com (mail-ej1-f41.google.com [209.85.218.41]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id DFD8D5B666 for ; Sat, 23 Mar 2024 23:13:22 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.218.41 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1711235604; cv=none; b=MjB0RSVkJJNDAZeNLYceX4Lb/kOtDvS/Pv3skNUYpHpe02OQRYJ6ewXIOUw8vFzpVqwDGBoOE0WrKZawhT+czP23TRrzrHWtfHMXwbXt5Q3wqMI3wZcpNvhhQ7OnVtpKv1qfpd+7+QlOp5P6rtsFg6nsxxFcuDw3/dc84c51bCU= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1711235604; c=relaxed/simple; bh=qz1l88f4ZYFGTNTTkYuVy+gK3kOuL24C4n/HW9H3Gm4=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=bIZPFvPOlhaTBGB5ZO4bhaAwllkHlZ+OryC4y5nyufweY/229S8mG5yFLx0jxuRTw+/G9S8zMbN96lL9UpnjyloPrFqzLxOswxfjzcy1JVUXahaUJyVMavuuKBXhr3dxdebuFlCxqjULplR57h778Er9K//8k0I59MzyObxO6C4= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=googlemail.com; spf=pass smtp.mailfrom=googlemail.com; dkim=pass (2048-bit key) header.d=googlemail.com header.i=@googlemail.com header.b=ErMz3ejS; arc=none smtp.client-ip=209.85.218.41 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=googlemail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=googlemail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=googlemail.com header.i=@googlemail.com header.b="ErMz3ejS" Received: by mail-ej1-f41.google.com with SMTP id a640c23a62f3a-a466fc8fcccso435284666b.1 for ; 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=1711235601; x=1711840401; darn=vger.kernel.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=ErMz3ejSfPMXtLQQTLI1e2+hrTvcseF80p138SkHFzUsv5tzYUKJ0UqXcT+bSgO8cb GC9Q7keOQs9rN+ZUAD3jxZxWSY0F8r7Yjf6uO1OTbN3nY8EZfQWqTMMOuG7Co213AUar Y+P2bP3OgEeFZ5qMwht3HGEgv+aGdi7GajOunrooDZD2NGYB+MAh/EYfSiLBpsjc777z puexkpu60DHMkMAA0l/za5EoFAMLg5/5+EuD/L1U+SX7OSalA5ZpVMFG2FCsqlJvVRiE 8T1AxxhCgrSbx9flihUL0pbFHtWfRjmL0uQ/PXcvo+NwKvmgSCAmW7UInk1GTB6WdLlV 0nLw== 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=HeS15Hu/wX1HuZdJYp60Yl62g2sr7v9Vm3Io1GlQb2+1/RkE5j7kATCYg4nFfgN24n hYm1qI8dj7s67GQzgolxXgqJ4TnYVcRacenPbQr6nuvqmR1ygfQ66nbaoSYW7Y0y5S9p e8wH9gqPZDxTJvu6cMXa69xqJPq8+MKIMedqGr1s5vzxtqFx8x/xpSddh3R7+ylSJJll so7xD1DlhaqhJ63JP1uVppBgwyPdJJA5AAPW/Sgv4yYz3Mb4ACcwyFikc6crKjzSsniL JyHVDfI1fgFTCDElkVDNf84JRuZJ7CSZpshic8ShyNDcr11KwuoN2AdsrNpHe7dni+v1 sMyA== X-Forwarded-Encrypted: i=1; AJvYcCV6CIwGzT5kFlP1iYuK2nGjX2UYxPUv1OiDufD9PSBv1zSib/0lfzN94tI8m5kLBdGPTDFXrrWkOrNu7pJIFP6umQXNHwQD7FzJJVzt X-Gm-Message-State: AOJu0YxIaSkyTZvIrAknWMy8KaKpJKKZKB0iTfD36qCsVzb1D7ZVMKcE Y4P4t9HpNYKlhKoS8NFH2Ip1F60wrSf6sbrJeLq7lvswXtlz+uD7 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> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" 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) =20 #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 =3D 1, }; =20 +enum meson_sar_adc_vref_voltage { + VREF_VOLTAGE_0V9 =3D 0, + VREF_VOLTAGE_1V8 =3D 1, +}; + enum meson_sar_adc_avg_mode { NO_AVERAGING =3D 0x0, MEAN_AVERAGING =3D 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; }; =20 struct meson_sar_adc_data { @@ -982,14 +987,16 @@ static int meson_sar_adc_init(struct iio_dev *indio_d= ev) MESON_SAR_ADC_DELTA_10_TS_REVE0, 0); } =20 - regval =3D FIELD_PREP(MESON_SAR_ADC_REG3_CTRL_CONT_RING_COUNTER_EN, - priv->param->disable_ring_counter); + if (priv->param->disable_ring_counter) + regval =3D MESON_SAR_ADC_REG3_CTRL_CONT_RING_COUNTER_EN; + else + regval =3D 0; regmap_update_bits(priv->regmap, MESON_SAR_ADC_REG3, MESON_SAR_ADC_REG3_CTRL_CONT_RING_COUNTER_EN, regval); =20 if (priv->param->has_reg11) { - regval =3D FIELD_PREP(MESON_SAR_ADC_REG11_EOC, priv->param->adc_eoc); + regval =3D 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); =20 @@ -1005,8 +1012,7 @@ static int meson_sar_adc_init(struct iio_dev *indio_d= ev) regmap_update_bits(priv->regmap, MESON_SAR_ADC_REG11, MESON_SAR_ADC_REG11_VREF_VOLTAGE, regval); =20 - regval =3D FIELD_PREP(MESON_SAR_ADC_REG11_CMV_SEL, - priv->param->cmv_select); + regval =3D 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 =3D { .regmap_config =3D &meson_sar_adc_regmap_config_gxbb, .resolution =3D 10, .has_reg11 =3D true, - .vref_voltage =3D 1, - .cmv_select =3D 1, + .vref_voltage =3D VREF_VOLTAGE_1V8, + .cmv_select =3D true, }; =20 static const struct meson_sar_adc_param meson_sar_adc_gxl_param =3D { @@ -1237,8 +1243,8 @@ static const struct meson_sar_adc_param meson_sar_adc= _gxl_param =3D { .resolution =3D 12, .disable_ring_counter =3D 1, .has_reg11 =3D true, - .vref_voltage =3D 1, - .cmv_select =3D 1, + .vref_voltage =3D VREF_VOLTAGE_1V8, + .cmv_select =3D true, }; =20 static const struct meson_sar_adc_param meson_sar_adc_axg_param =3D { @@ -1249,10 +1255,10 @@ static const struct meson_sar_adc_param meson_sar_a= dc_axg_param =3D { .resolution =3D 12, .disable_ring_counter =3D 1, .has_reg11 =3D true, - .vref_voltage =3D 1, + .vref_voltage =3D VREF_VOLTAGE_1V8, .has_vref_select =3D true, .vref_select =3D VREF_VDDA, - .cmv_select =3D 1, + .cmv_select =3D true, }; =20 static const struct meson_sar_adc_param meson_sar_adc_g12a_param =3D { @@ -1263,7 +1269,8 @@ static const struct meson_sar_adc_param meson_sar_adc= _g12a_param =3D { .resolution =3D 12, .disable_ring_counter =3D 1, .has_reg11 =3D true, - .adc_eoc =3D 1, + .vref_voltage =3D VREF_VOLTAGE_0V9, + .adc_eoc =3D true, .has_vref_select =3D true, .vref_select =3D VREF_VDDA, }; --=20 2.44.0 From nobody Sun Feb 8 17:46:37 2026 Received: from mail-wr1-f45.google.com (mail-wr1-f45.google.com [209.85.221.45]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 7285C5C60D for ; Sat, 23 Mar 2024 23:13:24 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.221.45 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1711235606; cv=none; b=PQU0UBZKSgrs3bPZTPqY4heg688kzYVe8yIMPq8KlV18TuwAjjjvUBeR1DoTK0m7YDQKRqyb/YSdf0QEvLsRfBpSGYWJZcbp/PbLUQcjon+2KBVHLqYGKSvUvW1RcpzQFoOewbxTX+3aYE4keTJ3l5P6eNLs5ZglXFaSavD4g+U= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1711235606; c=relaxed/simple; bh=MRGCY4Jg7QfK8V7QflvA9iWC6dBAvCc23rZx6if+6xk=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=uzWkm85bRv4zfwB+6rn28roO9FlXfTvn6l+VlU27V/K2wirQ2VOxX+Y8TKwlTpn7l68LuZn1E+G71TnkICnOIXwN2Tca+s7Zga1/7O6nGBWJzHtjdfm07c1NLhOj4hxsyDm6rBzxK1NyE4ld8lhEWjLVTySkFd+++qaTir/2m1I= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=googlemail.com; spf=pass smtp.mailfrom=googlemail.com; dkim=pass (2048-bit key) header.d=googlemail.com header.i=@googlemail.com header.b=dN/fE9Ut; arc=none smtp.client-ip=209.85.221.45 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=googlemail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=googlemail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=googlemail.com header.i=@googlemail.com header.b="dN/fE9Ut" Received: by mail-wr1-f45.google.com with SMTP id ffacd0b85a97d-341950a6c9aso2790856f8f.1 for ; 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=vger.kernel.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=dN/fE9UtXmo1EncSINdiz7juTiGae0qRCZgTSjVIpsLmiGbV1gaMXLtiozkrmJak7I IGKfW3JWfeCd8w6jCaf0C5PH3J5W0fnLkKtmTXP3aEzIG1WWXa+2V/OpqaY/E67tSrLD gmBQO+A4tHRuL8AuAAFWUbb4s0V62e+aadnOsEzMoA/fey/EqRPP5fi7TAm4oaiRv3gO EOGDAb90Rx8ibZFA2kZWurudEP0OCno/bKLX9g2bm27RXG2iRGlGs/VIVF5Ukr+3xdUq HUKTRnUa/0NegdK1G1j/60ECmxcxntyvcdeXHaSjEeI/t5b63oaaWgUL2n+nhYOijl1u JyVg== 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=KuMekoU1tZ5f2g8i7aJof2wh7YpOrbQthiQjFniHr4D0K2JhzKQf9KJAfhz6KndfeE M6j5sSRsso15aqBf1lKE0R5CjNF0q9i4T/Ccei5679krNsGTuvn9ghZosFQAXHs/EnJ3 ggW8EZgLI1VFZHr1p+5oB+CcQ3LtMBG1t2ARGT2rBWGM8FrugICCEUihsAAy+lru9F9T YY91K0TPrsS4U224VzlpjX63cMTPxeBqpzs7mhXGSnFvO01hk/3U5gJ4PRoH/VV0v53T 8c03Ds1JYaLzRIIl4R1xTbSnpLLcT6RUBXgA4JCP5VyQgzHa6z0IZPSb5Q4WOvdDju6d 5IwA== X-Forwarded-Encrypted: i=1; AJvYcCXwVhSrNXZZwU4bt6UDGguU2e82mI+f0Y2mit//zRE4I0hsenTA9ZcBLDRlOqXRYyn+bCB4BnQztjm4NwTT3TQ66Zd5fNQmvTfu0ELy X-Gm-Message-State: AOJu0YzuxdipX+RX7N97kcaz1oDaWlEKtI4yyHB8PjxBSvhBidU+qpAJ Ub1Z3JcT1gsYLjAdhOslWEXAmoxRhArlTchiNV2wIvjYmfpIA6+Y 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> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" 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_t= emp_iio_channels[] =3D { 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); =20 - if (priv->param->has_reg11) { + if (priv->param->regmap_config->max_register >=3D MESON_SAR_ADC_REG11) { regval =3D 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_o= ff) { struct meson_sar_adc_priv *priv =3D iio_priv(indio_dev); - const struct meson_sar_adc_param *param =3D priv->param; - u32 enable_mask; =20 - if (param->bandgap_reg =3D=3D MESON_SAR_ADC_REG11) - enable_mask =3D MESON_SAR_ADC_REG11_BANDGAP_EN; + if (priv->param->regmap_config->max_register >=3D 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 =3D 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); } =20 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 = =3D { static const struct meson_sar_adc_param meson_sar_adc_meson8_param =3D { .has_bl30_integration =3D false, .clock_rate =3D 1150000, - .bandgap_reg =3D MESON_SAR_ADC_DELTA_10, .regmap_config =3D &meson_sar_adc_regmap_config_meson8, .resolution =3D 10, .temperature_trimming_bits =3D 4, @@ -1216,7 +1212,6 @@ static const struct meson_sar_adc_param meson_sar_adc= _meson8_param =3D { static const struct meson_sar_adc_param meson_sar_adc_meson8b_param =3D { .has_bl30_integration =3D false, .clock_rate =3D 1150000, - .bandgap_reg =3D MESON_SAR_ADC_DELTA_10, .regmap_config =3D &meson_sar_adc_regmap_config_meson8, .resolution =3D 10, .temperature_trimming_bits =3D 5, @@ -1227,10 +1222,8 @@ static const struct meson_sar_adc_param meson_sar_ad= c_meson8b_param =3D { static const struct meson_sar_adc_param meson_sar_adc_gxbb_param =3D { .has_bl30_integration =3D true, .clock_rate =3D 1200000, - .bandgap_reg =3D MESON_SAR_ADC_REG11, .regmap_config =3D &meson_sar_adc_regmap_config_gxbb, .resolution =3D 10, - .has_reg11 =3D true, .vref_voltage =3D VREF_VOLTAGE_1V8, .cmv_select =3D true, }; @@ -1238,11 +1231,9 @@ static const struct meson_sar_adc_param meson_sar_ad= c_gxbb_param =3D { static const struct meson_sar_adc_param meson_sar_adc_gxl_param =3D { .has_bl30_integration =3D true, .clock_rate =3D 1200000, - .bandgap_reg =3D MESON_SAR_ADC_REG11, .regmap_config =3D &meson_sar_adc_regmap_config_gxbb, .resolution =3D 12, .disable_ring_counter =3D 1, - .has_reg11 =3D true, .vref_voltage =3D VREF_VOLTAGE_1V8, .cmv_select =3D true, }; @@ -1250,11 +1241,9 @@ static const struct meson_sar_adc_param meson_sar_ad= c_gxl_param =3D { static const struct meson_sar_adc_param meson_sar_adc_axg_param =3D { .has_bl30_integration =3D true, .clock_rate =3D 1200000, - .bandgap_reg =3D MESON_SAR_ADC_REG11, .regmap_config =3D &meson_sar_adc_regmap_config_gxbb, .resolution =3D 12, .disable_ring_counter =3D 1, - .has_reg11 =3D true, .vref_voltage =3D VREF_VOLTAGE_1V8, .has_vref_select =3D true, .vref_select =3D VREF_VDDA, @@ -1264,11 +1253,9 @@ static const struct meson_sar_adc_param meson_sar_ad= c_axg_param =3D { static const struct meson_sar_adc_param meson_sar_adc_g12a_param =3D { .has_bl30_integration =3D false, .clock_rate =3D 1200000, - .bandgap_reg =3D MESON_SAR_ADC_REG11, .regmap_config =3D &meson_sar_adc_regmap_config_gxbb, .resolution =3D 12, .disable_ring_counter =3D 1, - .has_reg11 =3D true, .vref_voltage =3D VREF_VOLTAGE_0V9, .adc_eoc =3D true, .has_vref_select =3D true, --=20 2.44.0