From: Miquel Raynal <miquel.raynal@bootlin.com>
To: Jonathan Cameron <jic23@kernel.org>,
Lee Jones <lee.jones@linaro.org>,
linux-iio@vger.kernel.org, linux-omap@vger.kernel.org,
Thomas Petazzoni <thomas.petazzoni@bootlin.com>,
Ryan Barnett <ryan.barnett@collins.com>,
linux-kernel@vger.kernel.org
Cc: Miquel Raynal <miquel.raynal@bootlin.com>,
Jonathan Cameron <Jonathan.Cameron@huawei.com>
Subject: [PATCH v6 28/48] mfd: ti_am335x_tscadc: Clarify the maximum values for DT entries
Date: Fri, 15 Oct 2021 10:14:46 +0200 [thread overview]
Message-ID: <20211015081506.933180-29-miquel.raynal@bootlin.com> (raw)
In-Reply-To: <20211015081506.933180-1-miquel.raynal@bootlin.com>
Clearly define the maximum open delay and sample delay. Use these
definitions in place of a mask (which works because this is the first
field in the register) and an open-coded value. While at it reword a
little bit the error messages to make them look clearer and similar.
Signed-off-by: Miquel Raynal <miquel.raynal@bootlin.com>
Reviewed-by: Jonathan Cameron <Jonathan.Cameron@huawei.com>
---
drivers/iio/adc/ti_am335x_adc.c | 18 +++++++++---------
include/linux/mfd/ti_am335x_tscadc.h | 2 ++
2 files changed, 11 insertions(+), 9 deletions(-)
diff --git a/drivers/iio/adc/ti_am335x_adc.c b/drivers/iio/adc/ti_am335x_adc.c
index 3dec115e68ee..a241e6fa3564 100644
--- a/drivers/iio/adc/ti_am335x_adc.c
+++ b/drivers/iio/adc/ti_am335x_adc.c
@@ -126,7 +126,7 @@ static void tiadc_step_config(struct iio_dev *indio_dev)
chan = adc_dev->channel_line[i];
if (adc_dev->step_avg[i] > STEPCONFIG_AVG_16) {
- dev_warn(dev, "chan %d step_avg truncating to %ld\n",
+ dev_warn(dev, "chan %d: wrong step avg, truncated to %ld\n",
chan, STEPCONFIG_AVG_16);
adc_dev->step_avg[i] = STEPCONFIG_AVG_16;
}
@@ -147,16 +147,16 @@ static void tiadc_step_config(struct iio_dev *indio_dev)
STEPCONFIG_RFP_VREFP |
STEPCONFIG_RFM_VREFN);
- if (adc_dev->open_delay[i] > STEPDELAY_OPEN_MASK) {
- dev_warn(dev, "chan %d open delay truncating to 0x3FFFF\n",
- chan);
- adc_dev->open_delay[i] = STEPDELAY_OPEN_MASK;
+ if (adc_dev->open_delay[i] > STEPCONFIG_MAX_OPENDLY) {
+ dev_warn(dev, "chan %d: wrong open delay, truncated to 0x%lX\n",
+ chan, STEPCONFIG_MAX_OPENDLY);
+ adc_dev->open_delay[i] = STEPCONFIG_MAX_OPENDLY;
}
- if (adc_dev->sample_delay[i] > 0xFF) {
- dev_warn(dev, "chan %d sample delay truncating to 0xFF\n",
- chan);
- adc_dev->sample_delay[i] = 0xFF;
+ if (adc_dev->sample_delay[i] > STEPCONFIG_MAX_SAMPLE) {
+ dev_warn(dev, "chan %d: wrong sample delay, truncated to 0x%lX\n",
+ chan, STEPCONFIG_MAX_SAMPLE);
+ adc_dev->sample_delay[i] = STEPCONFIG_MAX_SAMPLE;
}
tiadc_writel(adc_dev, REG_STEPDELAY(steps),
diff --git a/include/linux/mfd/ti_am335x_tscadc.h b/include/linux/mfd/ti_am335x_tscadc.h
index ae694fa2d711..31cffb6e8b17 100644
--- a/include/linux/mfd/ti_am335x_tscadc.h
+++ b/include/linux/mfd/ti_am335x_tscadc.h
@@ -84,7 +84,9 @@
#define STEPCONFIG_OPENDLY STEPDELAY_OPEN(0x098)
#define STEPDELAY_SAMPLE_MASK GENMASK(31, 24)
#define STEPDELAY_SAMPLE(val) FIELD_PREP(STEPDELAY_SAMPLE_MASK, (val))
+#define STEPCONFIG_MAX_OPENDLY GENMASK(17, 0)
#define STEPCONFIG_SAMPLEDLY STEPDELAY_SAMPLE(0)
+#define STEPCONFIG_MAX_SAMPLE GENMASK(7, 0)
/* Charge Config */
#define STEPCHARGE_RFP_MASK GENMASK(14, 12)
--
2.27.0
next prev parent reply other threads:[~2021-10-15 8:16 UTC|newest]
Thread overview: 60+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-10-15 8:14 [PATCH v6 00/48] TI AM437X ADC1 Miquel Raynal
2021-10-15 8:14 ` [PATCH v6 01/48] clk: ti: am43xx: Add clkctrl data for am43xx ADC1 Miquel Raynal
2021-10-15 8:14 ` [PATCH v6 02/48] dt-bindings: mfd: ti,am3359-tscadc: Add a yaml description for this MFD Miquel Raynal
2021-10-15 8:14 ` [PATCH v6 03/48] dt-bindings: touchscreen: ti,am3359-tsc: New yaml description Miquel Raynal
2021-10-15 8:14 ` [PATCH v6 04/48] dt-bindings: iio: adc: ti,am3359-adc: " Miquel Raynal
2021-10-15 8:14 ` [PATCH v6 05/48] dt-bindings: touchscreen: ti,am3359-tsc: Remove deprecated text file Miquel Raynal
2021-10-15 8:14 ` [PATCH v6 06/48] dt-bindings: mfd: ti,am3359-tscadc: Describe am4372 MFD compatible Miquel Raynal
2021-10-15 8:14 ` [PATCH v6 07/48] dt-bindings: iio: adc: ti,am3359-adc: Describe am4372 ADC compatible Miquel Raynal
2021-10-15 8:14 ` [PATCH v6 08/48] mfd: ti_am335x_tscadc: Ensure a balanced number of node get/put Miquel Raynal
2021-10-15 8:14 ` [PATCH v6 09/48] mfd: ti_am335x_tscadc: Replace license text with SPDX tag Miquel Raynal
2021-10-15 8:14 ` [PATCH v6 10/48] mfd: ti_am335x_tscadc: Fix style Miquel Raynal
2021-10-15 8:14 ` [PATCH v6 11/48] mfd: ti_am335x_tscadc: Drop extra spacing when declaring stack variables Miquel Raynal
2021-10-15 8:14 ` [PATCH v6 12/48] mfd: ti_am335x_tscadc: Get rid of useless gotos Miquel Raynal
2021-10-15 8:14 ` [PATCH v6 13/48] mfd: ti_am335x_tscadc: Reword the comment explaining the dividers Miquel Raynal
2021-10-15 8:14 ` [PATCH v6 14/48] mfd: ti_am335x_tscadc: Don't search the tree for our clock Miquel Raynal
2022-03-04 22:38 ` H. Nikolaus Schaller
2022-03-07 11:10 ` Miquel Raynal
2022-03-07 11:15 ` H. Nikolaus Schaller
2021-10-15 8:14 ` [PATCH v6 15/48] mfd: ti_am335x_tscadc: Simplify divisor calculation Miquel Raynal
2021-10-15 8:14 ` [PATCH v6 16/48] mfd: ti_am335x_tscadc: Move the driver structure allocation earlier Miquel Raynal
2021-10-15 8:14 ` [PATCH v6 17/48] mfd: ti_am335x_tscadc: Use driver data Miquel Raynal
2021-10-15 8:14 ` [PATCH v6 18/48] mfd: ti_am335x_tscadc: Mimic the probe from resume() Miquel Raynal
2021-10-15 8:14 ` [PATCH v6 19/48] mfd: ti_am335x_tscadc: Drop useless variables from the driver structure Miquel Raynal
2021-10-15 8:14 ` [PATCH v6 20/48] mfd: ti_am335x_tscadc: Always provide an idle configuration Miquel Raynal
2021-10-15 8:14 ` [PATCH v6 21/48] mfd: ti_am335x_tscadc: Reorder the initialization steps Miquel Raynal
2021-10-15 8:14 ` [PATCH v6 22/48] mfd: ti_am335x_tscadc: Gather the ctrl register logic in one place Miquel Raynal
2021-10-15 8:14 ` [PATCH v6 23/48] mfd: ti_am335x_tscadc: Replace the header license text with SPDX tag Miquel Raynal
2021-10-15 8:14 ` [PATCH v6 24/48] mfd: ti_am335x_tscadc: Fix header spacing Miquel Raynal
2021-10-15 8:14 ` [PATCH v6 25/48] mfd: ti_am335x_tscadc: Use the new HZ_PER_MHZ macro Miquel Raynal
2021-10-15 8:14 ` [PATCH v6 26/48] mfd: ti_am335x_tscadc: Drop unused definitions from the header Miquel Raynal
2021-10-15 14:00 ` Jonathan Cameron
2021-10-15 8:14 ` [PATCH v6 27/48] mfd: ti_am335x_tscadc: Use BIT(), GENMASK() and FIELD_PREP() when relevant Miquel Raynal
2021-10-15 8:14 ` Miquel Raynal [this message]
2021-10-15 8:14 ` [PATCH v6 29/48] mfd: ti_am335x_tscadc: Drop useless definitions from the header Miquel Raynal
2021-10-15 8:14 ` [PATCH v6 30/48] mfd: ti_am335x_tscadc: Rename the subsystem enable macro Miquel Raynal
2021-10-15 8:14 ` [PATCH v6 31/48] mfd: ti_am335x_tscadc: Add TSC prefix in certain macros Miquel Raynal
2021-10-15 8:14 ` [PATCH v6 32/48] mfd: ti_am335x_tscadc: Rename a variable Miquel Raynal
2021-10-15 8:14 ` [PATCH v6 33/48] mfd: ti_am335x_tscadc: Fix an error message Miquel Raynal
2021-10-15 8:14 ` [PATCH v6 34/48] mfd: ti_am335x_tscadc: Add a boolean to clarify the presence of a touchscreen Miquel Raynal
2021-10-15 8:14 ` [PATCH v6 35/48] mfd: ti_am335x_tscadc: Introduce a helper to deal with the type of hardware Miquel Raynal
2021-10-15 8:14 ` [PATCH v6 36/48] mfd: ti_am335x_tscadc: Add ADC1/magnetic reader support Miquel Raynal
2021-10-15 8:14 ` [PATCH v6 37/48] mfd: ti_am335x_tscadc: Support the correctly spelled DT property Miquel Raynal
2021-10-15 8:14 ` [PATCH v6 38/48] iio: adc: ti_am335x_adc: Wait the idle state to avoid stalls Miquel Raynal
2021-10-15 8:14 ` [PATCH v6 39/48] iio: adc: ti_am335x_adc: Replace license text with SPDX tag Miquel Raynal
2021-10-15 8:14 ` [PATCH v6 40/48] iio: adc: ti_am335x_adc: Fix style Miquel Raynal
2021-10-15 8:14 ` [PATCH v6 41/48] iio: adc: ti_am335x_adc: Get rid of useless gotos Miquel Raynal
2021-10-15 8:15 ` [PATCH v6 42/48] iio: adc: ti_am335x_adc: Gather the checks on the delays Miquel Raynal
2021-10-15 8:15 ` [PATCH v6 43/48] iio: adc: ti_am335x_adc: Add a unit to the timeout delay Miquel Raynal
2021-10-15 8:15 ` [PATCH v6 44/48] iio: adc: ti_am335x_adc: Add the scale information Miquel Raynal
2021-10-15 8:15 ` [PATCH v6 45/48] iio: adc: ti_am335x_adc: Add the am437x compatible Miquel Raynal
2021-10-15 8:15 ` [PATCH v6 46/48] ARM: dts: am437x-cm-t43: Use a correctly spelled DT property Miquel Raynal
2021-10-15 8:15 ` [PATCH v6 47/48] ARM: dts: am43xx: Describe the magnetic reader/ADC1 hardware module Miquel Raynal
2021-10-15 8:15 ` [PATCH v6 48/48] ARM: dts: am437x-gp-evm: enable ADC1 Miquel Raynal
2021-10-20 15:36 ` [PATCH v6 00/48] TI AM437X ADC1 Miquel Raynal
2021-10-20 15:57 ` Lee Jones
2021-10-21 7:45 ` Miquel Raynal
2021-10-21 12:02 ` [GIT PULL] Immutable branch between MFD, IIO, Input (Touchscreen) and Clk due for the v5.16 merge window Lee Jones
2021-10-21 12:13 ` Miquel Raynal
2021-10-21 12:31 ` Lee Jones
2021-10-21 12:41 ` Miquel Raynal
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20211015081506.933180-29-miquel.raynal@bootlin.com \
--to=miquel.raynal@bootlin.com \
--cc=Jonathan.Cameron@huawei.com \
--cc=jic23@kernel.org \
--cc=lee.jones@linaro.org \
--cc=linux-iio@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-omap@vger.kernel.org \
--cc=ryan.barnett@collins.com \
--cc=thomas.petazzoni@bootlin.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).