| Message ID | 1550679018-1380-1-git-send-email-fabrizio.castro@bp.renesas.com (mailing list archive) |
|---|---|
| State | Accepted |
| Delegated to: | Geert Uytterhoeven |
| Headers | show |
| Series | pinctrl: sh-pfc: r8a77990: move CANFD pin groups and functions | expand |
> From: Fabrizio Castro <fabrizio.castro@bp.renesas.com> > Sent: 20 February 2019 16:10 > To: Geert Uytterhoeven <geert+renesas@glider.be>; Linus Walleij > <linus.walleij@linaro.org> > Cc: Fabrizio Castro <fabrizio.castro@bp.renesas.com>; linux-renesas- > soc@vger.kernel.org; linux-gpio@vger.kernel.org; Simon Horman > <horms@verge.net.au>; Chris Paterson <Chris.Paterson2@renesas.com>; > Biju Das <biju.das@bp.renesas.com> > Subject: [PATCH] pinctrl: sh-pfc: r8a77990: move CANFD pin groups and > functions > > CANFD is found also on the R8A774C0, therefore move CANFD pin > groups and functions to "common". > > Signed-off-by: Fabrizio Castro <fabrizio.castro@bp.renesas.com> Reviewed-by: Chris Paterson <chris.paterson2@renesas.com> > --- > drivers/pinctrl/sh-pfc/pfc-r8a77990.c | 16 ++++++++-------- > 1 file changed, 8 insertions(+), 8 deletions(-) > > diff --git a/drivers/pinctrl/sh-pfc/pfc-r8a77990.c b/drivers/pinctrl/sh-pfc/pfc- > r8a77990.c > index 52daa56..d3b1cd6 100644 > --- a/drivers/pinctrl/sh-pfc/pfc-r8a77990.c > +++ b/drivers/pinctrl/sh-pfc/pfc-r8a77990.c > @@ -3767,8 +3767,8 @@ static const unsigned int vin5_clk_b_mux[] = { > }; > > static const struct { > - struct sh_pfc_pin_group common[245]; > - struct sh_pfc_pin_group automotive[23]; > + struct sh_pfc_pin_group common[247]; > + struct sh_pfc_pin_group automotive[21]; > } pinmux_groups = { > .common = { > SH_PFC_PIN_GROUP(audio_clk_a), > @@ -3799,6 +3799,8 @@ static const struct { > SH_PFC_PIN_GROUP(can0_data), > SH_PFC_PIN_GROUP(can1_data), > SH_PFC_PIN_GROUP(can_clk), > + SH_PFC_PIN_GROUP(canfd0_data), > + SH_PFC_PIN_GROUP(canfd1_data), > SH_PFC_PIN_GROUP(du_rgb666), > SH_PFC_PIN_GROUP(du_rgb888), > SH_PFC_PIN_GROUP(du_clk_in_0), > @@ -4018,8 +4020,6 @@ static const struct { > SH_PFC_PIN_GROUP(vin5_clk_b), > }, > .automotive = { > - SH_PFC_PIN_GROUP(canfd0_data), > - SH_PFC_PIN_GROUP(canfd1_data), > SH_PFC_PIN_GROUP(drif0_ctrl_a), > SH_PFC_PIN_GROUP(drif0_data0_a), > SH_PFC_PIN_GROUP(drif0_data1_a), > @@ -4466,8 +4466,8 @@ static const char * const vin5_groups[] = { > }; > > static const struct { > - struct sh_pfc_function common[45]; > - struct sh_pfc_function automotive[6]; > + struct sh_pfc_function common[47]; > + struct sh_pfc_function automotive[4]; > } pinmux_functions = { > .common = { > SH_PFC_FUNCTION(audio_clk), > @@ -4475,6 +4475,8 @@ static const struct { > SH_PFC_FUNCTION(can0), > SH_PFC_FUNCTION(can1), > SH_PFC_FUNCTION(can_clk), > + SH_PFC_FUNCTION(canfd0), > + SH_PFC_FUNCTION(canfd1), > SH_PFC_FUNCTION(du), > SH_PFC_FUNCTION(hscif0), > SH_PFC_FUNCTION(hscif1), > @@ -4517,8 +4519,6 @@ static const struct { > SH_PFC_FUNCTION(vin5), > }, > .automotive = { > - SH_PFC_FUNCTION(canfd0), > - SH_PFC_FUNCTION(canfd1), > SH_PFC_FUNCTION(drif0), > SH_PFC_FUNCTION(drif1), > SH_PFC_FUNCTION(drif2), > -- > 2.7.4
On Wed, Feb 20, 2019 at 5:10 PM Fabrizio Castro <fabrizio.castro@bp.renesas.com> wrote: > CANFD is found also on the R8A774C0, therefore move CANFD pin > groups and functions to "common". > > Signed-off-by: Fabrizio Castro <fabrizio.castro@bp.renesas.com> Reviewed-by: Geert Uytterhoeven <geert+renesas@glider.be> i.e. will queue in sh-pfc-for-v5.2. Gr{oetje,eeting}s, Geert
diff --git a/drivers/pinctrl/sh-pfc/pfc-r8a77990.c b/drivers/pinctrl/sh-pfc/pfc-r8a77990.c index 52daa56..d3b1cd6 100644 --- a/drivers/pinctrl/sh-pfc/pfc-r8a77990.c +++ b/drivers/pinctrl/sh-pfc/pfc-r8a77990.c @@ -3767,8 +3767,8 @@ static const unsigned int vin5_clk_b_mux[] = { }; static const struct { - struct sh_pfc_pin_group common[245]; - struct sh_pfc_pin_group automotive[23]; + struct sh_pfc_pin_group common[247]; + struct sh_pfc_pin_group automotive[21]; } pinmux_groups = { .common = { SH_PFC_PIN_GROUP(audio_clk_a), @@ -3799,6 +3799,8 @@ static const struct { SH_PFC_PIN_GROUP(can0_data), SH_PFC_PIN_GROUP(can1_data), SH_PFC_PIN_GROUP(can_clk), + SH_PFC_PIN_GROUP(canfd0_data), + SH_PFC_PIN_GROUP(canfd1_data), SH_PFC_PIN_GROUP(du_rgb666), SH_PFC_PIN_GROUP(du_rgb888), SH_PFC_PIN_GROUP(du_clk_in_0), @@ -4018,8 +4020,6 @@ static const struct { SH_PFC_PIN_GROUP(vin5_clk_b), }, .automotive = { - SH_PFC_PIN_GROUP(canfd0_data), - SH_PFC_PIN_GROUP(canfd1_data), SH_PFC_PIN_GROUP(drif0_ctrl_a), SH_PFC_PIN_GROUP(drif0_data0_a), SH_PFC_PIN_GROUP(drif0_data1_a), @@ -4466,8 +4466,8 @@ static const char * const vin5_groups[] = { }; static const struct { - struct sh_pfc_function common[45]; - struct sh_pfc_function automotive[6]; + struct sh_pfc_function common[47]; + struct sh_pfc_function automotive[4]; } pinmux_functions = { .common = { SH_PFC_FUNCTION(audio_clk), @@ -4475,6 +4475,8 @@ static const struct { SH_PFC_FUNCTION(can0), SH_PFC_FUNCTION(can1), SH_PFC_FUNCTION(can_clk), + SH_PFC_FUNCTION(canfd0), + SH_PFC_FUNCTION(canfd1), SH_PFC_FUNCTION(du), SH_PFC_FUNCTION(hscif0), SH_PFC_FUNCTION(hscif1), @@ -4517,8 +4519,6 @@ static const struct { SH_PFC_FUNCTION(vin5), }, .automotive = { - SH_PFC_FUNCTION(canfd0), - SH_PFC_FUNCTION(canfd1), SH_PFC_FUNCTION(drif0), SH_PFC_FUNCTION(drif1), SH_PFC_FUNCTION(drif2),
CANFD is found also on the R8A774C0, therefore move CANFD pin groups and functions to "common". Signed-off-by: Fabrizio Castro <fabrizio.castro@bp.renesas.com> --- drivers/pinctrl/sh-pfc/pfc-r8a77990.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-)