aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorUlrich Hecht <ulrich.hecht+renesas@gmail.com>2018-03-19 12:37:18 -0400
committerGeert Uytterhoeven <geert+renesas@glider.be>2018-03-21 13:24:16 -0400
commitb538dc5bbb40dbf214987cc2f30915275057c948 (patch)
tree83551d317e8415b0380a551957f845a43451fdd5
parent3b047a9597e4e252991899f019bbfd0271cda814 (diff)
pinctrl: sh-pfc: r8a7795: Correct VIN4 18-bit pins
RGB666 has a pin assignment that differs from the other formats. Fixes: 6b4de408105fc51e ("pinctrl: sh-pfc: r8a7795: 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>
-rw-r--r--drivers/pinctrl/sh-pfc/pfc-r8a7795.c24
1 files changed, 12 insertions, 12 deletions
diff --git a/drivers/pinctrl/sh-pfc/pfc-r8a7795.c b/drivers/pinctrl/sh-pfc/pfc-r8a7795.c
index d39636c3bbb8..011b98dab1b7 100644
--- a/drivers/pinctrl/sh-pfc/pfc-r8a7795.c
+++ b/drivers/pinctrl/sh-pfc/pfc-r8a7795.c
@@ -4054,48 +4054,48 @@ static const unsigned int vin4_data16_b_mux[] = {
4054 VI4_DATA14_MARK, VI4_DATA15_MARK, 4054 VI4_DATA14_MARK, VI4_DATA15_MARK,
4055}; 4055};
4056static const unsigned int vin4_data18_a_pins[] = { 4056static const unsigned int vin4_data18_a_pins[] = {
4057 RCAR_GP_PIN(0, 8), RCAR_GP_PIN(0, 9),
4058 RCAR_GP_PIN(0, 10), RCAR_GP_PIN(0, 11), 4057 RCAR_GP_PIN(0, 10), RCAR_GP_PIN(0, 11),
4059 RCAR_GP_PIN(0, 12), RCAR_GP_PIN(0, 13), 4058 RCAR_GP_PIN(0, 12), RCAR_GP_PIN(0, 13),
4060 RCAR_GP_PIN(0, 14), RCAR_GP_PIN(0, 15), 4059 RCAR_GP_PIN(0, 14), RCAR_GP_PIN(0, 15),
4061 RCAR_GP_PIN(1, 0), RCAR_GP_PIN(1, 1),
4062 RCAR_GP_PIN(1, 2), RCAR_GP_PIN(1, 3), 4060 RCAR_GP_PIN(1, 2), RCAR_GP_PIN(1, 3),
4063 RCAR_GP_PIN(1, 4), RCAR_GP_PIN(1, 5), 4061 RCAR_GP_PIN(1, 4), RCAR_GP_PIN(1, 5),
4064 RCAR_GP_PIN(1, 6), RCAR_GP_PIN(1, 7), 4062 RCAR_GP_PIN(1, 6), RCAR_GP_PIN(1, 7),
4065 RCAR_GP_PIN(0, 0), RCAR_GP_PIN(0, 1), 4063 RCAR_GP_PIN(0, 2), RCAR_GP_PIN(0, 3),
4064 RCAR_GP_PIN(0, 4), RCAR_GP_PIN(0, 5),
4065 RCAR_GP_PIN(0, 6), RCAR_GP_PIN(0, 7),
4066}; 4066};
4067static const unsigned int vin4_data18_a_mux[] = { 4067static const unsigned int vin4_data18_a_mux[] = {
4068 VI4_DATA0_A_MARK, VI4_DATA1_A_MARK,
4069 VI4_DATA2_A_MARK, VI4_DATA3_A_MARK, 4068 VI4_DATA2_A_MARK, VI4_DATA3_A_MARK,
4070 VI4_DATA4_A_MARK, VI4_DATA5_A_MARK, 4069 VI4_DATA4_A_MARK, VI4_DATA5_A_MARK,
4071 VI4_DATA6_A_MARK, VI4_DATA7_A_MARK, 4070 VI4_DATA6_A_MARK, VI4_DATA7_A_MARK,
4072 VI4_DATA8_MARK, VI4_DATA9_MARK,
4073 VI4_DATA10_MARK, VI4_DATA11_MARK, 4071 VI4_DATA10_MARK, VI4_DATA11_MARK,
4074 VI4_DATA12_MARK, VI4_DATA13_MARK, 4072 VI4_DATA12_MARK, VI4_DATA13_MARK,
4075 VI4_DATA14_MARK, VI4_DATA15_MARK, 4073 VI4_DATA14_MARK, VI4_DATA15_MARK,
4076 VI4_DATA16_MARK, VI4_DATA17_MARK, 4074 VI4_DATA18_MARK, VI4_DATA19_MARK,
4075 VI4_DATA20_MARK, VI4_DATA21_MARK,
4076 VI4_DATA22_MARK, VI4_DATA23_MARK,
4077}; 4077};
4078static const unsigned int vin4_data18_b_pins[] = { 4078static const unsigned int vin4_data18_b_pins[] = {
4079 RCAR_GP_PIN(2, 0), RCAR_GP_PIN(2, 1),
4080 RCAR_GP_PIN(2, 2), RCAR_GP_PIN(2, 3), 4079 RCAR_GP_PIN(2, 2), RCAR_GP_PIN(2, 3),
4081 RCAR_GP_PIN(2, 4), RCAR_GP_PIN(2, 5), 4080 RCAR_GP_PIN(2, 4), RCAR_GP_PIN(2, 5),
4082 RCAR_GP_PIN(2, 6), RCAR_GP_PIN(2, 7), 4081 RCAR_GP_PIN(2, 6), RCAR_GP_PIN(2, 7),
4083 RCAR_GP_PIN(1, 0), RCAR_GP_PIN(1, 1),
4084 RCAR_GP_PIN(1, 2), RCAR_GP_PIN(1, 3), 4082 RCAR_GP_PIN(1, 2), RCAR_GP_PIN(1, 3),
4085 RCAR_GP_PIN(1, 4), RCAR_GP_PIN(1, 5), 4083 RCAR_GP_PIN(1, 4), RCAR_GP_PIN(1, 5),
4086 RCAR_GP_PIN(1, 6), RCAR_GP_PIN(1, 7), 4084 RCAR_GP_PIN(1, 6), RCAR_GP_PIN(1, 7),
4087 RCAR_GP_PIN(0, 0), RCAR_GP_PIN(0, 1), 4085 RCAR_GP_PIN(0, 2), RCAR_GP_PIN(0, 3),
4086 RCAR_GP_PIN(0, 4), RCAR_GP_PIN(0, 5),
4087 RCAR_GP_PIN(0, 6), RCAR_GP_PIN(0, 7),
4088}; 4088};
4089static const unsigned int vin4_data18_b_mux[] = { 4089static const unsigned int vin4_data18_b_mux[] = {
4090 VI4_DATA0_B_MARK, VI4_DATA1_B_MARK,
4091 VI4_DATA2_B_MARK, VI4_DATA3_B_MARK, 4090 VI4_DATA2_B_MARK, VI4_DATA3_B_MARK,
4092 VI4_DATA4_B_MARK, VI4_DATA5_B_MARK, 4091 VI4_DATA4_B_MARK, VI4_DATA5_B_MARK,
4093 VI4_DATA6_B_MARK, VI4_DATA7_B_MARK, 4092 VI4_DATA6_B_MARK, VI4_DATA7_B_MARK,
4094 VI4_DATA8_MARK, VI4_DATA9_MARK,
4095 VI4_DATA10_MARK, VI4_DATA11_MARK, 4093 VI4_DATA10_MARK, VI4_DATA11_MARK,
4096 VI4_DATA12_MARK, VI4_DATA13_MARK, 4094 VI4_DATA12_MARK, VI4_DATA13_MARK,
4097 VI4_DATA14_MARK, VI4_DATA15_MARK, 4095 VI4_DATA14_MARK, VI4_DATA15_MARK,
4098 VI4_DATA16_MARK, VI4_DATA17_MARK, 4096 VI4_DATA18_MARK, VI4_DATA19_MARK,
4097 VI4_DATA20_MARK, VI4_DATA21_MARK,
4098 VI4_DATA22_MARK, VI4_DATA23_MARK,
4099}; 4099};
4100static const unsigned int vin4_data20_a_pins[] = { 4100static const unsigned int vin4_data20_a_pins[] = {
4101 RCAR_GP_PIN(0, 8), RCAR_GP_PIN(0, 9), 4101 RCAR_GP_PIN(0, 8), RCAR_GP_PIN(0, 9),