Merge ../linux-2.6

1 files changed, 325 insertions, 0 deletions

diff --git a/arch/arm/mach-ixp23xx/ixdp2351.c b/arch/arm/mach-ixp23xx/ixdp2351.c
new file mode 100644
index 000000000000..00146c35daac
--- /dev/null
+++ b/arch/arm/mach-ixp23xx/ixdp2351.c
@@ -0,0 +1,325 @@
+/*
+ * arch/arm/mach-ixp23xx/ixdp2351.c
+ *
+ * IXDP2351 board-specific routines
+ *
+ * Author: Deepak Saxena <dsaxena@plexity.net>
+ *
+ * Copyright 2005 (c) MontaVista Software, Inc.
+ *
+ * Based on 2.4 code Copyright 2004 (c) Intel Corporation
+ *
+ * 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/config.h>
+#include <linux/kernel.h>
+#include <linux/init.h>
+#include <linux/spinlock.h>
+#include <linux/sched.h>
+#include <linux/interrupt.h>
+#include <linux/serial.h>
+#include <linux/tty.h>
+#include <linux/bitops.h>
+#include <linux/ioport.h>
+#include <linux/serial.h>
+#include <linux/serial_8250.h>
+#include <linux/serial_core.h>
+#include <linux/device.h>
+#include <linux/mm.h>
+#include <linux/pci.h>
+#include <linux/mtd/physmap.h>
+
+#include <asm/types.h>
+#include <asm/setup.h>
+#include <asm/memory.h>
+#include <asm/hardware.h>
+#include <asm/mach-types.h>
+#include <asm/irq.h>
+#include <asm/system.h>
+#include <asm/tlbflush.h>
+#include <asm/pgtable.h>
+
+#include <asm/mach/map.h>
+#include <asm/mach/irq.h>
+#include <asm/mach/arch.h>
+#include <asm/mach/irq.h>
+#include <asm/mach/pci.h>
+
+/*
+ * IXDP2351 Interrupt Handling
+ */
+static void ixdp2351_inta_mask(unsigned int irq)
+{
+        *IXDP2351_CPLD_INTA_MASK_SET_REG = IXDP2351_INTA_IRQ_MASK(irq);
+}
+
+static void ixdp2351_inta_unmask(unsigned int irq)
+{
+        *IXDP2351_CPLD_INTA_MASK_CLR_REG = IXDP2351_INTA_IRQ_MASK(irq);
+}
+
+static void ixdp2351_inta_handler(unsigned int irq, struct irqdesc *desc, struct pt_regs *regs)
+{
+        u16 ex_interrupt =
+                *IXDP2351_CPLD_INTA_STAT_REG & IXDP2351_INTA_IRQ_VALID;
+        int i;
+
+        desc->chip->mask(irq);
+
+        for (i = 0; i < IXDP2351_INTA_IRQ_NUM; i++) {
+                if (ex_interrupt & (1 << i)) {
+                        struct irqdesc *cpld_desc;
+                        int cpld_irq =
+                                IXP23XX_MACH_IRQ(IXDP2351_INTA_IRQ_BASE + i);
+                        cpld_desc = irq_desc + cpld_irq;
+                        cpld_desc->handle(cpld_irq, cpld_desc, regs);
+                }
+        }
+
+        desc->chip->unmask(irq);
+}
+
+static struct irqchip ixdp2351_inta_chip = {
+        .ack    = ixdp2351_inta_mask,
+        .mask   = ixdp2351_inta_mask,
+        .unmask = ixdp2351_inta_unmask
+};
+
+static void ixdp2351_intb_mask(unsigned int irq)
+{
+        *IXDP2351_CPLD_INTB_MASK_SET_REG = IXDP2351_INTB_IRQ_MASK(irq);
+}
+
+static void ixdp2351_intb_unmask(unsigned int irq)
+{
+        *IXDP2351_CPLD_INTB_MASK_CLR_REG = IXDP2351_INTB_IRQ_MASK(irq);
+}
+
+static void ixdp2351_intb_handler(unsigned int irq, struct irqdesc *desc, struct pt_regs *regs)
+{
+        u16 ex_interrupt =
+                *IXDP2351_CPLD_INTB_STAT_REG & IXDP2351_INTB_IRQ_VALID;
+        int i;
+
+        desc->chip->ack(irq);
+
+        for (i = 0; i < IXDP2351_INTB_IRQ_NUM; i++) {
+                if (ex_interrupt & (1 << i)) {
+                        struct irqdesc *cpld_desc;
+                        int cpld_irq =
+                                IXP23XX_MACH_IRQ(IXDP2351_INTB_IRQ_BASE + i);
+                        cpld_desc = irq_desc + cpld_irq;
+                        cpld_desc->handle(cpld_irq, cpld_desc, regs);
+                }
+        }
+
+        desc->chip->unmask(irq);
+}
+
+static struct irqchip ixdp2351_intb_chip = {
+        .ack    = ixdp2351_intb_mask,
+        .mask   = ixdp2351_intb_mask,
+        .unmask = ixdp2351_intb_unmask
+};
+
+void ixdp2351_init_irq(void)
+{
+        int irq;
+
+        /* Mask all interrupts from CPLD, disable simulation */
+        *IXDP2351_CPLD_INTA_MASK_SET_REG = (u16) -1;
+        *IXDP2351_CPLD_INTB_MASK_SET_REG = (u16) -1;
+        *IXDP2351_CPLD_INTA_SIM_REG = 0;
+        *IXDP2351_CPLD_INTB_SIM_REG = 0;
+
+        ixp23xx_init_irq();
+
+        for (irq = IXP23XX_MACH_IRQ(IXDP2351_INTA_IRQ_BASE);
+             irq <
+             IXP23XX_MACH_IRQ(IXDP2351_INTA_IRQ_BASE + IXDP2351_INTA_IRQ_NUM);
+             irq++) {
+                if (IXDP2351_INTA_IRQ_MASK(irq) & IXDP2351_INTA_IRQ_VALID) {
+                        set_irq_flags(irq, IRQF_VALID);
+                        set_irq_handler(irq, do_level_IRQ);
+                        set_irq_chip(irq, &ixdp2351_inta_chip);
+                }
+        }
+
+        for (irq = IXP23XX_MACH_IRQ(IXDP2351_INTB_IRQ_BASE);
+             irq <
+             IXP23XX_MACH_IRQ(IXDP2351_INTB_IRQ_BASE + IXDP2351_INTB_IRQ_NUM);
+             irq++) {
+                if (IXDP2351_INTB_IRQ_MASK(irq) & IXDP2351_INTB_IRQ_VALID) {
+                        set_irq_flags(irq, IRQF_VALID);
+                        set_irq_handler(irq, do_level_IRQ);
+                        set_irq_chip(irq, &ixdp2351_intb_chip);
+                }
+        }
+
+        set_irq_chained_handler(IRQ_IXP23XX_INTA, &ixdp2351_inta_handler);
+        set_irq_chained_handler(IRQ_IXP23XX_INTB, &ixdp2351_intb_handler);
+}
+
+/*
+ * IXDP2351 PCI
+ */
+
+/*
+ * This board does not do normal PCI IRQ routing, or any
+ * sort of swizzling, so we just need to check where on the
+ * bus the device is and figure out what CPLD pin it is
+ * being routed to.
+ */
+#define DEVPIN(dev, pin) ((pin) | ((dev) << 3))
+
+static int __init ixdp2351_map_irq(struct pci_dev *dev, u8 slot, u8 pin)
+{
+        u8 bus = dev->bus->number;
+        u32 devpin = DEVPIN(PCI_SLOT(dev->devfn), pin);
+        struct pci_bus *tmp_bus = dev->bus;
+
+        /* Primary bus, no interrupts here */
+        if (!bus)
+                return -1;
+
+        /* Lookup first leaf in bus tree */
+        while ((tmp_bus->parent != NULL) && (tmp_bus->parent->parent != NULL))
+                tmp_bus = tmp_bus->parent;
+
+        /* Select between known bridges */
+        switch (tmp_bus->self->devfn | (tmp_bus->self->bus->number << 8)) {
+                /* Device is located after first bridge */
+        case 0x0008:
+                if (tmp_bus == dev->bus) {
+                        /* Device is located directy after first bridge */
+                        switch (devpin) {
+                                /* Onboard 82546 */
+                        case DEVPIN(1, 1):      /* Onboard 82546 ch 0 */
+                                return IRQ_IXDP2351_INTA_82546;
+                        case DEVPIN(1, 2):      /* Onboard 82546 ch 1 */
+                                return IRQ_IXDP2351_INTB_82546;
+                                /* PMC SLOT */
+                        case DEVPIN(0, 1):      /* PMCP INTA# */
+                        case DEVPIN(2, 4):      /* PMCS INTD# */
+                                return IRQ_IXDP2351_SPCI_PMC_INTA;
+                        case DEVPIN(0, 2):      /* PMCP INTB# */
+                        case DEVPIN(2, 1):      /* PMCS INTA# */
+                                return IRQ_IXDP2351_SPCI_PMC_INTB;
+                        case DEVPIN(0, 3):      /* PMCP INTC# */
+                        case DEVPIN(2, 2):      /* PMCS INTB# */
+                                return IRQ_IXDP2351_SPCI_PMC_INTC;
+                        case DEVPIN(0, 4):      /* PMCP INTD# */
+                        case DEVPIN(2, 3):      /* PMCS INTC# */
+                                return IRQ_IXDP2351_SPCI_PMC_INTD;
+                        }
+                } else {
+                        /* Device is located indirectly after first bridge */
+                        /* Not supported now */
+                        return -1;
+                }
+                break;
+        case 0x0010:
+                if (tmp_bus == dev->bus) {
+                        /* Device is located directy after second bridge */
+                        /* Secondary bus of second bridge */
+                        switch (devpin) {
+                        case DEVPIN(0, 1):      /* DB#0 */
+                        case DEVPIN(0, 2):
+                        case DEVPIN(0, 3):
+                        case DEVPIN(0, 4):
+                                return IRQ_IXDP2351_SPCI_DB_0;
+                        case DEVPIN(1, 1):      /* DB#1 */
+                        case DEVPIN(1, 2):
+                        case DEVPIN(1, 3):
+                        case DEVPIN(1, 4):
+                                return IRQ_IXDP2351_SPCI_DB_1;
+                        case DEVPIN(2, 1):      /* FIC1 */
+                        case DEVPIN(2, 2):
+                        case DEVPIN(2, 3):
+                        case DEVPIN(2, 4):
+                        case DEVPIN(3, 1):      /* FIC2 */
+                        case DEVPIN(3, 2):
+                        case DEVPIN(3, 3):
+                        case DEVPIN(3, 4):
+                                return IRQ_IXDP2351_SPCI_FIC;
+                        }
+                } else {
+                        /* Device is located indirectly after second bridge */
+                        /* Not supported now */
+                        return -1;
+                }
+                break;
+        }
+
+        return -1;
+}
+
+struct hw_pci ixdp2351_pci __initdata = {
+        .nr_controllers = 1,
+        .preinit        = ixp23xx_pci_preinit,
+        .setup          = ixp23xx_pci_setup,
+        .scan           = ixp23xx_pci_scan_bus,
+        .map_irq        = ixdp2351_map_irq,
+};
+
+int __init ixdp2351_pci_init(void)
+{
+        if (machine_is_ixdp2351())
+                pci_common_init(&ixdp2351_pci);
+
+        return 0;
+}
+
+subsys_initcall(ixdp2351_pci_init);
+
+/*
+ * IXDP2351 Static Mapped I/O
+ */
+static struct map_desc ixdp2351_io_desc[] __initdata = {
+        {
+                .virtual        = IXDP2351_NP_VIRT_BASE,
+                .pfn            = __phys_to_pfn((u64)IXDP2351_NP_PHYS_BASE),
+                .length         = IXDP2351_NP_PHYS_SIZE,
+                .type           = MT_DEVICE
+        }, {
+                .virtual        = IXDP2351_BB_BASE_VIRT,
+                .pfn            = __phys_to_pfn((u64)IXDP2351_BB_BASE_PHYS),
+                .length         = IXDP2351_BB_SIZE,
+                .type           = MT_DEVICE
+        }
+};
+
+static void __init ixdp2351_map_io(void)
+{
+        ixp23xx_map_io();
+        iotable_init(ixdp2351_io_desc, ARRAY_SIZE(ixdp2351_io_desc));
+}
+
+static void __init ixdp2351_init(void)
+{
+        physmap_configure(0x90000000, 0x04000000, 1, NULL);
+
+        /*
+         * Mark flash as writeable
+         */
+        IXP23XX_EXP_CS0[0] |= IXP23XX_FLASH_WRITABLE;
+        IXP23XX_EXP_CS0[1] |= IXP23XX_FLASH_WRITABLE;
+        IXP23XX_EXP_CS0[2] |= IXP23XX_FLASH_WRITABLE;
+        IXP23XX_EXP_CS0[3] |= IXP23XX_FLASH_WRITABLE;
+
+        ixp23xx_sys_init();
+}
+
+MACHINE_START(IXDP2351, "Intel IXDP2351 Development Platform")
+        /* Maintainer: MontaVista Software, Inc. */
+        .phys_io        = IXP23XX_PERIPHERAL_PHYS,
+        .io_pg_offst    = ((IXP23XX_PERIPHERAL_VIRT >> 18)) & 0xfffc,
+        .map_io         = ixdp2351_map_io,
+        .init_irq       = ixdp2351_init_irq,
+        .timer          = &ixp23xx_timer,
+        .boot_params    = 0x00000100,
+        .init_machine   = ixdp2351_init,
+MACHINE_END