ARM: mach-sunplus: Rework support and directory structure

Having a platform need a mach-* directory should be seen as a negative,
it means the platform needs special non-standard handling. ARM64 support
does not allow mach-* directories at all. While we may not get to that
given all the non-standard architectures we support, we should still try
to get as close as we can and reduce the number of mach directories.

The mach-sunplus/ directory and files, provides just one "feature":
having the kernel print the machine name if the DTB does not also contain
a "model" string (which they always do). To reduce the number of mach-*
directories let's do without that feature and remove this directory.

NOTE: The default l2c_aux_mask is now ~0 but these devices never have
this type of cache controller so this is safe.

Signed-off-by: Andrew Davis <afd@ti.com>
Signed-off-by: Arnd Bergmann <arnd@arndb.de>

diff --git a/MAINTAINERS b/MAINTAINERS
index d378e05ff680aec2c92a61b4b00c7bfe5f0bbf42..a3ad4f9bd2ec8da076fd22dff25c35d12eb90058 100644 (file)
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -2838,7 +2838,6 @@ F:        Documentation/devicetree/bindings/interrupt-controller/sunplus,sp7021-intc.ya
 F:     Documentation/devicetree/bindings/reset/sunplus,reset.yaml
 F:     arch/arm/boot/dts/sunplus/
 F:     arch/arm/configs/sp7021_*defconfig
-F:     arch/arm/mach-sunplus/
 F:     drivers/clk/clk-sp7021.c
 F:     drivers/irqchip/irq-sp7021-intc.c
 F:     drivers/reset/reset-sunplus.c

diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig
index fbdf366d260a6b41ad55fc939a742f997278fc1b..395530fe22402ec1ced1f4a1dc732ab1ee471a1b 100644 (file)
--- a/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
@@ -447,8 +447,6 @@ source "arch/arm/mach-sti/Kconfig"
 
 source "arch/arm/mach-stm32/Kconfig"
 
-source "arch/arm/mach-sunplus/Kconfig"
-
 source "arch/arm/mach-sunxi/Kconfig"
 
 source "arch/arm/mach-tegra/Kconfig"

diff --git a/arch/arm/Kconfig.platforms b/arch/arm/Kconfig.platforms
index 38457d5a18fffaeafd87a7e4ca0fd6f404fb45cc..acaced2f0ab049f8f17e7d14c1de27e2a5981bfd 100644 (file)
--- a/arch/arm/Kconfig.platforms
+++ b/arch/arm/Kconfig.platforms
@@ -123,6 +123,35 @@ config ARCH_RDA
        help
          This enables support for the RDA Micro 8810PL SoC family.
 
