Create r8a7795 USB OVC pin groups

Split the r8a7795 USB pin groups to create separate groups for the
OVC pins.  This is required for the AGL reference hardware boards,
which use some of the OVC pins in other pinmux modes.

Upstream-Status: pending    
 
Signed-off-by: Scott Murray <scott.murray@konsulko.com>
Signed-off-by: Raquel Medina <raquel.medina@konsulko.com

---
 .../boot/dts/renesas/r8a7795-es1-salvator-x.dts    |  2 +-
 arch/arm64/boot/dts/renesas/r8a7795-salvator-x.dts |  2 +-
 .../arm64/boot/dts/renesas/r8a7795-salvator-xs.dts |  4 +-
 arch/arm64/boot/dts/renesas/salvator-common.dtsi   |  6 +-
 arch/arm64/boot/dts/renesas/ulcb-kf.dtsi           |  2 +-
 arch/arm64/boot/dts/renesas/ulcb.dtsi              |  2 +-
 drivers/pinctrl/sh-pfc/pfc-r8a7795-es1.c           | 75 +++++++++++++++++-----
 drivers/pinctrl/sh-pfc/pfc-r8a7795.c               | 75 +++++++++++++++++-----
 8 files changed, 129 insertions(+), 39 deletions(-)

diff --git a/arch/arm64/boot/dts/renesas/r8a7795-es1-salvator-x.dts b/arch/arm64/boot/dts/renesas/r8a7795-es1-salvator-x.dts
index 63d7cd7c5c47..4a3e0deaa929 100644
--- a/arch/arm64/boot/dts/renesas/r8a7795-es1-salvator-x.dts
+++ b/arch/arm64/boot/dts/renesas/r8a7795-es1-salvator-x.dts
@@ -166,7 +166,7 @@
 
 &pfc {
 	usb2_pins: usb2 {
-		groups = "usb2";
+		groups = "usb2", "usb2_ovc";
 		function = "usb2";
 	};
 };
diff --git a/arch/arm64/boot/dts/renesas/r8a7795-salvator-x.dts b/arch/arm64/boot/dts/renesas/r8a7795-salvator-x.dts
index 4f743db4b9ae..6a1f58ed40d1 100644
--- a/arch/arm64/boot/dts/renesas/r8a7795-salvator-x.dts
+++ b/arch/arm64/boot/dts/renesas/r8a7795-salvator-x.dts
@@ -166,7 +166,7 @@
 
 &pfc {
 	usb2_pins: usb2 {
-		groups = "usb2";
+		groups = "usb2", "usb2_ovc";
 		function = "usb2";
 	};
 };
diff --git a/arch/arm64/boot/dts/renesas/r8a7795-salvator-xs.dts b/arch/arm64/boot/dts/renesas/r8a7795-salvator-xs.dts
index 9bf8bee35113..9e8dbeecd755 100644
--- a/arch/arm64/boot/dts/renesas/r8a7795-salvator-xs.dts
+++ b/arch/arm64/boot/dts/renesas/r8a7795-salvator-xs.dts
@@ -190,7 +190,7 @@
 
 &pfc {
 	usb2_pins: usb2 {
-		groups = "usb2";
+		groups = "usb2", "usb2_ovc";
 		function = "usb2";
 	};
 
@@ -207,7 +207,7 @@
 	 *	- Connect GP6_{04,21} to ADV7842.
 	 */
 	usb2_ch3_pins: usb2_ch3 {
-		groups = "usb2_ch3";
+		groups = "usb2_ch3", "usb2_ch3_ovc";
 		function = "usb2_ch3";
 	};
 };
diff --git a/arch/arm64/boot/dts/renesas/salvator-common.dtsi b/arch/arm64/boot/dts/renesas/salvator-common.dtsi
index 08b1259c4a1c..26a8cfbcf4c3 100644
--- a/arch/arm64/boot/dts/renesas/salvator-common.dtsi
+++ b/arch/arm64/boot/dts/renesas/salvator-common.dtsi
@@ -751,13 +751,13 @@
 	};
 
 	usb0_pins: usb0 {
-		groups = "usb0";
+		groups = "usb0", "usb0_ovc";
 		function = "usb0";
 	};
 
 	usb1_pins: usb1 {
 		mux {
-			groups = "usb1";
+			groups = "usb1", "usb1_ovc";
 			function = "usb1";
 		};
 
@@ -773,7 +773,7 @@
 	};
 
 	usb30_pins: usb30 {
-		groups = "usb30";
+		groups = "usb30", "usb30_ovc";
 		function = "usb30";
 	};
 };
