| Message ID | 1550678985-1316-1-git-send-email-fabrizio.castro@bp.renesas.com |
|---|---|
| State | New |
| Headers | show |
| Series | pinctrl: sh-pfc: r8a7796: 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: r8a7796: move CANFD pin groups and > functions > > CANFD is found also on the R8A774A1, 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-r8a7796.c | 18 +++++++++--------- > 1 file changed, 9 insertions(+), 9 deletions(-) > > diff --git a/drivers/pinctrl/sh-pfc/pfc-r8a7796.c b/drivers/pinctrl/sh-pfc/pfc- > r8a7796.c > index 7e33035..30d4ffc 100644 > --- a/drivers/pinctrl/sh-pfc/pfc-r8a7796.c > +++ b/drivers/pinctrl/sh-pfc/pfc-r8a7796.c > @@ -4163,8 +4163,8 @@ static const unsigned int vin5_clk_mux[] = { > }; > > static const struct { > - struct sh_pfc_pin_group common[310]; > - struct sh_pfc_pin_group automotive[33]; > + struct sh_pfc_pin_group common[313]; > + struct sh_pfc_pin_group automotive[30]; > } pinmux_groups = { > .common = { > SH_PFC_PIN_GROUP(audio_clk_a_a), > @@ -4199,6 +4199,9 @@ static const struct { > SH_PFC_PIN_GROUP(can0_data_b), > SH_PFC_PIN_GROUP(can1_data), > SH_PFC_PIN_GROUP(can_clk), > + SH_PFC_PIN_GROUP(canfd0_data_a), > + SH_PFC_PIN_GROUP(canfd0_data_b), > + SH_PFC_PIN_GROUP(canfd1_data), > SH_PFC_PIN_GROUP(du_rgb666), > SH_PFC_PIN_GROUP(du_rgb888), > SH_PFC_PIN_GROUP(du_clk_out_0), > @@ -4479,9 +4482,6 @@ static const struct { > SH_PFC_PIN_GROUP(vin5_clk), > }, > .automotive = { > - SH_PFC_PIN_GROUP(canfd0_data_a), > - SH_PFC_PIN_GROUP(canfd0_data_b), > - 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), > @@ -5021,8 +5021,8 @@ static const char * const vin5_groups[] = { > }; > > static const struct { > - struct sh_pfc_function common[48]; > - struct sh_pfc_function automotive[6]; > + struct sh_pfc_function common[50]; > + struct sh_pfc_function automotive[4]; > } pinmux_functions = { > .common = { > SH_PFC_FUNCTION(audio_clk), > @@ -5030,6 +5030,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(hdmi0), > SH_PFC_FUNCTION(hscif0), > @@ -5075,8 +5077,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 08:39:33PM +0000, Chris Paterson wrote: > > 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: r8a7796: move CANFD pin groups and > > functions > > > > CANFD is found also on the R8A774A1, 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> Reviewed-by: Simon Horman <horms+renesas@verge.net.au>
On Wed, Feb 20, 2019 at 5:10 PM Fabrizio Castro <fabrizio.castro@bp.renesas.com> wrote: > CANFD is found also on the R8A774A1, 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-r8a7796.c b/drivers/pinctrl/sh-pfc/pfc-r8a7796.c index 7e33035..30d4ffc 100644 --- a/drivers/pinctrl/sh-pfc/pfc-r8a7796.c +++ b/drivers/pinctrl/sh-pfc/pfc-r8a7796.c @@ -4163,8 +4163,8 @@ static const unsigned int vin5_clk_mux[] = { }; static const struct { - struct sh_pfc_pin_group common[310]; - struct sh_pfc_pin_group automotive[33]; + struct sh_pfc_pin_group common[313]; + struct sh_pfc_pin_group automotive[30]; } pinmux_groups = { .common = { SH_PFC_PIN_GROUP(audio_clk_a_a), @@ -4199,6 +4199,9 @@ static const struct { SH_PFC_PIN_GROUP(can0_data_b), SH_PFC_PIN_GROUP(can1_data), SH_PFC_PIN_GROUP(can_clk), + SH_PFC_PIN_GROUP(canfd0_data_a), + SH_PFC_PIN_GROUP(canfd0_data_b), + SH_PFC_PIN_GROUP(canfd1_data), SH_PFC_PIN_GROUP(du_rgb666), SH_PFC_PIN_GROUP(du_rgb888), SH_PFC_PIN_GROUP(du_clk_out_0), @@ -4479,9 +4482,6 @@ static const struct { SH_PFC_PIN_GROUP(vin5_clk), }, .automotive = { - SH_PFC_PIN_GROUP(canfd0_data_a), - SH_PFC_PIN_GROUP(canfd0_data_b), - 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), @@ -5021,8 +5021,8 @@ static const char * const vin5_groups[] = { }; static const struct { - struct sh_pfc_function common[48]; - struct sh_pfc_function automotive[6]; + struct sh_pfc_function common[50]; + struct sh_pfc_function automotive[4]; } pinmux_functions = { .common = { SH_PFC_FUNCTION(audio_clk), @@ -5030,6 +5030,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(hdmi0), SH_PFC_FUNCTION(hscif0), @@ -5075,8 +5077,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 R8A774A1, therefore move CANFD pin groups and functions to "common". Signed-off-by: Fabrizio Castro <fabrizio.castro@bp.renesas.com> --- drivers/pinctrl/sh-pfc/pfc-r8a7796.c | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-)