Commit 21c8db9e authored by David Woodhouse's avatar David Woodhouse

[MTD] Restore MTD_ROM and MTD_RAM types

Let's not attempt the abolition of mtd->type until/unless it's properly
thought through. And certainly, let's not do it by halves.
Signed-off-by: default avatarDavid Woodhouse <dwmw2@infradead.org>
parent 783ed81f
......@@ -64,7 +64,7 @@ static struct mtd_info *map_ram_probe(struct map_info *map)
map->fldrv = &mapram_chipdrv;
mtd->priv = map;
mtd->name = map->name;
mtd->type = MTD_GENERIC_TYPE;
mtd->type = MTD_RAM;
mtd->size = map->size;
mtd->erase = mapram_erase;
mtd->read = mapram_read;
......
......@@ -40,7 +40,7 @@ static struct mtd_info *map_rom_probe(struct map_info *map)
map->fldrv = &maprom_chipdrv;
mtd->priv = map;
mtd->name = map->name;
mtd->type = MTD_GENERIC_TYPE;
mtd->type = MTD_ROM;
mtd->size = map->size;
mtd->read = maprom_read;
mtd->write = maprom_write;
......
......@@ -324,7 +324,7 @@ static struct block2mtd_dev *add_device(char *devname, int erase_size)
dev->mtd.size = dev->blkdev->bd_inode->i_size & PAGE_MASK;
dev->mtd.erasesize = erase_size;
dev->mtd.type = MTD_GENERIC_TYPE;
dev->mtd.type = MTD_RAM;
dev->mtd.flags = MTD_CAP_RAM;
dev->mtd.erase = block2mtd_erase;
dev->mtd.write = block2mtd_write;
......
......@@ -218,7 +218,7 @@ static int __init ms02nv_init_one(ulong addr)
fixsize = (size - (fixaddr - addr)) & ~(PAGE_SIZE - 1);
mp->uaddr = phys_to_virt(fixaddr);
mtd->type = MTD_GENERIC_TYPE;
mtd->type = MTD_RAM;
mtd->flags = MTD_CAP_RAM;
mtd->size = fixsize;
mtd->name = (char *)ms02nv_name;
......
......@@ -103,7 +103,7 @@ int mtdram_init_device(struct mtd_info *mtd, void *mapped_address,
/* Setup the MTD structure */
mtd->name = name;
mtd->type = MTD_GENERIC_TYPE;
mtd->type = MTD_RAM;
mtd->flags = MTD_CAP_RAM;
mtd->size = size;
mtd->writesize = 1;
......
......@@ -149,7 +149,7 @@ static int register_device(char *name, unsigned long start, unsigned long len)
new->mtd.read = phram_read;
new->mtd.write = phram_write;
new->mtd.owner = THIS_MODULE;
new->mtd.type = MTD_GENERIC_TYPE;
new->mtd.type = MTD_RAM;
new->mtd.erasesize = PAGE_SIZE;
ret = -EAGAIN;
......
......@@ -775,7 +775,7 @@ static int __init init_pmc551(void)
mtd->write = pmc551_write;
mtd->point = pmc551_point;
mtd->unpoint = pmc551_unpoint;
mtd->type = MTD_GENERIC_TYPE;
mtd->type = MTD_RAM;
mtd->name = "PMC551 RAM board";
mtd->erasesize = 0x10000;
mtd->owner = THIS_MODULE;
......
......@@ -207,7 +207,7 @@ static int register_device(char *name, unsigned long start, unsigned long length
(*curmtd)->mtdinfo->read = slram_read;
(*curmtd)->mtdinfo->write = slram_write;
(*curmtd)->mtdinfo->owner = THIS_MODULE;
(*curmtd)->mtdinfo->type = MTD_GENERIC_TYPE;
(*curmtd)->mtdinfo->type = MTD_RAM;
(*curmtd)->mtdinfo->erasesize = SLRAM_BLK_SZ;
if (add_mtd_device((*curmtd)->mtdinfo)) {
......
......@@ -24,10 +24,11 @@ struct mtd_oob_buf {
};
#define MTD_ABSENT 0
#define MTD_RAM 1
#define MTD_ROM 2
#define MTD_NORFLASH 3
#define MTD_NANDFLASH 4
#define MTD_DATAFLASH 6
#define MTD_GENERIC_TYPE 7
#define MTD_WRITEABLE 0x400 /* Device is writeable */
#define MTD_BIT_WRITEABLE 0x800 /* Single bits can be flipped */
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment