@@ -2270,7 +2270,6 @@ F: Documentation/devicetree/bindings/memory-controllers/intel,ixp4xx-expansion*
F: Documentation/devicetree/bindings/rng/intel,ixp46x-rng.yaml
F: Documentation/devicetree/bindings/timer/intel,ixp4xx-timer.yaml
F: arch/arm/boot/dts/intel/ixp/
-F: arch/arm/mach-ixp4xx/
F: drivers/bus/intel-ixp4xx-eb.c
F: drivers/char/hw_random/ixp4xx-rng.c
F: drivers/clocksource/timer-ixp4xx.c
@@ -112,6 +112,25 @@ config ARCH_HPE_GXP
endif
+config ARCH_IXP4XX
+ bool "IXP4xx-based platforms"
+ depends on ARCH_MULTI_V5
+ depends on CPU_BIG_ENDIAN
+ select ARM_APPENDED_DTB # Old Redboot bootloaders deployed
+ select CPU_XSCALE
+ select GPIO_IXP4XX
+ select GPIOLIB
+ select FORCE_PCI
+ select I2C
+ select I2C_IOP3XX
+ select IXP4XX_IRQ
+ select IXP4XX_TIMER
+ select USB_EHCI_BIG_ENDIAN_DESC
+ select USB_EHCI_BIG_ENDIAN_MMIO
+ select USE_OF
+ help
+ Support for Intel's IXP4XX (XScale) family of processors.
+
config ARCH_LPC18XX
bool "NXP LPC18xx/LPC43xx"
depends on ARM_SINGLE_ARMV7M
deleted file mode 100644
@@ -1,19 +0,0 @@
-# SPDX-License-Identifier: GPL-2.0-only
-menuconfig ARCH_IXP4XX
- bool "IXP4xx-based platforms"
- depends on ARCH_MULTI_V5
- depends on CPU_BIG_ENDIAN
- select ARM_APPENDED_DTB # Old Redboot bootloaders deployed
- select CPU_XSCALE
- select GPIO_IXP4XX
- select GPIOLIB
- select FORCE_PCI
- select I2C
- select I2C_IOP3XX
- select IXP4XX_IRQ
- select IXP4XX_TIMER
- select USB_EHCI_BIG_ENDIAN_DESC
- select USB_EHCI_BIG_ENDIAN_MMIO
- select USE_OF
- help
- Support for Intel's IXP4XX (XScale) family of processors.
deleted file mode 100644
@@ -1,2 +0,0 @@
-# SPDX-License-Identifier: GPL-2.0
-obj-y += ixp4xx-of.o
deleted file mode 100644
@@ -1,22 +0,0 @@
-// SPDX-License-Identifier: GPL-2.0
-/*
- * IXP4xx Device Tree boot support
- */
-#include <asm/mach/arch.h>
-
-/*
- * We handle 4 different SoC families. These compatible strings are enough
- * to provide the core so that different boards can add their more detailed
- * specifics.
- */
-static const char *ixp4xx_of_board_compat[] = {
- "intel,ixp42x",
- "intel,ixp43x",
- "intel,ixp45x",
- "intel,ixp46x",
- NULL,
-};
-
-DT_MACHINE_START(IXP4XX_DT, "IXP4xx (Device Tree)")
- .dt_compat = ixp4xx_of_board_compat,
-MACHINE_END
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-ixp4xx/ 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 fallback machine has a default l2c_aux_mask value set to ~0, which is different than the value of 0 used when none is provided. This is safe here as this platform does not use an l2x0 cache controller. Signed-off-by: Andrew Davis <afd@ti.com> --- Changes from v1: - Updated commit desc with l2c_aux_mask info - Rebased on v6.9-rc1 MAINTAINERS | 1 - arch/arm/Kconfig.platforms | 19 +++++++++++++++++++ arch/arm/mach-ixp4xx/Kconfig | 19 ------------------- arch/arm/mach-ixp4xx/Makefile | 2 -- arch/arm/mach-ixp4xx/ixp4xx-of.c | 22 ---------------------- 5 files changed, 19 insertions(+), 44 deletions(-) delete mode 100644 arch/arm/mach-ixp4xx/Kconfig delete mode 100644 arch/arm/mach-ixp4xx/Makefile delete mode 100644 arch/arm/mach-ixp4xx/ixp4xx-of.c