From: Geert Uytterhoeven <geert+renesas@glider.be>
To: Tony Lindgren <tony@atomide.com>,
Russell King <linux@armlinux.org.uk>,
Rajendra Nayak <rnayak@codeaurora.org>,
Paul Walmsley <paul@pwsan.com>,
Michael Turquette <mturquette@baylibre.com>,
Stephen Boyd <sboyd@kernel.org>,
Nicolas Ferre <nicolas.ferre@microchip.com>,
Alexandre Belloni <alexandre.belloni@bootlin.com>,
Ludovic Desroches <ludovic.desroches@microchip.com>,
Tero Kristo <kristo@kernel.org>,
Jonathan Cameron <jic23@kernel.org>,
Lars-Peter Clausen <lars@metafoo.de>,
Lorenzo Bianconi <lorenzo.bianconi83@gmail.com>,
Benoit Parrot <bparrot@ti.com>,
Mauro Carvalho Chehab <mchehab@kernel.org>,
Adrian Hunter <adrian.hunter@intel.com>,
Andrew Jeffery <andrew@aj.id.au>,
Ulf Hansson <ulf.hansson@linaro.org>,
Joel Stanley <joel@jms.id.au>, Ping-Ke Shih <pkshih@realtek.com>,
Kalle Valo <kvalo@codeaurora.org>,
"David S . Miller" <davem@davemloft.net>,
Jakub Kicinski <kuba@kernel.org>,
Linus Walleij <linus.walleij@linaro.org>,
Liam Girdwood <lgirdwood@gmail.com>,
Mark Brown <broonie@kernel.org>,
Magnus Damm <magnus.damm@gmail.com>,
Eduardo Valentin <edubezval@gmail.com>,
Keerthy <j-keerthy@ti.com>,
"Rafael J . Wysocki" <rafael@kernel.org>,
Daniel Lezcano <daniel.lezcano@linaro.org>,
Amit Kucheria <amitk@kernel.org>, Zhang Rui <rui.zhang@intel.com>,
Jaroslav Kysela <perex@perex.cz>, Takashi Iwai <tiwai@suse.com>
Cc: linux-arm-kernel@lists.infradead.org, linux-omap@vger.kernel.org,
linux-kernel@vger.kernel.org, linux-clk@vger.kernel.org,
linux-renesas-soc@vger.kernel.org, linux-iio@vger.kernel.org,
linux-media@vger.kernel.org, linux-mmc@vger.kernel.org,
linux-aspeed@lists.ozlabs.org, openbmc@lists.ozlabs.org,
linux-wireless@vger.kernel.org, netdev@vger.kernel.org,
linux-gpio@vger.kernel.org, linux-pm@vger.kernel.org,
alsa-devel@alsa-project.org,
Geert Uytterhoeven <geert+renesas@glider.be>
Subject: [PATCH/RFC 13/17] pinctl: ti: iodelay: Use bitfield helpers
Date: Mon, 22 Nov 2021 16:54:06 +0100 [thread overview]
Message-ID: <60257a3c5b567fb5b14d6f9adb770899bce88f7a.1637592133.git.geert+renesas@glider.be> (raw)
In-Reply-To: <cover.1637592133.git.geert+renesas@glider.be>
Use the field_{get,prep}() helpers, instead of defining a custom
function, or open-coding the same operations.
Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be>
---
Compile-tested only.
Marked RFC, as this depends on [PATCH 01/17], but follows a different
path to upstream.
---
drivers/pinctrl/ti/pinctrl-ti-iodelay.c | 35 +++++++------------------
1 file changed, 10 insertions(+), 25 deletions(-)
diff --git a/drivers/pinctrl/ti/pinctrl-ti-iodelay.c b/drivers/pinctrl/ti/pinctrl-ti-iodelay.c
index 4e2382778d38f557..b220dcd9215520db 100644
--- a/drivers/pinctrl/ti/pinctrl-ti-iodelay.c
+++ b/drivers/pinctrl/ti/pinctrl-ti-iodelay.c
@@ -9,6 +9,7 @@
* warranty of any kind, whether express or implied.
*/
+#include <linux/bitfield.h>
#include <linux/err.h>
#include <linux/init.h>
#include <linux/io.h>
@@ -155,18 +156,6 @@ struct ti_iodelay_device {
struct ti_iodelay_reg_values reg_init_conf_values;
};
-/**
- * ti_iodelay_extract() - extract bits for a field
- * @val: Register value
- * @mask: Mask
- *
- * Return: extracted value which is appropriately shifted
- */
-static inline u32 ti_iodelay_extract(u32 val, u32 mask)
-{
- return (val & mask) >> __ffs(mask);
-}
-
/**
* ti_iodelay_compute_dpe() - Compute equation for delay parameter
* @period: Period to use
@@ -233,10 +222,10 @@ static int ti_iodelay_pinconf_set(struct ti_iodelay_device *iod,
}
reg_mask = reg->signature_mask;
- reg_val = reg->signature_value << __ffs(reg->signature_mask);
+ reg_val = field_prep(reg->signature_mask, reg->signature_value);
reg_mask |= reg->binary_data_coarse_mask;
- tmp_val = c_elements << __ffs(reg->binary_data_coarse_mask);
+ tmp_val = field_prep(reg->binary_data_coarse_mask, c_elements);
if (tmp_val & ~reg->binary_data_coarse_mask) {
dev_err(dev, "Masking overflow of coarse elements %08x\n",
tmp_val);
@@ -245,7 +234,7 @@ static int ti_iodelay_pinconf_set(struct ti_iodelay_device *iod,
reg_val |= tmp_val;
reg_mask |= reg->binary_data_fine_mask;
- tmp_val = f_elements << __ffs(reg->binary_data_fine_mask);
+ tmp_val = field_prep(reg->binary_data_fine_mask, f_elements);
if (tmp_val & ~reg->binary_data_fine_mask) {
dev_err(dev, "Masking overflow of fine elements %08x\n",
tmp_val);
@@ -260,7 +249,7 @@ static int ti_iodelay_pinconf_set(struct ti_iodelay_device *iod,
* impacting iodelay configuration. Use with care!
*/
reg_mask |= reg->lock_mask;
- reg_val |= reg->unlock_val << __ffs(reg->lock_mask);
+ reg_val |= field_prep(reg->lock_mask, reg->unlock_val);
r = regmap_update_bits(iod->regmap, cfg->offset, reg_mask, reg_val);
dev_dbg(dev, "Set reg 0x%x Delay(a: %d g: %d), Elements(C=%d F=%d)0x%x\n",
@@ -296,16 +285,14 @@ static int ti_iodelay_pinconf_init_dev(struct ti_iodelay_device *iod)
r = regmap_read(iod->regmap, reg->reg_refclk_offset, &val);
if (r)
return r;
- ival->ref_clk_period = ti_iodelay_extract(val, reg->refclk_period_mask);
+ ival->ref_clk_period = field_get(reg->refclk_period_mask, val);
dev_dbg(dev, "refclk_period=0x%04x\n", ival->ref_clk_period);
r = regmap_read(iod->regmap, reg->reg_coarse_offset, &val);
if (r)
return r;
- ival->coarse_ref_count =
- ti_iodelay_extract(val, reg->coarse_ref_count_mask);
- ival->coarse_delay_count =
- ti_iodelay_extract(val, reg->coarse_delay_count_mask);
+ ival->coarse_ref_count = field_get(reg->coarse_ref_count_mask, val);
+ ival->coarse_delay_count = field_get(reg->coarse_delay_count_mask, val);
if (!ival->coarse_delay_count) {
dev_err(dev, "Invalid Coarse delay count (0) (reg=0x%08x)\n",
val);
@@ -326,10 +313,8 @@ static int ti_iodelay_pinconf_init_dev(struct ti_iodelay_device *iod)
r = regmap_read(iod->regmap, reg->reg_fine_offset, &val);
if (r)
return r;
- ival->fine_ref_count =
- ti_iodelay_extract(val, reg->fine_ref_count_mask);
- ival->fine_delay_count =
- ti_iodelay_extract(val, reg->fine_delay_count_mask);
+ ival->fine_ref_count = field_get(reg->fine_ref_count_mask, val);
+ ival->fine_delay_count = field_get(reg->fine_delay_count_mask, val);
if (!ival->fine_delay_count) {
dev_err(dev, "Invalid Fine delay count (0) (reg=0x%08x)\n",
val);
--
2.25.1
next prev parent reply other threads:[~2021-11-22 15:55 UTC|newest]
Thread overview: 41+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-11-22 15:53 [PATCH 00/17] Non-const bitfield helper conversions Geert Uytterhoeven
2021-11-22 15:53 ` [PATCH 01/17] bitfield: Add non-constant field_{prep,get}() helpers Geert Uytterhoeven
2021-11-22 16:32 ` Johannes Berg
2021-11-23 1:17 ` Jakub Kicinski
2021-11-23 8:36 ` Geert Uytterhoeven
2021-11-23 16:24 ` Johannes Berg
2021-11-23 23:49 ` Jakub Kicinski
2021-11-24 8:03 ` Johannes Berg
2021-11-24 13:59 ` Jakub Kicinski
2021-11-24 14:07 ` Johannes Berg
2021-11-23 23:39 ` Jakub Kicinski
2021-11-23 1:52 ` Alex Elder
2021-11-23 8:38 ` Geert Uytterhoeven
2021-11-23 8:30 ` Geert Uytterhoeven
2021-11-23 16:21 ` Johannes Berg
2021-11-23 16:31 ` Geert Uytterhoeven
2021-11-24 8:24 ` Kalle Valo
2021-11-22 15:53 ` [PATCH 02/17] clk: renesas: Use bitfield helpers Geert Uytterhoeven
2021-11-22 15:53 ` [PATCH/RFC 03/17] soc: " Geert Uytterhoeven
2021-11-22 15:53 ` [PATCH/RFC 04/17] ARM: OMAP2+: " Geert Uytterhoeven
2021-11-22 15:53 ` [PATCH/RFC 05/17] bus: omap_l3_noc: " Geert Uytterhoeven
2021-11-22 15:53 ` [PATCH/RFC 06/17] clk: ti: " Geert Uytterhoeven
2021-11-22 15:54 ` [PATCH/RFC 07/17] iio: st_sensors: " Geert Uytterhoeven
2021-11-23 23:35 ` Linus Walleij
2021-11-22 15:54 ` [PATCH/RFC 08/17] iio: humidity: hts221: " Geert Uytterhoeven
2021-11-24 15:21 ` Jonathan Cameron
2021-11-22 15:54 ` [PATCH/RFC 09/17] iio: imu: st_lsm6dsx: " Geert Uytterhoeven
2021-11-22 15:54 ` [PATCH/RFC 10/17] media: ti-vpe: cal: " Geert Uytterhoeven
2021-11-22 15:54 ` [PATCH/RFC 11/17] mmc: sdhci-of-aspeed: " Geert Uytterhoeven
2021-11-22 15:54 ` [PATCH/RFC 12/17] pinctrl: aspeed: " Geert Uytterhoeven
2021-11-22 15:54 ` Geert Uytterhoeven [this message]
2021-11-22 17:52 ` [PATCH/RFC 13/17] pinctl: ti: iodelay: " Alexandre Belloni
2021-11-22 15:54 ` [PATCH/RFC 14/17] regulator: ti-abb: " Geert Uytterhoeven
2021-11-22 16:31 ` Mark Brown
2021-11-22 15:54 ` [PATCH/RFC 15/17] thermal/ti-soc-thermal: " Geert Uytterhoeven
2021-11-22 15:54 ` [PATCH/RFC 16/17] ALSA: ice1724: " Geert Uytterhoeven
2021-11-23 11:24 ` Takashi Iwai
2021-11-22 15:54 ` [PATCH/RFC 17/17] rtw89: " Geert Uytterhoeven
2021-11-22 18:38 ` Larry Finger
2021-11-22 17:50 ` [PATCH 00/17] Non-const bitfield helper conversions Alexandre Belloni
2021-11-23 8:20 ` Geert Uytterhoeven
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=60257a3c5b567fb5b14d6f9adb770899bce88f7a.1637592133.git.geert+renesas@glider.be \
--to=geert+renesas@glider.be \
--cc=adrian.hunter@intel.com \
--cc=alexandre.belloni@bootlin.com \
--cc=alsa-devel@alsa-project.org \
--cc=amitk@kernel.org \
--cc=andrew@aj.id.au \
--cc=bparrot@ti.com \
--cc=broonie@kernel.org \
--cc=daniel.lezcano@linaro.org \
--cc=davem@davemloft.net \
--cc=edubezval@gmail.com \
--cc=j-keerthy@ti.com \
--cc=jic23@kernel.org \
--cc=joel@jms.id.au \
--cc=kristo@kernel.org \
--cc=kuba@kernel.org \
--cc=kvalo@codeaurora.org \
--cc=lars@metafoo.de \
--cc=lgirdwood@gmail.com \
--cc=linus.walleij@linaro.org \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-aspeed@lists.ozlabs.org \
--cc=linux-clk@vger.kernel.org \
--cc=linux-gpio@vger.kernel.org \
--cc=linux-iio@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-media@vger.kernel.org \
--cc=linux-mmc@vger.kernel.org \
--cc=linux-omap@vger.kernel.org \
--cc=linux-pm@vger.kernel.org \
--cc=linux-renesas-soc@vger.kernel.org \
--cc=linux-wireless@vger.kernel.org \
--cc=linux@armlinux.org.uk \
--cc=lorenzo.bianconi83@gmail.com \
--cc=ludovic.desroches@microchip.com \
--cc=magnus.damm@gmail.com \
--cc=mchehab@kernel.org \
--cc=mturquette@baylibre.com \
--cc=netdev@vger.kernel.org \
--cc=nicolas.ferre@microchip.com \
--cc=openbmc@lists.ozlabs.org \
--cc=paul@pwsan.com \
--cc=perex@perex.cz \
--cc=pkshih@realtek.com \
--cc=rafael@kernel.org \
--cc=rnayak@codeaurora.org \
--cc=rui.zhang@intel.com \
--cc=sboyd@kernel.org \
--cc=tiwai@suse.com \
--cc=tony@atomide.com \
--cc=ulf.hansson@linaro.org \
/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).