]> pilppa.com Git - linux-2.6-omap-h63xx.git/commitdiff
[ARM] 3830/1: iop3xx: board support file cleanup
authorLennert Buytenhek <buytenh@wantstofly.org>
Mon, 18 Sep 2006 22:24:52 +0000 (23:24 +0100)
committerRussell King <rmk+kernel@arm.linux.org.uk>
Mon, 25 Sep 2006 09:25:50 +0000 (10:25 +0100)
Revamp the iop3xx board support: move the support code for each iop
board type into its own file, start using platform serial and platform
physmap flash devices, switch to a per-board time tick rate, and get
rid of the ARCH_EP80219 and STEPD config options by doing the relevant
checks at run time.

Signed-off-by: Lennert Buytenhek <buytenh@wantstofly.org>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
32 files changed:
arch/arm/configs/ep80219_defconfig
arch/arm/configs/iq31244_defconfig
arch/arm/configs/iq80321_defconfig
arch/arm/configs/iq80331_defconfig
arch/arm/configs/iq80332_defconfig
arch/arm/mach-iop32x/Kconfig
arch/arm/mach-iop32x/Makefile
arch/arm/mach-iop32x/common.c [deleted file]
arch/arm/mach-iop32x/iq31244-mm.c [deleted file]
arch/arm/mach-iop32x/iq31244-pci.c [deleted file]
arch/arm/mach-iop32x/iq31244.c [new file with mode: 0644]
arch/arm/mach-iop32x/iq80321-mm.c [deleted file]
arch/arm/mach-iop32x/iq80321-pci.c [deleted file]
arch/arm/mach-iop32x/iq80321.c [new file with mode: 0644]
arch/arm/mach-iop32x/setup.c [deleted file]
arch/arm/mach-iop33x/Kconfig
arch/arm/mach-iop33x/Makefile
arch/arm/mach-iop33x/iq80331-pci.c [deleted file]
arch/arm/mach-iop33x/iq80331.c [new file with mode: 0644]
arch/arm/mach-iop33x/iq80332-pci.c [deleted file]
arch/arm/mach-iop33x/iq80332.c [new file with mode: 0644]
arch/arm/mach-iop33x/setup.c [deleted file]
arch/arm/mach-iop33x/uart.c [new file with mode: 0644]
include/asm-arm/arch-iop32x/iop321.h
include/asm-arm/arch-iop32x/iq31244.h
include/asm-arm/arch-iop32x/iq80321.h
include/asm-arm/arch-iop32x/irqs.h
include/asm-arm/arch-iop33x/hardware.h
include/asm-arm/arch-iop33x/iop331.h
include/asm-arm/arch-iop33x/iq80331.h
include/asm-arm/arch-iop33x/iq80332.h
include/asm-arm/arch-iop33x/irqs.h

index f91cf8ff359d0a8153c4638e73ce0a794a9029d5..c10f3a8afb5947d7c2a3a8c9e94103ff88fa884d 100644 (file)
@@ -93,7 +93,6 @@ CONFIG_ARCH_IOP32X=y
 CONFIG_ARCH_IQ31244=y
 # CONFIG_ARCH_IQ80331 is not set
 # CONFIG_MACH_IQ80332 is not set
-CONFIG_ARCH_EP80219=y
 
 #
 # IOP3xx Chipset Features
@@ -231,9 +230,9 @@ CONFIG_MTD_CFI_UTIL=y
 #
 # CONFIG_MTD_COMPLEX_MAPPINGS is not set
 CONFIG_MTD_PHYSMAP=y
-CONFIG_MTD_PHYSMAP_START=0xf0000000
-CONFIG_MTD_PHYSMAP_LEN=0x00800000
-CONFIG_MTD_PHYSMAP_BANKWIDTH=2
+CONFIG_MTD_PHYSMAP_START=0x0
+CONFIG_MTD_PHYSMAP_LEN=0x0
+CONFIG_MTD_PHYSMAP_BANKWIDTH=1
 # CONFIG_MTD_ARM_INTEGRATOR is not set
 # CONFIG_MTD_EDB7312 is not set
 
index ce1b1f20b763c9107c47ee570003341125dc0a06..0955577243de26568bd3e140f985f97431ec89e5 100644 (file)
@@ -94,7 +94,6 @@ CONFIG_ARCH_IOP32X=y
 CONFIG_ARCH_IQ31244=y
 # CONFIG_ARCH_IQ80331 is not set
 # CONFIG_MACH_IQ80332 is not set
-# CONFIG_ARCH_EP80219 is not set
 
 #
 # IOP3xx Chipset Features
@@ -232,9 +231,9 @@ CONFIG_MTD_CFI_UTIL=y
 #
 # CONFIG_MTD_COMPLEX_MAPPINGS is not set
 CONFIG_MTD_PHYSMAP=y
-CONFIG_MTD_PHYSMAP_START=0xf0000000
-CONFIG_MTD_PHYSMAP_LEN=0x00800000
-CONFIG_MTD_PHYSMAP_BANKWIDTH=2
+CONFIG_MTD_PHYSMAP_START=0x0
+CONFIG_MTD_PHYSMAP_LEN=0x0
+CONFIG_MTD_PHYSMAP_BANKWIDTH=1
 # CONFIG_MTD_ARM_INTEGRATOR is not set
 # CONFIG_MTD_EDB7312 is not set
 
index f00b0d2159dd644a77fdeb26874ba21278adfeeb..96be4c058546d25aaf6dd0ea19979d5cd8f2c0f6 100644 (file)
@@ -93,7 +93,6 @@ CONFIG_ARCH_IQ80321=y
 # CONFIG_ARCH_IQ31244 is not set
 # CONFIG_ARCH_IQ80331 is not set
 # CONFIG_MACH_IQ80332 is not set
-# CONFIG_ARCH_EP80219 is not set
 
 #
 # IOP3xx Chipset Features
@@ -231,8 +230,8 @@ CONFIG_MTD_CFI_UTIL=y
 #
 # CONFIG_MTD_COMPLEX_MAPPINGS is not set
 CONFIG_MTD_PHYSMAP=y
-CONFIG_MTD_PHYSMAP_START=0xf0000000
-CONFIG_MTD_PHYSMAP_LEN=0x00800000
+CONFIG_MTD_PHYSMAP_START=0x0
+CONFIG_MTD_PHYSMAP_LEN=0x0
 CONFIG_MTD_PHYSMAP_BANKWIDTH=1
 # CONFIG_MTD_ARM_INTEGRATOR is not set
 # CONFIG_MTD_EDB7312 is not set
index af3a87e469d5903524f7818f59922eef722a1d0d..874872ab6bdd0964a121b7684956569d88d0394e 100644 (file)
@@ -93,12 +93,6 @@ CONFIG_ARCH_IOP33X=y
 # CONFIG_ARCH_IQ31244 is not set
 CONFIG_ARCH_IQ80331=y
 # CONFIG_MACH_IQ80332 is not set
-# CONFIG_ARCH_EP80219 is not set
-
-#
-# IOP3xx Chipset Features
-#
-CONFIG_IOP331_STEPD=y
 
 #
 # Processor Type
@@ -236,8 +230,8 @@ CONFIG_MTD_CFI_UTIL=y
 #
 # CONFIG_MTD_COMPLEX_MAPPINGS is not set
 CONFIG_MTD_PHYSMAP=y
-CONFIG_MTD_PHYSMAP_START=0xc0000000
-CONFIG_MTD_PHYSMAP_LEN=0x00800000
+CONFIG_MTD_PHYSMAP_START=0x0
+CONFIG_MTD_PHYSMAP_LEN=0x0
 CONFIG_MTD_PHYSMAP_BANKWIDTH=1
 # CONFIG_MTD_ARM_INTEGRATOR is not set
 # CONFIG_MTD_EDB7312 is not set
index 931c78755a30b9bc2f9a9ee25d324f7a8d57da24..a79895316535ba4f2876c9e6a4ec152b0c270b7a 100644 (file)
@@ -93,12 +93,6 @@ CONFIG_ARCH_IOP33X=y
 # CONFIG_ARCH_IQ31244 is not set
 # CONFIG_ARCH_IQ80331 is not set
 CONFIG_MACH_IQ80332=y
-# CONFIG_ARCH_EP80219 is not set
-
-#
-# IOP3xx Chipset Features
-#
-# CONFIG_IOP331_STEPD is not set
 
 #
 # Processor Type
@@ -236,8 +230,8 @@ CONFIG_MTD_CFI_UTIL=y
 #
 # CONFIG_MTD_COMPLEX_MAPPINGS is not set
 CONFIG_MTD_PHYSMAP=y
-CONFIG_MTD_PHYSMAP_START=0xc0000000
-CONFIG_MTD_PHYSMAP_LEN=0x00800000
+CONFIG_MTD_PHYSMAP_START=0x0
+CONFIG_MTD_PHYSMAP_LEN=0x0
 CONFIG_MTD_PHYSMAP_BANKWIDTH=1
 # CONFIG_MTD_ARM_INTEGRATOR is not set
 # CONFIG_MTD_EDB7312 is not set
index 21e3e8c8c2ad5d8556953d3aa69c17e4f118ff77..ff8a77a8866ea4daeacce967063153df5a7398e7 100644 (file)
@@ -16,13 +16,6 @@ config ARCH_IQ31244
          Say Y here if you want to run your kernel on the Intel IQ31244
          evaluation kit for the IOP321 chipset.
 
-config ARCH_EP80219
-       bool "Enable support for EP80219"
-       select ARCH_IQ31244
-       help
-         Say Y here if you want to run your kernel on the Intel EP80219
-         evaluation kit for the Intel 80219 chipset (a IOP321 variant).
-
 endmenu
 
 endif
index ef561db20c9b493a994454f03e310956ead5daa8..af1747ae392dad7f209d788c1bd81343faaa4d5f 100644 (file)
@@ -2,10 +2,10 @@
 # Makefile for the linux kernel.
 #
 
