Commit 19a2c394 authored by Linus Walleij's avatar Linus Walleij
Browse files

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

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

pinctrl: renesas: Updates for v6.3

  - Add pin groups for Video-In channels 4 and 5 on R-Car H3 ES1.x,
  - Miscellaneous fixes and improvements.
parents 9da134e2 698485cd

drivers/pinctrl/renesas/pfc-r8a77950.c

+244 −0
Original line number Diff line number Diff line
@@ -3820,6 +3820,186 @@ static const unsigned int usb31_mux[] = { 
	USB31_PWEN_MARK, USB31_OVC_MARK,

};



/* - VIN4 ------------------------------------------------------------------- */

static const unsigned int vin4_data18_a_pins[] = {

	RCAR_GP_PIN(0, 10), RCAR_GP_PIN(0, 11),

	RCAR_GP_PIN(0, 12), RCAR_GP_PIN(0, 13),

	RCAR_GP_PIN(0, 14), RCAR_GP_PIN(0, 15),

	RCAR_GP_PIN(1, 2), RCAR_GP_PIN(1, 3),

	RCAR_GP_PIN(1, 4), RCAR_GP_PIN(1, 5),

	RCAR_GP_PIN(1, 6), RCAR_GP_PIN(1, 7),

	RCAR_GP_PIN(0, 2), RCAR_GP_PIN(0, 3),

	RCAR_GP_PIN(0, 4), RCAR_GP_PIN(0, 5),

	RCAR_GP_PIN(0, 6), RCAR_GP_PIN(0, 7),

};

static const unsigned int vin4_data18_a_mux[] = {

	VI4_DATA2_A_MARK, VI4_DATA3_A_MARK,

	VI4_DATA4_A_MARK, VI4_DATA5_A_MARK,

	VI4_DATA6_A_MARK, VI4_DATA7_A_MARK,

	VI4_DATA10_MARK, VI4_DATA11_MARK,

	VI4_DATA12_MARK, VI4_DATA13_MARK,

	VI4_DATA14_MARK, VI4_DATA15_MARK,

	VI4_DATA18_MARK, VI4_DATA19_MARK,

	VI4_DATA20_MARK, VI4_DATA21_MARK,

	VI4_DATA22_MARK, VI4_DATA23_MARK,

};

static const unsigned int vin4_data18_b_pins[] = {

	RCAR_GP_PIN(2, 2), RCAR_GP_PIN(2, 3),

	RCAR_GP_PIN(2, 4), RCAR_GP_PIN(2, 5),

	RCAR_GP_PIN(2, 6), RCAR_GP_PIN(2, 7),

	RCAR_GP_PIN(1, 2), RCAR_GP_PIN(1, 3),

	RCAR_GP_PIN(1, 4), RCAR_GP_PIN(1, 5),

	RCAR_GP_PIN(1, 6), RCAR_GP_PIN(1, 7),

	RCAR_GP_PIN(0, 2), RCAR_GP_PIN(0, 3),

	RCAR_GP_PIN(0, 4), RCAR_GP_PIN(0, 5),

	RCAR_GP_PIN(0, 6), RCAR_GP_PIN(0, 7),

};

static const unsigned int vin4_data18_b_mux[] = {

	VI4_DATA2_B_MARK, VI4_DATA3_B_MARK,

	VI4_DATA4_B_MARK, VI4_DATA5_B_MARK,

	VI4_DATA6_B_MARK, VI4_DATA7_B_MARK,

	VI4_DATA10_MARK, VI4_DATA11_MARK,

	VI4_DATA12_MARK, VI4_DATA13_MARK,

	VI4_DATA14_MARK, VI4_DATA15_MARK,

	VI4_DATA18_MARK, VI4_DATA19_MARK,

	VI4_DATA20_MARK, VI4_DATA21_MARK,

	VI4_DATA22_MARK, VI4_DATA23_MARK,

};

