Commit 27e768a4 authored by Geert Uytterhoeven's avatar Geert Uytterhoeven
Browse files

pinctrl: renesas: Factor out common R-Car Gen3 bias handling 



All pin control drivers for R-Car Gen3 SoCs contain identical bias
handling.  Reduce code duplication by moving it to the common pinctrl.c
code.

Signed-off-by: default avatarGeert Uytterhoeven <geert+renesas@glider.be>
Link: https://lore.kernel.org/r/20201028151637.1734130-6-geert+renesas@glider.be
parent 8019938a

drivers/pinctrl/renesas/core.h

+4 −0
Original line number Diff line number Diff line
@@ -33,4 +33,8 @@ const struct pinmux_bias_reg * 
sh_pfc_pin_to_bias_reg(const struct sh_pfc *pfc, unsigned int pin,

		       unsigned int *bit);



unsigned int rcar_pinmux_get_bias(struct sh_pfc *pfc, unsigned int pin);

void rcar_pinmux_set_bias(struct sh_pfc *pfc, unsigned int pin,

			  unsigned int bias);



#endif /* __SH_PFC_CORE_H__ */

drivers/pinctrl/renesas/pfc-r8a77950.c

+2 −43
Original line number Diff line number Diff line
@@ -5820,51 +5820,10 @@ static const struct pinmux_bias_reg pinmux_bias_regs[] = { 
	{ /* sentinel */ },

};



static unsigned int r8a77950_pinmux_get_bias(struct sh_pfc *pfc,

					     unsigned int pin)

{

	const struct pinmux_bias_reg *reg;

	unsigned int bit;



	reg = sh_pfc_pin_to_bias_reg(pfc, pin, &bit);

	if (!reg)

		return PIN_CONFIG_BIAS_DISABLE;



	if (!(sh_pfc_read(pfc, reg->puen) & BIT(bit)))

		return PIN_CONFIG_BIAS_DISABLE;

	else if (sh_pfc_read(pfc, reg->pud) & BIT(bit))

		return PIN_CONFIG_BIAS_PULL_UP;

	else

		return PIN_CONFIG_BIAS_PULL_DOWN;

}



static void r8a77950_pinmux_set_bias(struct sh_pfc *pfc, unsigned int pin,

				     unsigned int bias)

{

	const struct pinmux_bias_reg *reg;

	u32 enable, updown;

	unsigned int bit;



	reg = sh_pfc_pin_to_bias_reg(pfc, pin, &bit);

	if (!reg)

		return;



	enable = sh_pfc_read(pfc, reg->puen) & ~BIT(bit);

	if (bias != PIN_CONFIG_BIAS_DISABLE)

		enable |= BIT(bit);



	updown = sh_pfc_read(pfc, reg->pud) & ~BIT(bit);

	if (bias == PIN_CONFIG_BIAS_PULL_UP)

		updown |= BIT(bit);



	sh_pfc_write(pfc, reg->pud, updown);

	sh_pfc_write(pfc, reg->puen, enable);

}



static const struct sh_pfc_soc_operations r8a77950_pinmux_ops = {

	.pin_to_pocctrl = r8a77950_pin_to_pocctrl,

	.get_bias = r8a77950_pinmux_get_bias,

	.set_bias = r8a77950_pinmux_set_bias,

	.get_bias = rcar_pinmux_get_bias,

	.set_bias = rcar_pinmux_set_bias,

};



