From: Dario Binacchi <dariobin@libero.it>
To: u-boot@lists.denx.de
Subject: [PATCH v2 08/12] pinctrl: single: add register access functions
Date: Thu, 28 Jan 2021 23:24:57 +0100 [thread overview]
Message-ID: <20210128222501.31943-9-dariobin@libero.it> (raw)
In-Reply-To: <20210128222501.31943-1-dariobin@libero.it>
The configuration of pinmux registers was implemented with duplicate
code which can be removed by adding two functions for read/write access.
Access to 8-bit registers has also been added.
Signed-off-by: Dario Binacchi <dariobin@libero.it>
---
Changes in v2:
- Updated commit message.
- Remove pointer to access functions.
drivers/pinctrl/pinctrl-single.c | 71 +++++++++++++++++++++-----------
1 file changed, 46 insertions(+), 25 deletions(-)
diff --git a/drivers/pinctrl/pinctrl-single.c b/drivers/pinctrl/pinctrl-single.c
index 630a6c08b8..5b3ccc2281 100644
--- a/drivers/pinctrl/pinctrl-single.c
+++ b/drivers/pinctrl/pinctrl-single.c
@@ -56,6 +56,38 @@ struct single_fdt_bits_cfg {
fdt32_t mask;
};
+static unsigned int single_read(struct udevice *dev, fdt_addr_t reg)
+{
+ struct single_pdata *pdata = dev_get_plat(dev);
+
+ switch (pdata->width) {
+ case 8:
+ return readb(reg);
+ case 16:
+ return readw(reg);
+ default: /* 32 bits */
+ return readl(reg);
+ }
+
+ return readb(reg);
+}
+
+static void single_write(struct udevice *dev, unsigned int val, fdt_addr_t reg)
+{
+ struct single_pdata *pdata = dev_get_plat(dev);
+
+ switch (pdata->width) {
+ case 8:
+ writeb(val, reg);
+ break;
+ case 16:
+ writew(val, reg);
+ break;
+ default: /* 32 bits */
+ writel(val, reg);
+ }
+}
+
/**
* single_configure_pins() - Configure pins based on FDT data
*
@@ -93,19 +125,10 @@ static int single_configure_pins(struct udevice *dev,
reg = pdata->base + offset;
val = fdt32_to_cpu(pins->val) & pdata->mask;
- switch (pdata->width) {
- case 16:
- writew((readw(reg) & ~pdata->mask) | val, reg);
- break;
- case 32:
- writel((readl(reg) & ~pdata->mask) | val, reg);
- break;
- default:
- dev_warn(dev, "unsupported register width %i\n",
- pdata->width);
- continue;
- }
+ single_write(dev, (single_read(dev, reg) & ~pdata->mask) | val,
+ reg);
dev_dbg(dev, " reg/val %pa/0x%08x\n", ®, val);
+
}
return 0;
}
@@ -131,19 +154,7 @@ static int single_configure_bits(struct udevice *dev,
mask = fdt32_to_cpu(pins->mask);
val = fdt32_to_cpu(pins->val) & mask;
-
- switch (pdata->width) {
- case 16:
- writew((readw(reg) & ~mask) | val, reg);
- break;
- case 32:
- writel((readl(reg) & ~mask) | val, reg);
- break;
- default:
- dev_warn(dev, "unsupported register width %i\n",
- pdata->width);
- continue;
- }
+ single_write(dev, (single_read(dev, reg) & ~mask) | val, reg);
dev_dbg(dev, " reg/val %pa/0x%08x\n", ®, val);
}
return 0;
@@ -196,6 +207,16 @@ static int single_of_to_plat(struct udevice *dev)
return ret;
}
+ switch (pdata->width) {
+ case 8:
+ case 16:
+ case 32:
+ break;
+ default:
+ dev_err(dev, "wrong register width\n");
+ return -EINVAL;
+ }
+
addr = dev_read_addr_size(dev, "reg", &size);
if (addr == FDT_ADDR_T_NONE) {
dev_err(dev, "failed to get base register size\n");
--
2.17.1
next prev parent reply other threads:[~2021-01-28 22:24 UTC|newest]
Thread overview: 23+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-01-28 22:24 [PATCH v2 00/12] Add support for pinmux status command on beaglebone Dario Binacchi
2021-01-28 22:24 ` [PATCH v2 01/12] pinctrl: single: fix format of structure documentation Dario Binacchi
2021-01-28 22:24 ` [PATCH v2 02/12] pinctrl: single: fix the loop counter variable type Dario Binacchi
2021-01-28 22:24 ` [PATCH v2 03/12] pinctrl: single: fix offset management Dario Binacchi
2021-01-29 16:50 ` Pratyush Yadav
2021-01-28 22:24 ` [PATCH v2 04/12] pinctrl: single: fix debug messages formatting Dario Binacchi
2021-01-29 16:53 ` Pratyush Yadav
2021-01-28 22:24 ` [PATCH v2 05/12] pinctrl: single: get register area size by device API Dario Binacchi
2021-01-29 17:47 ` Pratyush Yadav
2021-01-28 22:24 ` [PATCH v2 06/12] pinctrl: single: check "register-width" DT property Dario Binacchi
2021-01-28 22:24 ` [PATCH v2 07/12] pinctrl: single: change function mask default value Dario Binacchi
2021-02-01 20:44 ` Simon Glass
2021-01-28 22:24 ` Dario Binacchi [this message]
2021-02-01 20:44 ` [PATCH v2 08/12] pinctrl: single: add register access functions Simon Glass
2021-01-28 22:24 ` [PATCH v2 09/12] pinctrl: single: add get_pins_count operation Dario Binacchi
2021-01-28 22:24 ` [PATCH v2 10/12] pinctrl: single: add get_pin_name operation Dario Binacchi
2021-01-28 22:25 ` [PATCH v2 11/12] pinctrl: single: add get_pin_muxing operation Dario Binacchi
2021-02-01 20:44 ` Simon Glass
2021-01-28 22:25 ` [PATCH v2 12/12] test: pinmux: add test for 'pinctrl-single' driver Dario Binacchi
2021-02-04 18:02 ` [PATCH v2 00/12] Add support for pinmux status command on beaglebone Lokesh Vutla
2021-02-05 10:54 ` Dario Binacchi
2021-02-05 14:17 ` Lokesh Vutla
2021-02-05 18:37 ` Tom Rini
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=20210128222501.31943-9-dariobin@libero.it \
--to=dariobin@libero.it \
--cc=u-boot@lists.denx.de \
/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