redonkable
/
alistair23-linux
1
0
Fork 0
Code Releases Activity

pinctrl: sh-pfc: r8a77990: Rename IOCTRLx registers 

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 the code to match this.

Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be>
Reviewed-by: Ulrich Hecht <uli+renesas@fpond.eu>
hifive-unleashed-5.2
Geert Uytterhoeven 2019-02-18 10:42:43 +01:00
parent a8d728a0c5
commit 3df892fdbf
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
drivers/pinctrl/sh-pfc/pfc-r8a77990.c
View File

@ -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;