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

Commit 6e96783f 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:
  [JFFS2] print a message when marking bad block
  [JFFS2] Check for all-zero node headers
  [MTD] [OneNAND] Classify the page data and oob buffer
  [MTD] [OneNAND] Exit the loop when transferring/filling of the oob is finished
  [MTD] [OneNAND] add Nokia Copyright and a credit
  [MTD] [OneNAND] Fix typo & wrong comments
  [MTD] [OneNAND] Use oob buffer instead of main one in oob functions
  [MTD] Correct partition failed erase address
  [JFFS2] Use yield() between GC passes in background thread.
  [MTD] [NAND] Correct misspelled preprocessor variable.
  [MTD] [MAPS] dilnetpc: Fix printk warning
  [MTD] [NOR] Fix oops in cfi_amdstd_sync
  [MTD] ESB2 check for closed ROM window
  [JFFS2] Fix writebuffer recovery in the first page of a block
  [MTD] [NAND] make oobavail public
parents 8466c833 0feba829

drivers/mtd/chips/cfi_cmdset_0002.c

+2 −0
Original line number Original line Diff line number Diff line
@@ -359,6 +359,8 @@ struct mtd_info *cfi_cmdset_0002(struct map_info *map, int primary) 
		cfi->chips[i].word_write_time = 1<<cfi->cfiq->WordWriteTimeoutTyp;

		cfi->chips[i].word_write_time = 1<<cfi->cfiq->WordWriteTimeoutTyp;

		cfi->chips[i].buffer_write_time = 1<<cfi->cfiq->BufWriteTimeoutTyp;

		cfi->chips[i].buffer_write_time = 1<<cfi->cfiq->BufWriteTimeoutTyp;

		cfi->chips[i].erase_time = 1<<cfi->cfiq->BlockEraseTimeoutTyp;

		cfi->chips[i].erase_time = 1<<cfi->cfiq->BlockEraseTimeoutTyp;

		cfi->chips[i].ref_point_counter = 0;

		init_waitqueue_head(&(cfi->chips[i].wq));

	}

	}





	map->fldrv = &cfi_amdstd_chipdrv;

	map->fldrv = &cfi_amdstd_chipdrv;

drivers/mtd/chips/cfi_cmdset_0020.c

+2 −0
Original line number Original line Diff line number Diff line
@@ -158,6 +158,8 @@ struct mtd_info *cfi_cmdset_0020(struct map_info *map, int primary) 
		cfi->chips[i].word_write_time = 128;

		cfi->chips[i].word_write_time = 128;

		cfi->chips[i].buffer_write_time = 128;

		cfi->chips[i].buffer_write_time = 128;

		cfi->chips[i].erase_time = 1024;

		cfi->chips[i].erase_time = 1024;

		cfi->chips[i].ref_point_counter = 0;

		init_waitqueue_head(&(cfi->chips[i].wq));

	}

	}





	return cfi_staa_setup(map);

	return cfi_staa_setup(map);

drivers/mtd/maps/dilnetpc.c

+2 −2
Original line number Original line Diff line number Diff line
@@ -402,8 +402,8 @@ static int __init init_dnpc(void) 
			++higlvl_partition_info[i].name;

			++higlvl_partition_info[i].name;

	}

	}





	printk(KERN_NOTICE "DIL/Net %s flash: 0x%lx at 0x%lx\n",

	printk(KERN_NOTICE "DIL/Net %s flash: 0x%lx at 0x%llx\n",

		is_dnp ? "DNPC" : "ADNP", dnpc_map.size, dnpc_map.phys);

		is_dnp ? "DNPC" : "ADNP", dnpc_map.size, (unsigned long long)dnpc_map.phys);





	dnpc_map.virt = ioremap_nocache(dnpc_map.phys, dnpc_map.size);

	dnpc_map.virt = ioremap_nocache(dnpc_map.phys, dnpc_map.size);

drivers/mtd/maps/esb2rom.c

+8 −3
Original line number Original line Diff line number Diff line
@@ -185,7 +185,7 @@ static int __devinit esb2rom_init_one(struct pci_dev *pdev, 
	/* Find a region continuous to the end of the ROM window  */

	/* Find a region continuous to the end of the ROM window  */

	window->phys = 0;

	window->phys = 0;

	pci_read_config_word(pdev, FWH_DEC_EN1, &word);

	pci_read_config_word(pdev, FWH_DEC_EN1, &word);

	printk(KERN_DEBUG "pci_read_config_byte : %x\n", word);

	printk(KERN_DEBUG "pci_read_config_word : %x\n", word);





	if ((word & FWH_8MiB) == FWH_8MiB)

	if ((word & FWH_8MiB) == FWH_8MiB)

		window->phys = 0xff400000;

		window->phys = 0xff400000;
@@ -212,6 +212,11 @@ static int __devinit esb2rom_init_one(struct pci_dev *pdev, 
	else if ((word & FWH_0_5MiB) == FWH_0_5MiB)

	else if ((word & FWH_0_5MiB) == FWH_0_5MiB)

		window->phys = 0xfff80000;

		window->phys = 0xfff80000;





	if (window->phys == 0) {

		printk(KERN_ERR MOD_NAME ": Rom window is closed\n");

		goto out;

	}



	/* reserved  0x0020 and 0x0010 */

	/* reserved  0x0020 and 0x0010 */

	window->phys -= 0x400000UL;

	window->phys -= 0x400000UL;

	window->size = (0xffffffffUL - window->phys) + 1UL;

	window->size = (0xffffffffUL - window->phys) + 1UL;

drivers/mtd/mtdconcat.c

+1 −0
Original line number Original line Diff line number Diff line
@@ -727,6 +727,7 @@ struct mtd_info *mtd_concat_create(struct mtd_info *subdev[], /* subdevices to c 
	concat->mtd.erasesize = subdev[0]->erasesize;

	concat->mtd.erasesize = subdev[0]->erasesize;

	concat->mtd.writesize = subdev[0]->writesize;

	concat->mtd.writesize = subdev[0]->writesize;

	concat->mtd.oobsize = subdev[0]->oobsize;

	concat->mtd.oobsize = subdev[0]->oobsize;

	concat->mtd.oobavail = subdev[0]->oobavail;

	if (subdev[0]->writev)

	if (subdev[0]->writev)

		concat->mtd.writev = concat_writev;

		concat->mtd.writev = concat_writev;

	if (subdev[0]->read_oob)

	if (subdev[0]->read_oob)