Commit 73c2cdfd authored by Linus Walleij's avatar Linus Walleij
Browse files

Merge tag 'renesas-pinctrl-for-v6.15-tag1' of... 

Merge tag 'renesas-pinctrl-for-v6.15-tag1' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/renesas-drivers

 into devel

pinctrl: renesas: Updates for v6.15

  - Add suspend/resume support for pull up/down on RZ/G3S,
  - Miscellaneous fixes and improvements.

Signed-off-by: default avatarLinus Walleij <linus.walleij@linaro.org>
parents 3f11be83 ea406534

drivers/pinctrl/renesas/pinctrl-rza2.c

+3 −0
Original line number Diff line number Diff line
@@ -246,6 +246,9 @@ static int rza2_gpio_register(struct rza2_pinctrl_priv *priv) 
	int ret;



	chip.label = devm_kasprintf(priv->dev, GFP_KERNEL, "%pOFn", np);

	if (!chip.label)

		return -ENOMEM;



	chip.parent = priv->dev;

	chip.ngpio = priv->npins;

drivers/pinctrl/renesas/pinctrl-rzg2l.c

+19 −1
Original line number Diff line number Diff line
@@ -318,6 +318,7 @@ struct rzg2l_pinctrl_pin_settings { 
 * @pmc: PMC registers cache

 * @pfc: PFC registers cache

 * @iolh: IOLH registers cache

 * @pupd: PUPD registers cache

 * @ien: IEN registers cache

 * @sd_ch: SD_CH registers cache

 * @eth_poc: ET_POC registers cache
@@ -331,6 +332,7 @@ struct rzg2l_pinctrl_reg_cache { 
	u32	*pfc;

	u32	*iolh[2];

	u32	*ien[2];

	u32	*pupd[2];

	u8	sd_ch[2];

	u8	eth_poc[2];

	u8	eth_mode;
@@ -2712,6 +2714,11 @@ static int rzg2l_pinctrl_reg_cache_alloc(struct rzg2l_pinctrl *pctrl) 
		if (!cache->ien[i])

			return -ENOMEM;



		cache->pupd[i] = devm_kcalloc(pctrl->dev, nports, sizeof(*cache->pupd[i]),

					      GFP_KERNEL);

		if (!cache->pupd[i])

			return -ENOMEM;



		/* Allocate dedicated cache. */

		dedicated_cache->iolh[i] = devm_kcalloc(pctrl->dev, n_dedicated_pins,

							sizeof(*dedicated_cache->iolh[i]),
@@ -2953,7 +2960,7 @@ static void rzg2l_pinctrl_pm_setup_regs(struct rzg2l_pinctrl *pctrl, bool suspen 
	struct rzg2l_pinctrl_reg_cache *cache = pctrl->cache;



	for (u32 port = 0; port < nports; port++) {

		bool has_iolh, has_ien;

		bool has_iolh, has_ien, has_pupd;

		u32 off, caps;

		u8 pincnt;

		u64 cfg;
@@ -2965,6 +2972,7 @@ static void rzg2l_pinctrl_pm_setup_regs(struct rzg2l_pinctrl *pctrl, bool suspen 
		caps = FIELD_GET(PIN_CFG_MASK, cfg);

		has_iolh = !!(caps & (PIN_CFG_IOLH_A | PIN_CFG_IOLH_B | PIN_CFG_IOLH_C));

		has_ien = !!(caps & PIN_CFG_IEN);

		has_pupd = !!(caps & PIN_CFG_PUPD);



		if (suspend)

			RZG2L_PCTRL_REG_ACCESS32(suspend, pctrl->base + PFC(off), cache->pfc[port]);
@@ -2983,6 +2991,15 @@ static void rzg2l_pinctrl_pm_setup_regs(struct rzg2l_pinctrl *pctrl, bool suspen 
			}

		}



		if (has_pupd) {

			RZG2L_PCTRL_REG_ACCESS32(suspend, pctrl->base + PUPD(off),

						 cache->pupd[0][port]);

			if (pincnt >= 4) {

				RZG2L_PCTRL_REG_ACCESS32(suspend, pctrl->base + PUPD(off),

							 cache->pupd[1][port]);

			}

		}



		RZG2L_PCTRL_REG_ACCESS16(suspend, pctrl->base + PM(off), cache->pm[port]);

		RZG2L_PCTRL_REG_ACCESS8(suspend, pctrl->base + P(off), cache->p[port]);
@@ -3386,6 +3403,7 @@ static struct platform_driver rzg2l_pinctrl_driver = { 
		.name = DRV_NAME,

		.of_match_table = of_match_ptr(rzg2l_pinctrl_of_table),

		.pm = pm_sleep_ptr(&rzg2l_pinctrl_pm_ops),

		.suppress_bind_attrs = true,

	},

	.probe = rzg2l_pinctrl_probe,

};