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

Commit 4d9c6a21 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] [NAND] fix OOPS accessing flash operations over STM flash on PXA
  [MTD] [NAND] drivers/mtd/nand/pasemi_nand.c: Add missing pci_dev_put
  [MTD] [NAND] fsl_upm: fix build problem with 2.6.28-rc2
  [MTD] physmap: fix memory leak on physmap_flash_remove by using devres
  [MTD] m25p80: chip erase != block erase != sector erase
  [MTD] m25p80: fix detection of m25p16 flashes
  [MTD] m25p80: fix detection of SPI parts
  [MTD] [NAND] OMAP: OneNAND: header file relocation (part 2)
  [MTD] [NAND] OMAP: OneNAND: header file relocation
parents b749e3f8 e93f1be5

drivers/mtd/devices/m25p80.c

+16 −12
Original line number Diff line number Diff line
@@ -39,7 +39,7 @@ 
#define	OPCODE_PP		0x02	/* Page program (up to 256 bytes) */

#define	OPCODE_BE_4K		0x20	/* Erase 4KiB block */

#define	OPCODE_BE_32K		0x52	/* Erase 32KiB block */

#define	OPCODE_BE		0xc7	/* Erase whole flash block */

#define	OPCODE_CHIP_ERASE	0xc7	/* Erase whole flash chip */

#define	OPCODE_SE		0xd8	/* Sector erase (usually 64KiB) */

#define	OPCODE_RDID		0x9f	/* Read JEDEC ID */
@@ -167,7 +167,7 @@ static int wait_till_ready(struct m25p *flash) 
 *

 * Returns 0 if successful, non-zero otherwise.

 */

static int erase_block(struct m25p *flash)

static int erase_chip(struct m25p *flash)

