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

* 'devel' of master.kernel.org:/home/rmk/linux-2.6-arm: (130 commits)
  [ARM] 3856/1: Add clocksource for Intel IXP4xx platforms
  [ARM] 3855/1: Add generic time support
  [ARM] 3873/1: S3C24XX: Add irq_chip names
  [ARM] 3872/1: S3C24XX: Apply consistant tabbing to irq_chips
  [ARM] 3871/1: S3C24XX: Fix ordering of EINT4..23
  [ARM] nommu: confirms the CR_V bit in nommu mode
  [ARM] nommu: abort handler fixup for !CPU_CP15_MMU cores.
  [ARM] 3870/1: AT91: Start removing static memory mappings
  [ARM] 3869/1: AT91: NAND support for DK and KB9202 boards
  [ARM] 3868/1: AT91 hardware header update
  [ARM] 3867/1: AT91 GPIO update
  [ARM] 3866/1: AT91 clock update
  [ARM] 3865/1: AT91RM9200 header updates
  [ARM] 3862/2: S3C2410 - add basic power management support for AML M5900 series
  [ARM] kthread: switch arch/arm/kernel/apm.c
  [ARM] Off-by-one in arch/arm/common/icst*
  [ARM] 3864/1: Refactore sharpsl_pm
  [ARM] 3863/1: Add Locomo SPI Device
  [ARM] 3847/2:  Convert LOMOMO to use struct device for GPIOs
  [ARM] Use CPU_CACHE_* where possible in asm/cacheflush.h
  ...

1 files changed, 105 insertions, 0 deletions

diff --git a/arch/arm/mach-iop33x/uart.c b/arch/arm/mach-iop33x/uart.c
new file mode 100644
index 000000000000..ac297cd0276c
--- /dev/null
+++ b/arch/arm/mach-iop33x/uart.c
@@ -0,0 +1,105 @@
+/*
+ * 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 IOP33X_UART_XTAL 33334000
+
+static struct plat_serial8250_port iop33x_uart0_data[] = {
+        {
+                .membase        = (char *)IOP33X_UART0_VIRT,
+                .mapbase        = IOP33X_UART0_PHYS,
+                .irq            = IRQ_IOP33X_UART0,
+                .uartclk        = IOP33X_UART_XTAL,
+                .regshift       = 2,
+                .iotype         = UPIO_MEM,
+                .flags          = UPF_SKIP_TEST,
+        },
+        { },
+};
+
+static struct resource iop33x_uart0_resources[] = {
+        [0] = {
+                .start  = IOP33X_UART0_PHYS,
+                .end    = IOP33X_UART0_PHYS + 0x3f,
+                .flags  = IORESOURCE_MEM,
+        },
+        [1] = {
+                .start  = IRQ_IOP33X_UART0,
+                .end    = IRQ_IOP33X_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  = IOP33X_UART1_PHYS,
+                .end    = IOP33X_UART1_PHYS + 0x3f,
+                .flags  = IORESOURCE_MEM,
+        },
+        [1] = {
+                .start  = IRQ_IOP33X_UART1,
+                .end    = IRQ_IOP33X_UART1,
+                .flags  = IORESOURCE_IRQ,
+        },
+};
+
+static struct plat_serial8250_port iop33x_uart1_data[] = {
+        {
+                .membase        = (char *)IOP33X_UART1_VIRT,
+                .mapbase        = IOP33X_UART1_PHYS,
+                .irq            = IRQ_IOP33X_UART1,
+                .uartclk        = IOP33X_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,
+};