diff --git a/arch/arm64/boot/dts/renesas/ulcb-kf.dtsi b/arch/arm64/boot/dts/renesas/ulcb-kf.dtsi
index 202177706cde..6a09243d2b49 100644
--- a/arch/arm64/boot/dts/renesas/ulcb-kf.dtsi
+++ b/arch/arm64/boot/dts/renesas/ulcb-kf.dtsi
@@ -285,7 +285,7 @@
 	};
 
 	usb0_pins: usb0 {
-		groups = "usb0";
+		groups = "usb0", "usb0_ovc";
 		function = "usb0";
 	};
 };
diff --git a/arch/arm64/boot/dts/renesas/ulcb.dtsi b/arch/arm64/boot/dts/renesas/ulcb.dtsi
index 9fda41e8317c..469665305630 100644
--- a/arch/arm64/boot/dts/renesas/ulcb.dtsi
+++ b/arch/arm64/boot/dts/renesas/ulcb.dtsi
@@ -375,7 +375,7 @@
 	};
 
 	usb1_pins: usb1 {
-		groups = "usb1";
+		groups = "usb1", "usb1_ovc";
 		function = "usb1";
 	};
 };
diff --git a/drivers/pinctrl/sh-pfc/pfc-r8a7795-es1.c b/drivers/pinctrl/sh-pfc/pfc-r8a7795-es1.c
index 48fd5415f811..153039dfc83e 100644
--- a/drivers/pinctrl/sh-pfc/pfc-r8a7795-es1.c
+++ b/drivers/pinctrl/sh-pfc/pfc-r8a7795-es1.c
@@ -3834,44 +3834,79 @@ static const unsigned int tmu_tclk2_b_mux[] = {
 
 /* - USB0 ------------------------------------------------------------------- */
 static const unsigned int usb0_pins[] = {
-	/* PWEN, OVC */
-	RCAR_GP_PIN(6, 24), RCAR_GP_PIN(6, 25),
+	/* PWEN */
+	RCAR_GP_PIN(6, 24),
 };
 static const unsigned int usb0_mux[] = {
-	USB0_PWEN_MARK, USB0_OVC_MARK,
+	USB0_PWEN_MARK,
+};
+static const unsigned int usb0_ovc_pins[] = {
+	/* OVC */
+	RCAR_GP_PIN(6, 25),
+};
+static const unsigned int usb0_ovc_mux[] = {
+	USB0_OVC_MARK,
 };
 /* - USB1 ------------------------------------------------------------------- */
 static const unsigned int usb1_pins[] = {
-	/* PWEN, OVC */
-	RCAR_GP_PIN(6, 26), RCAR_GP_PIN(6, 27),
+	/* PWEN */
+	RCAR_GP_PIN(6, 26),
 };
 static const unsigned int usb1_mux[] = {
-	USB1_PWEN_MARK, USB1_OVC_MARK,
+	USB1_PWEN_MARK,
+};
+static const unsigned int usb1_ovc_pins[] = {
+	/* OVC */
+	RCAR_GP_PIN(6, 27),
+};
+static const unsigned int usb1_ovc_mux[] = {
+	USB1_OVC_MARK,
 };
 /* - USB2 ------------------------------------------------------------------- */
 static const unsigned int usb2_pins[] = {
-	/* PWEN, OVC */
-	RCAR_GP_PIN(6, 14), RCAR_GP_PIN(6, 15),
+	/* PWEN */
+	RCAR_GP_PIN(6, 14),
 };
 static const unsigned int usb2_mux[] = {
-	USB2_PWEN_MARK, USB2_OVC_MARK,
+	USB2_PWEN_MARK,
+};
+static const unsigned int usb2_ovc_pins[] = {
+	/* OVC */
+	RCAR_GP_PIN(6, 15),
+};
+static const unsigned int usb2_ovc_mux[] = {
+	USB2_OVC_MARK,
 };
 
 /* - USB30 ------------------------------------------------------------------ */
 static const unsigned int usb30_pins[] = {
-	/* PWEN, OVC */
-	RCAR_GP_PIN(6, 28), RCAR_GP_PIN(6, 29),
+	/* PWEN */
+	RCAR_GP_PIN(6, 28),
 };
 static const unsigned int usb30_mux[] = {
-	USB30_PWEN_MARK, USB30_OVC_MARK,
+	USB30_PWEN_MARK,
+};
+static const unsigned int usb30_ovc_pins[] = {
+	/* OVC */
+	RCAR_GP_PIN(6, 29),
+};
+static const unsigned int usb30_ovc_mux[] = {
+	USB30_OVC_MARK,
 };
 /* - USB31 ------------------------------------------------------------------ */
 static const unsigned int usb31_pins[] = {
-	/* PWEN, OVC */
-	RCAR_GP_PIN(6, 30), RCAR_GP_PIN(6, 31),
+	/* PWEN */
+	RCAR_GP_PIN(6, 30),
 };
 static const unsigned int usb31_mux[] = {
-	USB31_PWEN_MARK, USB31_OVC_MARK,
+	USB31_PWEN_MARK,
+};
+static const unsigned int usb31_ovc_pins[] = {
+	/* OVC */
+	RCAR_GP_PIN(6, 31),
+};
+static const unsigned int usb31_ovc_mux[] = {
+	USB31_OVC_MARK,
 };

 static const unsigned int vin4_data18_a_mux[] = {
@@ -4430,10 +4465,15 @@ static const struct sh_pfc_pin_group pinmux_groups[] = {
 	SH_PFC_PIN_GROUP(tpu_to2),
 	SH_PFC_PIN_GROUP(tpu_to3),
 	SH_PFC_PIN_GROUP(usb0),
+	SH_PFC_PIN_GROUP(usb0_ovc),
 	SH_PFC_PIN_GROUP(usb1),
+	SH_PFC_PIN_GROUP(usb1_ovc),
 	SH_PFC_PIN_GROUP(usb2),
+	SH_PFC_PIN_GROUP(usb2_ovc),
 	SH_PFC_PIN_GROUP(usb30),
+	SH_PFC_PIN_GROUP(usb30_ovc),
 	SH_PFC_PIN_GROUP(usb31),
+	SH_PFC_PIN_GROUP(usb31_ovc),
 	VIN_DATA_PIN_GROUP(vin4_data, 8, _a),
 	VIN_DATA_PIN_GROUP(vin4_data. 16, _a),
 	SH_PFC_PIN_GROUP(vin4_data18_a),
@@ -4928,22 +4967,27 @@ static const char * const tpu_groups[] = {
 
 static const char * const usb0_groups[] = {
 	"usb0",
+	"usb0_ovc",
 };
 
 static const char * const usb1_groups[] = {
 	"usb1",
+	"usb1_ovc",
 };
 
 static const char * const usb2_groups[] = {
 	"usb2",
+	"usb2_ovc",
 };
 
 static const char * const usb30_groups[] = {
 	"usb30",
+	"usb30_ovc",
 };
 
 static const char * const usb31_groups[] = {
 	"usb31",
+	"usb31_ovc",
 };
 
 static const char * const vin4_groups[] = {
diff --git a/drivers/pinctrl/sh-pfc/pfc-r8a7795.c b/drivers/pinctrl/sh-pfc/pfc-r8a7795.c
index 2988c1d43c32..5292ea7c15de 100644
--- a/drivers/pinctrl/sh-pfc/pfc-r8a7795.c
+++ b/drivers/pinctrl/sh-pfc/pfc-r8a7795.c
@@ -3925,44 +3925,79 @@ static const unsigned int tmu_tclk2_b_mux[] = {
 
 /* - USB0 ------------------------------------------------------------------- */
 static const unsigned int usb0_pins[] = {
-	/* PWEN, OVC */
-	RCAR_GP_PIN(6, 24), RCAR_GP_PIN(6, 25),
+	/* PWEN */
+	RCAR_GP_PIN(6, 24),
 };
 static const unsigned int usb0_mux[] = {
-	USB0_PWEN_MARK, USB0_OVC_MARK,
+	USB0_PWEN_MARK,
+};
+static const unsigned int usb0_ovc_pins[] = {
+	/* OVC */
+	RCAR_GP_PIN(6, 25),
+};
+static const unsigned int usb0_ovc_mux[] = {
+	USB0_OVC_MARK,
 };
 /* - USB1 ------------------------------------------------------------------- */
 static const unsigned int usb1_pins[] = {
-	/* PWEN, OVC */
-	RCAR_GP_PIN(6, 26), RCAR_GP_PIN(6, 27),
+	/* PWEN */
+	RCAR_GP_PIN(6, 26),
 };
 static const unsigned int usb1_mux[] = {
-	USB1_PWEN_MARK, USB1_OVC_MARK,
+	USB1_PWEN_MARK,
+};
+static const unsigned int usb1_ovc_pins[] = {
+	/* OVC */
+	RCAR_GP_PIN(6, 27),
+};
+static const unsigned int usb1_ovc_mux[] = {
+	USB1_OVC_MARK,
 };
 /* - USB2 ------------------------------------------------------------------- */
 static const unsigned int usb2_pins[] = {
-	/* PWEN, OVC */
-	RCAR_GP_PIN(6, 14), RCAR_GP_PIN(6, 15),
+	/* PWEN */
+	RCAR_GP_PIN(6, 14),
 };
 static const unsigned int usb2_mux[] = {
-	USB2_PWEN_MARK, USB2_OVC_MARK,
+	USB2_PWEN_MARK,
+};
+static const unsigned int usb2_ovc_pins[] = {
+	/* OVC */
+	RCAR_GP_PIN(6, 15),
+};
+static const unsigned int usb2_ovc_mux[] = {
+	USB2_OVC_MARK,
 };
 /* - USB2_CH3 --------------------------------------------------------------- */
 static const unsigned int usb2_ch3_pins[] = {
-	/* PWEN, OVC */
-	RCAR_GP_PIN(6, 30), RCAR_GP_PIN(6, 31),
+	/* PWEN */
+	RCAR_GP_PIN(6, 30),
 };
 static const unsigned int usb2_ch3_mux[] = {
-	USB2_CH3_PWEN_MARK, USB2_CH3_OVC_MARK,
+	USB2_CH3_PWEN_MARK,
+};
+static const unsigned int usb2_ch3_ovc_pins[] = {
+	/* OVC */
+	RCAR_GP_PIN(6, 31),
+};
+static const unsigned int usb2_ch3_ovc_mux[] = {
+	USB2_CH3_OVC_MARK,
 };
 
 /* - USB30 ------------------------------------------------------------------ */
 static const unsigned int usb30_pins[] = {
-	/* PWEN, OVC */
-	RCAR_GP_PIN(6, 28), RCAR_GP_PIN(6, 29),
+	/* PWEN */
+	RCAR_GP_PIN(6, 28),
 };
 static const unsigned int usb30_mux[] = {
-	USB30_PWEN_MARK, USB30_OVC_MARK,
+	USB30_PWEN_MARK,
+};
+static const unsigned int usb30_ovc_pins[] = {
+	/* OVC */
+	RCAR_GP_PIN(6, 29),
+};
+static const unsigned int usb30_ovc_mux[] = {
+	USB30_OVC_MARK,
 };
 
 /* - VIN4 ------------------------------------------------------------------- */
@@ -4507,10 +4542,15 @@ static const struct sh_pfc_pin_group pinmux_groups[] = {
 	SH_PFC_PIN_GROUP(tpu_to2),
 	SH_PFC_PIN_GROUP(tpu_to3),
 	SH_PFC_PIN_GROUP(usb0),
+	SH_PFC_PIN_GROUP(usb0_ovc),
 	SH_PFC_PIN_GROUP(usb1),
+	SH_PFC_PIN_GROUP(usb1_ovc),
 	SH_PFC_PIN_GROUP(usb2),
+	SH_PFC_PIN_GROUP(usb2_ovc),
 	SH_PFC_PIN_GROUP(usb2_ch3),
+	SH_PFC_PIN_GROUP(usb2_ch3_ovc),
 	SH_PFC_PIN_GROUP(usb30),
+	SH_PFC_PIN_GROUP(usb30_ovc),
 	VIN_DATA_PIN_GROUP(vin4_data, 8, _a),
 	VIN_DATA_PIN_GROUP(vin4_data, 10, _a),
 	VIN_DATA_PIN_GROUP(vin4_data, 12, _a),
@@ -5012,22 +5052,27 @@ static const char * const tmu_groups[] = {
 
 static const char * const usb0_groups[] = {
 	"usb0",
+	"usb0_ovc",
 };
 
 static const char * const usb1_groups[] = {
 	"usb1",
+	"usb1_ovc",
 };
 
 static const char * const usb2_groups[] = {
 	"usb2",
+	"usb2_ovc",
 };
 
 static const char * const usb2_ch3_groups[] = {
 	"usb2_ch3",
+	"usb2_ch3_ovc",
 };
 
 static const char * const usb30_groups[] = {
 	"usb30",
+	"usb30_ovc",
 };
 
 static const char * const vin4_groups[] = {