Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 221be177 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge git://git.infradead.org/mtd-2.6 

* git://git.infradead.org/mtd-2.6:
  [MTD] [MAPS] Remove MODULE_DEVICE_TABLE() from ck804rom driver.
  [JFFS2] fix mount crash caused by removed nodes
  [JFFS2] force the jffs2 GC daemon to behave a bit better
  [MTD] [MAPS] blackfin async requires complex mappings
  [MTD] [MAPS] blackfin: fix memory leak in error path
  [MTD] [MAPS] physmap: fix wrong free and del_mtd_{partition,device}
  [MTD] slram: Handle negative devlength correctly
  [MTD] map_rom has NULL erase pointer
  [MTD] [LPDDR] qinfo_probe depends on lpddr
parents d4998115 b50be33e

drivers/mtd/chips/map_rom.c

+8 −0
Original line number Diff line number Diff line
@@ -19,6 +19,7 @@ static int maprom_read (struct mtd_info *, loff_t, size_t, size_t *, u_char *); 
static int maprom_write (struct mtd_info *, loff_t, size_t, size_t *, const u_char *);

static void maprom_nop (struct mtd_info *);

static struct mtd_info *map_rom_probe(struct map_info *map);

static int maprom_erase (struct mtd_info *mtd, struct erase_info *info);



static struct mtd_chip_driver maprom_chipdrv = {

	.probe	= map_rom_probe,
@@ -42,6 +43,7 @@ static struct mtd_info *map_rom_probe(struct map_info *map) 
	mtd->read = maprom_read;

	mtd->write = maprom_write;

	mtd->sync = maprom_nop;

	mtd->erase = maprom_erase;

	mtd->flags = MTD_CAP_ROM;

	mtd->erasesize = map->size;

	mtd->writesize = 1;
@@ -71,6 +73,12 @@ static int maprom_write (struct mtd_info *mtd, loff_t to, size_t len, size_t *re 
	return -EIO;

}



static int maprom_erase (struct mtd_info *mtd, struct erase_info *info)

{

	/* We do our best 8) */

	return -EROFS;

}



static int __init map_rom_init(void)

{

	register_mtd_chip_driver(&maprom_chipdrv);

drivers/mtd/devices/slram.c

+10 −4
Original line number Diff line number Diff line
@@ -267,22 +267,28 @@ static int parse_cmdline(char *devname, char *szstart, char *szlength) 
	if (*(szlength) != '+') {

		devlength = simple_strtoul(szlength, &buffer, 0);

		devlength = handle_unit(devlength, buffer) - devstart;

		if (devlength < devstart)

			goto err_out;



		devlength -= devstart;

	} else {

		devlength = simple_strtoul(szlength + 1, &buffer, 0);

		devlength = handle_unit(devlength, buffer);

	}

	T("slram: devname=%s, devstart=0x%lx, devlength=0x%lx\n",

			devname, devstart, devlength);

	if ((devstart < 0) || (devlength < 0) || (devlength % SLRAM_BLK_SZ != 0)) {

		E("slram: Illegal start / length parameter.\n");

		return(-EINVAL);

	}

	if (devlength % SLRAM_BLK_SZ != 0)

		goto err_out;



	if ((devstart = register_device(devname, devstart, devlength))){

		unregister_devices();

		return((int)devstart);

	}

	return(0);



err_out:

	E("slram: Illegal length parameter.\n");

	return(-EINVAL);

}



#ifndef MODULE

drivers/mtd/lpddr/Kconfig

+1 −0
Original line number Diff line number Diff line
@@ -12,6 +12,7 @@ config MTD_LPDDR 
	  DDR memories, intended for battery-operated systems.



config MTD_QINFO_PROBE

	depends on MTD_LPDDR

	tristate "Detect flash chips by QINFO probe"

	help

	    Device Information for LPDDR chips is offered through the Overlay

drivers/mtd/maps/Kconfig

+1 −1
Original line number Diff line number Diff line
@@ -491,7 +491,7 @@ config MTD_PCMCIA_ANONYMOUS 


config MTD_BFIN_ASYNC

	tristate "Blackfin BF533-STAMP Flash Chip Support"

	depends on BFIN533_STAMP && MTD_CFI

	depends on BFIN533_STAMP && MTD_CFI && MTD_COMPLEX_MAPPINGS

	select MTD_PARTITIONS

	default y

	help

drivers/mtd/maps/bfin-async-flash.c

+5 −1
Original line number Diff line number Diff line
@@ -152,14 +152,18 @@ static int __devinit bfin_flash_probe(struct platform_device *pdev) 


	if (gpio_request(state->enet_flash_pin, DRIVER_NAME)) {

		pr_devinit(KERN_ERR DRIVER_NAME ": Failed to request gpio %d\n", state->enet_flash_pin);

		kfree(state);

		return -EBUSY;

	}

	gpio_direction_output(state->enet_flash_pin, 1);



	pr_devinit(KERN_NOTICE DRIVER_NAME ": probing %d-bit flash bus\n", state->map.bankwidth * 8);

	state->mtd = do_map_probe(memory->name, &state->map);

	if (!state->mtd)

	if (!state->mtd) {

		gpio_free(state->enet_flash_pin);

		kfree(state);

		return -ENXIO;

	}



#ifdef CONFIG_MTD_PARTITIONS

	ret = parse_mtd_partitions(state->mtd, part_probe_types, &pdata->parts, 0);