pinctrl: renesas: r8a7796: Share more VIN pin group data

Pin group vin4_g8 is a subset of vin4_data24_a.
Pin group vin5_high8 is a subset of vin5_data16.

This reduces kernel size by 128 bytes.

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

diff --git a/drivers/pinctrl/renesas/pfc-r8a7796.c b/drivers/pinctrl/renesas/pfc-r8a7796.c
index f74b424fa8e4230f967a16dfcc81e32f7964b9d1..6079f588a201430d6872503c5b30f37ef3e0c10b 100644 (file)
--- a/drivers/pinctrl/renesas/pfc-r8a7796.c
+++ b/drivers/pinctrl/renesas/pfc-r8a7796.c
@@ -4042,18 +4042,6 @@ static const unsigned int vin4_data_b_mux[] = {
        VI4_DATA20_MARK, VI4_DATA21_MARK,
        VI4_DATA22_MARK, VI4_DATA23_MARK,
 };
-static const unsigned int vin4_g8_pins[] = {
-       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_g8_mux[] = {
-       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_sync_pins[] = {
        /* HSYNC#, VSYNC# */
        RCAR_GP_PIN(1, 18), RCAR_GP_PIN(1, 17),
@@ -4104,18 +4092,6 @@ static const unsigned int vin5_data_mux[] = {
        VI5_DATA12_MARK, VI5_DATA13_MARK,
        VI5_DATA14_MARK, VI5_DATA15_MARK,
 };
-static const unsigned int vin5_high8_pins[] = {
-       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_high8_mux[] = {
-       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),
@@ -4462,7 +4438,7 @@ static const struct {
                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(vin4_g8),
+               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),
@@ -4471,7 +4447,7 @@ static const struct {
                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(vin5_high8),
+               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),