Merge branch 'sa11x0-mcp-fixes' into fixes

diff --combined arch/arm/mach-sa1100/collie.c
index cce8763d0839cbeb0ed8352b50f076d60fd3639d,b9060e236def9e90204fa2be99734ea3a4fc6417..fd5652118ed19565d5754ffdd16f1cfe0db59011
--- 1/arch/arm/mach-sa1100/collie.c
--- 2/arch/arm/mach-sa1100/collie.c
+++ b/arch/arm/mach-sa1100/collie.c
@@@ -27,7 -27,6 +27,6 @@@
  #include <linux/timer.h>
  #include <linux/gpio.h>
  #include <linux/pda_power.h>
- #include <linux/mfd/ucb1x00.h>
  
  #include <mach/hardware.h>
  #include <asm/mach-types.h>
@@@ -86,15 -85,10 +85,10 @@@ static struct scoop_pcmcia_config colli
        .num_devs       = 1,
  };
  
- static struct ucb1x00_plat_data collie_ucb1x00_data = {
-       .gpio_base      = COLLIE_TC35143_GPIO_BASE,
- };
- 
  static struct mcp_plat_data collie_mcp_data = {
        .mccr0          = MCCR0_ADM | MCCR0_ExtClk,
        .sclk_rate      = 9216000,
-       .codec          = "ucb1x00",
-       .codec_pdata    = &collie_ucb1x00_data,
+       .gpio_base      = COLLIE_TC35143_GPIO_BASE,
  };
  
  /*
@@@ -144,6 -138,8 +138,6 @@@ static struct pda_power_pdata collie_po
  static struct resource collie_power_resource[] = {
        {
                .name           = "ac",
 -              .start          = gpio_to_irq(COLLIE_GPIO_AC_IN),
 -              .end            = gpio_to_irq(COLLIE_GPIO_AC_IN),
                .flags          = IORESOURCE_IRQ |
                                  IORESOURCE_IRQ_HIGHEDGE |
                                  IORESOURCE_IRQ_LOWEDGE,
@@@ -345,8 -341,7 +339,8 @@@ static void __init collie_init(void
  
        GPSR |= _COLLIE_GPIO_UCB1x00_RESET;
  
 -
 +      collie_power_resource[0].start = gpio_to_irq(COLLIE_GPIO_AC_IN);
 +      collie_power_resource[0].end = gpio_to_irq(COLLIE_GPIO_AC_IN);
        platform_scoop_config = &collie_pcmcia_config;
  
        ret = platform_add_devices(devices, ARRAY_SIZE(devices));
@@@ -356,16 -351,6 +350,6 @@@
  
        sa11x0_register_mtd(&collie_flash_data, collie_flash_resources,
                            ARRAY_SIZE(collie_flash_resources));
- 
-       /*
-        * Setup the PPC unit correctly.
-        */
-       PPDR &= ~PPC_RXD4;
-       PPDR |= PPC_TXD4 | PPC_SCLK | PPC_SFRM;
-       PSDR |= PPC_RXD4;
-       PSDR &= ~(PPC_TXD4 | PPC_SCLK | PPC_SFRM);
-       PPSR &= ~(PPC_TXD4 | PPC_SCLK | PPC_SFRM);
- 
        sa11x0_register_mcp(&collie_mcp_data);
  
        sharpsl_save_param();

diff --combined arch/arm/mach-sa1100/generic.c
index a7c0df6e670c51d1842b518f6fb17b1f992e8510,480d2ea46b000a9f862c7bef28280a31730b47d9..bb10ee2cb89f11f82c801d7f9c1d8ced11c1c3b7
--- 1/arch/arm/mach-sa1100/generic.c
--- 2/arch/arm/mach-sa1100/generic.c
+++ b/arch/arm/mach-sa1100/generic.c
@@@ -217,15 -217,10 +217,10 @@@ static struct platform_device sa11x0uar
  static struct resource sa11x0mcp_resources[] = {
        [0] = {
                .start  = __PREG(Ser4MCCR0),
-               .end    = __PREG(Ser4MCCR0) + 0x1C - 1,
+               .end    = __PREG(Ser4MCCR0) + 0xffff,
                .flags  = IORESOURCE_MEM,
        },
        [1] = {
-               .start  = __PREG(Ser4MCCR1),
-               .end    = __PREG(Ser4MCCR1) + 0x4 - 1,
-               .flags  = IORESOURCE_MEM,
-       },
-       [2] = {
                .start  = IRQ_Ser4MCP,
                .end    = IRQ_Ser4MCP,
                .flags  = IORESOURCE_IRQ,
@@@ -350,9 -345,29 +345,9 @@@ void sa11x0_register_irda(struct irda_p
        sa11x0_register_device(&sa11x0ir_device, irda);
  }
  
 -static struct resource sa11x0rtc_resources[] = {
 -      [0] = {
 -              .start  = 0x90010000,
 -              .end    = 0x900100ff,
 -              .flags  = IORESOURCE_MEM,
 -      },
 -      [1] = {
 -              .start  = IRQ_RTC1Hz,
 -              .end    = IRQ_RTC1Hz,
 -              .flags  = IORESOURCE_IRQ,
 -      },
 -      [2] = {
 -              .start  = IRQ_RTCAlrm,
 -              .end    = IRQ_RTCAlrm,
 -              .flags  = IORESOURCE_IRQ,
 -      },
 -};
 -
  static struct platform_device sa11x0rtc_device = {
        .name           = "sa1100-rtc",
        .id             = -1,
 -      .resource       = sa11x0rtc_resources,
 -      .num_resources  = ARRAY_SIZE(sa11x0rtc_resources),
  };
  
  static struct platform_device *sa11x0_devices[] __initdata = {