+menuconfig ARCH_SUNPLUS
+       bool "Sunplus SoCs"
+       depends on ARCH_MULTI_V7
+       help
+         Support for Sunplus SoC family: SP7021 and succeeding SoC-based systems,
+         such as the Banana Pi BPI-F2S development board (and derivatives).
+         (<http://www.sinovoip.com.cn/ecp_view.asp?id=586>)
+         (<https://tibbo.com/store/plus1.html>)
+
+if ARCH_SUNPLUS
+
+config SOC_SP7021
+       bool "Sunplus SP7021 SoC support"
+       default ARCH_SUNPLUS
+       select HAVE_ARM_ARCH_TIMER
+       select ARM_GIC
+       select ARM_PSCI
+       select PINCTRL
+       select PINCTRL_SPPCTL
+       select SERIAL_SUNPLUS if TTY
+       select SERIAL_SUNPLUS_CONSOLE if TTY
+       help
+         Support for Sunplus SP7021 SoC. It is based on ARM 4-core
+         Cortex-A7 with various peripherals (e.g.: I2C, SPI, SDIO,
+         Ethernet, etc.), FPGA interface,  chip-to-chip bus.
+         It is designed for industrial control.
+
+endif
+
 config ARCH_UNIPHIER
        bool "Socionext UniPhier SoCs"
        depends on ARCH_MULTI_V7

diff --git a/arch/arm/Makefile b/arch/arm/Makefile
index eb72b092d7b4aca1275a30bc3316d941de89dea4..699be64a74be6c9c480f3b3da5de2f8e66a36897 100644 (file)
--- a/arch/arm/Makefile
+++ b/arch/arm/Makefile
@@ -216,7 +216,6 @@ machine-$(CONFIG_ARCH_RENESAS)              += shmobile
 machine-$(CONFIG_ARCH_INTEL_SOCFPGA)   += socfpga
 machine-$(CONFIG_ARCH_STI)             += sti
 machine-$(CONFIG_ARCH_STM32)           += stm32
-machine-$(CONFIG_ARCH_SUNPLUS)         += sunplus
 machine-$(CONFIG_ARCH_SUNXI)           += sunxi
 machine-$(CONFIG_ARCH_TEGRA)           += tegra
 machine-$(CONFIG_ARCH_U8500)           += ux500

diff --git a/arch/arm/mach-sunplus/Kconfig b/arch/arm/mach-sunplus/Kconfig
deleted file mode 100644 (file)
index d0c2416..0000000
--- a/arch/arm/mach-sunplus/Kconfig
+++ /dev/null
@@ -1,27 +0,0 @@
-# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause)
-
-menuconfig ARCH_SUNPLUS
-       bool "Sunplus SoCs"
-       depends on ARCH_MULTI_V7
-       help
-         Support for Sunplus SoC family: SP7021 and succeeding SoC-based systems,
-         such as the Banana Pi BPI-F2S development board (and derivatives).
-         (<http://www.sinovoip.com.cn/ecp_view.asp?id=586>)
-         (<https://tibbo.com/store/plus1.html>)
-
-config SOC_SP7021
-       bool "Sunplus SP7021 SoC support"
-       depends on ARCH_SUNPLUS
-       default ARCH_SUNPLUS
-       select HAVE_ARM_ARCH_TIMER
-       select ARM_GIC
-       select ARM_PSCI
-       select PINCTRL
-       select PINCTRL_SPPCTL
-       select SERIAL_SUNPLUS if TTY
-       select SERIAL_SUNPLUS_CONSOLE if TTY
-       help
-         Support for Sunplus SP7021 SoC. It is based on ARM 4-core
-         Cortex-A7 with various peripherals (e.g.: I2C, SPI, SDIO,
-         Ethernet, etc.), FPGA interface,  chip-to-chip bus.
-         It is designed for industrial control.

diff --git a/arch/arm/mach-sunplus/Makefile b/arch/arm/mach-sunplus/Makefile
deleted file mode 100644 (file)
index d211de6..0000000
--- a/arch/arm/mach-sunplus/Makefile
+++ /dev/null
@@ -1,8 +0,0 @@
-# SPDX-License-Identifier: GPL-2.0
-#
-# Makefile for the linux kernel.
-#
-
-# Object file lists.
-
-obj-$(CONFIG_SOC_SP7021)       += sp7021.o

diff --git a/arch/arm/mach-sunplus/sp7021.c b/arch/arm/mach-sunplus/sp7021.c
deleted file mode 100644 (file)
index 774d0a5..0000000
--- a/arch/arm/mach-sunplus/sp7021.c
+++ /dev/null
@@ -1,16 +0,0 @@
-// SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause)
-/*
- * Copyright (C) Sunplus Technology Co., Ltd.
- *       All rights reserved.
- */
-#include <linux/kernel.h>
-#include <asm/mach/arch.h>
-
-static const char *sp7021_compat[] __initconst = {
-       "sunplus,sp7021",
-       NULL
-};
-
-DT_MACHINE_START(SP7021_DT, "SP7021")
-       .dt_compat      = sp7021_compat,
-MACHINE_END