* [PATCH 0/3] pinctrl: sh-pfc: rcar-gen3: Rename IOCTRLx registers
@ 2019-02-18 13:59 Geert Uytterhoeven
2019-02-18 13:59 ` [PATCH 1/3] pinctrl: sh-pfc: r8a77970: " Geert Uytterhoeven
` (2 more replies)
0 siblings, 3 replies; 7+ messages in thread
From: Geert Uytterhoeven @ 2019-02-18 13:59 UTC (permalink / raw)
To: Linus Walleij
Cc: Marek Vasut, linux-renesas-soc, linux-gpio, Geert Uytterhoeven
Hi all,
The R-Car Gen3 HardWare Manual Errata for Rev. 1.00 (Jul 2, 2018)
renamed the various miscellaneous I/O control registers (IOCTRLx) on
R-Car V3M, V3H, and E3, to reflect better their actual purposes, and
matching other SoCs.
Update to code to match this.
I plan to queue these in sh-pfc-for-v5.2.
Thanks!
Geert Uytterhoeven (3):
pinctrl: sh-pfc: r8a77970: Rename IOCTRLx registers
pinctrl: sh-pfc: r8a77980: Rename IOCTRLx registers
pinctrl: sh-pfc: r8a77990: Rename IOCTRLx registers
drivers/pinctrl/sh-pfc/pfc-r8a77970.c | 16 ++++++++--------
drivers/pinctrl/sh-pfc/pfc-r8a77980.c | 22 +++++++++++-----------
drivers/pinctrl/sh-pfc/pfc-r8a77990.c | 6 +++---
3 files changed, 22 insertions(+), 22 deletions(-)
--
2.17.1
Gr{oetje,eeting}s,
Geert
--
Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- geert@linux-m68k.org
In personal conversations with technical people, I call myself a hacker. But
when I'm talking to journalists I just say "programmer" or something like that.
-- Linus Torvalds
^ permalink raw reply [flat|nested] 7+ messages in thread
* [PATCH 1/3] pinctrl: sh-pfc: r8a77970: Rename IOCTRLx registers
2019-02-18 13:59 [PATCH 0/3] pinctrl: sh-pfc: rcar-gen3: Rename IOCTRLx registers Geert Uytterhoeven
@ 2019-02-18 13:59 ` Geert Uytterhoeven
2019-02-19 8:57 ` Ulrich Hecht
2019-02-18 13:59 ` [PATCH 2/3] pinctrl: sh-pfc: r8a77980: " Geert Uytterhoeven
2019-02-18 13:59 ` [PATCH 3/3] pinctrl: sh-pfc: r8a77990: " Geert Uytterhoeven
2 siblings, 1 reply; 7+ messages in thread
From: Geert Uytterhoeven @ 2019-02-18 13:59 UTC (permalink / raw)
To: Linus Walleij
Cc: Marek Vasut, linux-renesas-soc, linux-gpio, Geert Uytterhoeven
The R-Car Gen3 HardWare Manual Errata for Rev. 1.00 (Jul 2, 2018)
renamed the various miscellaneous I/O control registers (IOCTRLx) on
R-Car V3M, to reflect better their actual purposes, and matching other
SoCs.
Update to code to match this.
Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be>
---
drivers/pinctrl/sh-pfc/pfc-r8a77970.c | 16 ++++++++--------
1 file changed, 8 insertions(+), 8 deletions(-)
diff --git a/drivers/pinctrl/sh-pfc/pfc-r8a77970.c b/drivers/pinctrl/sh-pfc/pfc-r8a77970.c
index c5e67ba29f7c88cd..e2d1b49aaee6cc4c 100644
--- a/drivers/pinctrl/sh-pfc/pfc-r8a77970.c
+++ b/drivers/pinctrl/sh-pfc/pfc-r8a77970.c
@@ -2406,15 +2406,15 @@ static const struct pinmux_cfg_reg pinmux_config_regs[] = {
};
enum ioctrl_regs {
- IOCTRL30,
- IOCTRL31,
- IOCTRL32,
+ POCCTRL0,
+ POCCTRL1,
+ POCCTRL2,
};
static const struct pinmux_ioctrl_reg pinmux_ioctrl_regs[] = {
- [IOCTRL30] = { 0xe6060380 },
- [IOCTRL31] = { 0xe6060384 },
- [IOCTRL32] = { 0xe6060388 },
+ [POCCTRL0] = { 0xe6060380 },
+ [POCCTRL1] = { 0xe6060384 },
+ [POCCTRL2] = { 0xe6060388 },
{ /* sentinel */ },
};
@@ -2423,13 +2423,13 @@ static int r8a77970_pin_to_pocctrl(struct sh_pfc *pfc, unsigned int pin,
{
int bit = pin & 0x1f;
- *pocctrl = pinmux_ioctrl_regs[IOCTRL30].reg;
+ *pocctrl = pinmux_ioctrl_regs[POCCTRL0].reg;
if (pin >= RCAR_GP_PIN(0, 0) && pin <= RCAR_GP_PIN(0, 21))
return bit;
if (pin >= RCAR_GP_PIN(2, 0) && pin <= RCAR_GP_PIN(2, 9))
return bit + 22;
- *pocctrl = pinmux_ioctrl_regs[IOCTRL31].reg;
+ *pocctrl = pinmux_ioctrl_regs[POCCTRL1].reg;
if (pin >= RCAR_GP_PIN(2, 10) && pin <= RCAR_GP_PIN(2, 16))
return bit - 10;
if (pin >= RCAR_GP_PIN(3, 0) && pin <= RCAR_GP_PIN(3, 16))
--
2.17.1
^ permalink raw reply related [flat|nested] 7+ messages in thread
* [PATCH 2/3] pinctrl: sh-pfc: r8a77980: Rename IOCTRLx registers
2019-02-18 13:59 [PATCH 0/3] pinctrl: sh-pfc: rcar-gen3: Rename IOCTRLx registers Geert Uytterhoeven
2019-02-18 13:59 ` [PATCH 1/3] pinctrl: sh-pfc: r8a77970: " Geert Uytterhoeven
@ 2019-02-18 13:59 ` Geert Uytterhoeven
2019-02-19 8:58 ` Ulrich Hecht
2019-02-18 13:59 ` [PATCH 3/3] pinctrl: sh-pfc: r8a77990: " Geert Uytterhoeven
2 siblings, 1 reply; 7+ messages in thread
From: Geert Uytterhoeven @ 2019-02-18 13:59 UTC (permalink / raw)
To: Linus Walleij
Cc: Marek Vasut, linux-renesas-soc, linux-gpio, Geert Uytterhoeven
The R-Car Gen3 HardWare Manual Errata for Rev. 1.00 (Jul 2, 2018)
renamed the various miscellaneous I/O control registers (IOCTRLx) on
R-Car V3H, to reflect better their actual purposes, and matching other
SoCs.
Update to code to match this.
Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be>
---
drivers/pinctrl/sh-pfc/pfc-r8a77980.c | 22 +++++++++++-----------
1 file changed, 11 insertions(+), 11 deletions(-)
diff --git a/drivers/pinctrl/sh-pfc/pfc-r8a77980.c b/drivers/pinctrl/sh-pfc/pfc-r8a77980.c
index b807b67ae143e30b..1dcc508366b89b4f 100644
--- a/drivers/pinctrl/sh-pfc/pfc-r8a77980.c
+++ b/drivers/pinctrl/sh-pfc/pfc-r8a77980.c
@@ -2828,17 +2828,17 @@ static const struct pinmux_cfg_reg pinmux_config_regs[] = {
};
enum ioctrl_regs {
- IOCTRL30,
- IOCTRL31,
- IOCTRL32,
- IOCTRL33,
+ POCCTRL0,
+ POCCTRL1,
+ POCCTRL2,
+ POCCTRL3,
};
static const struct pinmux_ioctrl_reg pinmux_ioctrl_regs[] = {
- [IOCTRL30] = { 0xe6060380, },
- [IOCTRL31] = { 0xe6060384, },
- [IOCTRL32] = { 0xe6060388, },
- [IOCTRL33] = { 0xe606038c, },
+ [POCCTRL0] = { 0xe6060380, },
+ [POCCTRL1] = { 0xe6060384, },
+ [POCCTRL2] = { 0xe6060388, },
+ [POCCTRL3] = { 0xe606038c, },
{ /* sentinel */ },
};
@@ -2847,20 +2847,20 @@ static int r8a77980_pin_to_pocctrl(struct sh_pfc *pfc, unsigned int pin,
{
int bit = pin & 0x1f;
- *pocctrl = pinmux_ioctrl_regs[IOCTRL30].reg;
+ *pocctrl = pinmux_ioctrl_regs[POCCTRL0].reg;
if (pin >= RCAR_GP_PIN(0, 0) && pin <= RCAR_GP_PIN(0, 21))
return bit;
else if (pin >= RCAR_GP_PIN(2, 0) && pin <= RCAR_GP_PIN(2, 9))
return bit + 22;
- *pocctrl = pinmux_ioctrl_regs[IOCTRL31].reg;
+ *pocctrl = pinmux_ioctrl_regs[POCCTRL1].reg;
if (pin >= RCAR_GP_PIN(2, 10) && pin <= RCAR_GP_PIN(2, 16))
return bit - 10;
if ((pin >= RCAR_GP_PIN(2, 17) && pin <= RCAR_GP_PIN(2, 24)) ||
(pin >= RCAR_GP_PIN(3, 0) && pin <= RCAR_GP_PIN(3, 16)))
return bit + 7;
- *pocctrl = pinmux_ioctrl_regs[IOCTRL32].reg;
+ *pocctrl = pinmux_ioctrl_regs[POCCTRL2].reg;
if (pin >= RCAR_GP_PIN(2, 25) && pin <= RCAR_GP_PIN(2, 29))
return pin - 25;
--
2.17.1
^ permalink raw reply related [flat|nested] 7+ messages in thread
* [PATCH 3/3] pinctrl: sh-pfc: r8a77990: Rename IOCTRLx registers
2019-02-18 13:59 [PATCH 0/3] pinctrl: sh-pfc: rcar-gen3: Rename IOCTRLx registers Geert Uytterhoeven
2019-02-18 13:59 ` [PATCH 1/3] pinctrl: sh-pfc: r8a77970: " Geert Uytterhoeven
2019-02-18 13:59 ` [PATCH 2/3] pinctrl: sh-pfc: r8a77980: " Geert Uytterhoeven
@ 2019-02-18 13:59 ` Geert Uytterhoeven
2019-02-19 8:59 ` Ulrich Hecht
2 siblings, 1 reply; 7+ messages in thread
From: Geert Uytterhoeven @ 2019-02-18 13:59 UTC (permalink / raw)
To: Linus Walleij
Cc: Marek Vasut, linux-renesas-soc, linux-gpio, Geert Uytterhoeven
The R-Car Gen3 HardWare Manual Errata for Rev. 1.00 (Jul 2, 2018)
renamed the various miscellaneous I/O control registers (IOCTRLx) on
R-Car E3, to reflect better their actual purposes, and matching other
SoCs.
Update to code to match this.
Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be>
---
drivers/pinctrl/sh-pfc/pfc-r8a77990.c | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/drivers/pinctrl/sh-pfc/pfc-r8a77990.c b/drivers/pinctrl/sh-pfc/pfc-r8a77990.c
index 151640c30e9dc791..982b215fa0724549 100644
--- a/drivers/pinctrl/sh-pfc/pfc-r8a77990.c
+++ b/drivers/pinctrl/sh-pfc/pfc-r8a77990.c
@@ -4995,11 +4995,11 @@ static const struct pinmux_cfg_reg pinmux_config_regs[] = {
};
enum ioctrl_regs {
- IOCTRL30,
+ POCCTRL0,
};
static const struct pinmux_ioctrl_reg pinmux_ioctrl_regs[] = {
- [IOCTRL30] = { 0xe6060380, },
+ [POCCTRL0] = { 0xe6060380, },
{ /* sentinel */ },
};
@@ -5008,7 +5008,7 @@ static int r8a77990_pin_to_pocctrl(struct sh_pfc *pfc, unsigned int pin,
{
int bit = -EINVAL;
- *pocctrl = pinmux_ioctrl_regs[IOCTRL30].reg;
+ *pocctrl = pinmux_ioctrl_regs[POCCTRL0].reg;
if (pin >= RCAR_GP_PIN(3, 0) && pin <= RCAR_GP_PIN(3, 11))
bit = pin & 0x1f;
--
2.17.1
^ permalink raw reply related [flat|nested] 7+ messages in thread
* Re: [PATCH 1/3] pinctrl: sh-pfc: r8a77970: Rename IOCTRLx registers
2019-02-18 13:59 ` [PATCH 1/3] pinctrl: sh-pfc: r8a77970: " Geert Uytterhoeven
@ 2019-02-19 8:57 ` Ulrich Hecht
0 siblings, 0 replies; 7+ messages in thread
From: Ulrich Hecht @ 2019-02-19 8:57 UTC (permalink / raw)
To: Geert Uytterhoeven, Linus Walleij
Cc: Marek Vasut, linux-renesas-soc, linux-gpio
> On February 18, 2019 at 2:59 PM Geert Uytterhoeven <geert+renesas@glider.be> wrote:
>
>
> The R-Car Gen3 HardWare Manual Errata for Rev. 1.00 (Jul 2, 2018)
> renamed the various miscellaneous I/O control registers (IOCTRLx) on
> R-Car V3M, to reflect better their actual purposes, and matching other
> SoCs.
>
> Update to code to match this.
>
> Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be>
Reviewed-by: Ulrich Hecht <uli+renesas@fpond.eu>
CU
Uli
^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: [PATCH 2/3] pinctrl: sh-pfc: r8a77980: Rename IOCTRLx registers
2019-02-18 13:59 ` [PATCH 2/3] pinctrl: sh-pfc: r8a77980: " Geert Uytterhoeven
@ 2019-02-19 8:58 ` Ulrich Hecht
0 siblings, 0 replies; 7+ messages in thread
From: Ulrich Hecht @ 2019-02-19 8:58 UTC (permalink / raw)
To: Geert Uytterhoeven, Linus Walleij
Cc: Marek Vasut, linux-renesas-soc, linux-gpio
> On February 18, 2019 at 2:59 PM Geert Uytterhoeven <geert+renesas@glider.be> wrote:
>
>
> The R-Car Gen3 HardWare Manual Errata for Rev. 1.00 (Jul 2, 2018)
> renamed the various miscellaneous I/O control registers (IOCTRLx) on
> R-Car V3H, to reflect better their actual purposes, and matching other
> SoCs.
>
> Update to code to match this.
>
> Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be>
Reviewed-by: Ulrich Hecht <uli+renesas@fpond.eu>
CU
Uli
^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: [PATCH 3/3] pinctrl: sh-pfc: r8a77990: Rename IOCTRLx registers
2019-02-18 13:59 ` [PATCH 3/3] pinctrl: sh-pfc: r8a77990: " Geert Uytterhoeven
@ 2019-02-19 8:59 ` Ulrich Hecht
0 siblings, 0 replies; 7+ messages in thread
From: Ulrich Hecht @ 2019-02-19 8:59 UTC (permalink / raw)
To: Geert Uytterhoeven, Linus Walleij
Cc: Marek Vasut, linux-renesas-soc, linux-gpio
> On February 18, 2019 at 2:59 PM Geert Uytterhoeven <geert+renesas@glider.be> wrote:
>
>
> The R-Car Gen3 HardWare Manual Errata for Rev. 1.00 (Jul 2, 2018)
> renamed the various miscellaneous I/O control registers (IOCTRLx) on
> R-Car E3, to reflect better their actual purposes, and matching other
> SoCs.
>
> Update to code to match this.
Reviewed-by: Ulrich Hecht <uli+renesas@fpond.eu>
CU
Uli
^ permalink raw reply [flat|nested] 7+ messages in thread
end of thread, other threads:[~2019-02-19 8:59 UTC | newest]
Thread overview: 7+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2019-02-18 13:59 [PATCH 0/3] pinctrl: sh-pfc: rcar-gen3: Rename IOCTRLx registers Geert Uytterhoeven
2019-02-18 13:59 ` [PATCH 1/3] pinctrl: sh-pfc: r8a77970: " Geert Uytterhoeven
2019-02-19 8:57 ` Ulrich Hecht
2019-02-18 13:59 ` [PATCH 2/3] pinctrl: sh-pfc: r8a77980: " Geert Uytterhoeven
2019-02-19 8:58 ` Ulrich Hecht
2019-02-18 13:59 ` [PATCH 3/3] pinctrl: sh-pfc: r8a77990: " Geert Uytterhoeven
2019-02-19 8:59 ` Ulrich Hecht
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).