pinctrl: sh-pfc: r8a7795: Fix VIN versioned groups

Versioned VIN groups can appear on different sets of pins. Using the
VIN_DATA_PIN_GROUP macro now supports proper naming of said groups
through an optional 'version' argument.

Use the 'version' argument for said macro to fix naming of versioned
groups for the R-Car H3 R8A7795 SoC.

Fixes: 9942a5b52990 ("pinctrl: sh-pfc: r8a7795: Deduplicate VIN4 pin definitions")
Signed-off-by: Jacopo Mondi <jacopo+renesas@jmondi.org>
Reviewed-by: Simon Horman <horms+renesas@verge.net.au>
Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be>

diff --git a/drivers/pinctrl/sh-pfc/pfc-r8a7795.c b/drivers/pinctrl/sh-pfc/pfc-r8a7795.c
index 0af737d11403b7e18220937c624cf78da677fbc0..20fac0fde91a22f01779e10679929464d3217afb 100644 (file)
--- a/drivers/pinctrl/sh-pfc/pfc-r8a7795.c
+++ b/drivers/pinctrl/sh-pfc/pfc-r8a7795.c
@@ -4474,20 +4474,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),
-       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),
+       VIN_DATA_PIN_GROUP(vin4_data, 8, _a),
+       VIN_DATA_PIN_GROUP(vin4_data, 10, _a),
+       VIN_DATA_PIN_GROUP(vin4_data, 12, _a),
+       VIN_DATA_PIN_GROUP(vin4_data, 16, _a),
        SH_PFC_PIN_GROUP(vin4_data18_a),
-       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),
+       VIN_DATA_PIN_GROUP(vin4_data, 20, _a),
+       VIN_DATA_PIN_GROUP(vin4_data, 24, _a),
+       VIN_DATA_PIN_GROUP(vin4_data, 8, _b),
+       VIN_DATA_PIN_GROUP(vin4_data, 10, _b),
+       VIN_DATA_PIN_GROUP(vin4_data, 12, _b),
+       VIN_DATA_PIN_GROUP(vin4_data, 16, _b),
        SH_PFC_PIN_GROUP(vin4_data18_b),
-       VIN_DATA_PIN_GROUP(vin4_data_b, 20),
-       VIN_DATA_PIN_GROUP(vin4_data_b, 24),
+       VIN_DATA_PIN_GROUP(vin4_data, 20, _b),
+       VIN_DATA_PIN_GROUP(vin4_data, 24, _b),
        SH_PFC_PIN_GROUP(vin4_sync),
        SH_PFC_PIN_GROUP(vin4_field),
        SH_PFC_PIN_GROUP(vin4_clkenb),