const struct sh_pfc_soc_info r8a77950_pinmux_info = {

drivers/pinctrl/renesas/pfc-r8a77951.c

+2 −43
Original line number Diff line number Diff line
@@ -6201,51 +6201,10 @@ static const struct pinmux_bias_reg pinmux_bias_regs[] = { 
	{ /* sentinel */ },

};



static unsigned int r8a77951_pinmux_get_bias(struct sh_pfc *pfc,

					     unsigned int pin)

{

	const struct pinmux_bias_reg *reg;

	unsigned int bit;



	reg = sh_pfc_pin_to_bias_reg(pfc, pin, &bit);

	if (!reg)

		return PIN_CONFIG_BIAS_DISABLE;



	if (!(sh_pfc_read(pfc, reg->puen) & BIT(bit)))

		return PIN_CONFIG_BIAS_DISABLE;

	else if (sh_pfc_read(pfc, reg->pud) & BIT(bit))

		return PIN_CONFIG_BIAS_PULL_UP;

	else

		return PIN_CONFIG_BIAS_PULL_DOWN;

}



static void r8a77951_pinmux_set_bias(struct sh_pfc *pfc, unsigned int pin,

				     unsigned int bias)

{

	const struct pinmux_bias_reg *reg;

	u32 enable, updown;

	unsigned int bit;



	reg = sh_pfc_pin_to_bias_reg(pfc, pin, &bit);

	if (!reg)

		return;



	enable = sh_pfc_read(pfc, reg->puen) & ~BIT(bit);

	if (bias != PIN_CONFIG_BIAS_DISABLE)

		enable |= BIT(bit);



	updown = sh_pfc_read(pfc, reg->pud) & ~BIT(bit);

	if (bias == PIN_CONFIG_BIAS_PULL_UP)

		updown |= BIT(bit);



	sh_pfc_write(pfc, reg->pud, updown);

	sh_pfc_write(pfc, reg->puen, enable);

}



static const struct sh_pfc_soc_operations r8a77951_pinmux_ops = {

	.pin_to_pocctrl = r8a77951_pin_to_pocctrl,

	.get_bias = r8a77951_pinmux_get_bias,

	.set_bias = r8a77951_pinmux_set_bias,

	.get_bias = rcar_pinmux_get_bias,

	.set_bias = rcar_pinmux_set_bias,

};



#ifdef CONFIG_PINCTRL_PFC_R8A774E1

drivers/pinctrl/renesas/pfc-r8a7796.c

+2 −43
Original line number Diff line number Diff line
@@ -6150,51 +6150,10 @@ static const struct pinmux_bias_reg pinmux_bias_regs[] = { 
	{ /* sentinel */ },

};



static unsigned int r8a7796_pinmux_get_bias(struct sh_pfc *pfc,

					    unsigned int pin)

{

	const struct pinmux_bias_reg *reg;

	unsigned int bit;



	reg = sh_pfc_pin_to_bias_reg(pfc, pin, &bit);

	if (!reg)

		return PIN_CONFIG_BIAS_DISABLE;



	if (!(sh_pfc_read(pfc, reg->puen) & BIT(bit)))

		return PIN_CONFIG_BIAS_DISABLE;

	else if (sh_pfc_read(pfc, reg->pud) & BIT(bit))

		return PIN_CONFIG_BIAS_PULL_UP;

	else

		return PIN_CONFIG_BIAS_PULL_DOWN;

}



static void r8a7796_pinmux_set_bias(struct sh_pfc *pfc, unsigned int pin,

				   unsigned int bias)

{

	const struct pinmux_bias_reg *reg;

	u32 enable, updown;

	unsigned int bit;



	reg = sh_pfc_pin_to_bias_reg(pfc, pin, &bit);

	if (!reg)

		return;



	enable = sh_pfc_read(pfc, reg->puen) & ~BIT(bit);

	if (bias != PIN_CONFIG_BIAS_DISABLE)

		enable |= BIT(bit);



	updown = sh_pfc_read(pfc, reg->pud) & ~BIT(bit);

	if (bias == PIN_CONFIG_BIAS_PULL_UP)

		updown |= BIT(bit);



	sh_pfc_write(pfc, reg->pud, updown);

	sh_pfc_write(pfc, reg->puen, enable);

}



static const struct sh_pfc_soc_operations r8a7796_pinmux_ops = {

	.pin_to_pocctrl = r8a7796_pin_to_pocctrl,

	.get_bias = r8a7796_pinmux_get_bias,

	.set_bias = r8a7796_pinmux_set_bias,

	.get_bias = rcar_pinmux_get_bias,

	.set_bias = rcar_pinmux_set_bias,

};



#ifdef CONFIG_PINCTRL_PFC_R8A774A1

drivers/pinctrl/renesas/pfc-r8a77965.c

+2 −43
Original line number Diff line number Diff line
@@ -6404,51 +6404,10 @@ static const struct pinmux_bias_reg pinmux_bias_regs[] = { 
	{ /* sentinel */ },

};



static unsigned int r8a77965_pinmux_get_bias(struct sh_pfc *pfc,

					    unsigned int pin)

{

	const struct pinmux_bias_reg *reg;

	unsigned int bit;



	reg = sh_pfc_pin_to_bias_reg(pfc, pin, &bit);

	if (!reg)

		return PIN_CONFIG_BIAS_DISABLE;



	if (!(sh_pfc_read(pfc, reg->puen) & BIT(bit)))

		return PIN_CONFIG_BIAS_DISABLE;

	else if (sh_pfc_read(pfc, reg->pud) & BIT(bit))

		return PIN_CONFIG_BIAS_PULL_UP;

	else

		return PIN_CONFIG_BIAS_PULL_DOWN;

}



static void r8a77965_pinmux_set_bias(struct sh_pfc *pfc, unsigned int pin,

				   unsigned int bias)

{

	const struct pinmux_bias_reg *reg;

	u32 enable, updown;

	unsigned int bit;



	reg = sh_pfc_pin_to_bias_reg(pfc, pin, &bit);

	if (!reg)

		return;



	enable = sh_pfc_read(pfc, reg->puen) & ~BIT(bit);

	if (bias != PIN_CONFIG_BIAS_DISABLE)

		enable |= BIT(bit);



	updown = sh_pfc_read(pfc, reg->pud) & ~BIT(bit);

	if (bias == PIN_CONFIG_BIAS_PULL_UP)

		updown |= BIT(bit);



	sh_pfc_write(pfc, reg->pud, updown);

	sh_pfc_write(pfc, reg->puen, enable);

}



static const struct sh_pfc_soc_operations r8a77965_pinmux_ops = {

	.pin_to_pocctrl = r8a77965_pin_to_pocctrl,

	.get_bias = r8a77965_pinmux_get_bias,

	.set_bias = r8a77965_pinmux_set_bias,

	.get_bias = rcar_pinmux_get_bias,

	.set_bias = rcar_pinmux_set_bias,

};



#ifdef CONFIG_PINCTRL_PFC_R8A774B1