static const unsigned int vin4_data_a_pins[] = {

	RCAR_GP_PIN(0, 8), RCAR_GP_PIN(0, 9),

	RCAR_GP_PIN(0, 10), RCAR_GP_PIN(0, 11),

	RCAR_GP_PIN(0, 12), RCAR_GP_PIN(0, 13),

	RCAR_GP_PIN(0, 14), RCAR_GP_PIN(0, 15),

	RCAR_GP_PIN(1, 0), RCAR_GP_PIN(1, 1),

	RCAR_GP_PIN(1, 2), RCAR_GP_PIN(1, 3),

	RCAR_GP_PIN(1, 4), RCAR_GP_PIN(1, 5),

	RCAR_GP_PIN(1, 6), RCAR_GP_PIN(1, 7),

	RCAR_GP_PIN(0, 0), RCAR_GP_PIN(0, 1),

	RCAR_GP_PIN(0, 2), RCAR_GP_PIN(0, 3),

	RCAR_GP_PIN(0, 4), RCAR_GP_PIN(0, 5),

	RCAR_GP_PIN(0, 6), RCAR_GP_PIN(0, 7),

};

static const unsigned int vin4_data_a_mux[] = {

	VI4_DATA0_A_MARK, VI4_DATA1_A_MARK,

	VI4_DATA2_A_MARK, VI4_DATA3_A_MARK,

	VI4_DATA4_A_MARK, VI4_DATA5_A_MARK,

	VI4_DATA6_A_MARK, VI4_DATA7_A_MARK,

	VI4_DATA8_MARK,  VI4_DATA9_MARK,

	VI4_DATA10_MARK, VI4_DATA11_MARK,

	VI4_DATA12_MARK, VI4_DATA13_MARK,

	VI4_DATA14_MARK, VI4_DATA15_MARK,

	VI4_DATA16_MARK, VI4_DATA17_MARK,

	VI4_DATA18_MARK, VI4_DATA19_MARK,

	VI4_DATA20_MARK, VI4_DATA21_MARK,

	VI4_DATA22_MARK, VI4_DATA23_MARK,

};

static const unsigned int vin4_data_b_pins[] = {

	RCAR_GP_PIN(2, 0), RCAR_GP_PIN(2, 1),

	RCAR_GP_PIN(2, 2), RCAR_GP_PIN(2, 3),

	RCAR_GP_PIN(2, 4), RCAR_GP_PIN(2, 5),

	RCAR_GP_PIN(2, 6), RCAR_GP_PIN(2, 7),

	RCAR_GP_PIN(1, 0), RCAR_GP_PIN(1, 1),

	RCAR_GP_PIN(1, 2), RCAR_GP_PIN(1, 3),

	RCAR_GP_PIN(1, 4), RCAR_GP_PIN(1, 5),

	RCAR_GP_PIN(1, 6), RCAR_GP_PIN(1, 7),

	RCAR_GP_PIN(0, 0), RCAR_GP_PIN(0, 1),

	RCAR_GP_PIN(0, 2), RCAR_GP_PIN(0, 3),

	RCAR_GP_PIN(0, 4), RCAR_GP_PIN(0, 5),

	RCAR_GP_PIN(0, 6), RCAR_GP_PIN(0, 7),

};

static const unsigned int vin4_data_b_mux[] = {

	VI4_DATA0_B_MARK, VI4_DATA1_B_MARK,

	VI4_DATA2_B_MARK, VI4_DATA3_B_MARK,

	VI4_DATA4_B_MARK, VI4_DATA5_B_MARK,

	VI4_DATA6_B_MARK, VI4_DATA7_B_MARK,

	VI4_DATA8_MARK,  VI4_DATA9_MARK,

	VI4_DATA10_MARK, VI4_DATA11_MARK,

	VI4_DATA12_MARK, VI4_DATA13_MARK,

	VI4_DATA14_MARK, VI4_DATA15_MARK,

	VI4_DATA16_MARK, VI4_DATA17_MARK,

	VI4_DATA18_MARK, VI4_DATA19_MARK,

	VI4_DATA20_MARK, VI4_DATA21_MARK,

	VI4_DATA22_MARK, VI4_DATA23_MARK,

};

static const unsigned int vin4_sync_pins[] = {

	/* HSYNC#, VSYNC# */

	RCAR_GP_PIN(1, 18), RCAR_GP_PIN(1, 17),

};

static const unsigned int vin4_sync_mux[] = {

	VI4_HSYNC_N_MARK, VI4_VSYNC_N_MARK,

};

