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, 10 insertions, 13 deletions

diff --git a/arch/arm/mach-sa1100/collie.c b/arch/arm/mach-sa1100/collie.c
index a0dfa390e34b..6496eb645cee 100644
--- a/arch/arm/mach-sa1100/collie.c
+++ b/arch/arm/mach-sa1100/collie.c
@@ -91,30 +91,29 @@ static struct mcp_plat_data collie_mcp_data = {
 /*
  * low-level UART features.
  */
-static struct locomo_dev *uart_dev = NULL;
+struct platform_device collie_locomo_device;
 
 static void collie_uart_set_mctrl(struct uart_port *port, u_int mctrl)
 {
-        if (!uart_dev) return;
-
         if (mctrl & TIOCM_RTS)
-                locomo_gpio_write(uart_dev, LOCOMO_GPIO_RTS, 0);
+                locomo_gpio_write(&collie_locomo_device.dev, LOCOMO_GPIO_RTS, 0);
         else
-                locomo_gpio_write(uart_dev, LOCOMO_GPIO_RTS, 1);
+                locomo_gpio_write(&collie_locomo_device.dev, LOCOMO_GPIO_RTS, 1);
 
         if (mctrl & TIOCM_DTR)
-                locomo_gpio_write(uart_dev, LOCOMO_GPIO_DTR, 0);
+                locomo_gpio_write(&collie_locomo_device.dev, LOCOMO_GPIO_DTR, 0);
         else
-                locomo_gpio_write(uart_dev, LOCOMO_GPIO_DTR, 1);
+                locomo_gpio_write(&collie_locomo_device.dev, LOCOMO_GPIO_DTR, 1);
 }
 
 static u_int collie_uart_get_mctrl(struct uart_port *port)
 {
         int ret = TIOCM_CD;
         unsigned int r;
-        if (!uart_dev) return ret;
 
-        r = locomo_gpio_read_output(uart_dev, LOCOMO_GPIO_CTS & LOCOMO_GPIO_DSR);
+        r = locomo_gpio_read_output(&collie_locomo_device.dev, LOCOMO_GPIO_CTS & LOCOMO_GPIO_DSR);
+        if (r == -ENODEV)
+                return ret;
         if (r & LOCOMO_GPIO_CTS)
                 ret |= TIOCM_CTS;
         if (r & LOCOMO_GPIO_DSR)
@@ -130,13 +129,11 @@ static struct sa1100_port_fns collie_port_fns __initdata = {
 
 static int collie_uart_probe(struct locomo_dev *dev)
 {
-        uart_dev = dev;
         return 0;
 }
 
 static int collie_uart_remove(struct locomo_dev *dev)
 {
-        uart_dev = NULL;
         return 0;
 }
 
@@ -170,7 +167,7 @@ static struct resource locomo_resources[] = {
         },
 };
 
-static struct platform_device locomo_device = {
+struct platform_device collie_locomo_device = {
         .name           = "locomo",
         .id             = 0,
         .num_resources  = ARRAY_SIZE(locomo_resources),
@@ -178,7 +175,7 @@ static struct platform_device locomo_device = {
 };
 
 static struct platform_device *devices[] __initdata = {
-        &locomo_device,
+        &collie_locomo_device,
         &colliescoop_device,
 };