Merge branch 'for-linus' of master.kernel.org:/home/rmk/linux-2.6-arm

* 'for-linus' of master.kernel.org:/home/rmk/linux-2.6-arm: (117 commits)
  [ARM] 4058/2: iop32x: set ->broken_parity_status on n2100 onboard r8169 ports
  [ARM] 4140/1: AACI stability add ac97 timeout and retries
  [ARM] 4139/1: AACI record support
  [ARM] 4138/1: AACI: multiple channel support for IRQ handling
  [ARM] 4211/1: Provide a defconfig for ns9xxx
  [ARM] 4210/1: base for new machine type "NetSilicon NS9360"
  [ARM] 4222/1: S3C2443: Remove reference to missing S3C2443_PM
  [ARM] 4221/1: S3C2443: DMA support
  [ARM] 4220/1: S3C24XX: DMA system initialised from sysdev
  [ARM] 4219/1: S3C2443: DMA source definitions
  [ARM] 4218/1: S3C2412: fix CONFIG_CPU_S3C2412_ONLY wrt to S3C2443
  [ARM] 4217/1: S3C24XX: remove the dma channel show at startup
  [ARM] 4090/2: avoid clash between PXA and SA1111 defines
  [ARM] 4216/1: add .gitignore entries for ARM specific files
  [ARM] 4214/2: S3C2410: Add Armzone QT2410
  [ARM] 4215/1: s3c2410 usb device:  per-platform vbus_draw
  [ARM] 4213/1: S3C2410 - Update definition of ADCTSC_XY_PST
  [ARM] 4098/1: ARM: rtc_lock only used with rtc_cmos
  [ARM] 4137/1: Add kexec support
  [ARM] 4201/1: SMP barriers pair needed for the secondary boot process
  ...

Fix up conflict due to typedef removal in sound/arm/aaci.h

6 files changed, 283 insertions, 23 deletions

diff --git a/arch/arm/mach-ixp4xx/Kconfig b/arch/arm/mach-ixp4xx/Kconfig
index e316bd93313f..8a339cdfe222 100644
--- a/arch/arm/mach-ixp4xx/Kconfig
+++ b/arch/arm/mach-ixp4xx/Kconfig
@@ -17,7 +17,7 @@ config MACH_NSLU2
           NSLU2 NAS device. For more information on this platform,
           see http://www.nslu2-linux.org
 
-config ARCH_AVILA
+config MACH_AVILA
         bool "Avila"
         select PCI
         help
@@ -25,6 +25,14 @@ config ARCH_AVILA
           Avila Network Platform. For more information on this platform,
           see <file:Documentation/arm/IXP4xx>.
 
+config MACH_LOFT
+    bool "Loft"
+    depends on MACH_AVILA
+    help
+          Say 'Y' here if you want your kernel to support the Giant
+          Shoulder Inc Loft board (a minor variation on the standard
+          Gateworks Avila Network Platform).
+
 config ARCH_ADI_COYOTE
         bool "Coyote"
         select PCI
@@ -86,7 +94,7 @@ config MACH_NAS100D
 #
 config  ARCH_IXDP4XX
         bool
-        depends on ARCH_IXDP425 || ARCH_AVILA || MACH_IXDP465
+        depends on ARCH_IXDP425 || MACH_IXDP465
         default y
 
 #
diff --git a/arch/arm/mach-ixp4xx/Makefile b/arch/arm/mach-ixp4xx/Makefile
index 640315d8b96a..746e297284ed 100644
--- a/arch/arm/mach-ixp4xx/Makefile
+++ b/arch/arm/mach-ixp4xx/Makefile
@@ -6,6 +6,7 @@ obj-pci-y	:=
 obj-pci-n       :=
 
 obj-pci-$(CONFIG_ARCH_IXDP4XX)          += ixdp425-pci.o
+obj-pci-$(CONFIG_MACH_AVILA)            += avila-pci.o
 obj-pci-$(CONFIG_MACH_IXDPG425)         += ixdpg425-pci.o
 obj-pci-$(CONFIG_ARCH_ADI_COYOTE)       += coyote-pci.o
 obj-pci-$(CONFIG_MACH_GTWX5715)         += gtwx5715-pci.o
@@ -15,6 +16,7 @@ obj-pci-$(CONFIG_MACH_NAS100D)		+= nas100d-pci.o
 obj-y   += common.o
 
 obj-$(CONFIG_ARCH_IXDP4XX)      += ixdp425-setup.o
