Commit 4f91d2b0 authored by Linus Walleij's avatar Linus Walleij
Browse files

Merge tag 'renesas-pinctrl-for-v6.19-tag1' of... 

Merge tag 'renesas-pinctrl-for-v6.19-tag1' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/renesas-drivers

 into devel

pinctrl: renesas: Updates for v6.19

  - Fix interrupt configuration and port mode after resume on RZ/G2L
    family SoCs,
  - Miscellaneous fixes and improvements.

Signed-off-by: default avatarLinus Walleij <linus.walleij@linaro.org>
parents 59d2d28f a5fad3ae

drivers/pinctrl/renesas/pfc-emev2.c

+0 −1
Original line number Diff line number Diff line
@@ -666,7 +666,6 @@ static const u16 pinmux_data[] = { 
	PINMUX_IPSR_NOFN(UART_1_0_PORT158, UART2_TX, SEL_UART_1_0_01),

};





#define EMEV_MUX_PIN(name, pin, mark) \

	static const unsigned int name##_pins[] = { pin }; \

	static const unsigned int name##_mux[] = { mark##_MARK }

drivers/pinctrl/renesas/pfc-r8a73a4.c

+0 −2
Original line number Diff line number Diff line
@@ -85,7 +85,6 @@ 
	/* Port320 - Port329 */						\

	PORT_10(320, fn, pfx##32, sfx)





enum {

	PINMUX_RESERVED = 0,
@@ -227,7 +226,6 @@ enum { 


	PINMUX_MARK_BEGIN,





#define F1(a)	a##_MARK

#define F2(a)	a##_MARK

#define F3(a)	a##_MARK

drivers/pinctrl/renesas/pfc-r8a7778.c

+0 −1
Original line number Diff line number Diff line
@@ -1994,7 +1994,6 @@ static const char * const scif5_groups[] = { 
	"scif5_data_b",

};





static const char * const sdhi0_groups[] = {

	"sdhi0_cd",

	"sdhi0_ctrl",

drivers/pinctrl/renesas/pfc-r8a77951.c

+0 −1
Original line number Diff line number Diff line
@@ -249,7 +249,6 @@ 
#define GPSR7_1		FM(AVS2)

#define GPSR7_0		FM(AVS1)





/* IPSRx */		/* 0 */			/* 1 */		/* 2 */			/* 3 */				/* 4 */		/* 5 */		/* 6 */			/* 7 */		/* 8 */			/* 9 */		/* A */		/* B */		/* C - F */

#define IP0_3_0		FM(AVB_MDC)		F_(0, 0)	FM(MSIOF2_SS2_C)	F_(0, 0)			F_(0, 0)	F_(0, 0)	F_(0, 0)		F_(0, 0)	F_(0, 0)		F_(0, 0)	F_(0, 0)	F_(0, 0)	F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0)

#define IP0_7_4		FM(AVB_MAGIC)		F_(0, 0)	FM(MSIOF2_SS1_C)	FM(SCK4_A)			F_(0, 0)	F_(0, 0)	F_(0, 0)		F_(0, 0)	F_(0, 0)		F_(0, 0)	F_(0, 0)	F_(0, 0)	F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0)

drivers/pinctrl/renesas/pfc-r8a7796.c

+0 −1
Original line number Diff line number Diff line
@@ -254,7 +254,6 @@ 
#define GPSR7_1		FM(AVS2)

#define GPSR7_0		FM(AVS1)





/* IPSRx */		/* 0 */			/* 1 */		/* 2 */			/* 3 */				/* 4 */		/* 5 */		/* 6 */			/* 7 */		/* 8 */			/* 9 */		/* A */		/* B */		/* C - F */

#define IP0_3_0		FM(AVB_MDC)		F_(0, 0)	FM(MSIOF2_SS2_C)	F_(0, 0)			F_(0, 0)	F_(0, 0)	F_(0, 0)		F_(0, 0)	F_(0, 0)		F_(0, 0)	F_(0, 0)	F_(0, 0)	F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0)

#define IP0_7_4		FM(AVB_MAGIC)		F_(0, 0)	FM(MSIOF2_SS1_C)	FM(SCK4_A)			F_(0, 0)	F_(0, 0)	F_(0, 0)		F_(0, 0)	F_(0, 0)		F_(0, 0)	F_(0, 0)	F_(0, 0)	F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0)