-obj-y                  := common.o setup.o irq.o
+obj-y                  := irq.o
 obj-m                  :=
 obj-n                  :=
 obj-                   :=
 
-obj-$(CONFIG_ARCH_IQ80321) += iq80321-mm.o iq80321-pci.o
-obj-$(CONFIG_ARCH_IQ31244) += iq31244-mm.o iq31244-pci.o
+obj-$(CONFIG_ARCH_IQ80321) += iq80321.o
+obj-$(CONFIG_ARCH_IQ31244) += iq31244.o
diff --git a/arch/arm/mach-iop32x/common.c b/arch/arm/mach-iop32x/common.c
deleted file mode 100644 (file)
index 9a17a08..0000000
+++ /dev/null
@@ -1,67 +0,0 @@
-/*
- * arch/arm/mach-iop32x/common.c
- *
- * Common routines shared across all IOP3xx implementations
- *
- * Author: Deepak Saxena <dsaxena@mvista.com>
- *
- * Copyright 2003 (c) MontaVista, Software, Inc.
- *
- * This file is licensed under  the terms of the GNU General Public
- * License version 2. This program is licensed "as is" without any
- * warranty of any kind, whether express or implied.
- */
-
-#include <linux/delay.h>
-#include <asm/hardware.h>
-#include <asm/hardware/iop3xx.h>
-
-#ifdef CONFIG_ARCH_EP80219
-#include <linux/kernel.h>
-/*
- * Default power-off for EP80219
- */
-
-static inline void ep80219_send_to_pic(__u8 c) {
-}
-
-void ep80219_power_off(void)
-{
-       /*
-     * This function will send a SHUTDOWN_COMPLETE message to the PIC controller
-     * over I2C.  We are not using the i2c subsystem since we are going to power
-     * off and it may be removed
-     */
-
-       /* Send the Address byte w/ the start condition */
-       *IOP3XX_IDBR1 = 0x60;
-       *IOP3XX_ICR1 = 0xE9;
-    mdelay(1);
-
-       /* Send the START_MSG byte w/ no start or stop condition */
-       *IOP3XX_IDBR1 = 0x0F;
-       *IOP3XX_ICR1 = 0xE8;
-    mdelay(1);
-
-       /* Send the SHUTDOWN_COMPLETE Message ID byte w/ no start or stop condition */
-       *IOP3XX_IDBR1 = 0x03;
-       *IOP3XX_ICR1 = 0xE8;
-    mdelay(1);
-
-       /* Send an ignored byte w/ stop condition */
-       *IOP3XX_IDBR1 = 0x00;
-       *IOP3XX_ICR1 = 0xEA;
-
-       while (1) ;
-}
-
-#include <linux/init.h>
-#include <linux/pm.h>
-
-static int __init ep80219_init(void)
-{
-       pm_power_off = ep80219_power_off;
-       return 0;
-}
-arch_initcall(ep80219_init);
-#endif
diff --git a/arch/arm/mach-iop32x/iq31244-mm.c b/arch/arm/mach-iop32x/iq31244-mm.c
deleted file mode 100644 (file)
index fba22d5..0000000
+++ /dev/null
@@ -1,46 +0,0 @@
-/*
- * linux/arch/arm/mach-iop32x/iq31244-mm.c
- *
- * Low level memory initialization for iq80321 platform
- *
- * Author: Rory Bolt <rorybolt@pacbell.net>
- * Copyright (C) 2002 Rory Bolt
- *
- * This program is free software; you can redistribute  it and/or modify it
- * under  the terms of  the GNU General  Public License as published by the
- * Free Software Foundation;  either version 2 of the  License, or (at your
- * option) any later version.
- *
- */
-
-#include <linux/mm.h>
-#include <linux/init.h>
-
-#include <asm/io.h>
-#include <asm/pgtable.h>
-#include <asm/page.h>
-
-#include <asm/mach/map.h>
-#include <asm/hardware/iop3xx.h>
-
-
-/*
- * IQ80321 specific IO mappings
- *
- * We use RedBoot's setup for the onboard devices.
- */
-static struct map_desc iq31244_io_desc[] __initdata = {
-       {       /* on-board devices */
-               .virtual        = IQ31244_UART,
-               .pfn            = __phys_to_pfn(IQ31244_UART),
-               .length         = 0x00100000,
-               .type           = MT_DEVICE
-       }
-};
-
-void __init iq31244_map_io(void)
-{
-       iop3xx_map_io();
-
-       iotable_init(iq31244_io_desc, ARRAY_SIZE(iq31244_io_desc));
-}
diff --git a/arch/arm/mach-iop32x/iq31244-pci.c b/arch/arm/mach-iop32x/iq31244-pci.c
deleted file mode 100644 (file)
index 605b795..0000000
+++ /dev/null
@@ -1,90 +0,0 @@
-/*
- * arch/arm/mach-iop32x/iq31244-pci.c
- *
- * PCI support for the Intel IQ31244 reference board
- *
- * Author: Rory Bolt <rorybolt@pacbell.net>
- * Copyright (C) 2002 Rory Bolt
- * Copyright (C) 2004 Intel Corp.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 2 as
- * published by the Free Software Foundation.
- */
-#include <linux/kernel.h>
-#include <linux/pci.h>
-#include <linux/init.h>
-#include <linux/string.h>
-#include <linux/slab.h>
-
-#include <asm/hardware.h>
-#include <asm/irq.h>
-#include <asm/mach/pci.h>
-#include <asm/mach-types.h>
-
-/*
- * The following macro is used to lookup irqs in a standard table
- * format for those systems that do not already have PCI
- * interrupts properly routed.  We assume 1 <= pin <= 4
- */
-#define PCI_IRQ_TABLE_LOOKUP(minid,maxid)      \
-({ int _ctl_ = -1;                             \
-   unsigned int _idsel = idsel - minid;                \
-   if (_idsel <= maxid)                                \
-      _ctl_ = pci_irq_table[_idsel][pin-1];    \
-   _ctl_; })
-
-#define INTA   IRQ_IQ31244_INTA
-#define INTB   IRQ_IQ31244_INTB
-#define INTC   IRQ_IQ31244_INTC
-#define INTD   IRQ_IQ31244_INTD
-
-#define INTE   IRQ_IQ31244_I82546
-
-static inline int __init
-iq31244_map_irq(struct pci_dev *dev, u8 idsel, u8 pin)
-{
-       static int pci_irq_table[][4] = {
-               /*
-                * PCI IDSEL/INTPIN->INTLINE
-                * A       B       C       D
-                */
-#ifdef CONFIG_ARCH_EP80219
-               {INTB, INTB, INTB, INTB}, /* CFlash */
-               {INTE, INTE, INTE, INTE}, /* 82551 Pro 100 */
-               {INTD, INTD, INTD, INTD}, /* PCI-X Slot */
-               {INTC, INTC, INTC, INTC}, /* SATA   */
-#else
-               {INTB, INTB, INTB, INTB}, /* CFlash */
-               {INTC, INTC, INTC, INTC}, /* SATA   */
-               {INTD, INTD, INTD, INTD}, /* PCI-X Slot */
-               {INTE, INTE, INTE, INTE}, /* 82546 GigE */
-#endif // CONFIG_ARCH_EP80219
-       };
-
-       BUG_ON(pin < 1 || pin > 4);
-
-       return PCI_IRQ_TABLE_LOOKUP(0, 7);
-}
-
-static struct hw_pci iq31244_pci __initdata = {
-       .swizzle        = pci_std_swizzle,
-       .nr_controllers = 1,
-       .setup          = iop3xx_pci_setup,
-       .scan           = iop3xx_pci_scan_bus,
-       .preinit        = iop3xx_pci_preinit,
-       .map_irq        = iq31244_map_irq
-};
-
-static int __init iq31244_pci_init(void)
-{
-       if (machine_is_iq31244())
-               pci_common_init(&iq31244_pci);
-       return 0;
-}
-
-subsys_initcall(iq31244_pci_init);
-
-
-
-
diff --git a/arch/arm/mach-iop32x/iq31244.c b/arch/arm/mach-iop32x/iq31244.c
new file mode 100644 (file)
index 0000000..88b77d3
--- /dev/null
@@ -0,0 +1,293 @@
+/*
+ * arch/arm/mach-iop32x/iq31244.c
+ *
+ * Board support code for the Intel EP80219 and IQ31244 platforms.
+ *
+ * Author: Rory Bolt <rorybolt@pacbell.net>
+ * Copyright (C) 2002 Rory Bolt
+ * Copyright 2003 (c) MontaVista, Software, Inc.
+ * Copyright (C) 2004 Intel Corp.
+ *
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by the
+ * Free Software Foundation; either version 2 of the License, or (at your
+ * option) any later version.
+ */
+
+#include <linux/mm.h>
+#include <linux/init.h>
+#include <linux/delay.h>
+#include <linux/kernel.h>
+#include <linux/pci.h>
+#include <linux/pm.h>
+#include <linux/string.h>
+#include <linux/slab.h>
+#include <linux/serial_core.h>
+#include <linux/serial_8250.h>
+#include <linux/mtd/physmap.h>
+#include <linux/platform_device.h>
+#include <asm/hardware.h>
+#include <asm/io.h>
+#include <asm/irq.h>
+#include <asm/mach/arch.h>
+#include <asm/mach/map.h>
+#include <asm/mach/pci.h>
+#include <asm/mach/time.h>
+#include <asm/mach-types.h>
+#include <asm/page.h>
+#include <asm/pgtable.h>
+
+
+/*
+ * The EP80219 and IQ31244 use the same machine ID.  To find out
+ * which of the two we're running on, we look at the processor ID.
+ */
+static int is_80219(void)
+{
+       extern int processor_id;
+       return !!((processor_id & 0xffffffe0) == 0x69052e20);
+}
+
+
+/*
+ * EP80219/IQ31244 timer tick configuration.
+ */
+static void __init iq31244_timer_init(void)
+{
+       if (is_80219()) {
+               /* 33.333 MHz crystal.  */
+               iop3xx_init_time(200000000);
+       } else {
+               /* 33.000 MHz crystal.  */
+               iop3xx_init_time(198000000);
+       }
+}
+
+static struct sys_timer iq31244_timer = {
+       .init           = iq31244_timer_init,
+       .offset         = iop3xx_gettimeoffset,
+};
+
+
+/*
+ * IQ31244 I/O.
+ */
+static struct map_desc iq31244_io_desc[] __initdata = {
+       {       /* on-board devices */
+               .virtual        = IQ31244_UART,
+               .pfn            = __phys_to_pfn(IQ31244_UART),
+               .length         = 0x00100000,
+               .type           = MT_DEVICE,
+       },
+};
+
+void __init iq31244_map_io(void)
+{
+       iop3xx_map_io();
+       iotable_init(iq31244_io_desc, ARRAY_SIZE(iq31244_io_desc));
+}
+
+
+/*
+ * EP80219/IQ31244 PCI.
+ */
+static inline int __init
+ep80219_pci_map_irq(struct pci_dev *dev, u8 slot, u8 pin)
+{
+       int irq;
+
+       if (slot == 0) {
+               /* CFlash */
+               irq = IRQ_IOP321_XINT1;
+       } else if (slot == 1) {
+               /* 82551 Pro 100 */
+               irq = IRQ_IOP321_XINT0;
+       } else if (slot == 2) {
+               /* PCI-X Slot */
+               irq = IRQ_IOP321_XINT3;
+       } else if (slot == 3) {
+               /* SATA */
+               irq = IRQ_IOP321_XINT2;
+       } else {
+               printk(KERN_ERR "ep80219_pci_map_irq() called for unknown "
+                       "device PCI:%d:%d:%d\n", dev->bus->number,
+                       PCI_SLOT(dev->devfn), PCI_FUNC(dev->devfn));
+               irq = -1;
+       }
+
+       return irq;
+}
+
+static struct hw_pci ep80219_pci __initdata = {
+       .swizzle        = pci_std_swizzle,
+       .nr_controllers = 1,
+       .setup          = iop3xx_pci_setup,
+       .preinit        = iop3xx_pci_preinit,
+       .scan           = iop3xx_pci_scan_bus,
+       .map_irq        = ep80219_pci_map_irq,
+};
+
+static inline int __init
+iq31244_pci_map_irq(struct pci_dev *dev, u8 slot, u8 pin)
+{
+       int irq;
+
+       if (slot == 0) {
+               /* CFlash */
+               irq = IRQ_IOP321_XINT1;
+       } else if (slot == 1) {
+               /* SATA */
+               irq = IRQ_IOP321_XINT2;
+       } else if (slot == 2) {
+               /* PCI-X Slot */
+               irq = IRQ_IOP321_XINT3;
+       } else if (slot == 3) {
+               /* 82546 GigE */
+               irq = IRQ_IOP321_XINT0;
+       } else {
+               printk(KERN_ERR "iq31244_pci_map_irq() called for unknown "
+                       "device PCI:%d:%d:%d\n", dev->bus->number,
+                       PCI_SLOT(dev->devfn), PCI_FUNC(dev->devfn));
+               irq = -1;
+       }
+
+       return irq;
+}
+
+static struct hw_pci iq31244_pci __initdata = {
+       .swizzle        = pci_std_swizzle,
+       .nr_controllers = 1,
+       .setup          = iop3xx_pci_setup,
+       .preinit        = iop3xx_pci_preinit,
+       .scan           = iop3xx_pci_scan_bus,
+       .map_irq        = iq31244_pci_map_irq,
+};
+
+static int __init iq31244_pci_init(void)
+{
+       if (machine_is_iq31244()) {
+               if (is_80219()) {
+                       pci_common_init(&ep80219_pci);
+               } else {
+                       pci_common_init(&iq31244_pci);
+               }
+       }
+
+       return 0;
+}
+
+subsys_initcall(iq31244_pci_init);
+
+
+/*
+ * IQ31244 machine initialisation.
+ */
+static struct physmap_flash_data iq31244_flash_data = {
+       .width          = 2,
+};
+
+static struct resource iq31244_flash_resource = {
+       .start          = 0xf0000000,
+       .end            = 0xf07fffff,
+       .flags          = IORESOURCE_MEM,
+};
+
+static struct platform_device iq31244_flash_device = {
+       .name           = "physmap-flash",
+       .id             = 0,
+       .dev            = {
+               .platform_data  = &iq31244_flash_data,
+       },
+       .num_resources  = 1,
+       .resource       = &iq31244_flash_resource,
+};
+
+static struct plat_serial8250_port iq31244_serial_port[] = {
+       {
+               .mapbase        = IQ31244_UART,
+               .membase        = (char *)IQ31244_UART,
+               .irq            = IRQ_IOP321_XINT1,
+               .flags          = UPF_SKIP_TEST,
+               .iotype         = UPIO_MEM,
+               .regshift       = 0,
+               .uartclk        = 1843200,
+       },
+       { },
+};
+
+static struct resource iq31244_uart_resource = {
+       .start          = IQ31244_UART,
+       .end            = IQ31244_UART + 7,
+       .flags          = IORESOURCE_MEM,
+};
+
+static struct platform_device iq31244_serial_device = {
+       .name           = "serial8250",
+       .id             = PLAT8250_DEV_PLATFORM,
+       .dev            = {
+               .platform_data          = iq31244_serial_port,
+       },
+       .num_resources  = 1,
+       .resource       = &iq31244_uart_resource,
+};
+
+/*
+ * This function will send a SHUTDOWN_COMPLETE message to the PIC
+ * controller over I2C.  We are not using the i2c subsystem since
+ * we are going to power off and it may be removed
+ */
+void ep80219_power_off(void)
+{
+       /*
+        * Send the Address byte w/ the start condition
+        */
+       *IOP3XX_IDBR1 = 0x60;
+       *IOP3XX_ICR1 = 0xE9;
+       mdelay(1);
+
+       /*
+        * Send the START_MSG byte w/ no start or stop condition
+        */
+       *IOP3XX_IDBR1 = 0x0F;
+       *IOP3XX_ICR1 = 0xE8;
+       mdelay(1);
+
+       /*
+        * Send the SHUTDOWN_COMPLETE Message ID byte w/ no start or
+        * stop condition
+        */
+       *IOP3XX_IDBR1 = 0x03;
+       *IOP3XX_ICR1 = 0xE8;
+       mdelay(1);
+
+       /*
+        * Send an ignored byte w/ stop condition
+        */
+       *IOP3XX_IDBR1 = 0x00;
+       *IOP3XX_ICR1 = 0xEA;
+
+       while (1)
+               ;
+}
+
+static void __init iq31244_init_machine(void)
+{
+       platform_device_register(&iop3xx_i2c0_device);
+       platform_device_register(&iop3xx_i2c1_device);
+       platform_device_register(&iq31244_flash_device);
+       platform_device_register(&iq31244_serial_device);
+
+       if (is_80219())
+               pm_power_off = ep80219_power_off;
+}
+
+MACHINE_START(IQ31244, "Intel IQ31244")
+       /* Maintainer: Intel Corp. */
+       .phys_io        = IQ31244_UART,
+       .io_pg_offst    = ((IQ31244_UART) >> 18) & 0xfffc,
+       .boot_params    = 0xa0000100,
+       .map_io         = iq31244_map_io,
+       .init_irq       = iop321_init_irq,
+       .timer          = &iq31244_timer,
+       .init_machine   = iq31244_init_machine,
+MACHINE_END
diff --git a/arch/arm/mach-iop32x/iq80321-mm.c b/arch/arm/mach-iop32x/iq80321-mm.c
deleted file mode 100644 (file)
index b6a3079..0000000
+++ /dev/null
@@ -1,46 +0,0 @@
-/*
- * linux/arch/arm/mach-iop32x/iq80321-mm.c
- *
- * Low level memory initialization for iq80321 platform
- *
- * Author: Rory Bolt <rorybolt@pacbell.net>
- * Copyright (C) 2002 Rory Bolt
- *
- * This program is free software; you can redistribute  it and/or modify it
- * under  the terms of  the GNU General  Public License as published by the
- * Free Software Foundation;  either version 2 of the  License, or (at your
- * option) any later version.
- *
- */
-
-#include <linux/mm.h>
-#include <linux/init.h>
-
-#include <asm/io.h>
-#include <asm/pgtable.h>
-#include <asm/page.h>
-
-#include <asm/mach/map.h>
-#include <asm/hardware/iop3xx.h>
-
-
-/*
- * IQ80321 specific IO mappings
- *
- * We use RedBoot's setup for the onboard devices.
- */
-static struct map_desc iq80321_io_desc[] __initdata = {
-       {       /* on-board devices */
-               .virtual        = IQ80321_UART,
-               .pfn            = __phys_to_pfn(IQ80321_UART),
-               .length         = 0x00100000,
-               .type           = MT_DEVICE
-       }
-};
-
-void __init iq80321_map_io(void)
-{
-       iop3xx_map_io();
-
-       iotable_init(iq80321_io_desc, ARRAY_SIZE(iq80321_io_desc));
-}
diff --git a/arch/arm/mach-iop32x/iq80321-pci.c b/arch/arm/mach-iop32x/iq80321-pci.c
deleted file mode 100644 (file)
index cedc37b..0000000
+++ /dev/null
@@ -1,84 +0,0 @@
-/*
- * arch/arm/mach-iop32x/iq80321-pci.c
- *
- * PCI support for the Intel IQ80321 reference board
- *
- * Author: Rory Bolt <rorybolt@pacbell.net>
- * Copyright (C) 2002 Rory Bolt
- * Copyright (C) 2004 Intel Corp.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 2 as
- * published by the Free Software Foundation.
- */
-#include <linux/kernel.h>
-#include <linux/pci.h>
-#include <linux/init.h>
-#include <linux/string.h>
-#include <linux/slab.h>
-
-#include <asm/hardware.h>
-#include <asm/irq.h>
-#include <asm/mach/pci.h>
-#include <asm/mach-types.h>
-
-/*
- * The following macro is used to lookup irqs in a standard table
- * format for those systems that do not already have PCI
- * interrupts properly routed.  We assume 1 <= pin <= 4
- */
-#define PCI_IRQ_TABLE_LOOKUP(minid,maxid)      \
-({ int _ctl_ = -1;                             \
-   unsigned int _idsel = idsel - minid;                \
-   if (_idsel <= maxid)                                \
-      _ctl_ = pci_irq_table[_idsel][pin-1];    \
-   _ctl_; })
-
-#define INTA   IRQ_IQ80321_INTA
-#define INTB   IRQ_IQ80321_INTB
-#define INTC   IRQ_IQ80321_INTC
-#define INTD   IRQ_IQ80321_INTD
-
-#define INTE   IRQ_IQ80321_I82544
-
-static inline int __init
-iq80321_map_irq(struct pci_dev *dev, u8 idsel, u8 pin)
-{
-       static int pci_irq_table[][4] = {
-               /*
-                * PCI IDSEL/INTPIN->INTLINE
-                * A       B       C       D
-                */
-               {INTE, INTE, INTE, INTE}, /* Gig-E */
-               {-1, -1, -1, -1},         /* Unused */
-               {INTC, INTD, INTA, INTB}, /* PCI-X Slot */
-               {-1, -1, -1, -1},
-       };
-
-       BUG_ON(pin < 1 || pin > 4);
-
-//     return PCI_IRQ_TABLE_LOOKUP(4, 7);
-       return pci_irq_table[idsel%4][pin-1];
-}
-
-static struct hw_pci iq80321_pci __initdata = {
-       .swizzle        = pci_std_swizzle,
-       .nr_controllers = 1,
-       .setup          = iop3xx_pci_setup,
-       .scan           = iop3xx_pci_scan_bus,
-       .preinit        = iop3xx_pci_preinit,
-       .map_irq        = iq80321_map_irq
-};
-
-static int __init iq80321_pci_init(void)
-{
-       if (machine_is_iq80321())
-               pci_common_init(&iq80321_pci);
-       return 0;
-}
-
-subsys_initcall(iq80321_pci_init);
-
-
-
-
diff --git a/arch/arm/mach-iop32x/iq80321.c b/arch/arm/mach-iop32x/iq80321.c
new file mode 100644 (file)
index 0000000..3c9b862
--- /dev/null
@@ -0,0 +1,193 @@
+/*
+ * arch/arm/mach-iop32x/iq80321.c
+ *
+ * Board support code for the Intel IQ80321 platform.
+ *
+ * Author: Rory Bolt <rorybolt@pacbell.net>
+ * Copyright (C) 2002 Rory Bolt
+ * Copyright (C) 2004 Intel Corp.
+ *
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by the
+ * Free Software Foundation; either version 2 of the License, or (at your
+ * option) any later version.
+ */
+
+#include <linux/mm.h>
+#include <linux/init.h>
+#include <linux/kernel.h>
+#include <linux/pci.h>
+#include <linux/string.h>
+#include <linux/slab.h>
+#include <linux/serial_core.h>
+#include <linux/serial_8250.h>
+#include <linux/mtd/physmap.h>
+#include <linux/platform_device.h>
+#include <asm/hardware.h>
+#include <asm/io.h>
+#include <asm/irq.h>
+#include <asm/mach/arch.h>
+#include <asm/mach/map.h>
+#include <asm/mach/pci.h>
+#include <asm/mach/time.h>
+#include <asm/mach-types.h>
+#include <asm/page.h>
+#include <asm/pgtable.h>
+
+/*
+ * IQ80321 timer tick configuration.
+ */
+static void __init iq80321_timer_init(void)
+{
+       /* 33.333 MHz crystal.  */
+       iop3xx_init_time(200000000);
+}
+
+static struct sys_timer iq80321_timer = {
+       .init           = iq80321_timer_init,
+       .offset         = iop3xx_gettimeoffset,
+};
+
+
+/*
+ * IQ80321 I/O.
+ */
+static struct map_desc iq80321_io_desc[] __initdata = {
+       {       /* on-board devices */
+               .virtual        = IQ80321_UART,
+               .pfn            = __phys_to_pfn(IQ80321_UART),
+               .length         = 0x00100000,
+               .type           = MT_DEVICE,
+       },
+};
+
+void __init iq80321_map_io(void)
+{
+       iop3xx_map_io();
+       iotable_init(iq80321_io_desc, ARRAY_SIZE(iq80321_io_desc));
+}
+
+
+/*
+ * IQ80321 PCI.
+ */
+static inline int __init
+iq80321_pci_map_irq(struct pci_dev *dev, u8 slot, u8 pin)
+{
+       int irq;
+
+       if ((slot == 2 || slot == 6) && pin == 1) {
+               /* PCI-X Slot INTA */
+               irq = IRQ_IOP321_XINT2;
+       } else if ((slot == 2 || slot == 6) && pin == 2) {
+               /* PCI-X Slot INTA */
+               irq = IRQ_IOP321_XINT3;
+       } else if ((slot == 2 || slot == 6) && pin == 3) {
+               /* PCI-X Slot INTA */
+               irq = IRQ_IOP321_XINT0;
+       } else if ((slot == 2 || slot == 6) && pin == 4) {
+               /* PCI-X Slot INTA */
+               irq = IRQ_IOP321_XINT1;
+       } else if (slot == 4 || slot == 8) {
+               /* Gig-E */
+               irq = IRQ_IOP321_XINT0;
+       } else {
+               printk(KERN_ERR "iq80321_pci_map_irq() called for unknown "
+                       "device PCI:%d:%d:%d\n", dev->bus->number,
+                       PCI_SLOT(dev->devfn), PCI_FUNC(dev->devfn));
+               irq = -1;
+       }
+
+       return irq;
+}
+
+static struct hw_pci iq80321_pci __initdata = {
+       .swizzle        = pci_std_swizzle,
+       .nr_controllers = 1,
+       .setup          = iop3xx_pci_setup,
+       .preinit        = iop3xx_pci_preinit,
+       .scan           = iop3xx_pci_scan_bus,
+       .map_irq        = iq80321_pci_map_irq,
+};
+
+static int __init iq80321_pci_init(void)
+{
+       if (machine_is_iq80321())
+               pci_common_init(&iq80321_pci);
+
+       return 0;
+}
+
+subsys_initcall(iq80321_pci_init);
+
+
+/*
+ * IQ80321 machine initialisation.
+ */
+static struct physmap_flash_data iq80321_flash_data = {
+       .width          = 1,
+};
+
+static struct resource iq80321_flash_resource = {
+       .start          = 0xf0000000,
+       .end            = 0xf07fffff,
+       .flags          = IORESOURCE_MEM,
+};
+
+static struct platform_device iq80321_flash_device = {
+       .name           = "physmap-flash",
+       .id             = 0,
+       .dev            = {
+               .platform_data  = &iq80321_flash_data,
+       },
+       .num_resources  = 1,
+       .resource       = &iq80321_flash_resource,
+};
+
+static struct plat_serial8250_port iq80321_serial_port[] = {
+       {
+               .mapbase        = IQ80321_UART,
+               .membase        = (char *)IQ80321_UART,
+               .irq            = IRQ_IOP321_XINT1,
+               .flags          = UPF_SKIP_TEST,
+               .iotype         = UPIO_MEM,
+               .regshift       = 0,
+               .uartclk        = 1843200,
+       },
+       { },
+};
+
+static struct resource iq80321_uart_resource = {
+       .start          = IQ80321_UART,
+       .end            = IQ80321_UART + 7,
+       .flags          = IORESOURCE_MEM,
+};
+
+static struct platform_device iq80321_serial_device = {
+       .name           = "serial8250",
+       .id             = PLAT8250_DEV_PLATFORM,
+       .dev            = {
+               .platform_data          = iq80321_serial_port,
+       },
+       .num_resources  = 1,
+       .resource       = &iq80321_uart_resource,
+};
+
+static void __init iq80321_init_machine(void)
+{
+       platform_device_register(&iop3xx_i2c0_device);
+       platform_device_register(&iop3xx_i2c1_device);
+       platform_device_register(&iq80321_flash_device);
+       platform_device_register(&iq80321_serial_device);
+}
+
+MACHINE_START(IQ80321, "Intel IQ80321")
+       /* Maintainer: Intel Corp. */
+       .phys_io        = IQ80321_UART,
+       .io_pg_offst    = ((IQ80321_UART) >> 18) & 0xfffc,
+       .boot_params    = 0xa0000100,
+       .map_io         = iq80321_map_io,
+       .init_irq       = iop321_init_irq,
+       .timer          = &iq80321_timer,
+       .init_machine   = iq80321_init_machine,
+MACHINE_END
diff --git a/arch/arm/mach-iop32x/setup.c b/arch/arm/mach-iop32x/setup.c
deleted file mode 100644 (file)
index 68de247..0000000
+++ /dev/null
@@ -1,111 +0,0 @@
-/*
- * linux/arch/arm/mach-iop32x/setup.c
- *
- * Author: Nicolas Pitre <nico@cam.org>
- * Copyright (C) 2001 MontaVista Software, Inc.
- * Copyright (C) 2004 Intel Corporation.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 2 as
- * published by the Free Software Foundation.
- *
- */
-#include <linux/mm.h>
-#include <linux/init.h>
-#include <linux/major.h>
-#include <linux/fs.h>
-#include <linux/platform_device.h>
-#include <linux/serial.h>
-#include <linux/tty.h>
-#include <linux/serial_core.h>
-
-#include <asm/io.h>
-#include <asm/pgtable.h>
-#include <asm/page.h>
-#include <asm/mach/map.h>
-#include <asm/setup.h>
-#include <asm/system.h>
-#include <asm/memory.h>
-#include <asm/hardware.h>
-#include <asm/mach-types.h>
-#include <asm/mach/arch.h>
-#include <asm/mach/time.h>
-#include <asm/hardware/iop3xx.h>
-
-#define IOP321_UART_XTAL 1843200
-
-#ifdef CONFIG_ARCH_IQ80321
-#define UARTBASE IQ80321_UART
-#define IRQ_UART IRQ_IQ80321_UART
-#endif
-
-#ifdef CONFIG_ARCH_IQ31244
-#define UARTBASE IQ31244_UART
-#define IRQ_UART IRQ_IQ31244_UART
-#endif
-
-static struct uart_port iop321_serial_ports[] = {
-       {
-               .membase        = (char*)(UARTBASE),
-               .mapbase        = (UARTBASE),
-               .irq            = IRQ_UART,
-               .flags          = UPF_SKIP_TEST,
-               .iotype         = UPIO_MEM,
-               .regshift       = 0,
-               .uartclk        = IOP321_UART_XTAL,
-               .line           = 0,
-               .type           = PORT_16550A,
-               .fifosize       = 16
-       }
-};
-
-void __init iop32x_init(void)
-{
-       platform_device_register(&iop3xx_i2c0_device);
-       platform_device_register(&iop3xx_i2c1_device);
-       early_serial_setup(&iop321_serial_ports[0]);
-}
-
-#ifdef CONFIG_ARCH_IQ80321
-extern void iq80321_map_io(void);
-#endif
-
-#ifdef CONFIG_ARCH_IQ31244
-extern void iq31244_map_io(void);
-#endif
-
-static void __init iop3xx_timer_init(void)
-{
-       iop3xx_init_time(IOP321_TICK_RATE);
-}
-
-struct sys_timer iop321_timer = {
-       .init           = iop3xx_timer_init,
-       .offset         = iop3xx_gettimeoffset,
-};
-
-#if defined(CONFIG_ARCH_IQ80321)
-MACHINE_START(IQ80321, "Intel IQ80321")
-       /* Maintainer: Intel Corporation */
-       .phys_io        = IQ80321_UART,
-       .io_pg_offst    = ((IQ80321_UART) >> 18) & 0xfffc,
-       .map_io         = iq80321_map_io,
-       .init_irq       = iop321_init_irq,
-       .timer          = &iop321_timer,
-       .boot_params    = 0xa0000100,
-       .init_machine   = iop32x_init,
-MACHINE_END
-#elif defined(CONFIG_ARCH_IQ31244)
-MACHINE_START(IQ31244, "Intel IQ31244")
-       /* Maintainer: Intel Corp. */
-       .phys_io        = IQ31244_UART,
-       .io_pg_offst    = ((IQ31244_UART) >> 18) & 0xfffc,
-       .map_io         = iq31244_map_io,
-       .init_irq       = iop321_init_irq,
-       .timer          = &iop321_timer,
-       .boot_params    = 0xa0000100,
-       .init_machine   = iop32x_init,
-MACHINE_END
-#else
-#error No machine descriptor defined for this IOP3XX implementation
-#endif
index 410df546e954b67f7400a43b8635c51bd8f7ec12..9aa016bb18f9d1012b32d0a05ce320c7cbbe32d3 100644 (file)
@@ -16,12 +16,6 @@ config MACH_IQ80332
          Say Y here if you want to run your kernel on the Intel IQ80332
          evaluation kit for the IOP332 chipset.
 
