diff mbox series

[2/6] pinctrl: renesas: r8a7796: Optimize pinctrl image size for R8A774A1

Message ID 20201019124258.4574-3-biju.das.jz@bp.renesas.com
State Superseded
Delegated to: Geert Uytterhoeven
Headers show
Series Optimize pinctrl image size for RZ/G SoC's | expand

Commit Message

Biju Das Oct. 19, 2020, 12:42 p.m. UTC
This driver supports both RZ/G2M and R-Car M3-W/W+(R8A7796[0|1]) SoC's.
Optimize pinctrl image size for RZ/G2M, when R-Car M3-W/W+(R8A7796[0|1])
SoC's are disabled in the defconfig.

Signed-off-by: Biju Das <biju.das.jz@bp.renesas.com>
---
 drivers/pinctrl/renesas/pfc-r8a7796.c | 12 ++++++++++++
 1 file changed, 12 insertions(+)

Comments

Biju Das Oct. 19, 2020, 12:51 p.m. UTC | #1
Hi All,

Please drop this patch, Will send V2 for this. I have missed adding CONFIG_PINCTRL_PFC_R8A77960  for automotive parts.
Sorry for the inconvenience.

Regards,
Biju

> -----Original Message-----
> From: Biju Das <biju.das.jz@bp.renesas.com>
> Sent: 19 October 2020 13:43
> To: Linus Walleij <linus.walleij@linaro.org>
> Cc: Biju Das <biju.das.jz@bp.renesas.com>; Geert Uytterhoeven
> <geert+renesas@glider.be>; linux-renesas-soc@vger.kernel.org; linux-
> gpio@vger.kernel.org; Chris Paterson <Chris.Paterson2@renesas.com>; Biju
> Das <biju.das@bp.renesas.com>; Prabhakar Mahadev Lad
> <prabhakar.mahadev-lad.rj@bp.renesas.com>
> Subject: [PATCH 2/6] pinctrl: renesas: r8a7796: Optimize pinctrl image size for
> R8A774A1
> 
> This driver supports both RZ/G2M and R-Car M3-W/W+(R8A7796[0|1]) SoC's.
> Optimize pinctrl image size for RZ/G2M, when R-Car M3-
> W/W+(R8A7796[0|1]) SoC's are disabled in the defconfig.
> 
> Signed-off-by: Biju Das <biju.das.jz@bp.renesas.com>
> ---
>  drivers/pinctrl/renesas/pfc-r8a7796.c | 12 ++++++++++++
>  1 file changed, 12 insertions(+)
> 
> diff --git a/drivers/pinctrl/renesas/pfc-r8a7796.c
> b/drivers/pinctrl/renesas/pfc-r8a7796.c
> index 55f0344a3d3e..65bb8b3c62d4 100644
> --- a/drivers/pinctrl/renesas/pfc-r8a7796.c
> +++ b/drivers/pinctrl/renesas/pfc-r8a7796.c
> @@ -1831,6 +1831,7 @@ static const unsigned int canfd1_data_mux[] = {
>  	CANFD1_TX_MARK,         CANFD1_RX_MARK,
>  };
> 
> +#ifdef CONFIG_PINCTRL_PFC_R8A77961
>  /* - DRIF0 --------------------------------------------------------------- */  static
> const unsigned int drif0_ctrl_a_pins[] = {
>  	/* CLK, SYNC */
> @@ -2045,6 +2046,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[] = { @@ -4133,7 +4135,9 @@ static const
> unsigned int vin5_clk_mux[] = {
> 
>  static const struct {
>  	struct sh_pfc_pin_group common[316];
> +#ifdef CONFIG_PINCTRL_PFC_R8A77961
>  	struct sh_pfc_pin_group automotive[30];
> +#endif
>  } pinmux_groups = {
>  	.common = {
>  		SH_PFC_PIN_GROUP(audio_clk_a_a),
> @@ -4453,6 +4457,7 @@ static const struct {
>  		SH_PFC_PIN_GROUP(vin5_clkenb),
>  		SH_PFC_PIN_GROUP(vin5_clk),
>  	},
> +#ifdef CONFIG_PINCTRL_PFC_R8A77961
>  	.automotive = {
>  		SH_PFC_PIN_GROUP(drif0_ctrl_a),
>  		SH_PFC_PIN_GROUP(drif0_data0_a),
> @@ -4485,6 +4490,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[] = { @@ -4543,6 +4549,7 @@
> static const char * const canfd1_groups[] = {
>  	"canfd1_data",
>  };
> 
> +#ifdef CONFIG_PINCTRL_PFC_R8A77961
>  static const char * const drif0_groups[] = {
>  	"drif0_ctrl_a",
>  	"drif0_data0_a",
> @@ -4584,6 +4591,7 @@ static const char * const drif3_groups[] = {
>  	"drif3_data0_b",
>  	"drif3_data1_b",
>  };
> +#endif
> 
>  static const char * const du_groups[] = {
>  	"du_rgb666",
> @@ -4997,7 +5005,9 @@ static const char * const vin5_groups[] = {
> 
>  static const struct {
>  	struct sh_pfc_function common[50];
> +#ifdef CONFIG_PINCTRL_PFC_R8A77961
>  	struct sh_pfc_function automotive[4];
> +#endif
>  } pinmux_functions = {
>  	.common = {
>  		SH_PFC_FUNCTION(audio_clk),
> @@ -5051,12 +5061,14 @@ static const struct {
>  		SH_PFC_FUNCTION(vin4),
>  		SH_PFC_FUNCTION(vin5),
>  	},
> +#ifdef CONFIG_PINCTRL_PFC_R8A77961
>  	.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[] = {
> --
> 2.17.1
diff mbox series

Patch

diff --git a/drivers/pinctrl/renesas/pfc-r8a7796.c b/drivers/pinctrl/renesas/pfc-r8a7796.c
index 55f0344a3d3e..65bb8b3c62d4 100644
--- a/drivers/pinctrl/renesas/pfc-r8a7796.c
+++ b/drivers/pinctrl/renesas/pfc-r8a7796.c
@@ -1831,6 +1831,7 @@  static const unsigned int canfd1_data_mux[] = {
 	CANFD1_TX_MARK,         CANFD1_RX_MARK,
 };
 
+#ifdef CONFIG_PINCTRL_PFC_R8A77961
 /* - DRIF0 --------------------------------------------------------------- */
 static const unsigned int drif0_ctrl_a_pins[] = {
 	/* CLK, SYNC */
@@ -2045,6 +2046,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[] = {
@@ -4133,7 +4135,9 @@  static const unsigned int vin5_clk_mux[] = {
 
 static const struct {
 	struct sh_pfc_pin_group common[316];
+#ifdef CONFIG_PINCTRL_PFC_R8A77961
 	struct sh_pfc_pin_group automotive[30];
+#endif
 } pinmux_groups = {
 	.common = {
 		SH_PFC_PIN_GROUP(audio_clk_a_a),
@@ -4453,6 +4457,7 @@  static const struct {
 		SH_PFC_PIN_GROUP(vin5_clkenb),
 		SH_PFC_PIN_GROUP(vin5_clk),
 	},
+#ifdef CONFIG_PINCTRL_PFC_R8A77961
 	.automotive = {
 		SH_PFC_PIN_GROUP(drif0_ctrl_a),
 		SH_PFC_PIN_GROUP(drif0_data0_a),
@@ -4485,6 +4490,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[] = {
@@ -4543,6 +4549,7 @@  static const char * const canfd1_groups[] = {
 	"canfd1_data",
 };
 
+#ifdef CONFIG_PINCTRL_PFC_R8A77961
 static const char * const drif0_groups[] = {
 	"drif0_ctrl_a",
 	"drif0_data0_a",
@@ -4584,6 +4591,7 @@  static const char * const drif3_groups[] = {
 	"drif3_data0_b",
 	"drif3_data1_b",
 };
+#endif
 
 static const char * const du_groups[] = {
 	"du_rgb666",
@@ -4997,7 +5005,9 @@  static const char * const vin5_groups[] = {
 
 static const struct {
 	struct sh_pfc_function common[50];
+#ifdef CONFIG_PINCTRL_PFC_R8A77961
 	struct sh_pfc_function automotive[4];
+#endif
 } pinmux_functions = {
 	.common = {
 		SH_PFC_FUNCTION(audio_clk),
@@ -5051,12 +5061,14 @@  static const struct {
 		SH_PFC_FUNCTION(vin4),
 		SH_PFC_FUNCTION(vin5),
 	},
+#ifdef CONFIG_PINCTRL_PFC_R8A77961
 	.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[] = {