ARM: mach-hpe: 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-hpe/ 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, we drop the l2c_aux_mask = ~0 line, but this is safe as
the fallback GENERIC_DT machine has that as the default.

Signed-off-by: Andrew Davis <afd@ti.com>
Link: https://lore.kernel.org/r/20250813170308.290349-1-afd@ti.com
Signed-off-by: Arnd Bergmann <arnd@arndb.de>

diff --git a/MAINTAINERS b/MAINTAINERS
index 6dcfbd11efef87927041f5cf58d70633dbb4b18d..81ab6ac5df1dd4def5364a9b2d320bd17383b2b7 100644 (file)
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -2728,7 +2728,6 @@ F:        Documentation/devicetree/bindings/spi/hpe,gxp-spifi.yaml
 F:     Documentation/devicetree/bindings/timer/hpe,gxp-timer.yaml
 F:     Documentation/hwmon/gxp-fan-ctrl.rst
 F:     arch/arm/boot/dts/hpe/
-F:     arch/arm/mach-hpe/
 F:     drivers/clocksource/timer-gxp.c
 F:     drivers/hwmon/gxp-fan-ctrl.c
 F:     drivers/i2c/busses/i2c-gxp.c

diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig
index b1f3df39ed4068f215a3460d5c4e021136438eaa..f8faa15c6a15f1fa2a183d29c3a69828312d090c 100644 (file)
--- a/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
@@ -393,8 +393,6 @@ source "arch/arm/mach-highbank/Kconfig"
 
 source "arch/arm/mach-hisi/Kconfig"
 
-source "arch/arm/mach-hpe/Kconfig"
-
 source "arch/arm/mach-imx/Kconfig"
 
 source "arch/arm/mach-ixp4xx/Kconfig"

diff --git a/arch/arm/Kconfig.platforms b/arch/arm/Kconfig.platforms
index 845ab08e20a4b5b669428e738f9f680a7adda948..5c19c1f2cff612a4c9ae413712de54e7593c7671 100644 (file)
--- a/arch/arm/Kconfig.platforms
+++ b/arch/arm/Kconfig.platforms
@@ -87,6 +87,31 @@ config MACH_ASM9260
        help
          Support for Alphascale ASM9260 based platform.
 
+menuconfig ARCH_HPE
+       bool "HPE SoC support"
+       depends on ARCH_MULTI_V7
+       help
+         This enables support for HPE ARM based BMC chips.
+
+if ARCH_HPE
+
+config ARCH_HPE_GXP
+       bool "HPE GXP SoC"
+       depends on ARCH_MULTI_V7
+       select ARM_VIC
+       select GENERIC_IRQ_CHIP
+       select CLKSRC_MMIO
+       help
+         HPE GXP is the name of the HPE Soc. This SoC is used to implement many
+         BMC features at HPE. It supports ARMv7 architecture based on the Cortex
+         A9 core. It is capable of using an AXI bus to which a memory controller
+         is attached. It has multiple SPI interfaces to connect boot flash and
+         BIOS flash. It uses a 10/100/1000 MAC for network connectivity. It
+         has multiple i2c engines to drive connectivity with a host
+         infrastructure.
+
+endif
+
 menuconfig ARCH_MOXART
        bool "MOXA ART SoC"
        depends on ARCH_MULTI_V4

diff --git a/arch/arm/Makefile b/arch/arm/Makefile
index e31e95ffd33fcf28d4ea1bdaa7d3386570f5c062..b7de4b6b284ca27ea6d5eb664f873cb83774419b 100644 (file)
--- a/arch/arm/Makefile
+++ b/arch/arm/Makefile
@@ -189,7 +189,6 @@ machine-$(CONFIG_ARCH_FOOTBRIDGE)   += footbridge
 machine-$(CONFIG_ARCH_GEMINI)          += gemini
 machine-$(CONFIG_ARCH_HIGHBANK)                += highbank
 machine-$(CONFIG_ARCH_HISI)            += hisi
-machine-$(CONFIG_ARCH_HPE)             += hpe
 machine-$(CONFIG_ARCH_IXP4XX)          += ixp4xx
 machine-$(CONFIG_ARCH_KEYSTONE)                += keystone
 machine-$(CONFIG_ARCH_LPC18XX)         += lpc18xx

diff --git a/arch/arm/mach-hpe/Kconfig b/arch/arm/mach-hpe/Kconfig
deleted file mode 100644 (file)
index 3372bbf..0000000
--- a/arch/arm/mach-hpe/Kconfig
+++ /dev/null
@@ -1,23 +0,0 @@
-menuconfig ARCH_HPE
-       bool "HPE SoC support"
-       depends on ARCH_MULTI_V7
-       help
-         This enables support for HPE ARM based BMC chips.
-if ARCH_HPE
-
-config ARCH_HPE_GXP
-       bool "HPE GXP SoC"
-       depends on ARCH_MULTI_V7
-       select ARM_VIC
-       select GENERIC_IRQ_CHIP
-       select CLKSRC_MMIO
-       help
-         HPE GXP is the name of the HPE Soc. This SoC is used to implement many
-         BMC features at HPE. It supports ARMv7 architecture based on the Cortex
-         A9 core. It is capable of using an AXI bus to which a memory controller
-         is attached. It has multiple SPI interfaces to connect boot flash and
-         BIOS flash. It uses a 10/100/1000 MAC for network connectivity. It
-         has multiple i2c engines to drive connectivity with a host
-         infrastructure.
-
-endif

diff --git a/arch/arm/mach-hpe/Makefile b/arch/arm/mach-hpe/Makefile
deleted file mode 100644 (file)
index 8b0a912..0000000
--- a/arch/arm/mach-hpe/Makefile
+++ /dev/null
@@ -1 +0,0 @@
-obj-$(CONFIG_ARCH_HPE_GXP) += gxp.o

diff --git a/arch/arm/mach-hpe/gxp.c b/arch/arm/mach-hpe/gxp.c
deleted file mode 100644 (file)
index 581c8da..0000000
--- a/arch/arm/mach-hpe/gxp.c
+++ /dev/null
@@ -1,15 +0,0 @@
-// SPDX-License-Identifier: GPL-2.0
-/* Copyright (C) 2022 Hewlett-Packard Enterprise Development Company, L.P. */
-
-#include <asm/mach/arch.h>
-
-static const char * const gxp_board_dt_compat[] = {
-       "hpe,gxp",
-       NULL,
-};
-
-DT_MACHINE_START(GXP_DT, "HPE GXP")
-       .dt_compat      = gxp_board_dt_compat,
-       .l2c_aux_val = 0,
-       .l2c_aux_mask = ~0,
-MACHINE_END