-config IOP331_STEPD
-       bool "Chip stepping D of the IOP80331 processor or IOP80333"
-       help
-         Say Y here if you have StepD of the IOP80331 or IOP8033
-         based platforms.
-
 endmenu
 
 endif
index f825cee57d9fbba9de4b9cea61585b10b1316099..90081d8c9d16c862da18602d851d7aa92cbea5e5 100644 (file)
@@ -2,10 +2,10 @@
 # Makefile for the linux kernel.
 #
 
-obj-y                  := setup.o irq.o
+obj-y                  := irq.o uart.o
 obj-m                  :=
 obj-n                  :=
 obj-                   :=
 
-obj-$(CONFIG_ARCH_IQ80331) += iq80331-pci.o
-obj-$(CONFIG_MACH_IQ80332) += iq80332-pci.o
+obj-$(CONFIG_ARCH_IQ80331) += iq80331.o
+obj-$(CONFIG_MACH_IQ80332) += iq80332.o
diff --git a/arch/arm/mach-iop33x/iq80331-pci.c b/arch/arm/mach-iop33x/iq80331-pci.c
deleted file mode 100644 (file)
index 8b0bed5..0000000
+++ /dev/null
@@ -1,80 +0,0 @@
-/*
- * arch/arm/mach-iop33x/iq80331-pci.c
- *
- * PCI support for the Intel IQ80331 reference board
- *
- * Author: Dave Jiang <dave.jiang@intel.com>
- * Copyright (C) 2003, 2004 Intel Corp.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 2 as
- * published by the Free Software Foundation.
- */
-#include <linux/kernel.h>
-#include <linux/pci.h>
-#include <linux/init.h>
-#include <linux/string.h>
-#include <linux/slab.h>
-
-#include <asm/hardware.h>
-#include <asm/irq.h>
-#include <asm/mach/pci.h>
-#include <asm/mach-types.h>
-
-/*
- * The following macro is used to lookup irqs in a standard table
- * format for those systems that do not already have PCI
- * interrupts properly routed.  We assume 1 <= pin <= 4
- */
-#define PCI_IRQ_TABLE_LOOKUP(minid,maxid)      \
-({ int _ctl_ = -1;                             \
-   unsigned int _idsel = idsel - minid;                \
-   if (_idsel <= maxid)                                \
-      _ctl_ = pci_irq_table[_idsel][pin-1];    \
-   _ctl_; })
-
-#define INTA   IRQ_IQ80331_INTA
-#define INTB   IRQ_IQ80331_INTB
-#define INTC   IRQ_IQ80331_INTC
-#define INTD   IRQ_IQ80331_INTD
-
-//#define INTE IRQ_IQ80331_I82544
-
-static inline int __init
-iq80331_map_irq(struct pci_dev *dev, u8 idsel, u8 pin)
-{
-       static int pci_irq_table[][4] = {
-               /*
-                * PCI IDSEL/INTPIN->INTLINE
-                * A       B       C       D
-                */
-               {INTB, INTC, INTD, INTA}, /* PCI-X Slot */
-               {INTC, INTC, INTC, INTC}, /* GigE  */
-       };
-
-       BUG_ON(pin < 1 || pin > 4);
-
-       return PCI_IRQ_TABLE_LOOKUP(1, 7);
-}
-
-static struct hw_pci iq80331_pci __initdata = {
-       .swizzle        = pci_std_swizzle,
-       .nr_controllers = 1,
-       .setup          = iop3xx_pci_setup,
-       .scan           = iop3xx_pci_scan_bus,
-       .preinit        = iop3xx_pci_preinit,
-       .map_irq        = iq80331_map_irq
-};
-
-static int __init iq80331_pci_init(void)
-{
-       if (machine_is_iq80331())
-               pci_common_init(&iq80331_pci);
-       return 0;
-}
-
-subsys_initcall(iq80331_pci_init);
-
-
-
-
diff --git a/arch/arm/mach-iop33x/iq80331.c b/arch/arm/mach-iop33x/iq80331.c
new file mode 100644 (file)
index 0000000..6b8475d
--- /dev/null
@@ -0,0 +1,148 @@
+/*
+ * arch/arm/mach-iop33x/iq80331.c
+ *
+ * Board support code for the Intel IQ80331 platform.
+ *
+ * Author: Dave Jiang <dave.jiang@intel.com>
+ * Copyright (C) 2003 Intel Corp.
+ *
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by the
+ * Free Software Foundation; either version 2 of the License, or (at your
+ * option) any later version.
+ */
+
+#include <linux/mm.h>
+#include <linux/init.h>
+#include <linux/kernel.h>
+#include <linux/pci.h>
+#include <linux/string.h>
+#include <linux/slab.h>
+#include <linux/serial_core.h>
+#include <linux/serial_8250.h>
+#include <linux/mtd/physmap.h>
+#include <linux/platform_device.h>
+#include <asm/hardware.h>
+#include <asm/io.h>
+#include <asm/irq.h>
+#include <asm/mach/arch.h>
+#include <asm/mach/map.h>
+#include <asm/mach/pci.h>
+#include <asm/mach/time.h>
+#include <asm/mach-types.h>
+#include <asm/page.h>
+#include <asm/pgtable.h>
+
+/*
+ * IQ80331 timer tick configuration.
+ */
+static void __init iq80331_timer_init(void)
+{
+       /* D-Step parts run at a higher internal bus frequency */
+       if (*IOP3XX_ATURID >= 0xa)
+               iop3xx_init_time(333000000);
+       else
+               iop3xx_init_time(266000000);
+}
+
+static struct sys_timer iq80331_timer = {
+       .init           = iq80331_timer_init,
+       .offset         = iop3xx_gettimeoffset,
+};
+
+
+/*
+ * IQ80331 PCI.
+ */
+static inline int __init
+iq80331_pci_map_irq(struct pci_dev *dev, u8 slot, u8 pin)
+{
+       int irq;
+
+       if (slot == 1 && pin == 1) {
+               /* PCI-X Slot INTA */
+               irq = IRQ_IOP331_XINT1;
+       } else if (slot == 1 && pin == 2) {
+               /* PCI-X Slot INTB */
+               irq = IRQ_IOP331_XINT2;
+       } else if (slot == 1 && pin == 3) {
+               /* PCI-X Slot INTC */
+               irq = IRQ_IOP331_XINT3;
+       } else if (slot == 1 && pin == 4) {
+               /* PCI-X Slot INTD */
+               irq = IRQ_IOP331_XINT0;
+       } else if (slot == 2) {
+               /* GigE */
+               irq = IRQ_IOP331_XINT2;
+       } else {
+               printk(KERN_ERR "iq80331_pci_map_irq() called for unknown "
+                       "device PCI:%d:%d:%d\n", dev->bus->number,
+                       PCI_SLOT(dev->devfn), PCI_FUNC(dev->devfn));
+               irq = -1;
+       }
+
+       return irq;
+}
+
+static struct hw_pci iq80331_pci __initdata = {
+       .swizzle        = pci_std_swizzle,
+       .nr_controllers = 1,
+       .setup          = iop3xx_pci_setup,
+       .preinit        = iop3xx_pci_preinit,
+       .scan           = iop3xx_pci_scan_bus,
+       .map_irq        = iq80331_pci_map_irq,
+};
+
+static int __init iq80331_pci_init(void)
+{
+       if (machine_is_iq80331())
+               pci_common_init(&iq80331_pci);
+
+       return 0;
+}
+
+subsys_initcall(iq80331_pci_init);
+
+
+/*
+ * IQ80331 machine initialisation.
+ */
+static struct physmap_flash_data iq80331_flash_data = {
+       .width          = 1,
+};
+
+static struct resource iq80331_flash_resource = {
+       .start          = 0xc0000000,
+       .end            = 0xc07fffff,
+       .flags          = IORESOURCE_MEM,
+};
+
+static struct platform_device iq80331_flash_device = {
+       .name           = "physmap-flash",
+       .id             = 0,
+       .dev            = {
+               .platform_data  = &iq80331_flash_data,
+       },
+       .num_resources  = 1,
+       .resource       = &iq80331_flash_resource,
+};
+
+static void __init iq80331_init_machine(void)
+{
+       platform_device_register(&iop3xx_i2c0_device);
+       platform_device_register(&iop3xx_i2c1_device);
+       platform_device_register(&iop33x_uart0_device);
+       platform_device_register(&iop33x_uart1_device);
+       platform_device_register(&iq80331_flash_device);
+}
+
+MACHINE_START(IQ80331, "Intel IQ80331")
+       /* Maintainer: Intel Corp. */
+       .phys_io        = 0xfefff000,
+       .io_pg_offst    = ((0xfffff000) >> 18) & 0xfffc,
+       .boot_params    = 0x00000100,
+       .map_io         = iop3xx_map_io,
+       .init_irq       = iop331_init_irq,
+       .timer          = &iq80331_timer,
+       .init_machine   = iq80331_init_machine,
+MACHINE_END
diff --git a/arch/arm/mach-iop33x/iq80332-pci.c b/arch/arm/mach-iop33x/iq80332-pci.c
deleted file mode 100644 (file)
index 0de8aa7..0000000
+++ /dev/null
@@ -1,86 +0,0 @@
-/*
- * arch/arm/mach-iop33x/iq80332-pci.c
- *
- * PCI support for the Intel IQ80332 reference board
- *
- * Author: Dave Jiang <dave.jiang@intel.com>
- * Copyright (C) 2004 Intel Corp.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 2 as
- * published by the Free Software Foundation.
- */
-#include <linux/kernel.h>
-#include <linux/pci.h>
-#include <linux/init.h>
-#include <linux/string.h>
-#include <linux/slab.h>
-
-#include <asm/hardware.h>
-#include <asm/irq.h>
-#include <asm/mach/pci.h>
-#include <asm/mach-types.h>
-
-/*
- * The following macro is used to lookup irqs in a standard table
- * format for those systems that do not already have PCI
- * interrupts properly routed.  We assume 1 <= pin <= 4
- */
-#define PCI_IRQ_TABLE_LOOKUP(minid,maxid)      \
-({ int _ctl_ = -1;                             \
-   unsigned int _idsel = idsel - minid;                \
-   if (_idsel <= maxid)                                \
-      _ctl_ = pci_irq_table[_idsel][pin-1];    \
-   _ctl_; })
-
-#define INTA   IRQ_IQ80332_INTA
-#define INTB   IRQ_IQ80332_INTB
-#define INTC   IRQ_IQ80332_INTC
-#define INTD   IRQ_IQ80332_INTD
-
-//#define INTE IRQ_IQ80332_I82544
-
-static inline int __init
-iq80332_map_irq(struct pci_dev *dev, u8 idsel, u8 pin)
-{
-       static int pci_irq_table[][8] = {
-               /*
-                * PCI IDSEL/INTPIN->INTLINE
-                * A       B       C       D
-                */
-               {-1,   -1,   -1,   -1},
-               {-1,   -1,   -1,   -1},
-               {-1,   -1,   -1,   -1},
-               {INTA, INTB, INTC, INTD}, /* PCI-X Slot */
-               {-1,   -1,   -1,   -1},
-               {INTC, INTC, INTC, INTC}, /* GigE  */
-               {-1,   -1,   -1,   -1},
-               {-1,   -1,   -1,   -1},
-       };
-
-       BUG_ON(pin < 1 || pin > 4);
-
-       return PCI_IRQ_TABLE_LOOKUP(1, 7);
-}
-
-static struct hw_pci iq80332_pci __initdata = {
-       .swizzle        = pci_std_swizzle,
-       .nr_controllers = 1,
-       .setup          = iop3xx_pci_setup,
-       .scan           = iop3xx_pci_scan_bus,
-       .preinit        = iop3xx_pci_preinit,
-       .map_irq        = iq80332_map_irq
-};
-
-static int __init iq80332_pci_init(void)
-{
-       if (machine_is_iq80332())
-               pci_common_init(&iq80332_pci);
-       return 0;
-}
-
-subsys_initcall(iq80332_pci_init);
-
-
-
-
diff --git a/arch/arm/mach-iop33x/iq80332.c b/arch/arm/mach-iop33x/iq80332.c
new file mode 100644 (file)
index 0000000..150f3fd
--- /dev/null
@@ -0,0 +1,148 @@
+/*
+ * arch/arm/mach-iop33x/iq80332.c
+ *
+ * Board support code for the Intel IQ80332 platform.
+ *
+ * Author: Dave Jiang <dave.jiang@intel.com>
+ * Copyright (C) 2004 Intel Corp.
+ *
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by the
+ * Free Software Foundation; either version 2 of the License, or (at your
+ * option) any later version.
+ */
+
+#include <linux/mm.h>
+#include <linux/init.h>
+#include <linux/kernel.h>
+#include <linux/pci.h>
+#include <linux/string.h>
+#include <linux/slab.h>
+#include <linux/serial_core.h>
+#include <linux/serial_8250.h>
+#include <linux/mtd/physmap.h>
+#include <linux/platform_device.h>
+#include <asm/hardware.h>
+#include <asm/io.h>
+#include <asm/irq.h>
+#include <asm/mach/arch.h>
+#include <asm/mach/map.h>
+#include <asm/mach/pci.h>
+#include <asm/mach/time.h>
+#include <asm/mach-types.h>
+#include <asm/page.h>
+#include <asm/pgtable.h>
+
+/*
+ * IQ80332 timer tick configuration.
+ */
+static void __init iq80332_timer_init(void)
+{
+       /* D-Step parts and the iop333 run at a higher internal bus frequency */
+       if (*IOP3XX_ATURID >= 0xa || *IOP3XX_ATUDID == 0x374)
+               iop3xx_init_time(333000000);
+       else
+               iop3xx_init_time(266000000);
+}
+
+static struct sys_timer iq80332_timer = {
+       .init           = iq80332_timer_init,
+       .offset         = iop3xx_gettimeoffset,
+};
+
+
+/*
+ * IQ80332 PCI.
+ */
+static inline int __init
+iq80332_pci_map_irq(struct pci_dev *dev, u8 slot, u8 pin)
+{
+       int irq;
+
+       if (slot == 4 && pin == 1) {
+               /* PCI-X Slot INTA */
+               irq = IRQ_IOP331_XINT0;
+       } else if (slot == 4 && pin == 2) {
+               /* PCI-X Slot INTB */
+               irq = IRQ_IOP331_XINT1;
+       } else if (slot == 4 && pin == 3) {
+               /* PCI-X Slot INTC */
+               irq = IRQ_IOP331_XINT2;
+       } else if (slot == 4 && pin == 4) {
+               /* PCI-X Slot INTD */
+               irq = IRQ_IOP331_XINT3;
+       } else if (slot == 6) {
+               /* GigE */
+               irq = IRQ_IOP331_XINT2;
+       } else {
+               printk(KERN_ERR "iq80332_pci_map_irq() called for unknown "
+                       "device PCI:%d:%d:%d\n", dev->bus->number,
+                       PCI_SLOT(dev->devfn), PCI_FUNC(dev->devfn));
+               irq = -1;
+       }
+
+       return irq;
+}
+
+static struct hw_pci iq80332_pci __initdata = {
+       .swizzle        = pci_std_swizzle,
+       .nr_controllers = 1,
+       .setup          = iop3xx_pci_setup,
+       .preinit        = iop3xx_pci_preinit,
+       .scan           = iop3xx_pci_scan_bus,
+       .map_irq        = iq80332_pci_map_irq,
+};
+
+static int __init iq80332_pci_init(void)
+{
+       if (machine_is_iq80332())
+               pci_common_init(&iq80332_pci);
+
+       return 0;
+}
+
+subsys_initcall(iq80332_pci_init);
+
+
+/*
+ * IQ80332 machine initialisation.
+ */
+static struct physmap_flash_data iq80332_flash_data = {
+       .width          = 1,
+};
+
+static struct resource iq80332_flash_resource = {
+       .start          = 0xc0000000,
+       .end            = 0xc07fffff,
+       .flags          = IORESOURCE_MEM,
+};
+
+static struct platform_device iq80332_flash_device = {
+       .name           = "physmap-flash",
+       .id             = 0,
+       .dev            = {
+               .platform_data  = &iq80332_flash_data,
+       },
+       .num_resources  = 1,
+       .resource       = &iq80332_flash_resource,
+};
+
+static void __init iq80332_init_machine(void)
+{
+       platform_device_register(&iop3xx_i2c0_device);
+       platform_device_register(&iop3xx_i2c1_device);
+       platform_device_register(&iop33x_uart0_device);
+       platform_device_register(&iop33x_uart1_device);
+       platform_device_register(&iq80332_flash_device);
+}
+
+MACHINE_START(IQ80332, "Intel IQ80332")
+       /* Maintainer: Intel Corp. */
+       .phys_io        = 0xfefff000,
+       .io_pg_offst    = ((0xfffff000) >> 18) & 0xfffc,
+       .boot_params    = 0x00000100,
+       .map_io         = iop3xx_map_io,
+       .init_irq       = iop331_init_irq,
+       .timer          = &iq80332_timer,
+       .init_machine   = iq80332_init_machine,
+MACHINE_END
diff --git a/arch/arm/mach-iop33x/setup.c b/arch/arm/mach-iop33x/setup.c
deleted file mode 100644 (file)
index 7cf5015..0000000
+++ /dev/null
@@ -1,162 +0,0 @@
-/*
- * linux/arch/arm/mach-iop33x/setup.c
- *
- * Author: Dave Jiang (dave.jiang@intel.com)
- * Copyright (C) 2004 Intel Corporation.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 2 as
- * published by the Free Software Foundation.
- *
- */
-#include <linux/mm.h>
-#include <linux/init.h>
-#include <linux/major.h>
-#include <linux/fs.h>
-#include <linux/platform_device.h>
-#include <linux/serial.h>
-#include <linux/tty.h>
-#include <linux/serial_8250.h>
-
-#include <asm/io.h>
-#include <asm/pgtable.h>
-#include <asm/page.h>
-#include <asm/mach/map.h>
-#include <asm/setup.h>
-#include <asm/system.h>
-#include <asm/memory.h>
-#include <asm/hardware.h>
-#include <asm/mach-types.h>
-#include <asm/mach/arch.h>
-#include <asm/mach/time.h>
-#include <asm/hardware/iop3xx.h>
-
-#define IOP331_UART_XTAL 33334000
-
-static struct resource iop33x_uart0_resources[] = {
-       [0] = {
-               .start = IOP331_UART0_PHYS,
-               .end = IOP331_UART0_PHYS + 0x3f,
-               .flags = IORESOURCE_MEM,
-       },
-       [1] = {
-               .start = IRQ_IOP331_UART0,
-               .end = IRQ_IOP331_UART0,
-               .flags = IORESOURCE_IRQ
-       }
-};
-
-static struct resource iop33x_uart1_resources[] = {
-       [0] = {
-               .start = IOP331_UART1_PHYS,
-               .end = IOP331_UART1_PHYS + 0x3f,
-               .flags = IORESOURCE_MEM,
-       },
-       [1] = {
-               .start = IRQ_IOP331_UART1,
-               .end = IRQ_IOP331_UART1,
-               .flags = IORESOURCE_IRQ
-       }
-};
-
-static struct plat_serial8250_port iop33x_uart0_data[] = {
-       {
-       .membase     = (char*)(IOP331_UART0_VIRT),
-       .mapbase     = (IOP331_UART0_PHYS),
-       .irq         = IRQ_IOP331_UART0,
-       .uartclk     = IOP331_UART_XTAL,
-       .regshift    = 2,
-       .iotype      = UPIO_MEM,
-       .flags       = UPF_SKIP_TEST,
-       },
-       {  },
-};
-
-static struct plat_serial8250_port iop33x_uart1_data[] = {
-       {
-       .membase     = (char*)(IOP331_UART1_VIRT),
-       .mapbase     = (IOP331_UART1_PHYS),
-       .irq         = IRQ_IOP331_UART1,
-       .uartclk     = IOP331_UART_XTAL,
-       .regshift    = 2,
-       .iotype      = UPIO_MEM,
-       .flags       = UPF_SKIP_TEST,
-       },
-       {  },
-};
-
-static struct platform_device iop33x_uart0 = {
-       .name = "serial8250",
-       .id = PLAT8250_DEV_PLATFORM,
-       .dev.platform_data = iop33x_uart0_data,
-       .num_resources = 2,
-       .resource = iop33x_uart0_resources,
-};
-
-static struct platform_device iop33x_uart1 = {
-       .name = "serial8250",
-       .id = PLAT8250_DEV_PLATFORM1,
-       .dev.platform_data = iop33x_uart1_data,
-       .num_resources = 2,
-       .resource = iop33x_uart1_resources,
-};
-
-static struct platform_device *iop33x_devices[] __initdata = {
-       &iop33x_uart0,
-       &iop33x_uart1,
-};
-
-void __init iop33x_init(void)
-{
-       if(iop_is_331())
-       {
-               platform_add_devices(iop33x_devices,
-                               ARRAY_SIZE(iop33x_devices));
-       }
-       platform_device_register(&iop3xx_i2c0_device);
-       platform_device_register(&iop3xx_i2c1_device);
-}
-
-#ifdef CONFIG_ARCH_IOP33X
-extern void iop331_init_irq(void);
-#endif
-
-static void __init iop3xx_timer_init(void)
-{
-       iop3xx_init_time(IOP331_TICK_RATE);
-}
-
-struct sys_timer iop331_timer = {
-       .init           = iop3xx_timer_init,
-       .offset         = iop3xx_gettimeoffset,
-};
-
-#if defined(CONFIG_ARCH_IQ80331)
-MACHINE_START(IQ80331, "Intel IQ80331")
-       /* Maintainer: Intel Corp. */
-       .phys_io        = 0xfefff000,
-       .io_pg_offst    = ((0xfffff000) >> 18) & 0xfffc, // virtual, physical
-       .map_io         = iop3xx_map_io,
-       .init_irq       = iop331_init_irq,
-       .timer          = &iop331_timer,
-       .boot_params    = 0x0100,
-       .init_machine   = iop33x_init,
-MACHINE_END
-
-#elif defined(CONFIG_MACH_IQ80332)
-MACHINE_START(IQ80332, "Intel IQ80332")
-       /* Maintainer: Intel Corp. */
-       .phys_io        = 0xfefff000,
-       .io_pg_offst    = ((0xfffff000) >> 18) & 0xfffc, // virtual, physical
-       .map_io         = iop3xx_map_io,
-       .init_irq       = iop331_init_irq,
-       .timer          = &iop331_timer,
-       .boot_params    = 0x0100,
-       .init_machine   = iop33x_init,
-MACHINE_END
-
-#else
-#error No machine descriptor defined for this IOP3XX implementation
-#endif
-
-
diff --git a/arch/arm/mach-iop33x/uart.c b/arch/arm/mach-iop33x/uart.c
new file mode 100644 (file)
index 0000000..d221d4a
--- /dev/null
@@ -0,0 +1,106 @@
+/*
+ * linux/arch/arm/mach-iop33x/uart.c
+ *
+ * Author: Dave Jiang (dave.jiang@intel.com)
+ * Copyright (C) 2004 Intel Corporation.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 as
+ * published by the Free Software Foundation.
+ */
+
+#include <linux/mm.h>
+#include <linux/init.h>
+#include <linux/major.h>
+#include <linux/fs.h>
+#include <linux/platform_device.h>
+#include <linux/serial.h>
+#include <linux/tty.h>
+#include <linux/serial_8250.h>
+
+#include <asm/io.h>
+#include <asm/pgtable.h>
+#include <asm/page.h>
+#include <asm/mach/map.h>
+#include <asm/setup.h>
+#include <asm/system.h>
+#include <asm/memory.h>
+#include <asm/hardware.h>
+#include <asm/hardware/iop3xx.h>
+#include <asm/mach-types.h>
+#include <asm/mach/arch.h>
+
+#define IOP331_UART_XTAL 33334000
+
+static struct plat_serial8250_port iop33x_uart0_data[] = {
+       {
+               .membase        = (char *)IOP331_UART0_VIRT,
+               .mapbase        = IOP331_UART0_PHYS,
+               .irq            = IRQ_IOP331_UART0,
+               .uartclk        = IOP331_UART_XTAL,
+               .regshift       = 2,
+               .iotype         = UPIO_MEM,
+               .flags          = UPF_SKIP_TEST,
+       },
+       { },
+};
+
+static struct resource iop33x_uart0_resources[] = {
+       [0] = {
+               .start  = IOP331_UART0_PHYS,
+               .end    = IOP331_UART0_PHYS + 0x3f,
+               .flags  = IORESOURCE_MEM,
+       },
+       [1] = {
+               .start  = IRQ_IOP331_UART0,
+               .end    = IRQ_IOP331_UART0,
+               .flags  = IORESOURCE_IRQ,
+       },
+};
+
+struct platform_device iop33x_uart0_device = {
+       .name           = "serial8250",
+       .id             = PLAT8250_DEV_PLATFORM,
+       .dev            = {
+               .platform_data          = iop33x_uart0_data,
+       },
+       .num_resources  = 2,
+       .resource       = iop33x_uart0_resources,
+};
+
+
+static struct resource iop33x_uart1_resources[] = {
+       [0] = {
+               .start  = IOP331_UART1_PHYS,
+               .end    = IOP331_UART1_PHYS + 0x3f,
+               .flags  = IORESOURCE_MEM,
+       },
+       [1] = {
+               .start  = IRQ_IOP331_UART1,
+               .end    = IRQ_IOP331_UART1,
+               .flags  = IORESOURCE_IRQ,
+       },
+};
+
+static struct plat_serial8250_port iop33x_uart1_data[] = {
+       {
+               .membase        = (char *)IOP331_UART1_VIRT,
+               .mapbase        = IOP331_UART1_PHYS,
+               .irq            = IRQ_IOP331_UART1,
+               .uartclk        = IOP331_UART_XTAL,
+               .regshift       = 2,
+               .iotype         = UPIO_MEM,
+               .flags          = UPF_SKIP_TEST,
+       },
+       { },
+};
+
+struct platform_device iop33x_uart1_device = {
+       .name           = "serial8250",
+       .id             = PLAT8250_DEV_PLATFORM1,
+       .dev            = {
+               .platform_data          = iop33x_uart1_data,
+       },
+       .num_resources  = 2,
+       .resource       = iop33x_uart1_resources,
+};
index 1e57e00947677e287fa3ea3ad4fb1b4430ec5e8a..8042946327edee9d0338d6fac20a41eec5a7334c 100644 (file)
 #define IOP321_IINTSRC    (volatile u32 *)IOP321_REG_ADDR(0x000007D8)
 #define IOP321_FINTSRC    (volatile u32 *)IOP321_REG_ADDR(0x000007DC)
 
