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

Commit 3f9c1268 authored by Laurent Pinchart's avatar Laurent Pinchart
Browse files

sh-pfc: Share common PORTCR macro definition 



The macro is defined identically in four different locations. Share it.

Signed-off-by: default avatarLaurent Pinchart <laurent.pinchart+renesas@ideasonboard.com>
Reviewed-by: default avatarSimon Horman <horms+renesas@verge.net.au>
Acked-by: default avatarLinus Walleij <linus.walleij@linaro.org>
parent 18334c8e

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

+0 −11
Original line number Diff line number Diff line
@@ -2061,17 +2061,6 @@ static const struct sh_pfc_function pinmux_functions[] = { 
	SH_PFC_FUNCTION(sdhi2),

};



#undef PORTCR

#define PORTCR(nr, reg)							\

	{								\

		PINMUX_CFG_REG("PORT" nr "CR", reg, 8, 4) {		\

			_PCRH(PORT##nr##_IN, 0, 0, PORT##nr##_OUT),	\

				PORT##nr##_FN0, PORT##nr##_FN1,		\

				PORT##nr##_FN2, PORT##nr##_FN3,		\

				PORT##nr##_FN4, PORT##nr##_FN5,		\

				PORT##nr##_FN6, PORT##nr##_FN7 }	\

	}



static const struct pinmux_cfg_reg pinmux_config_regs[] = {

	PORTCR(0, 0xe6050000),

	PORTCR(1, 0xe6050001),

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

+0 −11
Original line number Diff line number Diff line
@@ -3234,17 +3234,6 @@ static const struct sh_pfc_function pinmux_functions[] = { 
	SH_PFC_FUNCTION(tpu0),

};



#undef PORTCR

#define PORTCR(nr, reg)							\

	{								\

		PINMUX_CFG_REG("PORT" nr "CR", reg, 8, 4) {		\

			_PCRH(PORT##nr##_IN, 0, 0, PORT##nr##_OUT),	\

				PORT##nr##_FN0, PORT##nr##_FN1,		\

				PORT##nr##_FN2, PORT##nr##_FN3,		\

				PORT##nr##_FN4, PORT##nr##_FN5,		\

				PORT##nr##_FN6, PORT##nr##_FN7 }	\

	}



static const struct pinmux_cfg_reg pinmux_config_regs[] = {

	PORTCR(0,	0xe6050000), /* PORT0CR */

	PORTCR(1,	0xe6050001), /* PORT1CR */

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

+0 −11
Original line number Diff line number Diff line
@@ -2118,17 +2118,6 @@ static const struct sh_pfc_function pinmux_functions[] = { 
	SH_PFC_FUNCTION(usb1),

};



#undef PORTCR

#define PORTCR(nr, reg)							\

	{								\

		PINMUX_CFG_REG("PORT" nr "CR", reg, 8, 4) {		\

			_PCRH(PORT##nr##_IN, 0, 0, PORT##nr##_OUT),     \

				PORT##nr##_FN0, PORT##nr##_FN1,		\

				PORT##nr##_FN2, PORT##nr##_FN3,		\

				PORT##nr##_FN4, PORT##nr##_FN5,		\

				PORT##nr##_FN6, PORT##nr##_FN7 }	\

	}



static const struct pinmux_cfg_reg pinmux_config_regs[] = {

	PORTCR(0,	0xE6051000), /* PORT0CR */

	PORTCR(1,	0xE6051001), /* PORT1CR */

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

+0 −10
Original line number Diff line number Diff line
@@ -3138,16 +3138,6 @@ static const struct sh_pfc_function pinmux_functions[] = { 
	SH_PFC_FUNCTION(usb),

};



#undef PORTCR

#define PORTCR(nr, reg)							\

	{								\

		PINMUX_CFG_REG("PORT" nr "CR", reg, 8, 4) {		\

			_PCRH(PORT##nr##_IN, 0, 0, PORT##nr##_OUT),	\

				PORT##nr##_FN0, PORT##nr##_FN1,		\

				PORT##nr##_FN2, PORT##nr##_FN3,		\

				PORT##nr##_FN4, PORT##nr##_FN5,		\

				PORT##nr##_FN6, PORT##nr##_FN7 }	\

	}

static const struct pinmux_cfg_reg pinmux_config_regs[] = {

	PORTCR(0, 0xe6050000), /* PORT0CR */

	PORTCR(1, 0xe6050001), /* PORT1CR */

drivers/pinctrl/sh-pfc/sh_pfc.h

+1 −2
Original line number Diff line number Diff line
@@ -304,8 +304,7 @@ struct sh_pfc_soc_info { 
#define PORTCR(nr, reg)							\

	{								\

		PINMUX_CFG_REG("PORT" nr "CR", reg, 8, 4) {		\

			_PCRH(PORT##nr##_IN, PORT##nr##_IN_PD,		\

			      PORT##nr##_IN_PU, PORT##nr##_OUT),	\

			_PCRH(PORT##nr##_IN, 0, 0, PORT##nr##_OUT),	\

				PORT##nr##_FN0, PORT##nr##_FN1,		\

				PORT##nr##_FN2, PORT##nr##_FN3,		\

				PORT##nr##_FN4, PORT##nr##_FN5,		\