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

Commit e3d93b46 authored by Laurent Pinchart's avatar Laurent Pinchart
Browse files

sh-pfc: Consolidate PFC SoC data macros 



Move macros defined in several SoC data files to a common location and
document them.

Signed-off-by: default avatarLaurent Pinchart <laurent.pinchart+renesas@ideasonboard.com>
Tested-by: default avatarYusuke Goda <yusuke.goda.sx@renesas.com>
parent 757b055a

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

+0 −3
Original line number Diff line number Diff line
@@ -428,9 +428,6 @@ enum { 
	PINMUX_MARK_END,

};



#define _PORT_DATA(pfx, sfx)	PORT_DATA_IO(pfx)

#define PINMUX_DATA_ALL()    CPU_ALL_PORT(_PORT_DATA, , unused)



static const u16 pinmux_data[] = {

	/* specify valid pin states for each pin in GPIO mode */

	PINMUX_DATA_ALL(),

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

+1 −4
Original line number Diff line number Diff line
@@ -583,11 +583,8 @@ enum { 
	PINMUX_MARK_END,

};



#define _PORT_DATA(pfx, sfx)	PORT_DATA_IO(pfx)

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



static const u16 pinmux_data[] = {

	PINMUX_DATA_GP_ALL(),

	PINMUX_DATA_ALL(),



	/* Port0 */

	PINMUX_DATA(DBGMDT2_MARK,		PORT0_FN1),

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

+0 −40
Original line number Diff line number Diff line
@@ -23,26 +23,6 @@ 
#include <linux/kernel.h>

#include "sh_pfc.h"



#define PORT_GP_1(bank, pin, fn, sfx) fn(bank, pin, GP_##bank##_##pin, sfx)



#define PORT_GP_32(bank, fn, sfx)					\

	PORT_GP_1(bank, 0,  fn, sfx), PORT_GP_1(bank, 1,  fn, sfx),	\

	PORT_GP_1(bank, 2,  fn, sfx), PORT_GP_1(bank, 3,  fn, sfx),	\

	PORT_GP_1(bank, 4,  fn, sfx), PORT_GP_1(bank, 5,  fn, sfx),	\

	PORT_GP_1(bank, 6,  fn, sfx), PORT_GP_1(bank, 7,  fn, sfx),	\

	PORT_GP_1(bank, 8,  fn, sfx), PORT_GP_1(bank, 9,  fn, sfx),	\

	PORT_GP_1(bank, 10, fn, sfx), PORT_GP_1(bank, 11, fn, sfx),	\

	PORT_GP_1(bank, 12, fn, sfx), PORT_GP_1(bank, 13, fn, sfx),	\

	PORT_GP_1(bank, 14, fn, sfx), PORT_GP_1(bank, 15, fn, sfx),	\

	PORT_GP_1(bank, 16, fn, sfx), PORT_GP_1(bank, 17, fn, sfx),	\

	PORT_GP_1(bank, 18, fn, sfx), PORT_GP_1(bank, 19, fn, sfx),	\

	PORT_GP_1(bank, 20, fn, sfx), PORT_GP_1(bank, 21, fn, sfx),	\

	PORT_GP_1(bank, 22, fn, sfx), PORT_GP_1(bank, 23, fn, sfx),	\

	PORT_GP_1(bank, 24, fn, sfx), PORT_GP_1(bank, 25, fn, sfx),	\

	PORT_GP_1(bank, 26, fn, sfx), PORT_GP_1(bank, 27, fn, sfx),	\

	PORT_GP_1(bank, 28, fn, sfx), PORT_GP_1(bank, 29, fn, sfx),	\

	PORT_GP_1(bank, 30, fn, sfx), PORT_GP_1(bank, 31, fn, sfx)



#define PORT_GP_27(bank, fn, sfx)					\

	PORT_GP_1(bank, 0,  fn, sfx), PORT_GP_1(bank, 1,  fn, sfx),	\

	PORT_GP_1(bank, 2,  fn, sfx), PORT_GP_1(bank, 3,  fn, sfx),	\
@@ -66,26 +46,6 @@ 
	PORT_GP_32(3, fn, sfx),		\

	PORT_GP_27(4, fn, sfx)



#define _GP_PORT_ALL(bank, pin, name, sfx)	name##_##sfx



#define _GP_GPIO(bank, pin, _name, sfx)		\

	[RCAR_GP_PIN(bank, pin)] = {		\

		.name = __stringify(_name),	\

		.enum_id = _name##_DATA,	\

	}



#define _GP_DATA(bank, pin, name, sfx)		\

	PINMUX_DATA(name##_DATA, name##_FN)



#define GP_ALL(str)		CPU_ALL_PORT(_GP_PORT_ALL, str)

#define PINMUX_GPIO_GP_ALL()	CPU_ALL_PORT(_GP_GPIO, unused)

#define PINMUX_DATA_GP_ALL()	CPU_ALL_PORT(_GP_DATA, unused)



#define PINMUX_IPSR_NOGP(ispr, fn)	PINMUX_DATA(fn##_MARK, FN_##fn)

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

#define PINMUX_IPSR_MSEL(ipsr, fn, ms)	PINMUX_DATA(fn##_MARK, FN_##fn, FN_##ipsr, FN_##ms)

#define PINMUX_IPSR_NOGM(ispr, fn, ms)	PINMUX_DATA(fn##_MARK, FN_##fn,            FN_##ms)



enum {

	PINMUX_RESERVED = 0,

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

+2 −59
Original line number Diff line number Diff line
@@ -24,51 +24,13 @@ 


#include "sh_pfc.h"



#define PORT_GP_1(bank, pin, fn, sfx) fn(bank, pin, GP_##bank##_##pin, sfx)



#define PORT_GP_32(bank, fn, sfx)					\

	PORT_GP_1(bank, 0,  fn, sfx), PORT_GP_1(bank, 1,  fn, sfx),	\

	PORT_GP_1(bank, 2,  fn, sfx), PORT_GP_1(bank, 3,  fn, sfx),	\

	PORT_GP_1(bank, 4,  fn, sfx), PORT_GP_1(bank, 5,  fn, sfx),	\

	PORT_GP_1(bank, 6,  fn, sfx), PORT_GP_1(bank, 7,  fn, sfx),	\

	PORT_GP_1(bank, 8,  fn, sfx), PORT_GP_1(bank, 9,  fn, sfx),	\

	PORT_GP_1(bank, 10, fn, sfx), PORT_GP_1(bank, 11, fn, sfx),	\

	PORT_GP_1(bank, 12, fn, sfx), PORT_GP_1(bank, 13, fn, sfx),	\

	PORT_GP_1(bank, 14, fn, sfx), PORT_GP_1(bank, 15, fn, sfx),	\

	PORT_GP_1(bank, 16, fn, sfx), PORT_GP_1(bank, 17, fn, sfx),	\

	PORT_GP_1(bank, 18, fn, sfx), PORT_GP_1(bank, 19, fn, sfx),	\

	PORT_GP_1(bank, 20, fn, sfx), PORT_GP_1(bank, 21, fn, sfx),	\

	PORT_GP_1(bank, 22, fn, sfx), PORT_GP_1(bank, 23, fn, sfx),	\

	PORT_GP_1(bank, 24, fn, sfx), PORT_GP_1(bank, 25, fn, sfx),	\

	PORT_GP_1(bank, 26, fn, sfx), PORT_GP_1(bank, 27, fn, sfx),	\

	PORT_GP_1(bank, 28, fn, sfx), PORT_GP_1(bank, 29, fn, sfx),	\

	PORT_GP_1(bank, 30, fn, sfx), PORT_GP_1(bank, 31, fn, sfx)



#define PORT_GP_32_9(bank, fn, sfx)					\

#define PORT_GP_9(bank, fn, sfx)					\

	PORT_GP_1(bank, 0, fn, sfx), PORT_GP_1(bank, 1, fn, sfx),	\

	PORT_GP_1(bank, 2, fn, sfx), PORT_GP_1(bank, 3, fn, sfx),	\

	PORT_GP_1(bank, 4, fn, sfx), PORT_GP_1(bank, 5, fn, sfx),	\

	PORT_GP_1(bank, 6, fn, sfx), PORT_GP_1(bank, 7, fn, sfx),	\

	PORT_GP_1(bank, 8, fn, sfx)



#define PORT_GP_32_REV(bank, fn, sfx)					\

	PORT_GP_1(bank, 31, fn, sfx), PORT_GP_1(bank, 30, fn, sfx),	\

	PORT_GP_1(bank, 29, fn, sfx), PORT_GP_1(bank, 28, fn, sfx),	\

	PORT_GP_1(bank, 27, fn, sfx), PORT_GP_1(bank, 26, fn, sfx),	\

	PORT_GP_1(bank, 25, fn, sfx), PORT_GP_1(bank, 24, fn, sfx),	\

	PORT_GP_1(bank, 23, fn, sfx), PORT_GP_1(bank, 22, fn, sfx),	\

	PORT_GP_1(bank, 21, fn, sfx), PORT_GP_1(bank, 20, fn, sfx),	\

	PORT_GP_1(bank, 19, fn, sfx), PORT_GP_1(bank, 18, fn, sfx),	\

	PORT_GP_1(bank, 17, fn, sfx), PORT_GP_1(bank, 16, fn, sfx),	\

	PORT_GP_1(bank, 15, fn, sfx), PORT_GP_1(bank, 14, fn, sfx),	\

	PORT_GP_1(bank, 13, fn, sfx), PORT_GP_1(bank, 12, fn, sfx),	\

	PORT_GP_1(bank, 11, fn, sfx), PORT_GP_1(bank, 10, fn, sfx),	\

	PORT_GP_1(bank, 9,  fn, sfx), PORT_GP_1(bank, 8,  fn, sfx),	\

	PORT_GP_1(bank, 7,  fn, sfx), PORT_GP_1(bank, 6,  fn, sfx),	\

	PORT_GP_1(bank, 5,  fn, sfx), PORT_GP_1(bank, 4,  fn, sfx),	\

	PORT_GP_1(bank, 3,  fn, sfx), PORT_GP_1(bank, 2,  fn, sfx),	\

	PORT_GP_1(bank, 1,  fn, sfx), PORT_GP_1(bank, 0,  fn, sfx)



#define CPU_ALL_PORT(fn, sfx)						\

	PORT_GP_32(0, fn, sfx),						\

	PORT_GP_32(1, fn, sfx),						\
@@ -76,26 +38,7 @@ 
	PORT_GP_32(3, fn, sfx),						\

	PORT_GP_32(4, fn, sfx),						\

	PORT_GP_32(5, fn, sfx),						\

	PORT_GP_32_9(6, fn, sfx)



#define _GP_PORT_ALL(bank, pin, name, sfx)	name##_##sfx



#define _GP_GPIO(bank, pin, _name, sfx)					\

	[RCAR_GP_PIN(bank, pin)] = {					\

		.name = __stringify(_name),				\

		.enum_id = _name##_DATA,				\

	}



#define _GP_DATA(bank, pin, name, sfx)					\

	PINMUX_DATA(name##_DATA, name##_FN)



#define GP_ALL(str)		CPU_ALL_PORT(_GP_PORT_ALL, str)

#define PINMUX_GPIO_GP_ALL()	CPU_ALL_PORT(_GP_GPIO, unused)

#define PINMUX_DATA_GP_ALL()	CPU_ALL_PORT(_GP_DATA, 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, \

							  FN_##ipsr, FN_##fn)

	PORT_GP_9(6, fn, sfx)



enum {

	PINMUX_RESERVED = 0,

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

+0 −57
Original line number Diff line number Diff line
@@ -27,44 +27,6 @@ 
#include "core.h"

#include "sh_pfc.h"



#define PORT_GP_1(bank, pin, fn, sfx) fn(bank, pin, GP_##bank##_##pin, sfx)



#define PORT_GP_32(bank, fn, sfx)					\

	PORT_GP_1(bank, 0,  fn, sfx), PORT_GP_1(bank, 1,  fn, sfx),	\

	PORT_GP_1(bank, 2,  fn, sfx), PORT_GP_1(bank, 3,  fn, sfx),	\

	PORT_GP_1(bank, 4,  fn, sfx), PORT_GP_1(bank, 5,  fn, sfx),	\

	PORT_GP_1(bank, 6,  fn, sfx), PORT_GP_1(bank, 7,  fn, sfx),	\

	PORT_GP_1(bank, 8,  fn, sfx), PORT_GP_1(bank, 9,  fn, sfx),	\

	PORT_GP_1(bank, 10, fn, sfx), PORT_GP_1(bank, 11, fn, sfx),	\

	PORT_GP_1(bank, 12, fn, sfx), PORT_GP_1(bank, 13, fn, sfx),	\

	PORT_GP_1(bank, 14, fn, sfx), PORT_GP_1(bank, 15, fn, sfx),	\

	PORT_GP_1(bank, 16, fn, sfx), PORT_GP_1(bank, 17, fn, sfx),	\

	PORT_GP_1(bank, 18, fn, sfx), PORT_GP_1(bank, 19, fn, sfx),	\

	PORT_GP_1(bank, 20, fn, sfx), PORT_GP_1(bank, 21, fn, sfx),	\

	PORT_GP_1(bank, 22, fn, sfx), PORT_GP_1(bank, 23, fn, sfx),	\

	PORT_GP_1(bank, 24, fn, sfx), PORT_GP_1(bank, 25, fn, sfx),	\

	PORT_GP_1(bank, 26, fn, sfx), PORT_GP_1(bank, 27, fn, sfx),	\

	PORT_GP_1(bank, 28, fn, sfx), PORT_GP_1(bank, 29, fn, sfx),	\

	PORT_GP_1(bank, 30, fn, sfx), PORT_GP_1(bank, 31, fn, sfx)



#define PORT_GP_32_REV(bank, fn, sfx)					\

	PORT_GP_1(bank, 31, fn, sfx), PORT_GP_1(bank, 30, fn, sfx),	\

	PORT_GP_1(bank, 29, fn, sfx), PORT_GP_1(bank, 28, fn, sfx),	\

	PORT_GP_1(bank, 27, fn, sfx), PORT_GP_1(bank, 26, fn, sfx),	\

	PORT_GP_1(bank, 25, fn, sfx), PORT_GP_1(bank, 24, fn, sfx),	\

	PORT_GP_1(bank, 23, fn, sfx), PORT_GP_1(bank, 22, fn, sfx),	\

	PORT_GP_1(bank, 21, fn, sfx), PORT_GP_1(bank, 20, fn, sfx),	\

	PORT_GP_1(bank, 19, fn, sfx), PORT_GP_1(bank, 18, fn, sfx),	\

	PORT_GP_1(bank, 17, fn, sfx), PORT_GP_1(bank, 16, fn, sfx),	\

	PORT_GP_1(bank, 15, fn, sfx), PORT_GP_1(bank, 14, fn, sfx),	\

	PORT_GP_1(bank, 13, fn, sfx), PORT_GP_1(bank, 12, fn, sfx),	\

	PORT_GP_1(bank, 11, fn, sfx), PORT_GP_1(bank, 10, fn, sfx),	\

	PORT_GP_1(bank, 9,  fn, sfx), PORT_GP_1(bank, 8,  fn, sfx),	\

	PORT_GP_1(bank, 7,  fn, sfx), PORT_GP_1(bank, 6,  fn, sfx),	\

	PORT_GP_1(bank, 5,  fn, sfx), PORT_GP_1(bank, 4,  fn, sfx),	\

	PORT_GP_1(bank, 3,  fn, sfx), PORT_GP_1(bank, 2,  fn, sfx),	\

	PORT_GP_1(bank, 1,  fn, sfx), PORT_GP_1(bank, 0,  fn, sfx)



#define CPU_ALL_PORT(fn, sfx)						\

	PORT_GP_32(0, fn, sfx),						\

	PORT_GP_32(1, fn, sfx),						\
@@ -73,25 +35,6 @@ 
	PORT_GP_32(4, fn, sfx),						\

	PORT_GP_32(5, fn, sfx)



#define _GP_PORT_ALL(bank, pin, name, sfx)	name##_##sfx



#define _GP_GPIO(bank, pin, _name, sfx)					\

	[(bank * 32) + pin] = {						\

		.name = __stringify(_name),				\

		.enum_id = _name##_DATA,				\

	}



#define _GP_DATA(bank, pin, name, sfx)					\

	PINMUX_DATA(name##_DATA, name##_FN)



#define GP_ALL(str)		CPU_ALL_PORT(_GP_PORT_ALL, str)

#define PINMUX_GPIO_GP_ALL()	CPU_ALL_PORT(_GP_GPIO, unused)

#define PINMUX_DATA_GP_ALL()	CPU_ALL_PORT(_GP_DATA, 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, \

							  FN_##ipsr, FN_##fn)



enum {

	PINMUX_RESERVED = 0,