ARM: iop32x: enable multiplatform support

After iop32x was converted to the generic multi-irq entry
code, nothing really stops us from building it into a
generic kernel.

The two last headers can simply be removed, the mach/irqs.h
gets replaced with the sparse-irq intiialization from the
board specific .nr_irqs value, and the decompressor debug
output can use the debug_ll hack that all other platforms
use.

Signed-off-by: Arnd Bergmann <arnd@arndb.de>

diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig
index 68b0a85..94909ca 100644 (file)
--- a/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
@@ -356,17 +356,6 @@ config ARCH_FOOTBRIDGE
          Support for systems based on the DC21285 companion chip
          ("FootBridge"), such as the Simtec CATS and the Rebel NetWinder.
 
-config ARCH_IOP32X
-       bool "IOP32x-based"
-       select CPU_XSCALE
-       select GPIO_IOP
-       select GPIOLIB
-       select FORCE_PCI
-       select PLAT_IOP
-       help
-         Support for Intel's 80219 and IOP32X (XScale) family of
-         processors.
-
 config ARCH_IXP4XX
        bool "IXP4xx-based"
        select ARCH_SUPPORTS_BIG_ENDIAN
@@ -688,9 +677,6 @@ config ARCH_MPS2
 config ARCH_ACORN
        bool
 
-config PLAT_IOP
-       bool
-
 config PLAT_ORION
        bool
        select CLKSRC_MMIO

diff --git a/arch/arm/configs/iop32x_defconfig b/arch/arm/configs/iop32x_defconfig
index de2cc67..ead14c3 100644 (file)
--- a/arch/arm/configs/iop32x_defconfig
+++ b/arch/arm/configs/iop32x_defconfig
@@ -7,6 +7,7 @@ CONFIG_SLAB=y
 CONFIG_MODULES=y
 CONFIG_MODULE_UNLOAD=y
 # CONFIG_BLK_DEV_BSG is not set
+# CONFIG_ARCH_MULTI_V7 is not set
 CONFIG_ARCH_IOP32X=y
 CONFIG_MACH_GLANTANK=y
 CONFIG_ARCH_IQ80321=y

diff --git a/arch/arm/mach-iop32x/Kconfig b/arch/arm/mach-iop32x/Kconfig
index f1f342c..07dd137 100644 (file)
--- a/arch/arm/mach-iop32x/Kconfig
+++ b/arch/arm/mach-iop32x/Kconfig
@@ -1,9 +1,16 @@
 # SPDX-License-Identifier: GPL-2.0
-if ARCH_IOP32X
-
-menu "IOP32x Implementation Options"
+menuconfig ARCH_IOP32X
+       bool "IOP32x-based platforms"
+       depends on ARCH_MULTI_V5
+       select CPU_XSCALE
+       select GPIO_IOP
+       select GPIOLIB
+       select FORCE_PCI
+       help
+         Support for Intel's 80219 and IOP32X (XScale) family of
+         processors.
 
-comment "IOP32x Platform Types"
+if ARCH_IOP32X
 
 config MACH_EP80219
        bool
@@ -42,6 +49,4 @@ config MACH_EM7210
          board. Say also Y here if you have a SS4000e Baxter Creek NAS
          appliance."
 
-endmenu
-
 endif

diff --git a/arch/arm/mach-iop32x/em7210.c b/arch/arm/mach-iop32x/em7210.c
index d43ced3..ac130ab 100644 (file)
--- a/arch/arm/mach-iop32x/em7210.c
+++ b/arch/arm/mach-iop32x/em7210.c
@@ -223,6 +223,7 @@ static void __init em7210_init_machine(void)
 
 MACHINE_START(EM7210, "Lanner EM7210")
        .atag_offset    = 0x100,
+       .nr_irqs        = IOP32X_NR_IRQS,
        .map_io         = em7210_map_io,
        .init_irq       = iop32x_init_irq,
        .init_time      = em7210_timer_init,

diff --git a/arch/arm/mach-iop32x/glantank.c b/arch/arm/mach-iop32x/glantank.c
index 2fe0f77..cd6e7da 100644 (file)
--- a/arch/arm/mach-iop32x/glantank.c
+++ b/arch/arm/mach-iop32x/glantank.c
@@ -205,6 +205,7 @@ static void __init glantank_init_machine(void)
 MACHINE_START(GLANTANK, "GLAN Tank")
        /* Maintainer: Lennert Buytenhek <buytenh@wantstofly.org> */
        .atag_offset    = 0x100,
+       .nr_irqs        = IOP32X_NR_IRQS,
        .map_io         = glantank_map_io,
        .init_irq       = iop32x_init_irq,
        .init_time      = glantank_timer_init,

