diff mbox series

[5/5] soc: renesas: remove r8a77950 arch

Message ID 20230307105645.5285-6-wsa+renesas@sang-engineering.com
State New
Headers
Series renesas: remove support for H3 ES1 |

Commit Message

Wolfram Sang March 7, 2023, 10:56 a.m. UTC 
  R-Car H3 ES1.* was only available to an internal development group and
needed a lot of quirks and workarounds. These become a maintenance
burden now, so our development group decided to remove upstream support
and disable booting for this SoC. Public users only have ES2 onwards.

Remove the architecture which describes H3 ES1.*.

Reviewed-by: Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com>
Reviewed-by: Geert Uytterhoeven <geert+renesas@glider.be>
Signed-off-by: Wolfram Sang <wsa+renesas@sang-engineering.com>
---
 arch/arm64/configs/defconfig      | 1 -
 drivers/soc/renesas/Kconfig       | 7 -------
 drivers/soc/renesas/renesas-soc.c | 2 +-
 3 files changed, 1 insertion(+), 9 deletions(-)

Comments

Geert Uytterhoeven March 8, 2023, 9:57 a.m. UTC | #1 
Hi Wolfram,

On Tue, Mar 7, 2023 at 11:57 AM Wolfram Sang
<wsa+renesas@sang-engineering.com> wrote:
> R-Car H3 ES1.* was only available to an internal development group and
> needed a lot of quirks and workarounds. These become a maintenance
> burden now, so our development group decided to remove upstream support
> and disable booting for this SoC. Public users only have ES2 onwards.
>
> Remove the architecture which describes H3 ES1.*.
>
> Reviewed-by: Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com>
> Reviewed-by: Geert Uytterhoeven <geert+renesas@glider.be>
> Signed-off-by: Wolfram Sang <wsa+renesas@sang-engineering.com>

Thanks for your patch!

> ---
>  arch/arm64/configs/defconfig      | 1 -
>  drivers/soc/renesas/Kconfig       | 7 -------
>  drivers/soc/renesas/renesas-soc.c | 2 +-

I will split this in two patches (defconfig and drivers/soc)...

> --- a/drivers/soc/renesas/renesas-soc.c
> +++ b/drivers/soc/renesas/renesas-soc.c
> @@ -330,7 +330,7 @@ static const struct of_device_id renesas_socs[] __initconst = {
>  #ifdef CONFIG_ARCH_R8A7794
>         { .compatible = "renesas,r8a7794",      .data = &soc_rcar_e2 },
>  #endif
> -#if defined(CONFIG_ARCH_R8A77950) || defined(CONFIG_ARCH_R8A77951)
> +#if defined(CONFIG_ARCH_R8A77951)
>         { .compatible = "renesas,r8a7795",      .data = &soc_rcar_h3 },

... and merge this with the section below ...

>  #endif
>  #ifdef CONFIG_ARCH_R8A77951

... while queuing in renesas-devel for v6.4.

Gr{oetje,eeting}s,

                        Geert
Wolfram Sang March 8, 2023, 12:16 p.m. UTC | #2 
Hi Geert,

> ... while queuing in renesas-devel for v6.4.

Thank you for the fixups!

Happy hacking,

   Wolfram
diff mbox series

Patch

diff --git a/arch/arm64/configs/defconfig b/arch/arm64/configs/defconfig
index 7790ee42c68a..ef88f86fbfda 100644
--- a/arch/arm64/configs/defconfig
+++ b/arch/arm64/configs/defconfig
@@ -1217,7 +1217,6 @@  CONFIG_QCOM_APR=m
 CONFIG_QCOM_ICC_BWMON=m
 CONFIG_ARCH_R8A77995=y
 CONFIG_ARCH_R8A77990=y
-CONFIG_ARCH_R8A77950=y
 CONFIG_ARCH_R8A77951=y
 CONFIG_ARCH_R8A77965=y
 CONFIG_ARCH_R8A77960=y
diff --git a/drivers/soc/renesas/Kconfig b/drivers/soc/renesas/Kconfig
index 4e8b51ba2266..de31589ed054 100644
--- a/drivers/soc/renesas/Kconfig
+++ b/drivers/soc/renesas/Kconfig
@@ -206,13 +206,6 @@  config ARCH_R8A77990
 	  This enables support for the Renesas R-Car E3 SoC.
 	  This includes different gradings like R-Car E3e.
 
-config ARCH_R8A77950
-	bool "ARM64 Platform support for R-Car H3 ES1.x"
-	select ARCH_RCAR_GEN3
-	select SYSC_R8A7795
-	help
-	  This enables support for the Renesas R-Car H3 SoC (revision 1.x).
-
 config ARCH_R8A77951
 	bool "ARM64 Platform support for R-Car H3 ES2.0+"
 	select ARCH_RCAR_GEN3
diff --git a/drivers/soc/renesas/renesas-soc.c b/drivers/soc/renesas/renesas-soc.c
index 468ebce1ea88..66ff1c25f85f 100644
--- a/drivers/soc/renesas/renesas-soc.c
+++ b/drivers/soc/renesas/renesas-soc.c
@@ -330,7 +330,7 @@  static const struct of_device_id renesas_socs[] __initconst = {
 #ifdef CONFIG_ARCH_R8A7794
 	{ .compatible = "renesas,r8a7794",	.data = &soc_rcar_e2 },
 #endif
-#if defined(CONFIG_ARCH_R8A77950) || defined(CONFIG_ARCH_R8A77951)
+#if defined(CONFIG_ARCH_R8A77951)
 	{ .compatible = "renesas,r8a7795",	.data = &soc_rcar_h3 },
 #endif
 #ifdef CONFIG_ARCH_R8A77951