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

Commit 642fb53d authored by Linus Walleij's avatar Linus Walleij
Browse files

Merge tag 'sh-pfc-for-v4.21-tag3' of... 

Merge tag 'sh-pfc-for-v4.21-tag3' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/renesas-drivers into devel

pinctrl: sh-pfc: Fixes for v4.21

  - Miscellaneous fixes,
  - Build-time validation for pins/marks mismatches.
parents da801ab5 f83f9768

drivers/pinctrl/pinctrl-rza1.c

+5 −0
Original line number Diff line number Diff line
@@ -1225,6 +1225,9 @@ static int rza1_parse_gpiochip(struct rza1_pinctrl *rza1_pctl, 
	chip->base	= -1;

	chip->label	= devm_kasprintf(rza1_pctl->dev, GFP_KERNEL, "%pOFn",

					 np);

	if (!chip->label)

		return -ENOMEM;



	chip->ngpio	= of_args.args[2];

	chip->of_node	= np;

	chip->parent	= rza1_pctl->dev;
@@ -1326,6 +1329,8 @@ static int rza1_pinctrl_register(struct rza1_pinctrl *rza1_pctl) 
		pins[i].number = i;

		pins[i].name = devm_kasprintf(rza1_pctl->dev, GFP_KERNEL,

					      "P%u-%u", port, pin);

		if (!pins[i].name)

			return -ENOMEM;



		if (i % RZA1_PINS_PER_PORT == 0) {

			/*

drivers/pinctrl/sh-pfc/core.c

+1 −1
Original line number Diff line number Diff line
@@ -221,7 +221,7 @@ static void sh_pfc_write_config_reg(struct sh_pfc *pfc, 


	dev_dbg(pfc->dev, "write_reg addr = %x, value = 0x%x, field = %u, "

		"r_width = %u, f_width = %u\n",

		crp->reg, value, field, crp->reg_width, crp->field_width);

		crp->reg, value, field, crp->reg_width, hweight32(mask));



	mask = ~(mask << pos);

	value = value << pos;

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

+2 −1
Original line number Diff line number Diff line
@@ -1969,7 +1969,7 @@ static const unsigned int gether_gmii_pins[] = { 
	 */

	185, 186, 187, 188, 189, 190, 191, 192, 174, 161, 204,

	171, 170, 169, 168, 167, 166, 173, 172, 176, 184, 183, 203,

	205, 163, 206, 207,

	205, 163, 206, 207, 158,

};

static const unsigned int gether_gmii_mux[] = {

	ET_ERXD0_MARK, ET_ERXD1_MARK, ET_ERXD2_MARK, ET_ERXD3_MARK,
@@ -2141,6 +2141,7 @@ static const unsigned int lcd0_data24_1_mux[] = { 
	LCD0_D0_MARK, LCD0_D1_MARK, LCD0_D2_MARK, LCD0_D3_MARK,

	LCD0_D4_MARK, LCD0_D5_MARK, LCD0_D6_MARK, LCD0_D7_MARK,

	LCD0_D8_MARK, LCD0_D9_MARK, LCD0_D10_MARK, LCD0_D11_MARK,

	LCD0_D12_MARK, LCD0_D13_MARK, LCD0_D14_MARK, LCD0_D15_MARK,

	LCD0_D16_MARK, LCD0_D17_MARK, LCD0_D18_PORT163_MARK,

	LCD0_D19_PORT162_MARK, LCD0_D20_PORT161_MARK, LCD0_D21_PORT158_MARK,

	LCD0_D22_PORT160_MARK, LCD0_D23_PORT159_MARK,

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

+1 −5
Original line number Diff line number Diff line
@@ -3217,8 +3217,7 @@ static const unsigned int qspi_data4_b_pins[] = { 
	RCAR_GP_PIN(6, 4),

};

static const unsigned int qspi_data4_b_mux[] = {

	SPCLK_B_MARK, MOSI_IO0_B_MARK, MISO_IO1_B_MARK,

	IO2_B_MARK, IO3_B_MARK, SSL_B_MARK,

	MOSI_IO0_B_MARK, MISO_IO1_B_MARK, IO2_B_MARK, IO3_B_MARK,

};

/* - SCIF0 ------------------------------------------------------------------ */

static const unsigned int scif0_data_pins[] = {
@@ -4372,17 +4371,14 @@ static const unsigned int vin1_b_data18_pins[] = { 
};

static const unsigned int vin1_b_data18_mux[] = {

	/* B */

	VI1_DATA0_B_MARK, VI1_DATA1_B_MARK,

	VI1_DATA2_B_MARK, VI1_DATA3_B_MARK,

	VI1_DATA4_B_MARK, VI1_DATA5_B_MARK,

	VI1_DATA6_B_MARK, VI1_DATA7_B_MARK,

	/* G */

	VI1_G0_B_MARK, VI1_G1_B_MARK,

	VI1_G2_B_MARK, VI1_G3_B_MARK,

	VI1_G4_B_MARK, VI1_G5_B_MARK,

	VI1_G6_B_MARK, VI1_G7_B_MARK,

	/* R */

	VI1_R0_B_MARK, VI1_R1_B_MARK,

	VI1_R2_B_MARK, VI1_R3_B_MARK,

	VI1_R4_B_MARK, VI1_R5_B_MARK,

	VI1_R6_B_MARK, VI1_R7_B_MARK,

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

+1 −1
Original line number Diff line number Diff line
@@ -5212,7 +5212,7 @@ static const struct pinmux_cfg_reg pinmux_config_regs[] = { 
		FN_AVB_MDC, FN_SSI_SDATA6_B, 0, 0, }

	},

	{ PINMUX_CFG_REG_VAR("IPSR9", 0xE6060044, 32,

			     1, 3, 3, 3, 3, 2, 2, 3, 3, 3, 3, 3, 3) {

			     1, 3, 3, 3, 3, 2, 2, 3, 3, 3, 3, 3) {

		/* IP9_31 [1] */

		0, 0,

		/* IP9_30_28 [3] */