include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit...

[safe/jmp/linux-2.6] / arch / arm / mach-iop32x / iq80321.c

diff --git a/arch/arm/mach-iop32x/iq80321.c b/arch/arm/mach-iop32x/iq80321.c
index 3c9b862..c6a0e4e 100644 (file)
--- a/arch/arm/mach-iop32x/iq80321.c
+++ b/arch/arm/mach-iop32x/iq80321.c
@@ -18,13 +18,12 @@
 #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 <linux/io.h>
+#include <mach/hardware.h>
 #include <asm/irq.h>
 #include <asm/mach/arch.h>
 #include <asm/mach/map.h>
@@ -33,6 +32,7 @@
 #include <asm/mach-types.h>
 #include <asm/page.h>
 #include <asm/pgtable.h>
+#include <mach/time.h>
 
 /*
  * IQ80321 timer tick configuration.
@@ -40,12 +40,11 @@
 static void __init iq80321_timer_init(void)
 {
        /* 33.333 MHz crystal.  */
-       iop3xx_init_time(200000000);
+       iop_init_time(200000000);
 }
 
 static struct sys_timer iq80321_timer = {
        .init           = iq80321_timer_init,
-       .offset         = iop3xx_gettimeoffset,
 };
 
 
@@ -71,26 +70,26 @@ void __init iq80321_map_io(void)
 /*
  * IQ80321 PCI.
  */
-static inline int __init
+static 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;
+               irq = IRQ_IOP32X_XINT2;
        } else if ((slot == 2 || slot == 6) && pin == 2) {
                /* PCI-X Slot INTA */
-               irq = IRQ_IOP321_XINT3;
+               irq = IRQ_IOP32X_XINT3;
        } else if ((slot == 2 || slot == 6) && pin == 3) {
                /* PCI-X Slot INTA */
-               irq = IRQ_IOP321_XINT0;
+               irq = IRQ_IOP32X_XINT0;
        } else if ((slot == 2 || slot == 6) && pin == 4) {
                /* PCI-X Slot INTA */
-               irq = IRQ_IOP321_XINT1;
+               irq = IRQ_IOP32X_XINT1;
        } else if (slot == 4 || slot == 8) {
                /* Gig-E */
-               irq = IRQ_IOP321_XINT0;
+               irq = IRQ_IOP32X_XINT0;
        } else {
                printk(KERN_ERR "iq80321_pci_map_irq() called for unknown "
                        "device PCI:%d:%d:%d\n", dev->bus->number,
@@ -105,14 +104,15 @@ static struct hw_pci iq80321_pci __initdata = {
        .swizzle        = pci_std_swizzle,
        .nr_controllers = 1,
        .setup          = iop3xx_pci_setup,
-       .preinit        = iop3xx_pci_preinit,
+       .preinit        = iop3xx_pci_preinit_cond,
        .scan           = iop3xx_pci_scan_bus,
        .map_irq        = iq80321_pci_map_irq,
 };
 
 static int __init iq80321_pci_init(void)
 {
-       if (machine_is_iq80321())
+       if ((iop3xx_get_init_atu() == IOP3XX_INIT_ATU_ENABLE) &&
+               machine_is_iq80321())
                pci_common_init(&iq80321_pci);
 
        return 0;
@@ -148,7 +148,7 @@ static struct plat_serial8250_port iq80321_serial_port[] = {
        {
                .mapbase        = IQ80321_UART,
                .membase        = (char *)IQ80321_UART,
-               .irq            = IRQ_IOP321_XINT1,
+               .irq            = IRQ_IOP32X_XINT1,
                .flags          = UPF_SKIP_TEST,
                .iotype         = UPIO_MEM,
                .regshift       = 0,
@@ -179,6 +179,9 @@ static void __init iq80321_init_machine(void)
        platform_device_register(&iop3xx_i2c1_device);
        platform_device_register(&iq80321_flash_device);
        platform_device_register(&iq80321_serial_device);
+       platform_device_register(&iop3xx_dma_0_channel);
+       platform_device_register(&iop3xx_dma_1_channel);
+       platform_device_register(&iop3xx_aau_channel);
 }
 
 MACHINE_START(IQ80321, "Intel IQ80321")
@@ -187,7 +190,7 @@ MACHINE_START(IQ80321, "Intel IQ80321")
        .io_pg_offst    = ((IQ80321_UART) >> 18) & 0xfffc,
        .boot_params    = 0xa0000100,
        .map_io         = iq80321_map_io,
-       .init_irq       = iop321_init_irq,
+       .init_irq       = iop32x_init_irq,
        .timer          = &iq80321_timer,
        .init_machine   = iq80321_init_machine,
 MACHINE_END