Kernel/linux-next
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/next/linux-next.git synced 2024-12-29 17:22:07 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

ARM: mach-sunplus: Rework support and directory structure

Browse Source 
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>
This commit is contained in:
Andrew Davis 2023-11-13 08:43:57 -06:00 committed by Arnd Bergmann
parent 00e58c36d2
commit ae73dadb12
7 changed files with 29 additions and 55 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
MAINTAINERS
View File

@ -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

2
arch/arm/Kconfig
View File

@ -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"

29
arch/arm/Kconfig.platforms
View File

@ -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

1
arch/arm/Makefile
View File

@ -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

27
arch/arm/mach-sunplus/Kconfig
View File

@ -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.

8
arch/arm/mach-sunplus/Makefile
View File

@ -1,8 +0,0 @@
# SPDX-License-Identifier: GPL-2.0
#
# Makefile for the linux kernel.
#
# Object file lists.
obj-$(CONFIG_SOC_SP7021) += sp7021.o

16
arch/arm/mach-sunplus/sp7021.c
View File

@ -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