diff --git a/arch/arm/mach-iop32x/include/mach/irqs.h b/arch/arm/mach-iop32x/include/mach/irqs.h
deleted file mode 100644 (file)
index e09ae5f..0000000
--- a/arch/arm/mach-iop32x/include/mach/irqs.h
+++ /dev/null
@@ -1,14 +0,0 @@
-/* SPDX-License-Identifier: GPL-2.0-only */
-/*
- * arch/arm/mach-iop32x/include/mach/irqs.h
- *
- * Author:     Rory Bolt <rorybolt@pacbell.net>
- * Copyright:  (C) 2002 Rory Bolt
- */
-
-#ifndef __IRQS_H
-#define __IRQS_H
-
-#define NR_IRQS                        33
-
-#endif

diff --git a/arch/arm/mach-iop32x/include/mach/uncompress.h b/arch/arm/mach-iop32x/include/mach/uncompress.h
deleted file mode 100644 (file)
index c854887..0000000
--- a/arch/arm/mach-iop32x/include/mach/uncompress.h
+++ /dev/null
@@ -1,25 +0,0 @@
-/* SPDX-License-Identifier: GPL-2.0 */
-/*
- * arch/arm/mach-iop32x/include/mach/uncompress.h
- */
-
-#include <asm/types.h>
-#include <asm/mach-types.h>
-#include <linux/serial_reg.h>
-
-#define uart_base ((volatile u8 *)0xfe800000)
-
-#define TX_DONE                (UART_LSR_TEMT | UART_LSR_THRE)
-
-static inline void putc(char c)
-{
-       while ((uart_base[UART_LSR] & TX_DONE) != TX_DONE)
-               barrier();
-       uart_base[UART_TX] = c;
-}
-
-static inline void flush(void)
-{
-}
-
-#define arch_decomp_setup() do { } while (0)

diff --git a/arch/arm/mach-iop32x/iq31244.c b/arch/arm/mach-iop32x/iq31244.c
index 49caaa7..8b4c29d 100644 (file)
--- a/arch/arm/mach-iop32x/iq31244.c
+++ b/arch/arm/mach-iop32x/iq31244.c
@@ -324,6 +324,7 @@ MACHINE_END
 MACHINE_START(EP80219, "Intel EP80219")
        /* Maintainer: Intel Corp. */
        .atag_offset    = 0x100,
+       .nr_irqs        = IOP32X_NR_IRQS,
        .map_io         = iq31244_map_io,
        .init_irq       = iop32x_init_irq,
        .init_time      = iq31244_timer_init,

diff --git a/arch/arm/mach-iop32x/iq80321.c b/arch/arm/mach-iop32x/iq80321.c
index b455d70..d9780c4 100644 (file)
--- a/arch/arm/mach-iop32x/iq80321.c
+++ b/arch/arm/mach-iop32x/iq80321.c
@@ -183,6 +183,7 @@ static void __init iq80321_init_machine(void)
 MACHINE_START(IQ80321, "Intel IQ80321")
        /* Maintainer: Intel Corp. */
        .atag_offset    = 0x100,
+       .nr_irqs        = IOP32X_NR_IRQS,
        .map_io         = iq80321_map_io,
        .init_irq       = iop32x_init_irq,
        .init_time      = iq80321_timer_init,

diff --git a/arch/arm/mach-iop32x/irqs.h b/arch/arm/mach-iop32x/irqs.h
index e1dfc8b..e9fc88e 100644 (file)
--- a/arch/arm/mach-iop32x/irqs.h
+++ b/arch/arm/mach-iop32x/irqs.h
@@ -43,4 +43,6 @@
 #define IRQ_IOP32X_XINT3       IOP_IRQ(30)
 #define IRQ_IOP32X_HPI         IOP_IRQ(31)
 
+#define IOP32X_NR_IRQS         (IRQ_IOP32X_HPI + 1)
+
 #endif

diff --git a/arch/arm/mach-iop32x/n2100.c b/arch/arm/mach-iop32x/n2100.c
index bf99e71..bb1e2e1 100644 (file)
--- a/arch/arm/mach-iop32x/n2100.c
+++ b/arch/arm/mach-iop32x/n2100.c
@@ -358,6 +358,7 @@ static void __init n2100_init_machine(void)
 MACHINE_START(N2100, "Thecus N2100")
        /* Maintainer: Lennert Buytenhek <buytenh@wantstofly.org> */
        .atag_offset    = 0x100,
+       .nr_irqs        = IOP32X_NR_IRQS,
        .map_io         = n2100_map_io,
        .init_irq       = iop32x_init_irq,
        .init_time      = n2100_timer_init,