pinctrl: renesas: r8a7790: Share USB1 pin group data

Pin group usb0_ovc_vbus is a subset of usb0.
Pin group usb1_pwen is a subset of usb1.

This reduces kernel size by 16 bytes.

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

diff --git a/drivers/pinctrl/renesas/pfc-r8a7790.c b/drivers/pinctrl/renesas/pfc-r8a7790.c
index 9f3d9c165808dbeca9b09ec0727c1a2855b4c055..5c912d3c1f6977595d61cafb0b96db2828f9bbc9 100644 (file)
--- a/drivers/pinctrl/renesas/pfc-r8a7790.c
+++ b/drivers/pinctrl/renesas/pfc-r8a7790.c
@@ -3609,18 +3609,11 @@ static const unsigned int tpu0_to3_mux[] = {
 };
 /* - USB0 ------------------------------------------------------------------- */
 static const unsigned int usb0_pins[] = {
-       /* PWEN, OVC/VBUS */
-       RCAR_GP_PIN(5, 18), RCAR_GP_PIN(5, 19),
+       /* OVC/VBUS, PWEN */
+       RCAR_GP_PIN(5, 19), RCAR_GP_PIN(5, 18),
 };
 static const unsigned int usb0_mux[] = {
-       USB0_PWEN_MARK, USB0_OVC_VBUS_MARK,
-};
-static const unsigned int usb0_ovc_vbus_pins[] = {
-       /* OVC/VBUS */
-       RCAR_GP_PIN(5, 19),
-};
-static const unsigned int usb0_ovc_vbus_mux[] = {
-       USB0_OVC_VBUS_MARK,
+       USB0_OVC_VBUS_MARK, USB0_PWEN_MARK,
 };
 /* - USB1 ------------------------------------------------------------------- */
 static const unsigned int usb1_pins[] = {
@@ -3630,13 +3623,6 @@ static const unsigned int usb1_pins[] = {
 static const unsigned int usb1_mux[] = {
        USB1_PWEN_MARK, USB1_OVC_MARK,
 };
-static const unsigned int usb1_pwen_pins[] = {
-       /* PWEN */
-       RCAR_GP_PIN(5, 20),
-};
-static const unsigned int usb1_pwen_mux[] = {
-       USB1_PWEN_MARK,
-};
 /* - USB2 ------------------------------------------------------------------- */
 static const unsigned int usb2_pins[] = {
        /* PWEN, OVC */
@@ -4315,9 +4301,9 @@ static const struct {
                SH_PFC_PIN_GROUP(tpu0_to2),
                SH_PFC_PIN_GROUP(tpu0_to3),
                SH_PFC_PIN_GROUP(usb0),
-               SH_PFC_PIN_GROUP(usb0_ovc_vbus),
+               SH_PFC_PIN_GROUP_SUBSET(usb0_ovc_vbus, usb0, 0, 1),
                SH_PFC_PIN_GROUP(usb1),
-               SH_PFC_PIN_GROUP(usb1_pwen),
+               SH_PFC_PIN_GROUP_SUBSET(usb1_pwen, usb1, 0, 1),
                SH_PFC_PIN_GROUP(usb2),
                BUS_DATA_PIN_GROUP(vin0_data, 24),
                BUS_DATA_PIN_GROUP(vin0_data, 20),