static const unsigned int vin4_field_pins[] = {

	/* FIELD */

	RCAR_GP_PIN(1, 16),

};

static const unsigned int vin4_field_mux[] = {

	VI4_FIELD_MARK,

};

static const unsigned int vin4_clkenb_pins[] = {

	/* CLKENB */

	RCAR_GP_PIN(1, 19),

};

static const unsigned int vin4_clkenb_mux[] = {

	VI4_CLKENB_MARK,

};

static const unsigned int vin4_clk_pins[] = {

	/* CLK */

	RCAR_GP_PIN(1, 27),

};

static const unsigned int vin4_clk_mux[] = {

	VI4_CLK_MARK,

};



/* - VIN5 ------------------------------------------------------------------- */

static const unsigned int vin5_data_pins[] = {

	RCAR_GP_PIN(0, 0), RCAR_GP_PIN(0, 1),

	RCAR_GP_PIN(0, 2), RCAR_GP_PIN(0, 3),

	RCAR_GP_PIN(0, 4), RCAR_GP_PIN(0, 5),

	RCAR_GP_PIN(0, 6), RCAR_GP_PIN(0, 7),

	RCAR_GP_PIN(1, 12), RCAR_GP_PIN(1, 13),

	RCAR_GP_PIN(1, 14), RCAR_GP_PIN(1, 15),

	RCAR_GP_PIN(1, 4), RCAR_GP_PIN(1, 5),

	RCAR_GP_PIN(1, 6), RCAR_GP_PIN(1, 7),

};

static const unsigned int vin5_data_mux[] = {

	VI5_DATA0_MARK, VI5_DATA1_MARK,

	VI5_DATA2_MARK, VI5_DATA3_MARK,

	VI5_DATA4_MARK, VI5_DATA5_MARK,

	VI5_DATA6_MARK, VI5_DATA7_MARK,

	VI5_DATA8_MARK,  VI5_DATA9_MARK,

	VI5_DATA10_MARK, VI5_DATA11_MARK,

	VI5_DATA12_MARK, VI5_DATA13_MARK,

	VI5_DATA14_MARK, VI5_DATA15_MARK,

};

static const unsigned int vin5_sync_pins[] = {

	/* HSYNC#, VSYNC# */

	RCAR_GP_PIN(1, 10), RCAR_GP_PIN(1, 9),

};

static const unsigned int vin5_sync_mux[] = {

	VI5_HSYNC_N_MARK, VI5_VSYNC_N_MARK,

};

static const unsigned int vin5_field_pins[] = {

	RCAR_GP_PIN(1, 11),

};

static const unsigned int vin5_field_mux[] = {

	/* FIELD */

	VI5_FIELD_MARK,

};

static const unsigned int vin5_clkenb_pins[] = {

	RCAR_GP_PIN(1, 20),

};

static const unsigned int vin5_clkenb_mux[] = {

	/* CLKENB */

	VI5_CLKENB_MARK,

};

static const unsigned int vin5_clk_pins[] = {

	RCAR_GP_PIN(1, 21),

};

static const unsigned int vin5_clk_mux[] = {

	/* CLK */

	VI5_CLK_MARK,

};



