Fedora kernel-2.6.17-1.2142_FC4 patched with stable patch-2.6.17.4-vs2.0.2-rc26.diff

[linux-2.6.git] / drivers / mtd / maps / sharpsl-flash.c

diff --git a/drivers/mtd/maps/sharpsl-flash.c b/drivers/mtd/maps/sharpsl-flash.c
index b3b39cb..12fe53c 100644 (file)
--- a/drivers/mtd/maps/sharpsl-flash.c
+++ b/drivers/mtd/maps/sharpsl-flash.c
@@ -1,10 +1,10 @@
 /*
  * sharpsl-flash.c
- * 
+ *
  * Copyright (C) 2001 Lineo Japan, Inc.
  * Copyright (C) 2002  SHARP
  *
- * $Id: sharpsl-flash.c,v 1.2 2004/11/24 20:38:06 rpurdie Exp $
+ * $Id: sharpsl-flash.c,v 1.7 2005/11/07 11:14:28 gleixner Exp $
  *
  * based on rpxlite.c,v 1.15 2001/10/02 15:05:14 dwmw2 Exp
  *          Handle mapping of the flash on the RPX Lite and CLLF boards
@@ -24,13 +24,14 @@
 #include <linux/module.h>
 #include <linux/types.h>
 #include <linux/kernel.h>
-#include <asm/io.h>
 #include <linux/mtd/mtd.h>
 #include <linux/mtd/map.h>
 #include <linux/mtd/partitions.h>
+#include <asm/io.h>
+#include <asm/mach-types.h>
 
 #define WINDOW_ADDR 0x00000000
-#define WINDOW_SIZE 0x01000000
+#define WINDOW_SIZE 0x00800000
 #define BANK_WIDTH 2
 
 static struct mtd_info *mymtd;
@@ -44,26 +45,26 @@ struct map_info sharpsl_map = {
 
 static struct mtd_partition sharpsl_partitions[1] = {
        {
-               name:           "Filesystem",
-               size:           0x006d0000,
-               offset:         0x00120000
+               name:           "Boot PROM Filesystem",
        }
 };
 
-#define NB_OF(x)  (sizeof(x)/sizeof(x[0]))
-
 int __init init_sharpsl(void)
 {
        struct mtd_partition *parts;
        int nb_parts = 0;
        char *part_type = "static";
 
-       printk(KERN_NOTICE "Sharp SL series flash device: %x at %x\n", WINDOW_SIZE, WINDOW_ADDR);
+       printk(KERN_NOTICE "Sharp SL series flash device: %x at %x\n",
+               WINDOW_SIZE, WINDOW_ADDR);
        sharpsl_map.virt = ioremap(WINDOW_ADDR, WINDOW_SIZE);
        if (!sharpsl_map.virt) {
                printk("Failed to ioremap\n");
                return -EIO;
        }
+
+       simple_map_init(&sharpsl_map);
+
        mymtd = do_map_probe("map_rom", &sharpsl_map);
        if (!mymtd) {
                iounmap(sharpsl_map.virt);
@@ -72,8 +73,24 @@ int __init init_sharpsl(void)
 
        mymtd->owner = THIS_MODULE;
 
+       if (machine_is_corgi() || machine_is_shepherd() || machine_is_husky()
+               || machine_is_poodle()) {
+               sharpsl_partitions[0].size=0x006d0000;
+               sharpsl_partitions[0].offset=0x00120000;
+       } else if (machine_is_tosa()) {
+               sharpsl_partitions[0].size=0x006a0000;
+               sharpsl_partitions[0].offset=0x00160000;
+       } else if (machine_is_spitz() || machine_is_akita() || machine_is_borzoi()) {
+               sharpsl_partitions[0].size=0x006b0000;
+               sharpsl_partitions[0].offset=0x00140000;
+       } else {
+               map_destroy(mymtd);
+               iounmap(sharpsl_map.virt);
+               return -ENODEV;
+       }
+
        parts = sharpsl_partitions;
-       nb_parts = NB_OF(sharpsl_partitions);
+       nb_parts = ARRAY_SIZE(sharpsl_partitions);
 
        printk(KERN_NOTICE "Using %s partision definition\n", part_type);
        add_mtd_partitions(mymtd, parts, nb_parts);