diff --git a/drivers/pinctrl/sh-pfc/pfc-r8a7790.c b/drivers/pinctrl/sh-pfc/pfc-r8a7790.c
index 1375709422c7bd511e938acf9e757d87ff4dd4ab..5a45ab0877e58533f53c623aa984829fb17f8377 100644
--- a/drivers/pinctrl/sh-pfc/pfc-r8a7790.c
+++ b/drivers/pinctrl/sh-pfc/pfc-r8a7790.c
@@ -3278,28 +3278,28 @@ static const unsigned int vin0_data_b_mux[] = {
 	VI0_DATA3_VI0_B3_MARK, VI0_DATA4_VI0_B4_MARK, VI0_DATA5_VI0_B5_MARK,
 	VI0_DATA6_VI0_B6_MARK, VI0_DATA7_VI0_B7_MARK,
 };
-static const unsigned int vin0_hsync_signal_pins[] = {
+static const unsigned int vin0_hsync_pins[] = {
 	RCAR_GP_PIN(0, 12),
 };
-static const unsigned int vin0_hsync_signal_mux[] = {
+static const unsigned int vin0_hsync_mux[] = {
 	VI0_HSYNC_N_MARK,
 };
-static const unsigned int vin0_vsync_signal_pins[] = {
+static const unsigned int vin0_vsync_pins[] = {
 	RCAR_GP_PIN(0, 13),
 };
-static const unsigned int vin0_vsync_signal_mux[] = {
+static const unsigned int vin0_vsync_mux[] = {
 	VI0_VSYNC_N_MARK,
 };
-static const unsigned int vin0_field_signal_pins[] = {
+static const unsigned int vin0_field_pins[] = {
 	RCAR_GP_PIN(0, 15),
 };
-static const unsigned int vin0_field_signal_mux[] = {
+static const unsigned int vin0_field_mux[] = {
 	VI0_FIELD_MARK,
 };
-static const unsigned int vin0_data_enable_pins[] = {
+static const unsigned int vin0_clkenb_pins[] = {
 	RCAR_GP_PIN(0, 14),
 };
-static const unsigned int vin0_data_enable_mux[] = {
+static const unsigned int vin0_clkenb_mux[] = {
 	VI0_CLKENB_MARK,
 };
 static const unsigned int vin0_clk_pins[] = {
@@ -3535,10 +3535,10 @@ static const struct sh_pfc_pin_group pinmux_groups[] = {
 	SH_PFC_PIN_GROUP(vin0_data_g),
 	SH_PFC_PIN_GROUP(vin0_data_r),
 	SH_PFC_PIN_GROUP(vin0_data_b),
-	SH_PFC_PIN_GROUP(vin0_hsync_signal),
-	SH_PFC_PIN_GROUP(vin0_vsync_signal),
-	SH_PFC_PIN_GROUP(vin0_field_signal),
-	SH_PFC_PIN_GROUP(vin0_data_enable),
+	SH_PFC_PIN_GROUP(vin0_hsync),
+	SH_PFC_PIN_GROUP(vin0_vsync),
+	SH_PFC_PIN_GROUP(vin0_field),
+	SH_PFC_PIN_GROUP(vin0_clkenb),
 	SH_PFC_PIN_GROUP(vin0_clk),
 	SH_PFC_PIN_GROUP(vin1_data),
 	SH_PFC_PIN_GROUP(vin1_clk),
@@ -3861,10 +3861,10 @@ static const char * const vin0_groups[] = {
 	"vin0_data_g",
 	"vin0_data_r",
 	"vin0_data_b",
-	"vin0_hsync_signal",
-	"vin0_vsync_signal",
-	"vin0_field_signal",
-	"vin0_data_enable",
+	"vin0_hsync",
+	"vin0_vsync",
+	"vin0_field",
+	"vin0_clkenb",
 	"vin0_clk",
 };