-/* Timers */
-#ifdef CONFIG_ARCH_IQ80321
-#define        IOP321_TICK_RATE        200000000       /* 200 MHz clock */
-#elif defined(CONFIG_ARCH_IQ31244)
-#define IOP321_TICK_RATE       198000000       /* 33.000 MHz crystal */
-#endif
-
-#ifdef CONFIG_ARCH_EP80219
-#undef IOP321_TICK_RATE
-#define IOP321_TICK_RATE 200000000 /* 33.333333 Mhz crystal */
-#endif
-
 /* Application accelerator unit 0x00000800 - 0x000008FF */
 #define IOP321_AAU_ACR     (volatile u32 *)IOP321_REG_ADDR(0x00000800)
 #define IOP321_AAU_ASR     (volatile u32 *)IOP321_REG_ADDR(0x00000804)
index f490063d2156960b82658be82c629a670dfb50d1..cf2d2343398db0c4d0208e423a720c89f70da924 100644 (file)
@@ -7,18 +7,11 @@
 #ifndef _IQ31244_H_
 #define _IQ31244_H_
 
-#define        IQ31244_FLASHBASE       0xf0000000      /* Flash */
-#define        IQ31244_FLASHSIZE       0x00800000
-#define        IQ31244_FLASHWIDTH      2
-
 #define IQ31244_UART           0xfe800000      /* UART #1 */
 #define IQ31244_7SEG_1         0xfe840000      /* 7-Segment MSB */
 #define IQ31244_7SEG_0         0xfe850000      /* 7-Segment LSB (WO) */
 #define IQ31244_ROTARY_SW      0xfe8d0000      /* Rotary Switch */
 #define IQ31244_BATT_STAT      0xfe8f0000      /* Battery Status */
 
