pinctrl: renesas: r8a7778: Share MMC pin group data

Pin groups mmc_data[14] are subsets of mmc_data8.

This reduces kernel size by 40 bytes.

Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be>
Link: https://lore.kernel.org/r/d3bf7dfda2952a0265171f82024931d490d9178a.1640269757.git.geert+renesas@glider.be

diff --git a/drivers/pinctrl/renesas/pfc-r8a7778.c b/drivers/pinctrl/renesas/pfc-r8a7778.c
index d641e408f1bd413c5cd076a6242c6989defa4d7b..3b9bdd27cab98cc69993e34989e98555e37d3e16 100644 (file)
--- a/drivers/pinctrl/renesas/pfc-r8a7778.c
+++ b/drivers/pinctrl/renesas/pfc-r8a7778.c
@@ -1427,25 +1427,17 @@ I2C_PFC_MUX(i2c3_c,     SDA3_C,                 SCL3_C);
 /* - MMC macro -------------------------------------------------------------- */
 #define MMC_PFC_PINS(name, args...)            SH_PFC_PINS(name, args)
 #define MMC_PFC_CTRL(name, clk, cmd)           SH_PFC_MUX2(name, clk, cmd)
-#define MMC_PFC_DAT1(name, d0)                 SH_PFC_MUX1(name, d0)
-#define MMC_PFC_DAT4(name, d0, d1, d2, d3)     SH_PFC_MUX4(name, d0, d1, d2, d3)
 #define MMC_PFC_DAT8(name, d0, d1, d2, d3, d4, d5, d6, d7)     \
                        SH_PFC_MUX8(name, d0, d1, d2, d3, d4, d5, d6, d7)
 
 /* - MMC -------------------------------------------------------------------- */
 MMC_PFC_PINS(mmc_ctrl,         RCAR_GP_PIN(1, 5),      RCAR_GP_PIN(1, 6));
 MMC_PFC_CTRL(mmc_ctrl,         MMC_CLK,                MMC_CMD);
-MMC_PFC_PINS(mmc_data1,                RCAR_GP_PIN(1, 7));
-MMC_PFC_DAT1(mmc_data1,                MMC_D0);
-MMC_PFC_PINS(mmc_data4,                RCAR_GP_PIN(1, 7),      RCAR_GP_PIN(1, 8),
-                               RCAR_GP_PIN(0, 5),      RCAR_GP_PIN(0, 6));
-MMC_PFC_DAT4(mmc_data4,                MMC_D0,                 MMC_D1,
-                               MMC_D2,                 MMC_D3);
-MMC_PFC_PINS(mmc_data8,                RCAR_GP_PIN(1, 7),      RCAR_GP_PIN(1, 8),
+MMC_PFC_PINS(mmc_data,         RCAR_GP_PIN(1, 7),      RCAR_GP_PIN(1, 8),
                                RCAR_GP_PIN(0, 5),      RCAR_GP_PIN(0, 6),
                                RCAR_GP_PIN(1, 4),      RCAR_GP_PIN(1, 0),
                                RCAR_GP_PIN(0, 30),     RCAR_GP_PIN(0, 31));
-MMC_PFC_DAT8(mmc_data8,                MMC_D0,                 MMC_D1,
+MMC_PFC_DAT8(mmc_data,         MMC_D0,                 MMC_D1,
                                MMC_D2,                 MMC_D3,
                                MMC_D4,                 MMC_D5,
                                MMC_D6,                 MMC_D7);
@@ -1744,9 +1736,9 @@ static const struct sh_pfc_pin_group pinmux_groups[] = {
        SH_PFC_PIN_GROUP(i2c3_b),
        SH_PFC_PIN_GROUP(i2c3_c),
        SH_PFC_PIN_GROUP(mmc_ctrl),
-       SH_PFC_PIN_GROUP(mmc_data1),
-       SH_PFC_PIN_GROUP(mmc_data4),
-       SH_PFC_PIN_GROUP(mmc_data8),
+       BUS_DATA_PIN_GROUP(mmc_data, 1),
+       BUS_DATA_PIN_GROUP(mmc_data, 4),
+       BUS_DATA_PIN_GROUP(mmc_data, 8),
        SH_PFC_PIN_GROUP(scif_clk),
        SH_PFC_PIN_GROUP(scif0_data_a),
        SH_PFC_PIN_GROUP(scif0_data_b),