[PATCH v2] pinctrl: sunxi: dt: do not accumulate npins across probe attempts

[PATCH v2] pinctrl: sunxi: dt: do not accumulate npins across probe attempts

[Pablo Mazzini]

init_pins_table() adds to npins in the driver's static descriptor, so
after a probe deferral the count doubles and the next probe fails with
"pin 0 already registered". Reset it first.

Signed-off-by: Pablo Mazzini <pmazzini@gmail.com>
---
v2: reset npins instead of counting into a local (Andre)

 drivers/pinctrl/sunxi/pinctrl-sunxi-dt.c | 1 +
 1 file changed, 1 insertion(+)

diff --git a/drivers/pinctrl/sunxi/pinctrl-sunxi-dt.c b/drivers/pinctrl/sunxi/pinctrl-sunxi-dt.c
index 50a16f3bd131..8bcd566593ae 100644
--- a/drivers/pinctrl/sunxi/pinctrl-sunxi-dt.c
+++ b/drivers/pinctrl/sunxi/pinctrl-sunxi-dt.c
@@ -84,6 +84,7 @@ static struct sunxi_desc_pin *init_pins_table(struct device *dev,
 	 * Find the total number of pins.
 	 * Also work out how much memory we need to store all the pin names.
 	 */
+	desc->npins = 0;
 	for (i = 0; i < SUNXI_PINCTRL_MAX_BANKS; i++) {
 		desc->npins += pins_per_bank[i];
 		if (pins_per_bank[i] < 10) {
-- 
2.52.0

Re: [PATCH v2] pinctrl: sunxi: dt: do not accumulate npins across probe attempts

[Andre Przywara]

Hi,

On 10/7/26 08:01, Pablo Mazzini wrote:
> init_pins_table() adds to npins in the driver's static descriptor, so
> after a probe deferral the count doubles and the next probe fails with
> "pin 0 already registered". Reset it first.

Yes, thanks, this is what I had in mind. And I think it deserves some 
backports:

> Signed-off-by: Pablo Mazzini <pmazzini@gmail.com>

Fixes: f5e2cd34b12f ("pinctrl: sunxi: allow reading mux values from DT")
Reviewed-by: Andre Przywara <andre.przywara@arm.com>

Cheers,
Andre

> ---
> v2: reset npins instead of counting into a local (Andre)
> 
>   drivers/pinctrl/sunxi/pinctrl-sunxi-dt.c | 1 +
>   1 file changed, 1 insertion(+)
> 
> diff --git a/drivers/pinctrl/sunxi/pinctrl-sunxi-dt.c b/drivers/pinctrl/sunxi/pinctrl-sunxi-dt.c
> index 50a16f3bd131..8bcd566593ae 100644
> --- a/drivers/pinctrl/sunxi/pinctrl-sunxi-dt.c
> +++ b/drivers/pinctrl/sunxi/pinctrl-sunxi-dt.c
> @@ -84,6 +84,7 @@ static struct sunxi_desc_pin *init_pins_table(struct device *dev,
>   	 * Find the total number of pins.
>   	 * Also work out how much memory we need to store all the pin names.
>   	 */
> +	desc->npins = 0;
>   	for (i = 0; i < SUNXI_PINCTRL_MAX_BANKS; i++) {
>   		desc->npins += pins_per_bank[i];
>   		if (pins_per_bank[i] < 10) {

Re: [PATCH v2] pinctrl: sunxi: dt: do not accumulate npins across probe attempts

[Linus Walleij]

On Wed, Oct 7, 2026 at 8:01 AM Pablo Mazzini <pmazzini@gmail.com> wrote:

> init_pins_table() adds to npins in the driver's static descriptor, so
> after a probe deferral the count doubles and the next probe fails with
> "pin 0 already registered". Reset it first.
>
> Signed-off-by: Pablo Mazzini <pmazzini@gmail.com>
> ---
> v2: reset npins instead of counting into a local (Andre)

Patch applied for fixes!

Yours,
Linus Walleij