-#ifndef __ASSEMBLY__
-extern void iq31244_map_io(void);
-#endif
 
 #endif // _IQ31244_H_
index 7015a605ab64d8b2bfd880bcf0ccaa3501d78fee..55d70f49b7fdd56858a1629b9a5662fe8c798243 100644 (file)
@@ -7,18 +7,11 @@
 #ifndef _IQ80321_H_
 #define _IQ80321_H_
 
-#define        IQ80321_FLASHBASE       0xf0000000      /* Flash */
-#define        IQ80321_FLASHSIZE       0x00800000
-#define        IQ80321_FLASHWIDTH      1
-
 #define IQ80321_UART           0xfe800000      /* UART #1 */
 #define IQ80321_7SEG_1         0xfe840000      /* 7-Segment MSB */
 #define IQ80321_7SEG_0         0xfe850000      /* 7-Segment LSB (WO) */
 #define IQ80321_ROTARY_SW      0xfe8d0000      /* Rotary Switch */
 #define IQ80321_BATT_STAT      0xfe8f0000      /* Battery Status */
 
-#ifndef __ASSEMBLY__
-extern void iq80321_map_io(void);
-#endif
 
 #endif // _IQ80321_H_
index 9fefcf3372b1701749ba94a1fa45b8037b3c940a..a48327ced92e77849318f7840bd82bb06462d8c9 100644 (file)
 #define NR_IRQS                        32
 
 