+obj-$(CONFIG_MACH_AVILA)        += avila-setup.o
 obj-$(CONFIG_MACH_IXDPG425)     += coyote-setup.o
 obj-$(CONFIG_ARCH_ADI_COYOTE)   += coyote-setup.o
 obj-$(CONFIG_MACH_GTWX5715)     += gtwx5715-setup.o
diff --git a/arch/arm/mach-ixp4xx/avila-pci.c b/arch/arm/mach-ixp4xx/avila-pci.c
new file mode 100644
index 000000000000..3f867691d9f2
--- /dev/null
+++ b/arch/arm/mach-ixp4xx/avila-pci.c
@@ -0,0 +1,78 @@
+/*
+ * arch/arm/mach-ixp4xx/avila-pci.c
+ *
+ * Gateworks Avila board-level PCI initialization
+ *
+ * Author: Michael-Luke Jones <mlj28@cam.ac.uk>
+ *
+ * Based on ixdp-pci.c
+ * Copyright (C) 2002 Intel Corporation.
+ * Copyright (C) 2003-2004 MontaVista Software, Inc.
+ *
+ * Maintainer: Deepak Saxena <dsaxena@plexity.net>
+ *
+ * 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/irq.h>
+#include <linux/delay.h>
+
+#include <asm/mach/pci.h>
+#include <asm/irq.h>
+#include <asm/hardware.h>
+#include <asm/mach-types.h>
+
+void __init avila_pci_preinit(void)
+{
+        set_irq_type(IRQ_AVILA_PCI_INTA, IRQT_LOW);
+        set_irq_type(IRQ_AVILA_PCI_INTB, IRQT_LOW);
+        set_irq_type(IRQ_AVILA_PCI_INTC, IRQT_LOW);
+        set_irq_type(IRQ_AVILA_PCI_INTD, IRQT_LOW);
+
+        ixp4xx_pci_preinit();
+}
+
+static int __init avila_map_irq(struct pci_dev *dev, u8 slot, u8 pin)
+{
+        static int pci_irq_table[AVILA_PCI_IRQ_LINES] = {
+                IRQ_AVILA_PCI_INTA,
+                IRQ_AVILA_PCI_INTB,
+                IRQ_AVILA_PCI_INTC,
+                IRQ_AVILA_PCI_INTD
+        };
+
+        int irq = -1;
+
+        if (slot >= 1 &&
+        slot <= (machine_is_loft() ? LOFT_PCI_MAX_DEV : AVILA_PCI_MAX_DEV) &&
+                pin >= 1 && pin <= AVILA_PCI_IRQ_LINES) {
+                irq = pci_irq_table[(slot + pin - 2) % 4];
+        }
+
+        return irq;
+}
+
+struct hw_pci avila_pci __initdata = {
+        .nr_controllers = 1,
+        .preinit        = avila_pci_preinit,
+        .swizzle        = pci_std_swizzle,
+        .setup          = ixp4xx_setup,
+        .scan           = ixp4xx_scan_bus,
+        .map_irq        = avila_map_irq,
+};
+
+int __init avila_pci_init(void)
+{
+        if (machine_is_avila() || machine_is_loft())
+                pci_common_init(&avila_pci);
+        return 0;
+}
+
+subsys_initcall(avila_pci_init);
+
diff --git a/arch/arm/mach-ixp4xx/avila-setup.c b/arch/arm/mach-ixp4xx/avila-setup.c
new file mode 100644
index 000000000000..d59b8dc7dc7a
--- /dev/null
+++ b/arch/arm/mach-ixp4xx/avila-setup.c
@@ -0,0 +1,192 @@
+/*
+ * arch/arm/mach-ixp4xx/avila-setup.c
+ *
+ * Gateworks Avila board-setup
+ *
+ * Author: Michael-Luke Jones <mlj28@cam.ac.uk>
+ *
+ * Based on ixdp-setup.c
+ * Copyright (C) 2003-2005 MontaVista Software, Inc.
+ *
+ * Author: Deepak Saxena <dsaxena@plexity.net>
+ */
+
+#include <linux/kernel.h>
+#include <linux/init.h>
+#include <linux/device.h>
+#include <linux/serial.h>
+#include <linux/tty.h>
+#include <linux/serial_8250.h>
+#include <linux/slab.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/mach/arch.h>
+#include <asm/mach/flash.h>
+
+static struct flash_platform_data avila_flash_data = {
+        .map_name       = "cfi_probe",
+        .width          = 2,
+};
+
+static struct resource avila_flash_resource = {
+        .flags          = IORESOURCE_MEM,
+};
+
+static struct platform_device avila_flash = {
+        .name           = "IXP4XX-Flash",
+        .id             = 0,
+        .dev            = {
+                .platform_data = &avila_flash_data,
+        },
+        .num_resources  = 1,
+        .resource       = &avila_flash_resource,
+};
+
+static struct ixp4xx_i2c_pins avila_i2c_gpio_pins = {
+        .sda_pin        = AVILA_SDA_PIN,
+        .scl_pin        = AVILA_SCL_PIN,
+};
+
+static struct platform_device avila_i2c_controller = {
+        .name           = "IXP4XX-I2C",
+        .id             = 0,
+        .dev            = {
+                .platform_data = &avila_i2c_gpio_pins,
+        },
+        .num_resources  = 0
+};
+
+static struct resource avila_uart_resources[] = {
+        {
+                .start          = IXP4XX_UART1_BASE_PHYS,
+                .end            = IXP4XX_UART1_BASE_PHYS + 0x0fff,
+                .flags          = IORESOURCE_MEM
+        },
+        {
+                .start          = IXP4XX_UART2_BASE_PHYS,
+                .end            = IXP4XX_UART2_BASE_PHYS + 0x0fff,
+                .flags          = IORESOURCE_MEM
+        }
+};
+
+static struct plat_serial8250_port avila_uart_data[] = {
+        {
+                .mapbase        = IXP4XX_UART1_BASE_PHYS,
+                .membase        = (char *)IXP4XX_UART1_BASE_VIRT + REG_OFFSET,
+                .irq            = IRQ_IXP4XX_UART1,
+                .flags          = UPF_BOOT_AUTOCONF | UPF_SKIP_TEST,
+                .iotype         = UPIO_MEM,
+                .regshift       = 2,
+                .uartclk        = IXP4XX_UART_XTAL,
+        },
+        {
+                .mapbase        = IXP4XX_UART2_BASE_PHYS,
+                .membase        = (char *)IXP4XX_UART2_BASE_VIRT + REG_OFFSET,
+                .irq            = IRQ_IXP4XX_UART2,
+                .flags          = UPF_BOOT_AUTOCONF | UPF_SKIP_TEST,
+                .iotype         = UPIO_MEM,
+                .regshift       = 2,
+                .uartclk        = IXP4XX_UART_XTAL,
+        },
+        { },
+};
+
+static struct platform_device avila_uart = {
+        .name                   = "serial8250",
+        .id                     = PLAT8250_DEV_PLATFORM,
+        .dev.platform_data      = avila_uart_data,
+        .num_resources          = 2,
+        .resource               = avila_uart_resources
+};
+
+static struct resource avila_pata_resources[] = {
+        {
+                .flags  = IORESOURCE_MEM
+        },
+        {
+                .flags  = IORESOURCE_MEM,
+        },
+        {
+                .name   = "intrq",
+                .start  = IRQ_IXP4XX_GPIO12,
+                .end    = IRQ_IXP4XX_GPIO12,
+                .flags  = IORESOURCE_IRQ,
+        },
+};
+
+static struct ixp4xx_pata_data avila_pata_data = {
+        .cs0_bits       = 0xbfff0043,
+        .cs1_bits       = 0xbfff0043,
+};
+
+static struct platform_device avila_pata = {
+        .name                   = "pata_ixp4xx_cf",
+        .id                     = 0,
+        .dev.platform_data      = &avila_pata_data,
+        .num_resources          = ARRAY_SIZE(avila_pata_resources),
+        .resource               = avila_pata_resources,
+};
+
+static struct platform_device *avila_devices[] __initdata = {
+        &avila_i2c_controller,
+        &avila_flash,
+        &avila_uart
+};
+
+static void __init avila_init(void)
+{
+        ixp4xx_sys_init();
+
+        avila_flash_resource.start = IXP4XX_EXP_BUS_BASE(0);
+        avila_flash_resource.end =
+                IXP4XX_EXP_BUS_BASE(0) + ixp4xx_exp_bus_size - 1;
+
+        platform_add_devices(avila_devices, ARRAY_SIZE(avila_devices));
+
+        avila_pata_resources[0].start = IXP4XX_EXP_BUS_BASE(1);
+        avila_pata_resources[0].end = IXP4XX_EXP_BUS_END(1);
+
+        avila_pata_resources[1].start = IXP4XX_EXP_BUS_BASE(2);
+        avila_pata_resources[1].end = IXP4XX_EXP_BUS_END(2);
+
+        avila_pata_data.cs0_cfg = IXP4XX_EXP_CS1;
+        avila_pata_data.cs1_cfg = IXP4XX_EXP_CS2;
+
+        platform_device_register(&avila_pata);
+
+}
+
+MACHINE_START(AVILA, "Gateworks Avila Network Platform")
+        /* Maintainer: Deepak Saxena <dsaxena@plexity.net> */
+        .phys_io        = IXP4XX_PERIPHERAL_BASE_PHYS,
+        .io_pg_offst    = ((IXP4XX_PERIPHERAL_BASE_VIRT) >> 18) & 0xfffc,
+        .map_io         = ixp4xx_map_io,
+        .init_irq       = ixp4xx_init_irq,
+        .timer          = &ixp4xx_timer,
+        .boot_params    = 0x0100,
+        .init_machine   = avila_init,
+MACHINE_END
+
+ /*
+  * Loft is functionally equivalent to Avila except that it has a
+  * different number for the maximum PCI devices.  The MACHINE
+  * structure below is identical to Avila except for the comment.
+  */
+#ifdef CONFIG_MACH_LOFT
+MACHINE_START(LOFT, "Giant Shoulder Inc Loft board")
+        /* Maintainer: Tom Billman <kernel@giantshoulderinc.com> */
+        .phys_io        = IXP4XX_PERIPHERAL_BASE_PHYS,
+        .io_pg_offst    = ((IXP4XX_PERIPHERAL_BASE_VIRT) >> 18) & 0xfffc,
+        .map_io         = ixp4xx_map_io,
+        .init_irq       = ixp4xx_init_irq,
+        .timer          = &ixp4xx_timer,
+        .boot_params    = 0x0100,
+        .init_machine   = avila_init,
+MACHINE_END
+#endif
+
diff --git a/arch/arm/mach-ixp4xx/ixdp425-pci.c b/arch/arm/mach-ixp4xx/ixdp425-pci.c
index d5156c043f0b..99c1dc8033c8 100644
--- a/arch/arm/mach-ixp4xx/ixdp425-pci.c
+++ b/arch/arm/mach-ixp4xx/ixdp425-pci.c
@@ -66,7 +66,7 @@ struct hw_pci ixdp425_pci __initdata = {
 int __init ixdp425_pci_init(void)
 {
         if (machine_is_ixdp425() || machine_is_ixcdp1100() ||
-                        machine_is_avila() || machine_is_ixdp465())
+                        machine_is_ixdp465())
                 pci_common_init(&ixdp425_pci);
         return 0;
 }
