pinctrl: sh-pfc: r8a77990: Rename IOCTRLx registers (3df892fd) · Commits · 戴 / test

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>

drivers/pinctrl/sh-pfc/pfc-r8a77990.c

+3 −3

Original line number	Diff line number	Diff line
		@@ -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;

Admin message