-/*
- * Interrupts available on the IQ80321 board
- */
-
-/*
- * On board devices
- */
-#define        IRQ_IQ80321_I82544      IRQ_IOP321_XINT0
-#define IRQ_IQ80321_UART       IRQ_IOP321_XINT1
-
-/*
- * PCI interrupts
- */
-#define        IRQ_IQ80321_INTA        IRQ_IOP321_XINT0
-#define        IRQ_IQ80321_INTB        IRQ_IOP321_XINT1
-#define        IRQ_IQ80321_INTC        IRQ_IOP321_XINT2
-#define        IRQ_IQ80321_INTD        IRQ_IOP321_XINT3
-
-/*
- * Interrupts on the IQ31244 board
- */
-
-/*
- * On board devices
- */
-#define IRQ_IQ31244_UART       IRQ_IOP321_XINT1
-#define        IRQ_IQ31244_I82546      IRQ_IOP321_XINT0
-#define IRQ_IQ31244_SATA       IRQ_IOP321_XINT2
-#define        IRQ_IQ31244_PCIX_SLOT   IRQ_IOP321_XINT3
-
-/*
- * PCI interrupts
- */
-#define        IRQ_IQ31244_INTA        IRQ_IOP321_XINT0
-#define        IRQ_IQ31244_INTB        IRQ_IOP321_XINT1
-#define        IRQ_IQ31244_INTC        IRQ_IOP321_XINT2
-#define        IRQ_IQ31244_INTD        IRQ_IOP321_XINT3
-
 #endif // _IRQ_H_
