Commit 9942a5b5 authored by Ulrich Hecht's avatar Ulrich Hecht Committed by Geert Uytterhoeven
Browse files

pinctrl: sh-pfc: r8a7795: Deduplicate VIN4 pin definitions 



Use union vin_data and VIN_DATA_PIN_GROUP() to reduce redundancies
in pin definitions.

Signed-off-by: default avatarUlrich Hecht <ulrich.hecht+renesas@gmail.com>
Signed-off-by: default avatarGeert Uytterhoeven <geert+renesas@glider.be>
parent 4fd82963

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

+72 −236
Original line number Diff line number Diff line
@@ -3929,130 +3929,6 @@ static const unsigned int usb30_mux[] = { 
};



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

static const unsigned int vin4_data8_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),

};

static const unsigned int vin4_data8_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,

};

static const unsigned int vin4_data8_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),

};

static const unsigned int vin4_data8_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,

};

static const unsigned int vin4_data10_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),

};

static const unsigned int vin4_data10_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,

};

static const unsigned int vin4_data10_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),

};

static const unsigned int vin4_data10_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,

};

static const unsigned int vin4_data12_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),

};

static const unsigned int vin4_data12_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,

};

static const unsigned int vin4_data12_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),

};

static const unsigned int vin4_data12_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,

};

static const unsigned int vin4_data16_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),

};

static const unsigned int vin4_data16_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,

};

static const unsigned int vin4_data16_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),

};

static const unsigned int vin4_data16_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,

};

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),
@@ -4097,55 +3973,8 @@ static const unsigned int vin4_data18_b_mux[] = { 
	VI4_DATA20_MARK, VI4_DATA21_MARK,

	VI4_DATA22_MARK, VI4_DATA23_MARK,

};

static const unsigned int vin4_data20_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),

};

static const unsigned int vin4_data20_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,

};

static const unsigned int vin4_data20_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),

};

static const unsigned int vin4_data20_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,

};

static const unsigned int vin4_data24_a_pins[] = {

static const union vin_data vin4_data_a_pins = {

	.data24 = {

		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),
@@ -4158,8 +3987,10 @@ static const unsigned int vin4_data24_a_pins[] = { 
		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_data24_a_mux[] = {

static const union vin_data vin4_data_a_mux = {

	.data24 = {

		VI4_DATA0_A_MARK, VI4_DATA1_A_MARK,

		VI4_DATA2_A_MARK, VI4_DATA3_A_MARK,

		VI4_DATA4_A_MARK, VI4_DATA5_A_MARK,
@@ -4172,8 +4003,10 @@ static const unsigned int vin4_data24_a_mux[] = { 
		VI4_DATA18_MARK, VI4_DATA19_MARK,

		VI4_DATA20_MARK, VI4_DATA21_MARK,

		VI4_DATA22_MARK, VI4_DATA23_MARK,

	},

};

static const unsigned int vin4_data24_b_pins[] = {

static const union vin_data vin4_data_b_pins = {

	.data24 = {

		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),
@@ -4186,8 +4019,10 @@ static const unsigned int vin4_data24_b_pins[] = { 
		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_data24_b_mux[] = {

static const union vin_data vin4_data_b_mux = {

	.data24 = {

		VI4_DATA0_B_MARK, VI4_DATA1_B_MARK,

		VI4_DATA2_B_MARK, VI4_DATA3_B_MARK,

		VI4_DATA4_B_MARK, VI4_DATA5_B_MARK,
@@ -4200,6 +4035,7 @@ static const unsigned int vin4_data24_b_mux[] = { 
		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# */
@@ -4642,20 +4478,20 @@ static const struct sh_pfc_pin_group pinmux_groups[] = { 
	SH_PFC_PIN_GROUP(usb2),

	SH_PFC_PIN_GROUP(usb2_ch3),

	SH_PFC_PIN_GROUP(usb30),

	SH_PFC_PIN_GROUP(vin4_data8_a),

	SH_PFC_PIN_GROUP(vin4_data10_a),

	SH_PFC_PIN_GROUP(vin4_data12_a),

	SH_PFC_PIN_GROUP(vin4_data16_a),

	VIN_DATA_PIN_GROUP(vin4_data_a, 8),

	VIN_DATA_PIN_GROUP(vin4_data_a, 10),

	VIN_DATA_PIN_GROUP(vin4_data_a, 12),

	VIN_DATA_PIN_GROUP(vin4_data_a, 16),

	SH_PFC_PIN_GROUP(vin4_data18_a),

	SH_PFC_PIN_GROUP(vin4_data20_a),

	SH_PFC_PIN_GROUP(vin4_data24_a),

	SH_PFC_PIN_GROUP(vin4_data8_b),

	SH_PFC_PIN_GROUP(vin4_data10_b),

	SH_PFC_PIN_GROUP(vin4_data12_b),

	SH_PFC_PIN_GROUP(vin4_data16_b),

	VIN_DATA_PIN_GROUP(vin4_data_a, 20),

	VIN_DATA_PIN_GROUP(vin4_data_a, 24),

	VIN_DATA_PIN_GROUP(vin4_data_b, 8),

	VIN_DATA_PIN_GROUP(vin4_data_b, 10),

	VIN_DATA_PIN_GROUP(vin4_data_b, 12),

	VIN_DATA_PIN_GROUP(vin4_data_b, 16),

	SH_PFC_PIN_GROUP(vin4_data18_b),

	SH_PFC_PIN_GROUP(vin4_data20_b),

	SH_PFC_PIN_GROUP(vin4_data24_b),

	VIN_DATA_PIN_GROUP(vin4_data_b, 20),

	VIN_DATA_PIN_GROUP(vin4_data_b, 24),

	SH_PFC_PIN_GROUP(vin4_sync),

	SH_PFC_PIN_GROUP(vin4_field),

	SH_PFC_PIN_GROUP(vin4_clkenb),