mtd: sm_common: split smartmedia and xD table

[safe/jmp/linux-2.6] / drivers / mtd / nand / sm_common.c

diff --git a/drivers/mtd/nand/sm_common.c b/drivers/mtd/nand/sm_common.c
index aae0b9a..ac80fb3 100644 (file)
--- a/drivers/mtd/nand/sm_common.c
+++ b/drivers/mtd/nand/sm_common.c
@@ -68,8 +68,6 @@ static int sm_block_markbad(struct mtd_info *mtd, loff_t ofs)
 
 
 static struct nand_flash_dev nand_smartmedia_flash_ids[] = {
-
-       /* SmartMedia */
        {"SmartMedia 1MiB 5V",          0x6e, 256, 1, 0x1000, 0},
        {"SmartMedia 1MiB 3,3V",        0xe8, 256, 1, 0x1000, 0},
        {"SmartMedia 1MiB 3,3V",        0xec, 256, 1, 0x1000, 0},
@@ -82,28 +80,34 @@ static struct nand_flash_dev nand_smartmedia_flash_ids[] = {
        {"SmartMedia 4MiB 3,3V ROM",    0xd5, 512, 4, 0x2000, NAND_ROM},
        {"SmartMedia 8MiB 3,3V",        0xe6, 512, 8, 0x2000, 0},
        {"SmartMedia 8MiB 3,3V ROM",    0xd6, 512, 8, 0x2000, NAND_ROM},
-
-#define XD_TYPEM       (NAND_NO_AUTOINCR | NAND_BROKEN_XD)
-       /* xD / SmartMedia */
-       {"SmartMedia/xD 16MiB 3,3V",    0x73, 512, 16, 0x4000, 0},
+       {"SmartMedia 16MiB 3,3V",       0x73, 512, 16, 0x4000, 0},
        {"SmartMedia 16MiB 3,3V ROM",   0x57, 512, 16, 0x4000, NAND_ROM},
-       {"SmartMedia/xD 32MiB 3,3V",    0x75, 512, 32, 0x4000, 0},
+       {"SmartMedia 32MiB 3,3V",       0x75, 512, 32, 0x4000, 0},
        {"SmartMedia 32MiB 3,3V ROM",   0x58, 512, 32, 0x4000, NAND_ROM},
-       {"SmartMedia/xD 64MiB 3,3V",    0x76, 512, 64, 0x4000, 0},
+       {"SmartMedia 64MiB 3,3V",       0x76, 512, 64, 0x4000, 0},
        {"SmartMedia 64MiB 3,3V ROM",   0xd9, 512, 64, 0x4000, NAND_ROM},
-       {"SmartMedia/xD 128MiB 3,3V",   0x79, 512, 128, 0x4000, 0},
+       {"SmartMedia 128MiB 3,3V",      0x79, 512, 128, 0x4000, 0},
        {"SmartMedia 128MiB 3,3V ROM",  0xda, 512, 128, 0x4000, NAND_ROM},
-       {"SmartMedia/xD 256MiB 3,3V",   0x71, 512, 256, 0x4000, XD_TYPEM},
+       {"SmartMedia 256MiB 3,3V",      0x71, 512, 256, 0x4000 },
        {"SmartMedia 256MiB 3,3V ROM",  0x5b, 512, 256, 0x4000, NAND_ROM},
+       {NULL,}
+};
 
-       /* xD only */
-       {"xD 512MiB 3,3V",              0xDC, 512, 512, 0x4000, XD_TYPEM},
-       {"xD 1GiB 3,3V",                0xD3, 512, 1024, 0x4000, XD_TYPEM},
-       {"xD 2GiB 3,3V",                0xD5, 512, 2048, 0x4000, XD_TYPEM},
+#define XD_TYPEM       (NAND_NO_AUTOINCR | NAND_BROKEN_XD)
+static struct nand_flash_dev nand_xd_flash_ids[] = {
+
+       {"xD 16MiB 3,3V",    0x73, 512, 16, 0x4000, 0},
+       {"xD 32MiB 3,3V",    0x75, 512, 32, 0x4000, 0},
+       {"xD 64MiB 3,3V",    0x76, 512, 64, 0x4000, 0},
+       {"xD 128MiB 3,3V",   0x79, 512, 128, 0x4000, 0},
+       {"xD 256MiB 3,3V",   0x71, 512, 256, 0x4000, XD_TYPEM},
+       {"xD 512MiB 3,3V",   0xdc, 512, 512, 0x4000, XD_TYPEM},
+       {"xD 1GiB 3,3V",     0xd3, 512, 1024, 0x4000, XD_TYPEM},
+       {"xD 2GiB 3,3V",     0xd5, 512, 2048, 0x4000, XD_TYPEM},
        {NULL,}
 };
 
-int sm_register_device(struct mtd_info *mtd)
+int sm_register_device(struct mtd_info *mtd, int smartmedia)
 {
        struct nand_chip *chip = (struct nand_chip *)mtd->priv;
        int ret;
@@ -111,7 +115,8 @@ int sm_register_device(struct mtd_info *mtd)
        chip->options |= NAND_SKIP_BBTSCAN;
 
        /* Scan for card properties */
-       ret = nand_scan_ident(mtd, 1, nand_smartmedia_flash_ids);
+       ret = nand_scan_ident(mtd, 1, smartmedia ?
+               nand_smartmedia_flash_ids : nand_xd_flash_ids);
 
        if (ret)
                return ret;