Commit 6d079d93 authored by Andre Przywara's avatar Andre Przywara Committed by Linus Walleij
Browse files

pinctrl: sunxi: support moved power configuration registers 



The Allwinner pincontroller IP features some registers to control the
withstand voltage of each pin group. So far those registers were always
located at the same offset, but the A523 SoC has moved them (probably to
accommodate all eleven pin banks).

Add a flag to note this feature, and use that to program the registers
either at offset 0x340 or 0x380. So far no pincontroller driver uses
this flag, but we need it for the upcoming A523 support.

Signed-off-by: default avatarAndre Przywara <andre.przywara@arm.com>
Reviewed-by: default avatarJernej Skrabec <jernej.skrabec@gmail.com>
Link: https://lore.kernel.org/20250306235827.4895-5-andre.przywara@arm.com


Signed-off-by: default avatarLinus Walleij <linus.walleij@linaro.org>
parent c6c4dc75

drivers/pinctrl/sunxi/pinctrl-sunxi.c

+11 −4
Original line number Diff line number Diff line
@@ -736,9 +736,11 @@ static int sunxi_pinctrl_set_io_bias_cfg(struct sunxi_pinctrl *pctl, 
		val = uV > 1800000 && uV <= 2500000 ? BIT(bank) : 0;



		raw_spin_lock_irqsave(&pctl->lock, flags);

		reg = readl(pctl->membase + PIO_POW_MOD_CTL_REG);

		reg = readl(pctl->membase + pctl->pow_mod_sel_offset +

			    PIO_POW_MOD_CTL_OFS);

		reg &= ~BIT(bank);

		writel(reg | val, pctl->membase + PIO_POW_MOD_CTL_REG);

		writel(reg | val, pctl->membase + pctl->pow_mod_sel_offset +

		       PIO_POW_MOD_CTL_OFS);

		raw_spin_unlock_irqrestore(&pctl->lock, flags);



		fallthrough;
@@ -746,9 +748,10 @@ static int sunxi_pinctrl_set_io_bias_cfg(struct sunxi_pinctrl *pctl, 
		val = uV <= 1800000 ? 1 : 0;



		raw_spin_lock_irqsave(&pctl->lock, flags);

		reg = readl(pctl->membase + PIO_POW_MOD_SEL_REG);

		reg = readl(pctl->membase + pctl->pow_mod_sel_offset);

		reg &= ~(1 << bank);

		writel(reg | val << bank, pctl->membase + PIO_POW_MOD_SEL_REG);

		writel(reg | val << bank,

		       pctl->membase + pctl->pow_mod_sel_offset);

		raw_spin_unlock_irqrestore(&pctl->lock, flags);

		return 0;

	default:
@@ -1520,6 +1523,10 @@ int sunxi_pinctrl_init_with_flags(struct platform_device *pdev, 
		pctl->pull_regs_offset = PULL_REGS_OFFSET;

		pctl->dlevel_field_width = DLEVEL_FIELD_WIDTH;

	}

	if (flags & SUNXI_PINCTRL_ELEVEN_BANKS)

		pctl->pow_mod_sel_offset = PIO_11B_POW_MOD_SEL_REG;

	else

		pctl->pow_mod_sel_offset = PIO_POW_MOD_SEL_REG;



	pctl->irq_array = devm_kcalloc(&pdev->dev,

				       IRQ_PER_BANK * pctl->desc->irq_banks,

drivers/pinctrl/sunxi/pinctrl-sunxi.h

+5 −2
Original line number Diff line number Diff line
@@ -87,9 +87,11 @@ 
#define SUNXI_PINCTRL_VARIANT_MASK	GENMASK(7, 0)

#define SUNXI_PINCTRL_NEW_REG_LAYOUT	BIT(8)

#define SUNXI_PINCTRL_PORTF_SWITCH	BIT(9)

#define SUNXI_PINCTRL_ELEVEN_BANKS	BIT(10)



#define PIO_POW_MOD_SEL_REG		0x340

#define PIO_POW_MOD_CTL_REG	0x344

#define PIO_11B_POW_MOD_SEL_REG		0x380

#define PIO_POW_MOD_CTL_OFS		0x004



#define PIO_BANK_K_OFFSET		0x500
@@ -173,6 +175,7 @@ struct sunxi_pinctrl { 
	u32				bank_mem_size;

	u32				pull_regs_offset;

	u32				dlevel_field_width;

	u32				pow_mod_sel_offset;

};



#define SUNXI_PIN(_pin, ...)					\