{

	DEBUG(MTD_DEBUG_LEVEL3, "%s: %s %dKiB\n",

			flash->spi->dev.bus_id, __func__,
@@ -181,7 +181,7 @@ static int erase_block(struct m25p *flash) 
	write_enable(flash);



	/* Set up command buffer. */

	flash->command[0] = OPCODE_BE;

	flash->command[0] = OPCODE_CHIP_ERASE;



	spi_write(flash->spi, flash->command, 1);
@@ -250,15 +250,18 @@ static int m25p80_erase(struct mtd_info *mtd, struct erase_info *instr) 


	mutex_lock(&flash->lock);



	/* REVISIT in some cases we could speed up erasing large regions

	 * by using OPCODE_SE instead of OPCODE_BE_4K

	 */



	/* now erase those sectors */

	if (len == flash->mtd.size && erase_block(flash)) {

	/* whole-chip erase? */

	if (len == flash->mtd.size && erase_chip(flash)) {

		instr->state = MTD_ERASE_FAILED;

		mutex_unlock(&flash->lock);

		return -EIO;



	/* REVISIT in some cases we could speed up erasing large regions

	 * by using OPCODE_SE instead of OPCODE_BE_4K.  We may have set up

	 * to use "small sector erase", but that's not always optimal.

	 */



	/* "sector"-at-a-time erase */

	} else {

		while (len) {

			if (erase_sector(flash, addr)) {
@@ -574,11 +577,12 @@ static struct flash_info *__devinit jedec_probe(struct spi_device *spi) 
	for (tmp = 0, info = m25p_data;

			tmp < ARRAY_SIZE(m25p_data);

			tmp++, info++) {

		if (info->jedec_id == jedec)

			if (ext_jedec != 0 && info->ext_id != ext_jedec)

		if (info->jedec_id == jedec) {

			if (info->ext_id != 0 && info->ext_id != ext_jedec)

				continue;

			return info;

		}

	}

	dev_err(&spi->dev, "unrecognized JEDEC id %06x\n", jedec);

	return NULL;

}

drivers/mtd/maps/physmap.c

+9 −17
Original line number Diff line number Diff line
@@ -19,7 +19,7 @@ 
#include <linux/mtd/partitions.h>

#include <linux/mtd/physmap.h>

#include <linux/mtd/concat.h>

#include <asm/io.h>

#include <linux/io.h>



#define MAX_RESOURCES		4
@@ -27,7 +27,6 @@ struct physmap_flash_info { 
	struct mtd_info		*mtd[MAX_RESOURCES];

	struct mtd_info		*cmtd;

	struct map_info		map[MAX_RESOURCES];

	struct resource		*res;

#ifdef CONFIG_MTD_PARTITIONS

	int			nr_parts;

	struct mtd_partition	*parts;
@@ -70,16 +69,7 @@ static int physmap_flash_remove(struct platform_device *dev) 
#endif

			map_destroy(info->mtd[i]);

		}



		if (info->map[i].virt != NULL)

			iounmap(info->map[i].virt);

	}



	if (info->res != NULL) {

		release_resource(info->res);

		kfree(info->res);

	}



	return 0;

}
@@ -101,7 +91,8 @@ static int physmap_flash_probe(struct platform_device *dev) 
	if (physmap_data == NULL)

		return -ENODEV;



	info = kzalloc(sizeof(struct physmap_flash_info), GFP_KERNEL);

	info = devm_kzalloc(&dev->dev, sizeof(struct physmap_flash_info),

			    GFP_KERNEL);

	if (info == NULL) {

		err = -ENOMEM;

		goto err_out;
@@ -114,10 +105,10 @@ static int physmap_flash_probe(struct platform_device *dev) 
		       (unsigned long long)(dev->resource[i].end - dev->resource[i].start + 1),

		       (unsigned long long)dev->resource[i].start);



		info->res = request_mem_region(dev->resource[i].start,

		if (!devm_request_mem_region(&dev->dev,

			dev->resource[i].start,

			dev->resource[i].end - dev->resource[i].start + 1,

					       dev->dev.bus_id);

		if (info->res == NULL) {

			dev->dev.bus_id)) {

			dev_err(&dev->dev, "Could not reserve memory region\n");

			err = -ENOMEM;

			goto err_out;
@@ -129,7 +120,8 @@ static int physmap_flash_probe(struct platform_device *dev) 
		info->map[i].bankwidth = physmap_data->width;

		info->map[i].set_vpp = physmap_data->set_vpp;



		info->map[i].virt = ioremap(info->map[i].phys, info->map[i].size);

		info->map[i].virt = devm_ioremap(&dev->dev, info->map[i].phys,

						 info->map[i].size);

		if (info->map[i].virt == NULL) {

			dev_err(&dev->dev, "Failed to ioremap flash region\n");

			err = EIO;

drivers/mtd/nand/fsl_upm.c

+5 −3
Original line number Diff line number Diff line
@@ -163,9 +163,11 @@ static int __devinit fun_chip_init(struct fsl_upm_nand *fun, 
	ret = parse_mtd_partitions(&fun->mtd, part_types, &fun->parts, 0);



#ifdef CONFIG_MTD_OF_PARTS

	if (ret == 0)

		ret = of_mtd_parse_partitions(fun->dev, &fun->mtd,

					      flash_np, &fun->parts);

	if (ret == 0) {

		ret = of_mtd_parse_partitions(fun->dev, flash_np, &fun->parts);

		if (ret < 0)

			goto err;

	}

#endif

	if (ret > 0)

		ret = add_mtd_partitions(&fun->mtd, fun->parts, ret);

drivers/mtd/nand/pasemi_nand.c

+1 −0
Original line number Diff line number Diff line
@@ -141,6 +141,7 @@ static int __devinit pasemi_nand_probe(struct of_device *ofdev, 
	}



	lpcctl = pci_resource_start(pdev, 0);

	pci_dev_put(pdev);



	if (!request_region(lpcctl, 4, driver_name)) {

		err = -EBUSY;

drivers/mtd/nand/pxa3xx_nand.c

+1 −0
Original line number Diff line number Diff line
@@ -269,6 +269,7 @@ static struct pxa3xx_nand_timing stm2GbX16_timing = { 


static struct pxa3xx_nand_flash stm2GbX16 = {

	.timing = &stm2GbX16_timing,

	.cmdset	= &largepage_cmdset,

	.page_per_block = 64,

	.page_size = 2048,

	.flash_width = 16,