Commit 50bdc4d4 authored by Linus Walleij's avatar Linus Walleij
Browse files

Merge tag 'renesas-pinctrl-for-v5.14-tag1' of... 

Merge tag 'renesas-pinctrl-for-v5.14-tag1' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/renesas-drivers into devel

pinctrl: renesas: Updates for v5.14

  - Minor fixes and improvements.
parents 696beef7 904ec4be

drivers/pinctrl/renesas/pfc-r8a7778.c

+0 −3
Original line number Diff line number Diff line
@@ -18,9 +18,6 @@ 


#include "sh_pfc.h"



#define PORT_GP_PUP_1(bank, pin, fn, sfx)	\

	PORT_GP_CFG_1(bank, pin, fn, sfx, SH_PFC_PIN_CFG_PULL_UP)



#define CPU_ALL_GP(fn, sfx)		\

	PORT_GP_CFG_32(0, fn, sfx, SH_PFC_PIN_CFG_PULL_UP),		\

	PORT_GP_CFG_32(1, fn, sfx, SH_PFC_PIN_CFG_PULL_UP),		\

drivers/pinctrl/renesas/pfc-r8a7796.c

+6 −4
Original line number Diff line number Diff line
@@ -67,6 +67,7 @@ 
	PIN_NOGP_CFG(QSPI1_MOSI_IO0, "QSPI1_MOSI_IO0", fn, CFG_FLAGS),	\

	PIN_NOGP_CFG(QSPI1_SPCLK, "QSPI1_SPCLK", fn, CFG_FLAGS),	\

	PIN_NOGP_CFG(QSPI1_SSL, "QSPI1_SSL", fn, CFG_FLAGS),		\

	PIN_NOGP_CFG(PRESET_N, "PRESET#", fn, SH_PFC_PIN_CFG_PULL_DOWN),\

	PIN_NOGP_CFG(RPC_INT_N, "RPC_INT#", fn, CFG_FLAGS),		\

	PIN_NOGP_CFG(RPC_RESET_N, "RPC_RESET#", fn, CFG_FLAGS),		\

	PIN_NOGP_CFG(RPC_WP_N, "RPC_WP#", fn, CFG_FLAGS),		\
@@ -5990,7 +5991,8 @@ static const struct pinmux_ioctrl_reg pinmux_ioctrl_regs[] = { 
	{ /* sentinel */ },

};



static int r8a7796_pin_to_pocctrl(struct sh_pfc *pfc, unsigned int pin, u32 *pocctrl)

static int r8a7796_pin_to_pocctrl(struct sh_pfc *pfc,

				  unsigned int pin, u32 *pocctrl)

{

	int bit = -EINVAL;
@@ -6218,7 +6220,7 @@ static const struct pinmux_bias_reg pinmux_bias_regs[] = { 
		[ 4] = RCAR_GP_PIN(6, 29),	/* USB30_OVC */

		[ 5] = RCAR_GP_PIN(6, 30),	/* GP6_30 */

		[ 6] = RCAR_GP_PIN(6, 31),	/* GP6_31 */

		[ 7] = SH_PFC_PIN_NONE,

		[ 7] = PIN_PRESET_N,		/* PRESET# */

		[ 8] = SH_PFC_PIN_NONE,

		[ 9] = SH_PFC_PIN_NONE,

		[10] = SH_PFC_PIN_NONE,

drivers/pinctrl/renesas/pfc-r8a77965.c

+40 −39
Original line number Diff line number Diff line
@@ -6248,7 +6248,8 @@ static const struct pinmux_ioctrl_reg pinmux_ioctrl_regs[] = { 
	{ /* sentinel */ },

};



static int r8a77965_pin_to_pocctrl(struct sh_pfc *pfc, unsigned int pin, u32 *pocctrl)

static int r8a77965_pin_to_pocctrl(struct sh_pfc *pfc,

				   unsigned int pin, u32 *pocctrl)

{

	int bit = -EINVAL;

drivers/pinctrl/renesas/pfc-r8a77990.c

+8 −8
Original line number Diff line number Diff line
@@ -53,10 +53,10 @@ 
	PIN_NOGP_CFG(FSCLKST_N, "FSCLKST_N", fn, CFG_FLAGS),		\

	PIN_NOGP_CFG(MLB_REF, "MLB_REF", fn, CFG_FLAGS),		\

	PIN_NOGP_CFG(PRESETOUT_N, "PRESETOUT_N", fn, CFG_FLAGS),	\

	PIN_NOGP_CFG(TCK, "TCK", fn, CFG_FLAGS),			\

	PIN_NOGP_CFG(TDI, "TDI", fn, CFG_FLAGS),			\

	PIN_NOGP_CFG(TMS, "TMS", fn, CFG_FLAGS),			\

	PIN_NOGP_CFG(TRST_N, "TRST_N", fn, CFG_FLAGS)

	PIN_NOGP_CFG(TCK, "TCK", fn, SH_PFC_PIN_CFG_PULL_UP),		\

	PIN_NOGP_CFG(TDI, "TDI", fn, SH_PFC_PIN_CFG_PULL_UP),		\

	PIN_NOGP_CFG(TMS, "TMS", fn, SH_PFC_PIN_CFG_PULL_UP),		\

	PIN_NOGP_CFG(TRST_N, "TRST_N", fn, SH_PFC_PIN_CFG_PULL_UP)



/*

 * F_() : just information
@@ -5197,8 +5197,8 @@ static const struct pinmux_bias_reg pinmux_bias_regs[] = { 
		[27] = RCAR_GP_PIN(1,  0),	/* A0 */

		[28] = SH_PFC_PIN_NONE,

		[29] = SH_PFC_PIN_NONE,

		[30] = RCAR_GP_PIN(2, 25),	/* PUEN_EX_WAIT0 */

		[31] = RCAR_GP_PIN(2, 24),	/* PUEN_RD/WR# */

		[30] = RCAR_GP_PIN(2, 25),	/* EX_WAIT0 */

		[31] = RCAR_GP_PIN(2, 24),	/* RD/WR# */

	} },

	{ PINMUX_BIAS_REG("PUEN2", 0xe6060408, "PUD2", 0xe6060448) {

		 [0] = RCAR_GP_PIN(3,  1),	/* SD0_CMD */
@@ -5333,8 +5333,8 @@ static const struct pinmux_bias_reg pinmux_bias_regs[] = { 
		[27] = SH_PFC_PIN_NONE,

		[28] = SH_PFC_PIN_NONE,

		[29] = SH_PFC_PIN_NONE,

		[30] = RCAR_GP_PIN(6,  9),	/* PUEN_USB30_OVC */

		[31] = RCAR_GP_PIN(6, 17),	/* PUEN_USB30_PWEN */

		[30] = RCAR_GP_PIN(6,  9),	/* USB30_OVC */

		[31] = RCAR_GP_PIN(6, 17),	/* USB30_PWEN */

	} },

	{ /* sentinel */ },

};

drivers/pinctrl/renesas/pfc-r8a77951.c

+2 −2

File changed.

Contains only whitespace changes.