Skip to content

Commit 9685b29

Browse files
glneoarndb
authored andcommitted
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>
1 parent 1141f2f commit 9685b29

7 files changed

Lines changed: 25 additions & 43 deletions

File tree

MAINTAINERS

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2728,7 +2728,6 @@ F: Documentation/devicetree/bindings/spi/hpe,gxp-spifi.yaml
27282728
F: Documentation/devicetree/bindings/timer/hpe,gxp-timer.yaml
27292729
F: Documentation/hwmon/gxp-fan-ctrl.rst
27302730
F: arch/arm/boot/dts/hpe/
2731-
F: arch/arm/mach-hpe/
27322731
F: drivers/clocksource/timer-gxp.c
27332732
F: drivers/hwmon/gxp-fan-ctrl.c
27342733
F: drivers/i2c/busses/i2c-gxp.c

arch/arm/Kconfig

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -393,8 +393,6 @@ source "arch/arm/mach-highbank/Kconfig"
393393

394394
source "arch/arm/mach-hisi/Kconfig"
395395

396-
source "arch/arm/mach-hpe/Kconfig"
397-
398396
source "arch/arm/mach-imx/Kconfig"
399397

400398
source "arch/arm/mach-ixp4xx/Kconfig"

arch/arm/Kconfig.platforms

Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -87,6 +87,31 @@ config MACH_ASM9260
8787
help
8888
Support for Alphascale ASM9260 based platform.
8989

90+
menuconfig ARCH_HPE
91+
bool "HPE SoC support"
92+
depends on ARCH_MULTI_V7
93+
help
94+
This enables support for HPE ARM based BMC chips.
95+
96+
if ARCH_HPE
97+
98+
config ARCH_HPE_GXP
99+
bool "HPE GXP SoC"
100+
depends on ARCH_MULTI_V7
101+
select ARM_VIC
102+
select GENERIC_IRQ_CHIP
103+
select CLKSRC_MMIO
104+
help
105+
HPE GXP is the name of the HPE Soc. This SoC is used to implement many
106+
BMC features at HPE. It supports ARMv7 architecture based on the Cortex
107+
A9 core. It is capable of using an AXI bus to which a memory controller
108+
is attached. It has multiple SPI interfaces to connect boot flash and
109+
BIOS flash. It uses a 10/100/1000 MAC for network connectivity. It
110+
has multiple i2c engines to drive connectivity with a host
111+
infrastructure.
112+
113+
endif
114+
90115
menuconfig ARCH_MOXART
91116
bool "MOXA ART SoC"
92117
depends on ARCH_MULTI_V4

arch/arm/Makefile

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -189,7 +189,6 @@ machine-$(CONFIG_ARCH_FOOTBRIDGE) += footbridge
189189
machine-$(CONFIG_ARCH_GEMINI) += gemini
190190
machine-$(CONFIG_ARCH_HIGHBANK) += highbank
191191
machine-$(CONFIG_ARCH_HISI) += hisi
192-
machine-$(CONFIG_ARCH_HPE) += hpe
193192
machine-$(CONFIG_ARCH_IXP4XX) += ixp4xx
194193
machine-$(CONFIG_ARCH_KEYSTONE) += keystone
195194
machine-$(CONFIG_ARCH_LPC18XX) += lpc18xx

arch/arm/mach-hpe/Kconfig

Lines changed: 0 additions & 23 deletions
This file was deleted.

arch/arm/mach-hpe/Makefile

Lines changed: 0 additions & 1 deletion
This file was deleted.

arch/arm/mach-hpe/gxp.c

Lines changed: 0 additions & 15 deletions
This file was deleted.

0 commit comments

Comments
 (0)