diff --git a/arch/arm/mach-ixp4xx/ixdp425-setup.c b/arch/arm/mach-ixp4xx/ixdp425-setup.c
index da72383ee301..04b1d56396a0 100644
--- a/arch/arm/mach-ixp4xx/ixdp425-setup.c
+++ b/arch/arm/mach-ixp4xx/ixdp425-setup.c
@@ -156,23 +156,3 @@ MACHINE_START(IXCDP1100, "Intel IXCDP1100 Development Platform")
         .init_machine   = ixdp425_init,
 MACHINE_END
 #endif
-
-/*
- * Avila is functionally equivalent to IXDP425 except that it adds
- * a CF IDE slot hanging off the expansion bus. When we have a 
- * driver for IXP4xx CF IDE with driver model support we'll move
- * Avila to it's own setup file.
- */
-#ifdef CONFIG_ARCH_AVILA
-MACHINE_START(AVILA, "Gateworks Avila Network Platform")
-        /* Maintainer: Deepak Saxena <dsaxena@plexity.net> */
-        .phys_io        = IXP4XX_PERIPHERAL_BASE_PHYS,
-        .io_pg_offst    = ((IXP4XX_PERIPHERAL_BASE_VIRT) >> 18) & 0xfffc,
-        .map_io         = ixp4xx_map_io,
-        .init_irq       = ixp4xx_init_irq,
-        .timer          = &ixp4xx_timer,
-        .boot_params    = 0x0100,
-        .init_machine   = ixdp425_init,
-MACHINE_END
-#endif
-