pinctrl: sh-pfc: r8a7796: Correct VIN4 18-bit pins

RGB666 has a pin assignment that differs from the other formats.

Fixes: 8db6cbabac4f2a02 ("pinctrl: sh-pfc: r8a7796: Add VIN4, VIN5 pins, groups and functions")
Signed-off-by: Ulrich Hecht <ulrich.hecht+renesas@gmail.com>
Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be>

diff --git a/drivers/pinctrl/sh-pfc/pfc-r8a7796.c b/drivers/pinctrl/sh-pfc/pfc-r8a7796.c
index d502b0cafeb015eb6d0c4ad5d8f129e9245c2c4a..4294652402dde09fbcf80f592c995d5718860ad0 100644 (file)
--- a/drivers/pinctrl/sh-pfc/pfc-r8a7796.c
+++ b/drivers/pinctrl/sh-pfc/pfc-r8a7796.c
@@ -4022,48 +4022,48 @@ static const unsigned int vin4_data16_b_mux[] = {
        VI4_DATA14_MARK, VI4_DATA15_MARK,
 };
 static const unsigned int vin4_data18_a_pins[] = {
-       RCAR_GP_PIN(0, 8), RCAR_GP_PIN(0, 9),
        RCAR_GP_PIN(0, 10), RCAR_GP_PIN(0, 11),
        RCAR_GP_PIN(0, 12), RCAR_GP_PIN(0, 13),
        RCAR_GP_PIN(0, 14), RCAR_GP_PIN(0, 15),
-       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),
-       RCAR_GP_PIN(0, 0), RCAR_GP_PIN(0, 1),
+       RCAR_GP_PIN(0, 2), RCAR_GP_PIN(0, 3),
+       RCAR_GP_PIN(0, 4), RCAR_GP_PIN(0, 5),
+       RCAR_GP_PIN(0, 6), RCAR_GP_PIN(0, 7),
 };
 static const unsigned int vin4_data18_a_mux[] = {
-       VI4_DATA0_A_MARK, VI4_DATA1_A_MARK,
        VI4_DATA2_A_MARK, VI4_DATA3_A_MARK,
        VI4_DATA4_A_MARK, VI4_DATA5_A_MARK,
        VI4_DATA6_A_MARK, VI4_DATA7_A_MARK,
-       VI4_DATA8_MARK,  VI4_DATA9_MARK,
        VI4_DATA10_MARK, VI4_DATA11_MARK,
        VI4_DATA12_MARK, VI4_DATA13_MARK,
        VI4_DATA14_MARK, VI4_DATA15_MARK,
-       VI4_DATA16_MARK, VI4_DATA17_MARK,
+       VI4_DATA18_MARK, VI4_DATA19_MARK,
+       VI4_DATA20_MARK, VI4_DATA21_MARK,
+       VI4_DATA22_MARK, VI4_DATA23_MARK,
 };
 static const unsigned int vin4_data18_b_pins[] = {
-       RCAR_GP_PIN(2, 0), RCAR_GP_PIN(2, 1),
        RCAR_GP_PIN(2, 2), RCAR_GP_PIN(2, 3),
        RCAR_GP_PIN(2, 4), RCAR_GP_PIN(2, 5),
        RCAR_GP_PIN(2, 6), RCAR_GP_PIN(2, 7),
-       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),
-       RCAR_GP_PIN(0, 0), RCAR_GP_PIN(0, 1),
+       RCAR_GP_PIN(0, 2), RCAR_GP_PIN(0, 3),
+       RCAR_GP_PIN(0, 4), RCAR_GP_PIN(0, 5),
+       RCAR_GP_PIN(0, 6), RCAR_GP_PIN(0, 7),
 };
 static const unsigned int vin4_data18_b_mux[] = {
-       VI4_DATA0_B_MARK, VI4_DATA1_B_MARK,
        VI4_DATA2_B_MARK, VI4_DATA3_B_MARK,
        VI4_DATA4_B_MARK, VI4_DATA5_B_MARK,
        VI4_DATA6_B_MARK, VI4_DATA7_B_MARK,
-       VI4_DATA8_MARK,  VI4_DATA9_MARK,
        VI4_DATA10_MARK, VI4_DATA11_MARK,
        VI4_DATA12_MARK, VI4_DATA13_MARK,
        VI4_DATA14_MARK, VI4_DATA15_MARK,
-       VI4_DATA16_MARK, VI4_DATA17_MARK,
+       VI4_DATA18_MARK, VI4_DATA19_MARK,
+       VI4_DATA20_MARK, VI4_DATA21_MARK,
+       VI4_DATA22_MARK, VI4_DATA23_MARK,
 };
 static const unsigned int vin4_data20_a_pins[] = {
        RCAR_GP_PIN(0, 8), RCAR_GP_PIN(0, 9),