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

Commit 17dffe48 authored by Laurent Pinchart's avatar Laurent Pinchart
Browse files

sh-pfc: Share the PORT_10_REV, PORT_32 and PORT_32_REV definitions 



The macros are defined identically and used in two SoC-specific files,
share them.

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

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

+8 −26
Original line number Diff line number Diff line
@@ -23,11 +23,6 @@ 


#include "sh_pfc.h"



#define CPU_32_PORT(fn, pfx, sfx)				\

	PORT_10(fn, pfx, sfx), PORT_10(fn, pfx##1, sfx),	\

	PORT_10(fn, pfx##2, sfx), PORT_1(fn, pfx##30, sfx),	\

	PORT_1(fn, pfx##31, sfx)



#define CPU_32_PORT6(fn, pfx, sfx)				\

	PORT_1(fn, pfx##0, sfx), PORT_1(fn, pfx##1, sfx),	\

	PORT_1(fn, pfx##2, sfx), PORT_1(fn, pfx##3, sfx),	\
@@ -36,12 +31,12 @@ 
	PORT_1(fn, pfx##8, sfx)



#define CPU_ALL_PORT(fn, pfx, sfx)				\

	CPU_32_PORT(fn, pfx##_0_, sfx),				\

	CPU_32_PORT(fn, pfx##_1_, sfx),				\

	CPU_32_PORT(fn, pfx##_2_, sfx),				\

	CPU_32_PORT(fn, pfx##_3_, sfx),				\

	CPU_32_PORT(fn, pfx##_4_, sfx),				\

	CPU_32_PORT(fn, pfx##_5_, sfx),				\

	PORT_32(fn, pfx##_0_, sfx),				\

	PORT_32(fn, pfx##_1_, sfx),				\

	PORT_32(fn, pfx##_2_, sfx),				\

	PORT_32(fn, pfx##_3_, sfx),				\

	PORT_32(fn, pfx##_4_, sfx),				\

	PORT_32(fn, pfx##_5_, sfx),				\

	CPU_32_PORT6(fn, pfx##_6_, sfx)



#define _GP_GPIO(pfx, sfx) PINMUX_GPIO(GPIO_GP##pfx, GP##pfx##_DATA)
@@ -55,21 +50,8 @@ 
#define PINMUX_GPIO_GP_ALL()	CPU_ALL_PORT(_GP_GPIO, , unused)

#define PINMUX_DATA_GP_ALL()	CPU_ALL_PORT(_GP_DATA, , unused)





#define PORT_10_REV(fn, pfx, sfx)				\

	PORT_1(fn, pfx##9, sfx), PORT_1(fn, pfx##8, sfx),	\

	PORT_1(fn, pfx##7, sfx), PORT_1(fn, pfx##6, sfx),	\

	PORT_1(fn, pfx##5, sfx), PORT_1(fn, pfx##4, sfx),	\

	PORT_1(fn, pfx##3, sfx), PORT_1(fn, pfx##2, sfx),	\

	PORT_1(fn, pfx##1, sfx), PORT_1(fn, pfx##0, sfx)



#define CPU_32_PORT_REV(fn, pfx, sfx)					\

	PORT_1(fn, pfx##31, sfx), PORT_1(fn, pfx##30, sfx),		\

	PORT_10_REV(fn, pfx##2, sfx), PORT_10_REV(fn, pfx##1, sfx),	\

	PORT_10_REV(fn, pfx, sfx)



#define GP_INOUTSEL(bank) CPU_32_PORT_REV(_GP_INOUTSEL, _##bank##_, unused)

#define GP_INDT(bank) CPU_32_PORT_REV(_GP_INDT, _##bank##_, unused)

#define GP_INOUTSEL(bank) PORT_32_REV(_GP_INOUTSEL, _##bank##_, unused)

#define GP_INDT(bank) PORT_32_REV(_GP_INDT, _##bank##_, unused)



#define PINMUX_IPSR_DATA(ipsr, fn) PINMUX_DATA(fn##_MARK, FN_##ipsr, FN_##fn)

#define PINMUX_IPSR_MODSEL_DATA(ipsr, fn, ms) PINMUX_DATA(fn##_MARK, FN_##ms, \

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

+7 −24
Original line number Diff line number Diff line
@@ -14,11 +14,6 @@ 


#include "sh_pfc.h"



#define CPU_32_PORT(fn, pfx, sfx)				\

	PORT_10(fn, pfx, sfx), PORT_10(fn, pfx##1, sfx),	\

	PORT_10(fn, pfx##2, sfx), PORT_1(fn, pfx##30, sfx),	\

	PORT_1(fn, pfx##31, sfx)



#define CPU_32_PORT5(fn, pfx, sfx)				\

	PORT_1(fn, pfx##0, sfx), PORT_1(fn, pfx##1, sfx),	\

	PORT_1(fn, pfx##2, sfx), PORT_1(fn, pfx##3, sfx),	\
@@ -29,11 +24,11 @@ 


/* GPSR0 - GPSR5 */

#define CPU_ALL_PORT(fn, pfx, sfx)				\

	CPU_32_PORT(fn, pfx##_0_, sfx),			\

	CPU_32_PORT(fn, pfx##_1_, sfx),				\

	CPU_32_PORT(fn, pfx##_2_, sfx),				\

	CPU_32_PORT(fn, pfx##_3_, sfx),				\

	CPU_32_PORT(fn, pfx##_4_, sfx),				\

	PORT_32(fn, pfx##_0_, sfx),			\

	PORT_32(fn, pfx##_1_, sfx),				\

	PORT_32(fn, pfx##_2_, sfx),				\

	PORT_32(fn, pfx##_3_, sfx),				\

	PORT_32(fn, pfx##_4_, sfx),				\

	CPU_32_PORT5(fn, pfx##_5_, sfx)



#define _GP_GPIO(pfx, sfx) PINMUX_GPIO(GPIO_GP##pfx, GP##pfx##_DATA)
@@ -47,20 +42,8 @@ 
#define PINMUX_GPIO_GP_ALL()	CPU_ALL_PORT(_GP_GPIO, , unused)

#define PINMUX_DATA_GP_ALL()	CPU_ALL_PORT(_GP_DATA, , unused)



#define PORT_10_REV(fn, pfx, sfx)	\

	PORT_1(fn, pfx##9, sfx), PORT_1(fn, pfx##8, sfx),	\

	PORT_1(fn, pfx##7, sfx), PORT_1(fn, pfx##6, sfx),	\

	PORT_1(fn, pfx##5, sfx), PORT_1(fn, pfx##4, sfx),	\

	PORT_1(fn, pfx##3, sfx), PORT_1(fn, pfx##2, sfx),	\

	PORT_1(fn, pfx##1, sfx), PORT_1(fn, pfx##0, sfx)



#define CPU_32_PORT_REV(fn, pfx, sfx)	\

	PORT_1(fn, pfx##31, sfx), PORT_1(fn, pfx##30, sfx),	\

	PORT_10_REV(fn, pfx##2, sfx), PORT_10_REV(fn, pfx##1, sfx),	\

	PORT_10_REV(fn, pfx, sfx)



#define GP_INOUTSEL(bank) CPU_32_PORT_REV(_GP_INOUTSEL, _##bank##_, unused)

#define GP_INDT(bank) CPU_32_PORT_REV(_GP_INDT, _##bank##_, unused)

#define GP_INOUTSEL(bank) PORT_32_REV(_GP_INOUTSEL, _##bank##_, unused)

#define GP_INDT(bank) PORT_32_REV(_GP_INDT, _##bank##_, unused)



#define PINMUX_IPSR_DATA(ipsr, fn) PINMUX_DATA(fn##_MARK, FN_##ipsr, FN_##fn)

#define PINMUX_IPSR_MODSEL_DATA(ipsr, fn, ms) PINMUX_DATA(fn##_MARK, FN_##ms, \

drivers/pinctrl/sh-pfc/sh_pfc.h

+17 −0
Original line number Diff line number Diff line
@@ -138,6 +138,23 @@ enum { GPIO_CFG_DRYRUN, GPIO_CFG_REQ, GPIO_CFG_FREE }; 
	PORT_1(fn, pfx##6, sfx), PORT_1(fn, pfx##7, sfx),	\

	PORT_1(fn, pfx##8, sfx), PORT_1(fn, pfx##9, sfx)



#define PORT_10_REV(fn, pfx, sfx)	\

	PORT_1(fn, pfx##9, sfx), PORT_1(fn, pfx##8, sfx),	\

	PORT_1(fn, pfx##7, sfx), PORT_1(fn, pfx##6, sfx),	\

	PORT_1(fn, pfx##5, sfx), PORT_1(fn, pfx##4, sfx),	\

	PORT_1(fn, pfx##3, sfx), PORT_1(fn, pfx##2, sfx),	\

	PORT_1(fn, pfx##1, sfx), PORT_1(fn, pfx##0, sfx)



#define PORT_32(fn, pfx, sfx)					\

	PORT_10(fn, pfx, sfx), PORT_10(fn, pfx##1, sfx),	\

	PORT_10(fn, pfx##2, sfx), PORT_1(fn, pfx##30, sfx),	\

	PORT_1(fn, pfx##31, sfx)



#define PORT_32_REV(fn, pfx, sfx)					\

	PORT_1(fn, pfx##31, sfx), PORT_1(fn, pfx##30, sfx),		\

	PORT_10_REV(fn, pfx##2, sfx), PORT_10_REV(fn, pfx##1, sfx),	\

	PORT_10_REV(fn, pfx, sfx)



#define PORT_90(fn, pfx, sfx) \

	PORT_10(fn, pfx##1, sfx), PORT_10(fn, pfx##2, sfx),	\

	PORT_10(fn, pfx##3, sfx), PORT_10(fn, pfx##4, sfx),	\