2022-02-10 11:57:46

by Zhou Yanjie

[permalink] [raw]
Subject: Re: [PATCH] pinctrl: ingenic: Fix regmap on X series SoCs

Hi Aidan,

On 2022/2/10 上午7:04, Aidan MacDonald wrote:
> The X series Ingenic SoCs have a shadow GPIO group which
> is at a higher offset than the other groups, and is used
> for all GPIO configuration. The regmap did not take this
> offset into account and set max_register too low. Writes
> to the shadow group registers were blocked, which made it
> impossible to change any pin configuration.
>
> Fix this by pretending there are at least 8 chips on any
> 'X' SoC for the purposes of calculating max_register. This
> ensures the shadow group is accessible.
>
> Signed-off-by: Aidan MacDonald <[email protected]>
> ---
> drivers/pinctrl/pinctrl-ingenic.c | 5 ++++-
> 1 file changed, 4 insertions(+), 1 deletion(-)


The M200 SoC (once planned to be called JZ4785) has a different shadow
register offset address,

if it needs to be supported in the future, then we need to deal with it
further, but fortunately pinctrl-ingenic.c

does not involve M200 support yet, so:


Reviewed-by: 周琰杰 (Zhou Yanjie) <[email protected]>


Thanks and best regards!


>
> diff --git a/drivers/pinctrl/pinctrl-ingenic.c b/drivers/pinctrl/pinctrl-ingenic.c
> index 2712f51eb238..9d2bccda50f1 100644
> --- a/drivers/pinctrl/pinctrl-ingenic.c
> +++ b/drivers/pinctrl/pinctrl-ingenic.c
> @@ -4168,7 +4168,10 @@ static int __init ingenic_pinctrl_probe(struct platform_device *pdev)
> return PTR_ERR(base);
>
> regmap_config = ingenic_pinctrl_regmap_config;
> - regmap_config.max_register = chip_info->num_chips * chip_info->reg_offset;
> + if (chip_info->version >= ID_X1000)
> + regmap_config.max_register = MIN(8, chip_info->num_chips) * chip_info->reg_offset;
> + else
> + regmap_config.max_register = chip_info->num_chips * chip_info->reg_offset;
>
> jzpc->map = devm_regmap_init_mmio(dev, base, &regmap_config);
> if (IS_ERR(jzpc->map)) {