| Message ID | 20201019124258.4574-2-biju.das.jz@bp.renesas.com |
|---|---|
| State | Accepted |
| Commit | b8029394efccf48687d9a7fae6c4747b81e35261 |
| Headers | show |
| Series | [1/6] pinctrl: renesas: r8a77951: Optimize pinctrl image size for R8A774E1 | expand |
Hi Biju, On Mon, Oct 19, 2020 at 2:43 PM Biju Das <biju.das.jz@bp.renesas.com> wrote: > This driver supports both RZ/G2H and R-Car H3(R8A77951) SoC's. > Optimize pinctrl image size for RZ/G2H, when R-Car H3(R8A77951) SoC is > disabled in the defconfig. > > Signed-off-by: Biju Das <biju.das.jz@bp.renesas.com> Thanks for your patch! > --- a/drivers/pinctrl/renesas/pfc-r8a77951.c > +++ b/drivers/pinctrl/renesas/pfc-r8a77951.c > @@ -1827,6 +1827,7 @@ static const unsigned int canfd1_data_mux[] = { > CANFD1_TX_MARK, CANFD1_RX_MARK, > }; > > +#ifdef CONFIG_PINCTRL_PFC_R8A77951 > /* - DRIF0 --------------------------------------------------------------- */ > static const unsigned int drif0_ctrl_a_pins[] = { > /* CLK, SYNC */ > @@ -2041,6 +2042,7 @@ static const unsigned int drif3_data1_b_pins[] = { > static const unsigned int drif3_data1_b_mux[] = { > RIF3_D1_B_MARK, > }; > +#endif For long #ifdef blocks, where you cannot see both the #ifdef and #endif in your editor window, it is recommended to add comments to the #endif. No worries, I'll fix that myself while applying. Reviewed-by: Geert Uytterhoeven <geert+renesas@glider.be> i.e. will queue in renesas-pinctrl-for-v5.11, with comments added to the #endifs where appropriate. Gr{oetje,eeting}s, Geert
Hi Geert, > Subject: Re: [PATCH 1/6] pinctrl: renesas: r8a77951: Optimize pinctrl image > size for R8A774E1 > > Hi Biju, > > On Mon, Oct 19, 2020 at 2:43 PM Biju Das <biju.das.jz@bp.renesas.com> > wrote: > > This driver supports both RZ/G2H and R-Car H3(R8A77951) SoC's. > > Optimize pinctrl image size for RZ/G2H, when R-Car H3(R8A77951) SoC is > > disabled in the defconfig. > > > > Signed-off-by: Biju Das <biju.das.jz@bp.renesas.com> > > Thanks for your patch! > > > --- a/drivers/pinctrl/renesas/pfc-r8a77951.c > > +++ b/drivers/pinctrl/renesas/pfc-r8a77951.c > > @@ -1827,6 +1827,7 @@ static const unsigned int canfd1_data_mux[] = { > > CANFD1_TX_MARK, CANFD1_RX_MARK, > > }; > > > > +#ifdef CONFIG_PINCTRL_PFC_R8A77951 > > /* - DRIF0 > > --------------------------------------------------------------- */ static const > unsigned int drif0_ctrl_a_pins[] = { > > /* CLK, SYNC */ > > @@ -2041,6 +2042,7 @@ static const unsigned int drif3_data1_b_pins[] = > > { static const unsigned int drif3_data1_b_mux[] = { > > RIF3_D1_B_MARK, > > }; > > +#endif > > For long #ifdef blocks, where you cannot see both the #ifdef and #endif in > your editor window, it is recommended to add comments to the #endif. > No worries, I'll fix that myself while applying. Thank you. Regards, Biju > Reviewed-by: Geert Uytterhoeven <geert+renesas@glider.be> i.e. will > queue in renesas-pinctrl-for-v5.11, with comments added to the #endifs > where appropriate. > > Gr{oetje,eeting}s, > > Geert > > -- > Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- geert@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
diff --git a/drivers/pinctrl/renesas/pfc-r8a77951.c b/drivers/pinctrl/renesas/pfc-r8a77951.c index a94ebe0bf5d0..c4011c57453d 100644 --- a/drivers/pinctrl/renesas/pfc-r8a77951.c +++ b/drivers/pinctrl/renesas/pfc-r8a77951.c @@ -1827,6 +1827,7 @@ static const unsigned int canfd1_data_mux[] = { CANFD1_TX_MARK, CANFD1_RX_MARK, }; +#ifdef CONFIG_PINCTRL_PFC_R8A77951 /* - DRIF0 --------------------------------------------------------------- */ static const unsigned int drif0_ctrl_a_pins[] = { /* CLK, SYNC */ @@ -2041,6 +2042,7 @@ static const unsigned int drif3_data1_b_pins[] = { static const unsigned int drif3_data1_b_mux[] = { RIF3_D1_B_MARK, }; +#endif /* - DU --------------------------------------------------------------------- */ static const unsigned int du_rgb666_pins[] = { @@ -4159,7 +4161,9 @@ static const unsigned int vin5_clk_mux[] = { static const struct { struct sh_pfc_pin_group common[320]; +#ifdef CONFIG_PINCTRL_PFC_R8A77951 struct sh_pfc_pin_group automotive[30]; +#endif } pinmux_groups = { .common = { SH_PFC_PIN_GROUP(audio_clk_a_a), @@ -4483,6 +4487,7 @@ static const struct { SH_PFC_PIN_GROUP(vin5_clkenb), SH_PFC_PIN_GROUP(vin5_clk), }, +#ifdef CONFIG_PINCTRL_PFC_R8A77951 .automotive = { SH_PFC_PIN_GROUP(drif0_ctrl_a), SH_PFC_PIN_GROUP(drif0_data0_a), @@ -4515,7 +4520,7 @@ static const struct { SH_PFC_PIN_GROUP(drif3_data0_b), SH_PFC_PIN_GROUP(drif3_data1_b), } - +#endif }; static const char * const audio_clk_groups[] = { @@ -4574,6 +4579,7 @@ static const char * const canfd1_groups[] = { "canfd1_data", }; +#ifdef CONFIG_PINCTRL_PFC_R8A77951 static const char * const drif0_groups[] = { "drif0_ctrl_a", "drif0_data0_a", @@ -4615,6 +4621,7 @@ static const char * const drif3_groups[] = { "drif3_data0_b", "drif3_data1_b", }; +#endif static const char * const du_groups[] = { "du_rgb666", @@ -5041,7 +5048,9 @@ static const char * const vin5_groups[] = { static const struct { struct sh_pfc_function common[53]; +#ifdef CONFIG_PINCTRL_PFC_R8A77951 struct sh_pfc_function automotive[4]; +#endif } pinmux_functions = { .common = { SH_PFC_FUNCTION(audio_clk), @@ -5098,13 +5107,14 @@ static const struct { SH_PFC_FUNCTION(vin4), SH_PFC_FUNCTION(vin5), }, +#ifdef CONFIG_PINCTRL_PFC_R8A77951 .automotive = { SH_PFC_FUNCTION(drif0), SH_PFC_FUNCTION(drif1), SH_PFC_FUNCTION(drif2), SH_PFC_FUNCTION(drif3), } - +#endif }; static const struct pinmux_cfg_reg pinmux_config_regs[] = {
This driver supports both RZ/G2H and R-Car H3(R8A77951) SoC's. Optimize pinctrl image size for RZ/G2H, when R-Car H3(R8A77951) SoC is disabled in the defconfig. Signed-off-by: Biju Das <biju.das.jz@bp.renesas.com> --- drivers/pinctrl/renesas/pfc-r8a77951.c | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-)