[v2] STi drivers cleanup

[PATCH v2 4/5] clk: st: flexgen: remove unused compatible

Posted by Raphael Gallais-Pou 2 weeks, 6 days ago

Following B2120 boards removal in commit dee546e1adef ("ARM: sti: drop
B2120 board support"), several compatibles are left unused.  Remove
them.

Signed-off-by: Raphael Gallais-Pou <rgallaispou@gmail.com>
---
 drivers/clk/st/clk-flexgen.c | 80 --------------------------------------------
 1 file changed, 80 deletions(-)

diff --git a/drivers/clk/st/clk-flexgen.c b/drivers/clk/st/clk-flexgen.c
index 5292208c4dd8b45edfe7c2722e934dd0299c6d34..e8e7626c76db06b2255908a6658bca1f42600c85 100644
--- a/drivers/clk/st/clk-flexgen.c
+++ b/drivers/clk/st/clk-flexgen.c
@@ -303,16 +303,6 @@ static const struct clkgen_data clkgen_video = {
 	.mode = 1,
 };
 
-static const struct clkgen_clk_out clkgen_stih407_a0_clk_out[] = {
-	/* This clk needs to be on so that memory interface is accessible */
-	{ .name = "clk-ic-lmi0", .flags = CLK_IS_CRITICAL },
-};
-
-static const struct clkgen_data clkgen_stih407_a0 = {
-	.outputs = clkgen_stih407_a0_clk_out,
-	.outputs_nb = ARRAY_SIZE(clkgen_stih407_a0_clk_out),
-};
-
 static const struct clkgen_clk_out clkgen_stih410_a0_clk_out[] = {
 	/* Those clks need to be on so that memory interface is accessible */
 	{ .name = "clk-ic-lmi0", .flags = CLK_IS_CRITICAL },
@@ -324,51 +314,6 @@ static const struct clkgen_data clkgen_stih410_a0 = {
 	.outputs_nb = ARRAY_SIZE(clkgen_stih410_a0_clk_out),
 };
 
-static const struct clkgen_clk_out clkgen_stih407_c0_clk_out[] = {
-	{ .name = "clk-icn-gpu", },
-	{ .name = "clk-fdma", },
-	{ .name = "clk-nand", },
-	{ .name = "clk-hva", },
-	{ .name = "clk-proc-stfe", },
-	{ .name = "clk-proc-tp", },
-	{ .name = "clk-rx-icn-dmu", },
-	{ .name = "clk-rx-icn-hva", },
-	/* This clk needs to be on to keep bus interconnect alive */
-	{ .name = "clk-icn-cpu", .flags = CLK_IS_CRITICAL },
-	/* This clk needs to be on to keep bus interconnect alive */
-	{ .name = "clk-tx-icn-dmu", .flags = CLK_IS_CRITICAL },
-	{ .name = "clk-mmc-0", },
-	{ .name = "clk-mmc-1", },
-	{ .name = "clk-jpegdec", },
-	/* This clk needs to be on to keep A9 running */
-	{ .name = "clk-ext2fa9", .flags = CLK_IS_CRITICAL },
-	{ .name = "clk-ic-bdisp-0", },
-	{ .name = "clk-ic-bdisp-1", },
-	{ .name = "clk-pp-dmu", },
-	{ .name = "clk-vid-dmu", },
-	{ .name = "clk-dss-lpc", },
-	{ .name = "clk-st231-aud-0", },
-	{ .name = "clk-st231-gp-1", },
-	{ .name = "clk-st231-dmu", },
-	/* This clk needs to be on to keep bus interconnect alive */
-	{ .name = "clk-icn-lmi", .flags = CLK_IS_CRITICAL },
-	{ .name = "clk-tx-icn-disp-1", },
-	/* This clk needs to be on to keep bus interconnect alive */
-	{ .name = "clk-icn-sbc", .flags = CLK_IS_CRITICAL },
-	{ .name = "clk-stfe-frc2", },
-	{ .name = "clk-eth-phy", },
-	{ .name = "clk-eth-ref-phyclk", },
-	{ .name = "clk-flash-promip", },
-	{ .name = "clk-main-disp", },
-	{ .name = "clk-aux-disp", },
-	{ .name = "clk-compo-dvp", },
-};
-
-static const struct clkgen_data clkgen_stih407_c0 = {
-	.outputs = clkgen_stih407_c0_clk_out,
-	.outputs_nb = ARRAY_SIZE(clkgen_stih407_c0_clk_out),
-};
-
 static const struct clkgen_clk_out clkgen_stih410_c0_clk_out[] = {
 	{ .name = "clk-icn-gpu", },
 	{ .name = "clk-fdma", },
@@ -482,19 +427,6 @@ static const struct clkgen_data clkgen_stih418_c0 = {
 	.outputs_nb = ARRAY_SIZE(clkgen_stih418_c0_clk_out),
 };
 
-static const struct clkgen_clk_out clkgen_stih407_d0_clk_out[] = {
-	{ .name = "clk-pcm-0", },
-	{ .name = "clk-pcm-1", },
-	{ .name = "clk-pcm-2", },
-	{ .name = "clk-spdiff", },
-};
-
-static const struct clkgen_data clkgen_stih407_d0 = {
-	.flags = CLK_SET_RATE_PARENT,
-	.outputs = clkgen_stih407_d0_clk_out,
-	.outputs_nb = ARRAY_SIZE(clkgen_stih407_d0_clk_out),
-};
-
 static const struct clkgen_clk_out clkgen_stih410_d0_clk_out[] = {
 	{ .name = "clk-pcm-0", },
 	{ .name = "clk-pcm-1", },
@@ -596,18 +528,10 @@ static const struct of_device_id flexgen_of_match[] = {
 		.compatible = "st,flexgen-video",
 		.data = &clkgen_video,
 	},
-	{
-		.compatible = "st,flexgen-stih407-a0",
-		.data = &clkgen_stih407_a0,
-	},
 	{
 		.compatible = "st,flexgen-stih410-a0",
 		.data = &clkgen_stih410_a0,
 	},
-	{
-		.compatible = "st,flexgen-stih407-c0",
-		.data = &clkgen_stih407_c0,
-	},
 	{
 		.compatible = "st,flexgen-stih410-c0",
 		.data = &clkgen_stih410_c0,
@@ -616,10 +540,6 @@ static const struct of_device_id flexgen_of_match[] = {
 		.compatible = "st,flexgen-stih418-c0",
 		.data = &clkgen_stih418_c0,
 	},
-	{
-		.compatible = "st,flexgen-stih407-d0",
-		.data = &clkgen_stih407_d0,
-	},
 	{
 		.compatible = "st,flexgen-stih410-d0",
 		.data = &clkgen_stih410_d0,

-- 
2.51.0

Re: [PATCH v2 4/5] clk: st: flexgen: remove unused compatible

Posted by Stephen Boyd 1 week, 4 days ago

Quoting Raphael Gallais-Pou (2025-09-12 04:36:11)
> Following B2120 boards removal in commit dee546e1adef ("ARM: sti: drop
> B2120 board support"), several compatibles are left unused.  Remove
> them.
> 
> Signed-off-by: Raphael Gallais-Pou <rgallaispou@gmail.com>
> ---

Applied to clk-next

Re: [PATCH v2 4/5] clk: st: flexgen: remove unused compatible

Posted by Brian Masney 2 weeks, 6 days ago

On Fri, Sep 12, 2025 at 01:36:11PM +0200, Raphael Gallais-Pou wrote:
> Following B2120 boards removal in commit dee546e1adef ("ARM: sti: drop
> B2120 board support"), several compatibles are left unused.  Remove
> them.
> 
> Signed-off-by: Raphael Gallais-Pou <rgallaispou@gmail.com>

Reviewed-by: Brian Masney <bmasney@redhat.com>

Re: [PATCH v2 4/5] clk: st: flexgen: remove unused compatible

Posted by Patrice CHOTARD 2 weeks, 6 days ago


On 9/12/25 13:36, Raphael Gallais-Pou wrote:
> Following B2120 boards removal in commit dee546e1adef ("ARM: sti: drop
> B2120 board support"), several compatibles are left unused.  Remove
> them.
> 
> Signed-off-by: Raphael Gallais-Pou <rgallaispou@gmail.com>
> ---
>  drivers/clk/st/clk-flexgen.c | 80 --------------------------------------------
>  1 file changed, 80 deletions(-)
> 
> diff --git a/drivers/clk/st/clk-flexgen.c b/drivers/clk/st/clk-flexgen.c
> index 5292208c4dd8b45edfe7c2722e934dd0299c6d34..e8e7626c76db06b2255908a6658bca1f42600c85 100644
> --- a/drivers/clk/st/clk-flexgen.c
> +++ b/drivers/clk/st/clk-flexgen.c
> @@ -303,16 +303,6 @@ static const struct clkgen_data clkgen_video = {
>  	.mode = 1,
>  };
>  
> -static const struct clkgen_clk_out clkgen_stih407_a0_clk_out[] = {
> -	/* This clk needs to be on so that memory interface is accessible */
> -	{ .name = "clk-ic-lmi0", .flags = CLK_IS_CRITICAL },
> -};
> -
> -static const struct clkgen_data clkgen_stih407_a0 = {
> -	.outputs = clkgen_stih407_a0_clk_out,
> -	.outputs_nb = ARRAY_SIZE(clkgen_stih407_a0_clk_out),
> -};
> -
>  static const struct clkgen_clk_out clkgen_stih410_a0_clk_out[] = {
>  	/* Those clks need to be on so that memory interface is accessible */
>  	{ .name = "clk-ic-lmi0", .flags = CLK_IS_CRITICAL },
> @@ -324,51 +314,6 @@ static const struct clkgen_data clkgen_stih410_a0 = {
>  	.outputs_nb = ARRAY_SIZE(clkgen_stih410_a0_clk_out),
>  };
>  
> -static const struct clkgen_clk_out clkgen_stih407_c0_clk_out[] = {
> -	{ .name = "clk-icn-gpu", },
> -	{ .name = "clk-fdma", },
> -	{ .name = "clk-nand", },
> -	{ .name = "clk-hva", },
> -	{ .name = "clk-proc-stfe", },
> -	{ .name = "clk-proc-tp", },
> -	{ .name = "clk-rx-icn-dmu", },
> -	{ .name = "clk-rx-icn-hva", },
> -	/* This clk needs to be on to keep bus interconnect alive */
> -	{ .name = "clk-icn-cpu", .flags = CLK_IS_CRITICAL },
> -	/* This clk needs to be on to keep bus interconnect alive */
> -	{ .name = "clk-tx-icn-dmu", .flags = CLK_IS_CRITICAL },
> -	{ .name = "clk-mmc-0", },
> -	{ .name = "clk-mmc-1", },
> -	{ .name = "clk-jpegdec", },
> -	/* This clk needs to be on to keep A9 running */
> -	{ .name = "clk-ext2fa9", .flags = CLK_IS_CRITICAL },
> -	{ .name = "clk-ic-bdisp-0", },
> -	{ .name = "clk-ic-bdisp-1", },
> -	{ .name = "clk-pp-dmu", },
> -	{ .name = "clk-vid-dmu", },
> -	{ .name = "clk-dss-lpc", },
> -	{ .name = "clk-st231-aud-0", },
> -	{ .name = "clk-st231-gp-1", },
> -	{ .name = "clk-st231-dmu", },
> -	/* This clk needs to be on to keep bus interconnect alive */
> -	{ .name = "clk-icn-lmi", .flags = CLK_IS_CRITICAL },
> -	{ .name = "clk-tx-icn-disp-1", },
> -	/* This clk needs to be on to keep bus interconnect alive */
> -	{ .name = "clk-icn-sbc", .flags = CLK_IS_CRITICAL },
> -	{ .name = "clk-stfe-frc2", },
> -	{ .name = "clk-eth-phy", },
> -	{ .name = "clk-eth-ref-phyclk", },
> -	{ .name = "clk-flash-promip", },
> -	{ .name = "clk-main-disp", },
> -	{ .name = "clk-aux-disp", },
> -	{ .name = "clk-compo-dvp", },
> -};
> -
> -static const struct clkgen_data clkgen_stih407_c0 = {
> -	.outputs = clkgen_stih407_c0_clk_out,
> -	.outputs_nb = ARRAY_SIZE(clkgen_stih407_c0_clk_out),
> -};
> -
>  static const struct clkgen_clk_out clkgen_stih410_c0_clk_out[] = {
>  	{ .name = "clk-icn-gpu", },
>  	{ .name = "clk-fdma", },
> @@ -482,19 +427,6 @@ static const struct clkgen_data clkgen_stih418_c0 = {
>  	.outputs_nb = ARRAY_SIZE(clkgen_stih418_c0_clk_out),
>  };
>  
> -static const struct clkgen_clk_out clkgen_stih407_d0_clk_out[] = {
> -	{ .name = "clk-pcm-0", },
> -	{ .name = "clk-pcm-1", },
> -	{ .name = "clk-pcm-2", },
> -	{ .name = "clk-spdiff", },
> -};
> -
> -static const struct clkgen_data clkgen_stih407_d0 = {
> -	.flags = CLK_SET_RATE_PARENT,
> -	.outputs = clkgen_stih407_d0_clk_out,
> -	.outputs_nb = ARRAY_SIZE(clkgen_stih407_d0_clk_out),
> -};
> -
>  static const struct clkgen_clk_out clkgen_stih410_d0_clk_out[] = {
>  	{ .name = "clk-pcm-0", },
>  	{ .name = "clk-pcm-1", },
> @@ -596,18 +528,10 @@ static const struct of_device_id flexgen_of_match[] = {
>  		.compatible = "st,flexgen-video",
>  		.data = &clkgen_video,
>  	},
> -	{
> -		.compatible = "st,flexgen-stih407-a0",
> -		.data = &clkgen_stih407_a0,
> -	},
>  	{
>  		.compatible = "st,flexgen-stih410-a0",
>  		.data = &clkgen_stih410_a0,
>  	},
> -	{
> -		.compatible = "st,flexgen-stih407-c0",
> -		.data = &clkgen_stih407_c0,
> -	},
>  	{
>  		.compatible = "st,flexgen-stih410-c0",
>  		.data = &clkgen_stih410_c0,
> @@ -616,10 +540,6 @@ static const struct of_device_id flexgen_of_match[] = {
>  		.compatible = "st,flexgen-stih418-c0",
>  		.data = &clkgen_stih418_c0,
>  	},
> -	{
> -		.compatible = "st,flexgen-stih407-d0",
> -		.data = &clkgen_stih407_d0,
> -	},
>  	{
>  		.compatible = "st,flexgen-stih410-d0",
>  		.data = &clkgen_stih410_d0,
> 
Reviewed-by: Patrice Chotard <patrice.chotard@foss.st.com>

Thanks
Patrice