Commit 33296238 authored by Geert Uytterhoeven's avatar Geert Uytterhoeven
Browse files

pinctrl: renesas: r8a7796: Share SDHI pin group data 



Pin groups sdhi[01]_data1 are subsets of sdhi[01]_data4.
Pin groups sdhi[23]_data[14] are subsets of sdhi[23]_data8.

This reduces kernel size by 96 bytes.

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

drivers/pinctrl/renesas/pfc-r8a7796.c

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



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

static const unsigned int sdhi0_data1_pins[] = {

	/* D0 */

	RCAR_GP_PIN(3, 2),

};

static const unsigned int sdhi0_data1_mux[] = {

	SD0_DAT0_MARK,

};

static const unsigned int sdhi0_data4_pins[] = {

static const unsigned int sdhi0_data_pins[] = {

	/* D[0:3] */

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

	RCAR_GP_PIN(3, 4), RCAR_GP_PIN(3, 5),

};

static const unsigned int sdhi0_data4_mux[] = {

static const unsigned int sdhi0_data_mux[] = {

	SD0_DAT0_MARK, SD0_DAT1_MARK,

	SD0_DAT2_MARK, SD0_DAT3_MARK,

};
@@ -3556,19 +3549,12 @@ static const unsigned int sdhi0_wp_mux[] = { 
	SD0_WP_MARK,

};

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

static const unsigned int sdhi1_data1_pins[] = {

	/* D0 */

	RCAR_GP_PIN(3, 8),

};

static const unsigned int sdhi1_data1_mux[] = {

	SD1_DAT0_MARK,

};

static const unsigned int sdhi1_data4_pins[] = {

static const unsigned int sdhi1_data_pins[] = {

	/* D[0:3] */

	RCAR_GP_PIN(3, 8),  RCAR_GP_PIN(3, 9),

	RCAR_GP_PIN(3, 10), RCAR_GP_PIN(3, 11),

};

static const unsigned int sdhi1_data4_mux[] = {

static const unsigned int sdhi1_data_mux[] = {

	SD1_DAT0_MARK, SD1_DAT1_MARK,

	SD1_DAT2_MARK, SD1_DAT3_MARK,

};
@@ -3594,30 +3580,14 @@ static const unsigned int sdhi1_wp_mux[] = { 
	SD1_WP_MARK,

};

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

static const unsigned int sdhi2_data1_pins[] = {

	/* D0 */

	RCAR_GP_PIN(4, 2),

};

static const unsigned int sdhi2_data1_mux[] = {

	SD2_DAT0_MARK,

};

static const unsigned int sdhi2_data4_pins[] = {

	/* D[0:3] */

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

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

};

static const unsigned int sdhi2_data4_mux[] = {

	SD2_DAT0_MARK, SD2_DAT1_MARK,

	SD2_DAT2_MARK, SD2_DAT3_MARK,

};

static const unsigned int sdhi2_data8_pins[] = {

static const unsigned int sdhi2_data_pins[] = {

	/* D[0:7] */

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

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

	RCAR_GP_PIN(3, 8),  RCAR_GP_PIN(3, 9),

	RCAR_GP_PIN(3, 10), RCAR_GP_PIN(3, 11),

};

static const unsigned int sdhi2_data8_mux[] = {

static const unsigned int sdhi2_data_mux[] = {

	SD2_DAT0_MARK, SD2_DAT1_MARK,

	SD2_DAT2_MARK, SD2_DAT3_MARK,

	SD2_DAT4_MARK, SD2_DAT5_MARK,
@@ -3666,30 +3636,14 @@ static const unsigned int sdhi2_ds_mux[] = { 
	SD2_DS_MARK,

};

/* - SDHI3 ------------------------------------------------------------------ */

static const unsigned int sdhi3_data1_pins[] = {

	/* D0 */

	RCAR_GP_PIN(4, 9),

};

static const unsigned int sdhi3_data1_mux[] = {

	SD3_DAT0_MARK,

};

static const unsigned int sdhi3_data4_pins[] = {

	/* D[0:3] */

	RCAR_GP_PIN(4, 9),  RCAR_GP_PIN(4, 10),

	RCAR_GP_PIN(4, 11), RCAR_GP_PIN(4, 12),

};

static const unsigned int sdhi3_data4_mux[] = {

	SD3_DAT0_MARK, SD3_DAT1_MARK,

	SD3_DAT2_MARK, SD3_DAT3_MARK,

};

static const unsigned int sdhi3_data8_pins[] = {

static const unsigned int sdhi3_data_pins[] = {

	/* D[0:7] */

	RCAR_GP_PIN(4, 9),  RCAR_GP_PIN(4, 10),

	RCAR_GP_PIN(4, 11), RCAR_GP_PIN(4, 12),

	RCAR_GP_PIN(4, 13), RCAR_GP_PIN(4, 14),

	RCAR_GP_PIN(4, 15), RCAR_GP_PIN(4, 16),

};

static const unsigned int sdhi3_data8_mux[] = {

static const unsigned int sdhi3_data_mux[] = {

	SD3_DAT0_MARK, SD3_DAT1_MARK,

	SD3_DAT2_MARK, SD3_DAT3_MARK,

	SD3_DAT4_MARK, SD3_DAT5_MARK,
@@ -4432,28 +4386,28 @@ static const struct { 
		SH_PFC_PIN_GROUP(scif5_clk_b),

		SH_PFC_PIN_GROUP(scif_clk_a),

		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),

		SH_PFC_PIN_GROUP(sdhi2_data8),

		BUS_DATA_PIN_GROUP(sdhi2_data, 1),

		BUS_DATA_PIN_GROUP(sdhi2_data, 4),

		BUS_DATA_PIN_GROUP(sdhi2_data, 8),

		SH_PFC_PIN_GROUP(sdhi2_ctrl),

		SH_PFC_PIN_GROUP(sdhi2_cd_a),

		SH_PFC_PIN_GROUP(sdhi2_wp_a),

		SH_PFC_PIN_GROUP(sdhi2_cd_b),

		SH_PFC_PIN_GROUP(sdhi2_wp_b),

		SH_PFC_PIN_GROUP(sdhi2_ds),

		SH_PFC_PIN_GROUP(sdhi3_data1),

		SH_PFC_PIN_GROUP(sdhi3_data4),

		SH_PFC_PIN_GROUP(sdhi3_data8),

		BUS_DATA_PIN_GROUP(sdhi3_data, 1),

		BUS_DATA_PIN_GROUP(sdhi3_data, 4),

		BUS_DATA_PIN_GROUP(sdhi3_data, 8),

		SH_PFC_PIN_GROUP(sdhi3_ctrl),

		SH_PFC_PIN_GROUP(sdhi3_cd),

		SH_PFC_PIN_GROUP(sdhi3_wp),