index 5e3cb32af0205e0c752f4a97df7686ace0149da4..3ebfdc6fea9965b26ceecdee7b84bc49fa08de71 100644 (file)
 #define PCIBIOS_MIN_IO         0x00000000
 #define PCIBIOS_MIN_MEM                0x00000000
 
+#ifndef __ASSEMBLY__
+extern struct platform_device iop33x_uart0_device;
+extern struct platform_device iop33x_uart1_device;
+#endif
+
 
 /*
  * Generic chipset bits
index d12a95aa967a3db9beb438b7c7d953b8cea3a9bd..a21872abd8775f73846fb991feb4f6b5929978c8 100644 (file)
 #define IOP331_FINTVEC    (volatile u32 *)IOP331_REG_ADDR(0x000007CC)
 
 
-/* Timers */
-#if defined(CONFIG_ARCH_IOP33X)
-#define        IOP331_TICK_RATE        266000000       /* 266 MHz IB clock */
-#endif
-
-#if defined(CONFIG_IOP331_STEPD) || defined(CONFIG_ARCH_IQ80333)
-#undef IOP331_TICK_RATE
-#define IOP331_TICK_RATE       333000000       /* 333 Mhz IB clock */
-#endif
-
 /* Application accelerator unit 0x00000800 - 0x000008FF */
 #define IOP331_AAU_ACR     (volatile u32 *)IOP331_REG_ADDR(0x00000800)
 #define IOP331_AAU_ASR     (volatile u32 *)IOP331_REG_ADDR(0x00000804)
