[v3,4/9] ARM: mach-uniphier: Move Socionext UniPhier support into Kconfig.platforms
Commit Message
This removes the need for a dedicated Kconfig and empty mach directory.
Signed-off-by: Andrew Davis <afd@ti.com>
---
MAINTAINERS | 1 -
arch/arm/Kconfig | 2 --
arch/arm/Kconfig.platforms | 15 +++++++++++++++
arch/arm/mach-uniphier/Kconfig | 15 ---------------
4 files changed, 15 insertions(+), 18 deletions(-)
delete mode 100644 arch/arm/mach-uniphier/Kconfig
Comments
On Mon, 13 Nov 2023 08:43:54 -0600
Andrew Davis <afd@ti.com> wrote:
> This removes the need for a dedicated Kconfig and empty mach directory.
>
> Signed-off-by: Andrew Davis <afd@ti.com>
This looks good to me.
Reviewed-by: Masami Hiramatsu (Google) <mhiramat@kernel.org>
Thanks,
> ---
> MAINTAINERS | 1 -
> arch/arm/Kconfig | 2 --
> arch/arm/Kconfig.platforms | 15 +++++++++++++++
> arch/arm/mach-uniphier/Kconfig | 15 ---------------
> 4 files changed, 15 insertions(+), 18 deletions(-)
> delete mode 100644 arch/arm/mach-uniphier/Kconfig
>
> diff --git a/MAINTAINERS b/MAINTAINERS
> index 97f51d5ec1cfd..b1ee757a4306d 100644
> --- a/MAINTAINERS
> +++ b/MAINTAINERS
> @@ -2957,7 +2957,6 @@ F: Documentation/devicetree/bindings/pinctrl/socionext,uniphier-pinctrl.yaml
> F: Documentation/devicetree/bindings/soc/socionext/socionext,uniphier*.yaml
> F: arch/arm/boot/dts/socionext/uniphier*
> F: arch/arm/include/asm/hardware/cache-uniphier.h
> -F: arch/arm/mach-uniphier/
> F: arch/arm/mm/cache-uniphier.c
> F: arch/arm64/boot/dts/socionext/uniphier*
> F: drivers/bus/uniphier-system-bus.c
> diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig
> index e1aeaf25d7aab..cfdfba4d52e19 100644
> --- a/arch/arm/Kconfig
> +++ b/arch/arm/Kconfig
> @@ -466,8 +466,6 @@ source "arch/arm/mach-sunxi/Kconfig"
>
> source "arch/arm/mach-tegra/Kconfig"
>
> -source "arch/arm/mach-uniphier/Kconfig"
> -
> source "arch/arm/mach-ux500/Kconfig"
>
> source "arch/arm/mach-versatile/Kconfig"
> diff --git a/arch/arm/Kconfig.platforms b/arch/arm/Kconfig.platforms
> index 80f5b040e6ef4..0e6d7172bf61e 100644
> --- a/arch/arm/Kconfig.platforms
> +++ b/arch/arm/Kconfig.platforms
> @@ -83,3 +83,18 @@ config ARCH_RDA
> select RDA_TIMER
> help
> This enables support for the RDA Micro 8810PL SoC family.
> +
> +config ARCH_UNIPHIER
> + bool "Socionext UniPhier SoCs"
> + depends on ARCH_MULTI_V7
> + select ARCH_HAS_RESET_CONTROLLER
> + select ARM_AMBA
> + select ARM_GLOBAL_TIMER
> + select ARM_GIC
> + select HAVE_ARM_SCU
> + select HAVE_ARM_TWD if SMP
> + select PINCTRL
> + select RESET_CONTROLLER
> + help
> + Support for UniPhier SoC family developed by Socionext Inc.
> + (formerly, System LSI Business Division of Panasonic Corporation)
> diff --git a/arch/arm/mach-uniphier/Kconfig b/arch/arm/mach-uniphier/Kconfig
> deleted file mode 100644
> index e661d26266751..0000000000000
> --- a/arch/arm/mach-uniphier/Kconfig
> +++ /dev/null
> @@ -1,15 +0,0 @@
> -# SPDX-License-Identifier: GPL-2.0
> -config ARCH_UNIPHIER
> - bool "Socionext UniPhier SoCs"
> - depends on ARCH_MULTI_V7
> - select ARCH_HAS_RESET_CONTROLLER
> - select ARM_AMBA
> - select ARM_GLOBAL_TIMER
> - select ARM_GIC
> - select HAVE_ARM_SCU
> - select HAVE_ARM_TWD if SMP
> - select PINCTRL
> - select RESET_CONTROLLER
> - help
> - Support for UniPhier SoC family developed by Socionext Inc.
> - (formerly, System LSI Business Division of Panasonic Corporation)
> --
> 2.39.2
>
@@ -2957,7 +2957,6 @@ F: Documentation/devicetree/bindings/pinctrl/socionext,uniphier-pinctrl.yaml
F: Documentation/devicetree/bindings/soc/socionext/socionext,uniphier*.yaml
F: arch/arm/boot/dts/socionext/uniphier*
F: arch/arm/include/asm/hardware/cache-uniphier.h
-F: arch/arm/mach-uniphier/
F: arch/arm/mm/cache-uniphier.c
F: arch/arm64/boot/dts/socionext/uniphier*
F: drivers/bus/uniphier-system-bus.c
@@ -466,8 +466,6 @@ source "arch/arm/mach-sunxi/Kconfig"
source "arch/arm/mach-tegra/Kconfig"
-source "arch/arm/mach-uniphier/Kconfig"
-
source "arch/arm/mach-ux500/Kconfig"
source "arch/arm/mach-versatile/Kconfig"
@@ -83,3 +83,18 @@ config ARCH_RDA
select RDA_TIMER
help
This enables support for the RDA Micro 8810PL SoC family.
+
+config ARCH_UNIPHIER
+ bool "Socionext UniPhier SoCs"
+ depends on ARCH_MULTI_V7
+ select ARCH_HAS_RESET_CONTROLLER
+ select ARM_AMBA
+ select ARM_GLOBAL_TIMER
+ select ARM_GIC
+ select HAVE_ARM_SCU
+ select HAVE_ARM_TWD if SMP
+ select PINCTRL
+ select RESET_CONTROLLER
+ help
+ Support for UniPhier SoC family developed by Socionext Inc.
+ (formerly, System LSI Business Division of Panasonic Corporation)
deleted file mode 100644
@@ -1,15 +0,0 @@
-# SPDX-License-Identifier: GPL-2.0
-config ARCH_UNIPHIER
- bool "Socionext UniPhier SoCs"
- depends on ARCH_MULTI_V7
- select ARCH_HAS_RESET_CONTROLLER
- select ARM_AMBA
- select ARM_GLOBAL_TIMER
- select ARM_GIC
- select HAVE_ARM_SCU
- select HAVE_ARM_TWD if SMP
- select PINCTRL
- select RESET_CONTROLLER
- help
- Support for UniPhier SoC family developed by Socionext Inc.
- (formerly, System LSI Business Division of Panasonic Corporation)