Commit 59916e93 authored by Geert Uytterhoeven's avatar Geert Uytterhoeven
Browse files

pinctrl: renesas: r8a7791: Share SDHI pin group data 



Pin groups sdhi[012]_data1 are subsets of sdhi[012]_data4.

This reduces kernel size by 24 bytes.

Signed-off-by: default avatarGeert Uytterhoeven <geert+renesas@glider.be>
Link: https://lore.kernel.org/r/cb39cb8fe9152197df56f70b4b146d8fe96fb0b7.1640269757.git.geert+renesas@glider.be
parent aee52eba

drivers/pinctrl/renesas/pfc-r8a7791.c

+12 −33
Original line number Diff line number Diff line
@@ -3780,19 +3780,12 @@ static const unsigned int scif_clk_b_mux[] = { 
};



/* - SDHI0 ------------------------------------------------------------------ */

static const unsigned int sdhi0_data1_pins[] = {

	/* D0 */

	RCAR_GP_PIN(6, 2),

};

static const unsigned int sdhi0_data1_mux[] = {

	SD0_DATA0_MARK,

};

static const unsigned int sdhi0_data4_pins[] = {

static const unsigned int sdhi0_data_pins[] = {

	/* D[0:3] */

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

	RCAR_GP_PIN(6, 4), RCAR_GP_PIN(6, 5),

};

static const unsigned int sdhi0_data4_mux[] = {

static const unsigned int sdhi0_data_mux[] = {

	SD0_DATA0_MARK, SD0_DATA1_MARK, SD0_DATA2_MARK, SD0_DATA3_MARK,

};

static const unsigned int sdhi0_ctrl_pins[] = {
@@ -3817,19 +3810,12 @@ static const unsigned int sdhi0_wp_mux[] = { 
	SD0_WP_MARK,

};

/* - SDHI1 ------------------------------------------------------------------ */

static const unsigned int sdhi1_data1_pins[] = {

	/* D0 */

	RCAR_GP_PIN(6, 10),

};

static const unsigned int sdhi1_data1_mux[] = {

	SD1_DATA0_MARK,

};

static const unsigned int sdhi1_data4_pins[] = {

static const unsigned int sdhi1_data_pins[] = {

	/* D[0:3] */

	RCAR_GP_PIN(6, 10), RCAR_GP_PIN(6, 11),

	RCAR_GP_PIN(6, 12), RCAR_GP_PIN(6, 13),

};

static const unsigned int sdhi1_data4_mux[] = {

static const unsigned int sdhi1_data_mux[] = {

	SD1_DATA0_MARK, SD1_DATA1_MARK, SD1_DATA2_MARK, SD1_DATA3_MARK,

};

static const unsigned int sdhi1_ctrl_pins[] = {
@@ -3854,19 +3840,12 @@ static const unsigned int sdhi1_wp_mux[] = { 
	SD1_WP_MARK,

};

/* - SDHI2 ------------------------------------------------------------------ */

static const unsigned int sdhi2_data1_pins[] = {

	/* D0 */

	RCAR_GP_PIN(6, 18),

};

static const unsigned int sdhi2_data1_mux[] = {

	SD2_DATA0_MARK,

};

static const unsigned int sdhi2_data4_pins[] = {

static const unsigned int sdhi2_data_pins[] = {

	/* D[0:3] */

	RCAR_GP_PIN(6, 18), RCAR_GP_PIN(6, 19),

	RCAR_GP_PIN(6, 20), RCAR_GP_PIN(6, 21),

};

static const unsigned int sdhi2_data4_mux[] = {

static const unsigned int sdhi2_data_mux[] = {

	SD2_DATA0_MARK, SD2_DATA1_MARK, SD2_DATA2_MARK, SD2_DATA3_MARK,

};

static const unsigned int sdhi2_ctrl_pins[] = {
@@ -4716,18 +4695,18 @@ static const struct { 
		SH_PFC_PIN_GROUP(scifb2_data_d),

		SH_PFC_PIN_GROUP(scif_clk),

		SH_PFC_PIN_GROUP(scif_clk_b),

		SH_PFC_PIN_GROUP(sdhi0_data1),

		SH_PFC_PIN_GROUP(sdhi0_data4),

		BUS_DATA_PIN_GROUP(sdhi0_data, 1),

		BUS_DATA_PIN_GROUP(sdhi0_data, 4),

		SH_PFC_PIN_GROUP(sdhi0_ctrl),

		SH_PFC_PIN_GROUP(sdhi0_cd),

		SH_PFC_PIN_GROUP(sdhi0_wp),

		SH_PFC_PIN_GROUP(sdhi1_data1),

		SH_PFC_PIN_GROUP(sdhi1_data4),

		BUS_DATA_PIN_GROUP(sdhi1_data, 1),

		BUS_DATA_PIN_GROUP(sdhi1_data, 4),

		SH_PFC_PIN_GROUP(sdhi1_ctrl),

		SH_PFC_PIN_GROUP(sdhi1_cd),

		SH_PFC_PIN_GROUP(sdhi1_wp),

		SH_PFC_PIN_GROUP(sdhi2_data1),

		SH_PFC_PIN_GROUP(sdhi2_data4),

		BUS_DATA_PIN_GROUP(sdhi2_data, 1),

		BUS_DATA_PIN_GROUP(sdhi2_data, 4),

		SH_PFC_PIN_GROUP(sdhi2_ctrl),

		SH_PFC_PIN_GROUP(sdhi2_cd),

		SH_PFC_PIN_GROUP(sdhi2_wp),