static const struct sh_pfc_pin_group pinmux_groups[] = {

	SH_PFC_PIN_GROUP(audio_clk_a_a),

	SH_PFC_PIN_GROUP(audio_clk_a_b),
@@ -4141,6 +4321,34 @@ static const struct sh_pfc_pin_group pinmux_groups[] = { 
	SH_PFC_PIN_GROUP(usb2),

	SH_PFC_PIN_GROUP(usb30),

	SH_PFC_PIN_GROUP(usb31),

	BUS_DATA_PIN_GROUP(vin4_data, 8, _a),

	BUS_DATA_PIN_GROUP(vin4_data, 10, _a),

	BUS_DATA_PIN_GROUP(vin4_data, 12, _a),

	BUS_DATA_PIN_GROUP(vin4_data, 16, _a),

	SH_PFC_PIN_GROUP(vin4_data18_a),

	BUS_DATA_PIN_GROUP(vin4_data, 20, _a),

	BUS_DATA_PIN_GROUP(vin4_data, 24, _a),

	BUS_DATA_PIN_GROUP(vin4_data, 8, _b),

	BUS_DATA_PIN_GROUP(vin4_data, 10, _b),

	BUS_DATA_PIN_GROUP(vin4_data, 12, _b),

	BUS_DATA_PIN_GROUP(vin4_data, 16, _b),

	SH_PFC_PIN_GROUP(vin4_data18_b),

	BUS_DATA_PIN_GROUP(vin4_data, 20, _b),

	BUS_DATA_PIN_GROUP(vin4_data, 24, _b),

	SH_PFC_PIN_GROUP_SUBSET(vin4_g8, vin4_data_a, 8, 8),

	SH_PFC_PIN_GROUP(vin4_sync),

	SH_PFC_PIN_GROUP(vin4_field),

	SH_PFC_PIN_GROUP(vin4_clkenb),

	SH_PFC_PIN_GROUP(vin4_clk),

	BUS_DATA_PIN_GROUP(vin5_data, 8),

	BUS_DATA_PIN_GROUP(vin5_data, 10),

	BUS_DATA_PIN_GROUP(vin5_data, 12),

	BUS_DATA_PIN_GROUP(vin5_data, 16),

	SH_PFC_PIN_GROUP_SUBSET(vin5_high8, vin5_data, 8, 8),

	SH_PFC_PIN_GROUP(vin5_sync),

	SH_PFC_PIN_GROUP(vin5_field),

	SH_PFC_PIN_GROUP(vin5_clkenb),

	SH_PFC_PIN_GROUP(vin5_clk),

};



static const char * const audio_clk_groups[] = {
@@ -4637,6 +4845,40 @@ static const char * const usb31_groups[] = { 
	"usb31",

};



static const char * const vin4_groups[] = {

	"vin4_data8_a",

	"vin4_data10_a",

	"vin4_data12_a",

	"vin4_data16_a",

	"vin4_data18_a",

	"vin4_data20_a",

	"vin4_data24_a",

	"vin4_data8_b",

	"vin4_data10_b",

	"vin4_data12_b",

	"vin4_data16_b",

	"vin4_data18_b",

	"vin4_data20_b",

	"vin4_data24_b",

	"vin4_g8",

	"vin4_sync",

	"vin4_field",

	"vin4_clkenb",

	"vin4_clk",

};



static const char * const vin5_groups[] = {

	"vin5_data8",

	"vin5_data10",

	"vin5_data12",

	"vin5_data16",

	"vin5_high8",

	"vin5_sync",

	"vin5_field",

	"vin5_clkenb",

	"vin5_clk",

};



static const struct sh_pfc_function pinmux_functions[] = {

	SH_PFC_FUNCTION(audio_clk),

	SH_PFC_FUNCTION(avb),
@@ -4696,6 +4938,8 @@ static const struct sh_pfc_function pinmux_functions[] = { 
	SH_PFC_FUNCTION(usb2),

	SH_PFC_FUNCTION(usb30),

	SH_PFC_FUNCTION(usb31),

	SH_PFC_FUNCTION(vin4),

	SH_PFC_FUNCTION(vin5),

};



static const struct pinmux_cfg_reg pinmux_config_regs[] = {

drivers/pinctrl/renesas/pinctrl-rzg2l.c

+17 −8
Original line number Diff line number Diff line
@@ -130,6 +130,7 @@ struct rzg2l_dedicated_configs { 
struct rzg2l_pinctrl_data {

	const char * const *port_pins;

	const u32 *port_pin_configs;

	unsigned int n_ports;

	struct rzg2l_dedicated_configs *dedicated_pins;

	unsigned int n_port_pins;

	unsigned int n_dedicated_pins;
@@ -1124,7 +1125,7 @@ static struct { 
	}

};



static int rzg2l_gpio_get_gpioint(unsigned int virq)

static int rzg2l_gpio_get_gpioint(unsigned int virq, const struct rzg2l_pinctrl_data *data)

{

	unsigned int gpioint;

	unsigned int i;
@@ -1133,13 +1134,13 @@ static int rzg2l_gpio_get_gpioint(unsigned int virq) 
	port = virq / 8;

	bit = virq % 8;



	if (port >= ARRAY_SIZE(rzg2l_gpio_configs) ||

	    bit >= RZG2L_GPIO_PORT_GET_PINCNT(rzg2l_gpio_configs[port]))

	if (port >= data->n_ports ||

	    bit >= RZG2L_GPIO_PORT_GET_PINCNT(data->port_pin_configs[port]))

		return -EINVAL;



	gpioint = bit;

	for (i = 0; i < port; i++)

		gpioint += RZG2L_GPIO_PORT_GET_PINCNT(rzg2l_gpio_configs[i]);

		gpioint += RZG2L_GPIO_PORT_GET_PINCNT(data->port_pin_configs[i]);



	return gpioint;

}
@@ -1239,7 +1240,7 @@ static int rzg2l_gpio_child_to_parent_hwirq(struct gpio_chip *gc, 
	unsigned long flags;

	int gpioint, irq;



	gpioint = rzg2l_gpio_get_gpioint(child);

	gpioint = rzg2l_gpio_get_gpioint(child, pctrl->data);

	if (gpioint < 0)

		return gpioint;
@@ -1313,8 +1314,8 @@ static void rzg2l_init_irq_valid_mask(struct gpio_chip *gc, 
		port = offset / 8;

		bit = offset % 8;



		if (port >= ARRAY_SIZE(rzg2l_gpio_configs) ||

		    bit >= RZG2L_GPIO_PORT_GET_PINCNT(rzg2l_gpio_configs[port]))

		if (port >= pctrl->data->n_ports ||

		    bit >= RZG2L_GPIO_PORT_GET_PINCNT(pctrl->data->port_pin_configs[port]))

			clear_bit(offset, valid_mask);

	}

}
@@ -1467,6 +1468,12 @@ static int rzg2l_pinctrl_probe(struct platform_device *pdev) 
	struct rzg2l_pinctrl *pctrl;

	int ret;



	BUILD_BUG_ON(ARRAY_SIZE(rzg2l_gpio_configs) * RZG2L_PINS_PER_PORT >

		     ARRAY_SIZE(rzg2l_gpio_names));



	BUILD_BUG_ON(ARRAY_SIZE(r9a07g043_gpio_configs) * RZG2L_PINS_PER_PORT >

		     ARRAY_SIZE(rzg2l_gpio_names));



	pctrl = devm_kzalloc(&pdev->dev, sizeof(*pctrl), GFP_KERNEL);

	if (!pctrl)

		return -ENOMEM;
@@ -1519,6 +1526,7 @@ static int rzg2l_pinctrl_probe(struct platform_device *pdev) 
static struct rzg2l_pinctrl_data r9a07g043_data = {

	.port_pins = rzg2l_gpio_names,

	.port_pin_configs = r9a07g043_gpio_configs,

	.n_ports = ARRAY_SIZE(r9a07g043_gpio_configs),

	.dedicated_pins = rzg2l_dedicated_pins.common,

	.n_port_pins = ARRAY_SIZE(r9a07g043_gpio_configs) * RZG2L_PINS_PER_PORT,

	.n_dedicated_pins = ARRAY_SIZE(rzg2l_dedicated_pins.common),
@@ -1527,8 +1535,9 @@ static struct rzg2l_pinctrl_data r9a07g043_data = { 
static struct rzg2l_pinctrl_data r9a07g044_data = {

	.port_pins = rzg2l_gpio_names,

	.port_pin_configs = rzg2l_gpio_configs,

	.n_ports = ARRAY_SIZE(rzg2l_gpio_configs),

	.dedicated_pins = rzg2l_dedicated_pins.common,

	.n_port_pins = ARRAY_SIZE(rzg2l_gpio_names),

	.n_port_pins = ARRAY_SIZE(rzg2l_gpio_configs) * RZG2L_PINS_PER_PORT,

	.n_dedicated_pins = ARRAY_SIZE(rzg2l_dedicated_pins.common) +

		ARRAY_SIZE(rzg2l_dedicated_pins.rzg2l_pins),

};

drivers/pinctrl/renesas/pfc-r8a779g0.c

+56 −56

File changed.

Contains only whitespace changes.