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

Commit 380c2ed9 authored by Laurent Pinchart's avatar Laurent Pinchart
Browse files

sh-pfc: Initialize pinmux_gpio flags statically 



All function GPIO entries are initialized with the GPIO_FN macro that
expands to the PINMUX_GPIO macro, used to initialize real GPIOs. Create
a PINMUX_GPIO_FN macro that duplicates PINMUX_GPIO and sets flags to
PINMUX_TYPE_FUNCTION and use it in GPIO_FN, and make PINMUX_GPIO set
flags to PINMUX_TYPE_GPIO.

This removes the need to initialize GPIO flags at runtime and thus
simplifies the code, preparing for the GPIO and functions split.

Signed-off-by: default avatarLaurent Pinchart <laurent.pinchart+renesas@ideasonboard.com>
Acked-by: default avatarLinus Walleij <linus.walleij@linaro.org>
parent 53f374b1

drivers/pinctrl/sh-pfc/pinctrl.c

+2 −17
Original line number Diff line number Diff line
@@ -315,22 +315,6 @@ static const struct pinconf_ops sh_pfc_pinconf_ops = { 
	.pin_config_dbg_show	= sh_pfc_pinconf_dbg_show,

};



static void sh_pfc_map_one_gpio(struct sh_pfc *pfc, struct sh_pfc_pinctrl *pmx,

				struct pinmux_gpio *gpio, unsigned offset)

{

	struct pinmux_data_reg *dummy;

	int bit;



	gpio->flags &= ~PINMUX_FLAG_TYPE;



	if (sh_pfc_get_data_reg(pfc, offset, &dummy, &bit) == 0)

		gpio->flags |= PINMUX_TYPE_GPIO;

	else {

		gpio->flags |= PINMUX_TYPE_FUNCTION;

		pmx->nr_functions++;

	}

}



/* pinmux ranges -> pinctrl pin descs */

static int sh_pfc_map_gpios(struct sh_pfc *pfc, struct sh_pfc_pinctrl *pmx)

{
@@ -356,7 +340,8 @@ static int sh_pfc_map_gpios(struct sh_pfc *pfc, struct sh_pfc_pinctrl *pmx) 
		if (unlikely(!gpio->enum_id))

			continue;



		sh_pfc_map_one_gpio(pfc, pmx, gpio, i);

		if ((gpio->flags & PINMUX_FLAG_TYPE) == PINMUX_TYPE_FUNCTION)

			pmx->nr_functions++;

	}



	return 0;

drivers/pinctrl/sh-pfc/sh_pfc.h

+13 −3
Original line number Diff line number Diff line
@@ -42,7 +42,17 @@ struct pinmux_gpio { 
};



#define PINMUX_GPIO(gpio, data_or_mark)			\

	[gpio] = { .name = __stringify(gpio), .enum_id = data_or_mark, .flags = PINMUX_TYPE_NONE }

	[gpio] = {					\

		.name = __stringify(gpio),		\

		.enum_id = data_or_mark,		\

		.flags = PINMUX_TYPE_GPIO		\

	}

#define PINMUX_GPIO_FN(gpio, data_or_mark)		\

	[gpio] = {					\

		.name = __stringify(gpio),		\

		.enum_id = data_or_mark,		\

		.flags = PINMUX_TYPE_FUNCTION		\

	}



#define PINMUX_DATA(data_or_mark, ids...) data_or_mark, ids, 0
@@ -135,7 +145,7 @@ enum { GPIO_CFG_DRYRUN, GPIO_CFG_REQ, GPIO_CFG_FREE }; 
#define _GPIO_PORT(pfx, sfx) PINMUX_GPIO(GPIO_PORT##pfx, PORT##pfx##_DATA)

#define PORT_ALL(str)	CPU_ALL_PORT(_PORT_ALL, PORT, str)

#define GPIO_PORT_ALL()	CPU_ALL_PORT(_GPIO_PORT, , unused)

#define GPIO_FN(str) PINMUX_GPIO(GPIO_FN_##str, str##_MARK)

#define GPIO_FN(str) PINMUX_GPIO_FN(GPIO_FN_##str, str##_MARK)



/* helper macro for pinmux_enum_t */

#define PORT_DATA_I(nr)	\