Re: [PATCH v4 4/4] pinctrl: sh-pfc: r8a77990: Add VIN[4|5] groups/functions
Hi Jacopo, On Wed, Nov 7, 2018 at 11:56 AM jacopo mondi wrote: > On Wed, Nov 07, 2018 at 11:34:50AM +0100, Simon Horman wrote: > > On Tue, Nov 06, 2018 at 11:35:33AM +0100, Jacopo Mondi wrote: > > > Add pin, mux and functions definitions for VIN4 and VIN5 for R-Car E3. > > > > > > Signed-off-by: Jacopo Mondi > > > > > > --- > > > v3 -> v4: > > > - Use new variadic version of VIN_DATA_PIN_GROUP macro > > > > I may be missing something but this patch seems to be the same as v3, > > using the VIN_DATA_PIN_GROUP_VER macro. > > > Oooops, I forgot to add the changes and lost them while rebasing. > > Sorry about this, I'll resend. Two quick comments below... > > > v2 -> v3: > > > - Rebased on v4.20-rc1 > > > - Use the newly introduced VIN_DATA_PIN_GROUP_VER macro > > > > > > Incorporate Geert's comments: > > > - vin5_data8_b is only used with 8 pins: use regular SH_PFC_PIN_GROUP() > > > - remove stf groups for vin4/vin5 > > > - confirmed that pins [23-8] of vin4's groups 'a' and 'b' are shared > > > - confirmed with HW team the synchronism pins in vin5 are only for group > > > 'a' > > > --- a/drivers/pinctrl/sh-pfc/pfc-r8a77990.c > > > +++ b/drivers/pinctrl/sh-pfc/pfc-r8a77990.c > > > +/* - VIN5 > > > --- */ > > > +static const union vin_data vin5_data_a_pins = { union vin_data16 > > > + .data16 = { > > > + RCAR_GP_PIN(1, 1), RCAR_GP_PIN(1, 2), > > > + RCAR_GP_PIN(1, 19), RCAR_GP_PIN(1, 12), > > > + RCAR_GP_PIN(1, 15), RCAR_GP_PIN(1, 16), > > > + RCAR_GP_PIN(1, 17), RCAR_GP_PIN(1, 18), > > > + RCAR_GP_PIN(0, 12), RCAR_GP_PIN(0, 13), > > > + RCAR_GP_PIN(0, 9), RCAR_GP_PIN(0, 11), > > > + RCAR_GP_PIN(0, 8), RCAR_GP_PIN(0, 10), > > > + RCAR_GP_PIN(0, 2), RCAR_GP_PIN(0, 3), > > > + }, > > > +}; > > > + > > > +static const union vin_data vin5_data_a_mux = { union vin_data16 > > > + .data16 = { > > > + VI5_DATA0_A_MARK, VI5_DATA1_A_MARK, > > > + VI5_DATA2_A_MARK, VI5_DATA3_A_MARK, > > > + VI5_DATA4_A_MARK, VI5_DATA5_A_MARK, > > > + VI5_DATA6_A_MARK, VI5_DATA7_A_MARK, > > > + VI5_DATA8_A_MARK, VI5_DATA9_A_MARK, > > > + VI5_DATA10_A_MARK, VI5_DATA11_A_MARK, > > > + VI5_DATA12_A_MARK, VI5_DATA13_A_MARK, > > > + VI5_DATA14_A_MARK, VI5_DATA15_A_MARK, > > > + }, > > > +}; Gr{oetje,eeting}s, Geert -- Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- ge...@linux-m68k.org In personal conversations with technical people, I call myself a hacker. But when I'm talking to journalists I just say "programmer" or something like that. -- Linus Torvalds
Re: [PATCH v4 4/4] pinctrl: sh-pfc: r8a77990: Add VIN[4|5] groups/functions
Hi Simon, On Wed, Nov 07, 2018 at 11:34:50AM +0100, Simon Horman wrote: > On Tue, Nov 06, 2018 at 11:35:33AM +0100, Jacopo Mondi wrote: > > Add pin, mux and functions definitions for VIN4 and VIN5 for R-Car E3. > > > > Signed-off-by: Jacopo Mondi > > > > --- > > v3 -> v4: > > - Use new variadic version of VIN_DATA_PIN_GROUP macro > > I may be missing something but this patch seems to be the same as v3, > using the VIN_DATA_PIN_GROUP_VER macro. > Oooops, I forgot to add the changes and lost them while rebasing. Sorry about this, I'll resend. Thanks j > > > > v2 -> v3: > > - Rebased on v4.20-rc1 > > - Use the newly introduced VIN_DATA_PIN_GROUP_VER macro > > > > Incorporate Geert's comments: > > - vin5_data8_b is only used with 8 pins: use regular SH_PFC_PIN_GROUP() > > - remove stf groups for vin4/vin5 > > - confirmed that pins [23-8] of vin4's groups 'a' and 'b' are shared > > - confirmed with HW team the synchronism pins in vin5 are only for group 'a' > > --- > > drivers/pinctrl/sh-pfc/pfc-r8a77990.c | 244 > > ++ > > 1 file changed, 244 insertions(+) > > > > diff --git a/drivers/pinctrl/sh-pfc/pfc-r8a77990.c > > b/drivers/pinctrl/sh-pfc/pfc-r8a77990.c > > index 1fdafa4..16fd139 100644 > > --- a/drivers/pinctrl/sh-pfc/pfc-r8a77990.c > > +++ b/drivers/pinctrl/sh-pfc/pfc-r8a77990.c > > @@ -2433,6 +2433,190 @@ static const unsigned int usb30_id_mux[] = { > > USB3HS0_ID_MARK, > > }; > > > > +/* - VIN4 > > --- */ > > +static const union vin_data vin4_data_a_pins = { > > + .data24 = { > > + RCAR_GP_PIN(2, 6), RCAR_GP_PIN(2, 7), > > + RCAR_GP_PIN(2, 8), RCAR_GP_PIN(2, 9), > > + RCAR_GP_PIN(2, 10), RCAR_GP_PIN(2, 11), > > + RCAR_GP_PIN(2, 12), RCAR_GP_PIN(2, 13), > > + RCAR_GP_PIN(1, 4), RCAR_GP_PIN(1, 5), > > + RCAR_GP_PIN(1, 6), RCAR_GP_PIN(1, 7), > > + RCAR_GP_PIN(1, 3), RCAR_GP_PIN(1, 10), > > + RCAR_GP_PIN(1, 13), RCAR_GP_PIN(1, 14), > > + RCAR_GP_PIN(1, 9), RCAR_GP_PIN(1, 12), > > + RCAR_GP_PIN(1, 15), RCAR_GP_PIN(1, 16), > > + RCAR_GP_PIN(1, 17), RCAR_GP_PIN(1, 18), > > + RCAR_GP_PIN(1, 19), RCAR_GP_PIN(0, 1), > > + }, > > +}; > > + > > +static const union vin_data vin4_data_a_mux = { > > + .data24 = { > > + 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 union vin_data vin4_data_b_pins = { > > + .data24 = { > > + RCAR_GP_PIN(1, 8), RCAR_GP_PIN(1, 11), > > + RCAR_GP_PIN(1, 21), RCAR_GP_PIN(1, 22), > > + RCAR_GP_PIN(0, 5), RCAR_GP_PIN(0, 6), > > + RCAR_GP_PIN(0, 16), RCAR_GP_PIN(0, 17), > > + RCAR_GP_PIN(1, 4), RCAR_GP_PIN(1, 5), > > + RCAR_GP_PIN(1, 6), RCAR_GP_PIN(1, 7), > > + RCAR_GP_PIN(1, 3), RCAR_GP_PIN(1, 10), > > + RCAR_GP_PIN(1, 13), RCAR_GP_PIN(1, 14), > > + RCAR_GP_PIN(1, 9), RCAR_GP_PIN(1, 12), > > + RCAR_GP_PIN(1, 15), RCAR_GP_PIN(1, 15), > > + RCAR_GP_PIN(1, 17), RCAR_GP_PIN(1, 18), > > + RCAR_GP_PIN(1, 19), RCAR_GP_PIN(0, 1), > > + }, > > +}; > > + > > +static const union vin_data vin4_data_b_mux = { > > + .data24 = { > > + 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_sync_pins[] = { > > + /* HSYNC, VSYNC */ > > + RCAR_GP_PIN(2, 25), RCAR_GP_PIN(2, 24), > > +}; > > + > > +static const unsigned int vin4_sync_mux[] = { > > + VI4_HSYNC_N_MARK, VI4_VSYNC_N_MARK, > > +}; > > + > > +static const unsigned int vin4_field_pins[] = { > > + RCAR_GP_PIN(2, 23), > > +}; > > + > > +static const unsigned int vin4_field_mux[] = { > > + VI4_FIELD_MARK, > > +}; > > + > > +static const unsigned int vin4_clkenb_pins[] = { > > +
Re: [PATCH v4 4/4] pinctrl: sh-pfc: r8a77990: Add VIN[4|5] groups/functions
On Tue, Nov 06, 2018 at 11:35:33AM +0100, Jacopo Mondi wrote: > Add pin, mux and functions definitions for VIN4 and VIN5 for R-Car E3. > > Signed-off-by: Jacopo Mondi > > --- > v3 -> v4: > - Use new variadic version of VIN_DATA_PIN_GROUP macro I may be missing something but this patch seems to be the same as v3, using the VIN_DATA_PIN_GROUP_VER macro. > > v2 -> v3: > - Rebased on v4.20-rc1 > - Use the newly introduced VIN_DATA_PIN_GROUP_VER macro > > Incorporate Geert's comments: > - vin5_data8_b is only used with 8 pins: use regular SH_PFC_PIN_GROUP() > - remove stf groups for vin4/vin5 > - confirmed that pins [23-8] of vin4's groups 'a' and 'b' are shared > - confirmed with HW team the synchronism pins in vin5 are only for group 'a' > --- > drivers/pinctrl/sh-pfc/pfc-r8a77990.c | 244 > ++ > 1 file changed, 244 insertions(+) > > diff --git a/drivers/pinctrl/sh-pfc/pfc-r8a77990.c > b/drivers/pinctrl/sh-pfc/pfc-r8a77990.c > index 1fdafa4..16fd139 100644 > --- a/drivers/pinctrl/sh-pfc/pfc-r8a77990.c > +++ b/drivers/pinctrl/sh-pfc/pfc-r8a77990.c > @@ -2433,6 +2433,190 @@ static const unsigned int usb30_id_mux[] = { > USB3HS0_ID_MARK, > }; > > +/* - VIN4 > --- */ > +static const union vin_data vin4_data_a_pins = { > + .data24 = { > + RCAR_GP_PIN(2, 6), RCAR_GP_PIN(2, 7), > + RCAR_GP_PIN(2, 8), RCAR_GP_PIN(2, 9), > + RCAR_GP_PIN(2, 10), RCAR_GP_PIN(2, 11), > + RCAR_GP_PIN(2, 12), RCAR_GP_PIN(2, 13), > + RCAR_GP_PIN(1, 4), RCAR_GP_PIN(1, 5), > + RCAR_GP_PIN(1, 6), RCAR_GP_PIN(1, 7), > + RCAR_GP_PIN(1, 3), RCAR_GP_PIN(1, 10), > + RCAR_GP_PIN(1, 13), RCAR_GP_PIN(1, 14), > + RCAR_GP_PIN(1, 9), RCAR_GP_PIN(1, 12), > + RCAR_GP_PIN(1, 15), RCAR_GP_PIN(1, 16), > + RCAR_GP_PIN(1, 17), RCAR_GP_PIN(1, 18), > + RCAR_GP_PIN(1, 19), RCAR_GP_PIN(0, 1), > + }, > +}; > + > +static const union vin_data vin4_data_a_mux = { > + .data24 = { > + 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 union vin_data vin4_data_b_pins = { > + .data24 = { > + RCAR_GP_PIN(1, 8), RCAR_GP_PIN(1, 11), > + RCAR_GP_PIN(1, 21), RCAR_GP_PIN(1, 22), > + RCAR_GP_PIN(0, 5), RCAR_GP_PIN(0, 6), > + RCAR_GP_PIN(0, 16), RCAR_GP_PIN(0, 17), > + RCAR_GP_PIN(1, 4), RCAR_GP_PIN(1, 5), > + RCAR_GP_PIN(1, 6), RCAR_GP_PIN(1, 7), > + RCAR_GP_PIN(1, 3), RCAR_GP_PIN(1, 10), > + RCAR_GP_PIN(1, 13), RCAR_GP_PIN(1, 14), > + RCAR_GP_PIN(1, 9), RCAR_GP_PIN(1, 12), > + RCAR_GP_PIN(1, 15), RCAR_GP_PIN(1, 15), > + RCAR_GP_PIN(1, 17), RCAR_GP_PIN(1, 18), > + RCAR_GP_PIN(1, 19), RCAR_GP_PIN(0, 1), > + }, > +}; > + > +static const union vin_data vin4_data_b_mux = { > + .data24 = { > + 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_sync_pins[] = { > + /* HSYNC, VSYNC */ > + RCAR_GP_PIN(2, 25), RCAR_GP_PIN(2, 24), > +}; > + > +static const unsigned int vin4_sync_mux[] = { > + VI4_HSYNC_N_MARK, VI4_VSYNC_N_MARK, > +}; > + > +static const unsigned int vin4_field_pins[] = { > + RCAR_GP_PIN(2, 23), > +}; > + > +static const unsigned int vin4_field_mux[] = { > + VI4_FIELD_MARK, > +}; > + > +static const unsigned int vin4_clkenb_pins[] = { > + RCAR_GP_PIN(1, 2), > +}; > + > +static const unsigned int vin4_clkenb_mux[] = { > + VI4_CLKENB_MARK, > +}; > + > +static const unsigned int vin4_clk_pins[] = { > + RCAR_GP_PIN(2, 22), > +}; > + > +static const unsigned int vin4_clk_mux[] = { > + VI4_CLK_MARK, > +}; > + > +/* - VIN5 >
[PATCH v4 4/4] pinctrl: sh-pfc: r8a77990: Add VIN[4|5] groups/functions
Add pin, mux and functions definitions for VIN4 and VIN5 for R-Car E3. Signed-off-by: Jacopo Mondi --- v3 -> v4: - Use new variadic version of VIN_DATA_PIN_GROUP macro v2 -> v3: - Rebased on v4.20-rc1 - Use the newly introduced VIN_DATA_PIN_GROUP_VER macro Incorporate Geert's comments: - vin5_data8_b is only used with 8 pins: use regular SH_PFC_PIN_GROUP() - remove stf groups for vin4/vin5 - confirmed that pins [23-8] of vin4's groups 'a' and 'b' are shared - confirmed with HW team the synchronism pins in vin5 are only for group 'a' --- drivers/pinctrl/sh-pfc/pfc-r8a77990.c | 244 ++ 1 file changed, 244 insertions(+) diff --git a/drivers/pinctrl/sh-pfc/pfc-r8a77990.c b/drivers/pinctrl/sh-pfc/pfc-r8a77990.c index 1fdafa4..16fd139 100644 --- a/drivers/pinctrl/sh-pfc/pfc-r8a77990.c +++ b/drivers/pinctrl/sh-pfc/pfc-r8a77990.c @@ -2433,6 +2433,190 @@ static const unsigned int usb30_id_mux[] = { USB3HS0_ID_MARK, }; +/* - VIN4 --- */ +static const union vin_data vin4_data_a_pins = { + .data24 = { + RCAR_GP_PIN(2, 6), RCAR_GP_PIN(2, 7), + RCAR_GP_PIN(2, 8), RCAR_GP_PIN(2, 9), + RCAR_GP_PIN(2, 10), RCAR_GP_PIN(2, 11), + RCAR_GP_PIN(2, 12), RCAR_GP_PIN(2, 13), + RCAR_GP_PIN(1, 4), RCAR_GP_PIN(1, 5), + RCAR_GP_PIN(1, 6), RCAR_GP_PIN(1, 7), + RCAR_GP_PIN(1, 3), RCAR_GP_PIN(1, 10), + RCAR_GP_PIN(1, 13), RCAR_GP_PIN(1, 14), + RCAR_GP_PIN(1, 9), RCAR_GP_PIN(1, 12), + RCAR_GP_PIN(1, 15), RCAR_GP_PIN(1, 16), + RCAR_GP_PIN(1, 17), RCAR_GP_PIN(1, 18), + RCAR_GP_PIN(1, 19), RCAR_GP_PIN(0, 1), + }, +}; + +static const union vin_data vin4_data_a_mux = { + .data24 = { + 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 union vin_data vin4_data_b_pins = { + .data24 = { + RCAR_GP_PIN(1, 8), RCAR_GP_PIN(1, 11), + RCAR_GP_PIN(1, 21), RCAR_GP_PIN(1, 22), + RCAR_GP_PIN(0, 5), RCAR_GP_PIN(0, 6), + RCAR_GP_PIN(0, 16), RCAR_GP_PIN(0, 17), + RCAR_GP_PIN(1, 4), RCAR_GP_PIN(1, 5), + RCAR_GP_PIN(1, 6), RCAR_GP_PIN(1, 7), + RCAR_GP_PIN(1, 3), RCAR_GP_PIN(1, 10), + RCAR_GP_PIN(1, 13), RCAR_GP_PIN(1, 14), + RCAR_GP_PIN(1, 9), RCAR_GP_PIN(1, 12), + RCAR_GP_PIN(1, 15), RCAR_GP_PIN(1, 15), + RCAR_GP_PIN(1, 17), RCAR_GP_PIN(1, 18), + RCAR_GP_PIN(1, 19), RCAR_GP_PIN(0, 1), + }, +}; + +static const union vin_data vin4_data_b_mux = { + .data24 = { + 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_sync_pins[] = { + /* HSYNC, VSYNC */ + RCAR_GP_PIN(2, 25), RCAR_GP_PIN(2, 24), +}; + +static const unsigned int vin4_sync_mux[] = { + VI4_HSYNC_N_MARK, VI4_VSYNC_N_MARK, +}; + +static const unsigned int vin4_field_pins[] = { + RCAR_GP_PIN(2, 23), +}; + +static const unsigned int vin4_field_mux[] = { + VI4_FIELD_MARK, +}; + +static const unsigned int vin4_clkenb_pins[] = { + RCAR_GP_PIN(1, 2), +}; + +static const unsigned int vin4_clkenb_mux[] = { + VI4_CLKENB_MARK, +}; + +static const unsigned int vin4_clk_pins[] = { + RCAR_GP_PIN(2, 22), +}; + +static const unsigned int vin4_clk_mux[] = { + VI4_CLK_MARK, +}; + +/* - VIN5 --- */ +static const union vin_data vin5_data_a_pins = { + .data16 = { + RCAR_GP_PIN(1, 1), RCAR_GP_PIN(1, 2), + RCAR_GP_PIN(1, 19), RCAR_GP_PIN(1, 12), + RCAR_GP_PIN(1, 15), RCAR_GP_PIN(1, 16), +