From: Geert Uytterhoeven <[email protected]>

The Kconfig symbol for Renesas 64-bit ARM SoCs has always been
ARCH_RENESAS, with ARCH_SHMOBILE being selected to reuse drivers shared
with Renesas 32-bit ARM and/or Renesas SuperH SH-Mobile SoCs.

Commit 9b5ba0df4ea4f940 ("ARM: shmobile: Introduce ARCH_RENESAS")
started the conversion from ARCH_SHMOBILE to ARCH_RENESAS for Renesas
32-bit SoCs.  Now all drivers for Renesas ARM SoCs have gained proper
ARCH_RENESAS platform dependencies, there is no longer a need to select
ARCH_SHMOBILE.

With ARCH_SHMOBILE gone, move the ARCH_RENESAS section up, to restore
alphabetical sort order.

Signed-off-by: Geert Uytterhoeven <[email protected]>
Acked-by: Arnd Bergmann <[email protected]>
Signed-off-by: Simon Horman <[email protected]>
---
 arch/arm64/Kconfig.platforms | 44 ++++++++++++++++++++------------------------
 1 file changed, 20 insertions(+), 24 deletions(-)

diff --git a/arch/arm64/Kconfig.platforms b/arch/arm64/Kconfig.platforms
index 393d2b524284..b3c4c66f8519 100644
--- a/arch/arm64/Kconfig.platforms
+++ b/arch/arm64/Kconfig.platforms
@@ -152,32 +152,8 @@ config ARCH_REALTEK
          This enables support for the ARMv8 based Realtek chipsets,
          like the RTD1295.
 
-config ARCH_ROCKCHIP
-       bool "Rockchip Platforms"
-       select ARCH_HAS_RESET_CONTROLLER
-       select GPIOLIB
-       select PINCTRL
-       select PINCTRL_ROCKCHIP
-       select PM
-       select ROCKCHIP_TIMER
-       help
-         This enables support for the ARMv8 based Rockchip chipsets,
-         like the RK3368.
-
-config ARCH_SEATTLE
-       bool "AMD Seattle SoC Family"
-       help
-         This enables support for AMD Seattle SOC Family
-
-config ARCH_SHMOBILE
-       bool
-
-config ARCH_SYNQUACER
-       bool "Socionext SynQuacer SoC Family"
-
 config ARCH_RENESAS
        bool "Renesas SoC Platforms"
-       select ARCH_SHMOBILE
        select PINCTRL
        select PM
        select PM_GENERIC_DOMAINS
@@ -228,11 +204,31 @@ config ARCH_R8A77995
        help
          This enables support for the Renesas R-Car D3 SoC.
 
+config ARCH_ROCKCHIP
+       bool "Rockchip Platforms"
+       select ARCH_HAS_RESET_CONTROLLER
+       select GPIOLIB
+       select PINCTRL
+       select PINCTRL_ROCKCHIP
+       select PM
+       select ROCKCHIP_TIMER
+       help
+         This enables support for the ARMv8 based Rockchip chipsets,
+         like the RK3368.
+
+config ARCH_SEATTLE
+       bool "AMD Seattle SoC Family"
+       help
+         This enables support for AMD Seattle SOC Family
+
 config ARCH_STRATIX10
        bool "Altera's Stratix 10 SoCFPGA Family"
        help
          This enables support for Altera's Stratix 10 SoCFPGA Family.
 
+config ARCH_SYNQUACER
+       bool "Socionext SynQuacer SoC Family"
+
 config ARCH_TEGRA
        bool "NVIDIA Tegra SoC Family"
        select ARCH_HAS_RESET_CONTROLLER
-- 
2.11.0

Reply via email to