[PATCH] collie: fix missing pcmcia bits

This adds missing bits of collie (sharp sl-5500) PCMCIA support and
MFD support.

Signed-off-by: Pavel Machek <pavel@suse.cz>
Acked-by: Richard Purdie <rpurdie@rpsys.net>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

1 files changed, 30 insertions, 0 deletions

diff --git a/arch/arm/mach-sa1100/collie.c b/arch/arm/mach-sa1100/collie.c
index 6888816a1935..102454082474 100644
--- a/arch/arm/mach-sa1100/collie.c
+++ b/arch/arm/mach-sa1100/collie.c
@@ -40,6 +40,7 @@
 #include <asm/hardware/scoop.h>
 #include <asm/mach/sharpsl_param.h>
 #include <asm/hardware/locomo.h>
+#include <asm/arch/mcp.h>
 
 #include "generic.h"
 
@@ -66,6 +67,32 @@ struct platform_device colliescoop_device = {
         .resource       = collie_scoop_resources,
 };
 
+static struct scoop_pcmcia_dev collie_pcmcia_scoop[] = {
+{
+       .dev        = &colliescoop_device.dev,
+       .irq        = COLLIE_IRQ_GPIO_CF_IRQ,
+       .cd_irq     = COLLIE_IRQ_GPIO_CF_CD,
+       .cd_irq_str = "PCMCIA0 CD",
+},
+};
+
+static struct scoop_pcmcia_config collie_pcmcia_config = {
+        .devs         = &collie_pcmcia_scoop[0],
+        .num_devs     = 1,
+};
+
+
+static struct mcp_plat_data collie_mcp_data = {
+        .mccr0          = MCCR0_ADM,
+        .sclk_rate      = 11981000,
+};
+
+
+static struct sa1100_port_fns collie_port_fns __initdata = {
+        .set_mctrl      = collie_uart_set_mctrl,
+        .get_mctrl      = collie_uart_get_mctrl,
+};
+
 
 static struct resource locomo_resources[] = {
         [0] = {
@@ -159,6 +186,8 @@ static void __init collie_init(void)
         GPDR |= GPIO_32_768kHz;
         TUCR  = TUCR_32_768kHz;
 
+        platform_scoop_config = &collie_pcmcia_config;
+
         ret = platform_add_devices(devices, ARRAY_SIZE(devices));
         if (ret) {
                 printk(KERN_WARNING "collie: Unable to register LoCoMo device\n");
@@ -166,6 +195,7 @@ static void __init collie_init(void)
 
         sa11x0_set_flash_data(&collie_flash_data, collie_flash_resources,
                               ARRAY_SIZE(collie_flash_resources));
+        sa11x0_set_mcp_data(&collie_mcp_data);
 
         sharpsl_save_param();
 }