index bda7ab6d55cfc06e76e4df1c4f7313f2ce41c329..186762bf8944f77f3083c74d0cd2ac17b6ac6f2f 100644 (file)
@@ -7,17 +7,10 @@
 #ifndef _IQ80331_H_
 #define _IQ80331_H_
 
-#define        IQ80331_FLASHBASE       0xc0000000      /* Flash */
-#define        IQ80331_FLASHSIZE       0x00800000
-#define        IQ80331_FLASHWIDTH      1
-
 #define IQ80331_7SEG_1         0xce840000      /* 7-Segment MSB */
 #define IQ80331_7SEG_0         0xce850000      /* 7-Segment LSB (WO) */
 #define IQ80331_ROTARY_SW      0xce8d0000      /* Rotary Switch */
 #define IQ80331_BATT_STAT      0xce8f0000      /* Battery Status */
 
-#ifndef __ASSEMBLY__
-extern void iq80331_map_io(void);
-#endif
 
 #endif // _IQ80331_H_
index f728e04378ab5c2e9091cb3ca28af51b5ba04205..2a5d4ee01df98153e16c0752a7ed7cc2bd077daa 100644 (file)
@@ -7,17 +7,10 @@
 #ifndef _IQ80332_H_
 #define _IQ80332_H_
 
-#define        IQ80332_FLASHBASE       0xc0000000      /* Flash */
-#define        IQ80332_FLASHSIZE       0x00800000
-#define        IQ80332_FLASHWIDTH      1
-
 #define IQ80332_7SEG_1         0xce840000      /* 7-Segment MSB */
 #define IQ80332_7SEG_0         0xce850000      /* 7-Segment LSB (WO) */
 #define IQ80332_ROTARY_SW      0xce8d0000      /* Rotary Switch */
 #define IQ80332_BATT_STAT      0xce8f0000      /* Battery Status */
 
-#ifndef __ASSEMBLY__
-extern void iq80332_map_io(void);
-#endif
 
 #endif // _IQ80332_H_
index 2e3ade3b5ff9b0253f0a80f51d3fc0432cb4c168..a875404a07fc8a70c4d2960bfd4609a733e80c81 100644 (file)
 #define NR_IRQS                        64
 
 
-/*
- * Interrupts available on the IQ80331 board
- */
-
-/*
- * On board devices
- */
-#define        IRQ_IQ80331_I82544      IRQ_IOP331_XINT0
-#define IRQ_IQ80331_UART0      IRQ_IOP331_UART0
-#define IRQ_IQ80331_UART1      IRQ_IOP331_UART1
-
-/*
- * PCI interrupts
- */
-#define        IRQ_IQ80331_INTA        IRQ_IOP331_XINT0
-#define        IRQ_IQ80331_INTB        IRQ_IOP331_XINT1
-#define        IRQ_IQ80331_INTC        IRQ_IOP331_XINT2
-#define        IRQ_IQ80331_INTD        IRQ_IOP331_XINT3
-
-/*
- * Interrupts available on the IQ80332 board
- */
-
-/*
- * On board devices
- */
-#define        IRQ_IQ80332_I82544      IRQ_IOP331_XINT0
-#define IRQ_IQ80332_UART0      IRQ_IOP331_UART0
-#define IRQ_IQ80332_UART1      IRQ_IOP331_UART1
-
-/*
- * PCI interrupts
- */
-#define        IRQ_IQ80332_INTA        IRQ_IOP331_XINT0
-#define        IRQ_IQ80332_INTB        IRQ_IOP331_XINT1
-#define        IRQ_IQ80332_INTC        IRQ_IOP331_XINT2
-#define        IRQ_IQ80332_INTD        IRQ_IOP331_XINT3
-
 #endif // _IRQ_H_