ARM: mach-uniphier: Move Socionext UniPhier support into Kconfig.platforms

This removes the need for a dedicated Kconfig and empty mach directory.

Signed-off-by: Andrew Davis <afd@ti.com>
Reviewed-by: Masami Hiramatsu (Google) <mhiramat@kernel.org>
Signed-off-by: Arnd Bergmann <arnd@arndb.de>

diff --git a/MAINTAINERS b/MAINTAINERS
index bf4def55293f0b829808d758d16a8a163723af59..d378e05ff680aec2c92a61b4b00c7bfe5f0bbf42 100644 (file)
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -2958,7 +2958,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 e1aeaf25d7aab1e1cf1d52f501c880787e381617..cfdfba4d52e1902f2ea2425db6010ccced299d17 100644 (file)
--- 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 80f5b040e6ef489674447cae2970e4c09a6833e2..0e6d7172bf61ed3635dd6e6a8e1f987b9f584ff9 100644 (file)
--- 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 (file)
index e661d26..0000000
--- 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)