Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b8b47d67 authored by Geert Uytterhoeven's avatar Geert Uytterhoeven
Browse files

pinctrl: sh-pfc: Rename .gpio_data[] to .pinmux_data[] 



The sh_pfc_soc_info.gpio_data[] array contains not only GPIO data, but
also various other pinmux-related data (functions and marks).
Every single driver already calls its local array pinmux_data[].
Hence rename the sh_pfc_soc_info member to "pinmux_data".

Signed-off-by: default avatarGeert Uytterhoeven <geert+renesas@glider.be>
Acked-by: default avatarLinus Walleij <linus.walleij@linaro.org>
Acked-by: default avatarLaurent Pinchart <laurent.pinchart@ideasonboard.com>
parent ae7465a0

drivers/pinctrl/sh-pfc/core.c

+2 −2
Original line number Diff line number Diff line
@@ -272,7 +272,7 @@ static int sh_pfc_get_config_reg(struct sh_pfc *pfc, u16 enum_id, 
static int sh_pfc_mark_to_enum(struct sh_pfc *pfc, u16 mark, int pos,

			      u16 *enum_idp)

{

	const u16 *data = pfc->info->gpio_data;

	const u16 *data = pfc->info->pinmux_data;

	unsigned int k;



	if (pos) {
@@ -280,7 +280,7 @@ static int sh_pfc_mark_to_enum(struct sh_pfc *pfc, u16 mark, int pos, 
		return pos + 1;

	}



	for (k = 0; k < pfc->info->gpio_data_size; k++) {

	for (k = 0; k < pfc->info->pinmux_data_size; k++) {

		if (data[k] == mark) {

			*enum_idp = data[k + 1];

			return k + 1;

drivers/pinctrl/sh-pfc/pfc-emev2.c

+2 −2
Original line number Diff line number Diff line
@@ -1706,6 +1706,6 @@ const struct sh_pfc_soc_info emev2_pinmux_info = { 


	.cfg_regs	= pinmux_config_regs,



	.gpio_data	= pinmux_data,

	.gpio_data_size	= ARRAY_SIZE(pinmux_data),

	.pinmux_data	= pinmux_data,

	.pinmux_data_size = ARRAY_SIZE(pinmux_data),

};

drivers/pinctrl/sh-pfc/pfc-r8a73a4.c

+4 −4
Original line number Diff line number Diff line
@@ -2737,8 +2737,8 @@ const struct sh_pfc_soc_info r8a73a4_pinmux_info = { 
	.cfg_regs = pinmux_config_regs,

	.data_regs = pinmux_data_regs,



	.gpio_data	= pinmux_data,

	.gpio_data_size	= ARRAY_SIZE(pinmux_data),

	.pinmux_data = pinmux_data,

	.pinmux_data_size = ARRAY_SIZE(pinmux_data),



	.gpio_irq = pinmux_irqs,

	.gpio_irq_size = ARRAY_SIZE(pinmux_irqs),

drivers/pinctrl/sh-pfc/pfc-r8a7740.c

+2 −2
Original line number Diff line number Diff line
@@ -3774,8 +3774,8 @@ const struct sh_pfc_soc_info r8a7740_pinmux_info = { 
	.cfg_regs	= pinmux_config_regs,

	.data_regs	= pinmux_data_regs,



	.gpio_data	= pinmux_data,

	.gpio_data_size	= ARRAY_SIZE(pinmux_data),

	.pinmux_data	= pinmux_data,

	.pinmux_data_size = ARRAY_SIZE(pinmux_data),



	.gpio_irq	= pinmux_irqs,

	.gpio_irq_size	= ARRAY_SIZE(pinmux_irqs),

drivers/pinctrl/sh-pfc/pfc-r8a7778.c

+2 −2
Original line number Diff line number Diff line
@@ -3144,6 +3144,6 @@ const struct sh_pfc_soc_info r8a7778_pinmux_info = { 


	.cfg_regs = pinmux_config_regs,



	.gpio_data = pinmux_data,

	.gpio_data_size = ARRAY_SIZE(pinmux_data),

	.pinmux_data = pinmux_data,

	.pinmux_data_size = ARRAY_SIZE(pinmux_data),

};