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

Commit 4cbb9b80 authored by Thomas Gleixner's avatar Thomas Gleixner
Browse files

Merge branch 'master' of /home/tglx/work/kernel/git/mtd-2.6/ 



Signed-off-by: default avatarThomas Gleixner <tglx@linutronix.de>
parents 6dfc6d25 9fe4854c

drivers/mtd/chips/cfi_cmdset_0001.c

+3 −3
Original line number Diff line number Diff line
@@ -545,12 +545,12 @@ static int cfi_intelext_partition_fixup(struct mtd_info *mtd, 
		if (extp->MinorVersion >= '4') {

			struct cfi_intelext_programming_regioninfo *prinfo;

			prinfo = (struct cfi_intelext_programming_regioninfo *)&extp->extra[offs];

			MTD_PROGREGION_SIZE(mtd) = cfi->interleave << prinfo->ProgRegShift;

			mtd->writesize = cfi->interleave << prinfo->ProgRegShift;

			MTD_PROGREGION_CTRLMODE_VALID(mtd) = cfi->interleave * prinfo->ControlValid;

			MTD_PROGREGION_CTRLMODE_INVALID(mtd) = cfi->interleave * prinfo->ControlInvalid;

			mtd->flags |= MTD_PROGRAM_REGIONS;

			mtd->flags &= ~MTD_BIT_WRITEABLE;

			printk(KERN_DEBUG "%s: program region size/ctrl_valid/ctrl_inval = %d/%d/%d\n",

			       map->name, MTD_PROGREGION_SIZE(mtd),

			       map->name, mtd->writesize,

			       MTD_PROGREGION_CTRLMODE_VALID(mtd),

			       MTD_PROGREGION_CTRLMODE_INVALID(mtd));

		}

drivers/mtd/chips/cfi_cmdset_0020.c

+2 −3
Original line number Diff line number Diff line
@@ -238,9 +238,8 @@ static struct mtd_info *cfi_staa_setup(struct map_info *map) 
	mtd->unlock = cfi_staa_unlock;

	mtd->suspend = cfi_staa_suspend;

	mtd->resume = cfi_staa_resume;

	mtd->flags = MTD_CAP_NORFLASH;

	mtd->flags |= MTD_ECC; /* FIXME: Not all STMicro flashes have this */

	mtd->eccsize = 8; /* FIXME: Should be 0 for STMicro flashes w/out ECC */

	mtd->flags = MTD_CAP_NORFLASH & ~MTD_BIT_WRITEABLE;

	mtd->writesize = 8; /* FIXME: Should be 0 for STMicro flashes w/out ECC */

	map->fldrv = &cfi_staa_chipdrv;

	__module_get(THIS_MODULE);

	mtd->name = map->name;

drivers/mtd/devices/doc2000.c

+1 −1
Original line number Diff line number Diff line
@@ -579,7 +579,7 @@ void DoC2k_init(struct mtd_info *mtd) 
	mtd->ecctype = MTD_ECC_RS_DiskOnChip;

	mtd->size = 0;

	mtd->erasesize = 0;

	mtd->oobblock = 512;

	mtd->writesize = 512;

	mtd->oobsize = 16;

	mtd->owner = THIS_MODULE;

	mtd->erase = doc_erase;

drivers/mtd/devices/doc2001.c

+1 −1
Original line number Diff line number Diff line
@@ -361,7 +361,7 @@ void DoCMil_init(struct mtd_info *mtd) 
	/* FIXME: erase size is not always 8KiB */

	mtd->erasesize = 0x2000;



	mtd->oobblock = 512;

	mtd->writesize = 512;

	mtd->oobsize = 16;

	mtd->owner = THIS_MODULE;

	mtd->erase = doc_erase;

drivers/mtd/devices/doc2001plus.c

+1 −1
Original line number Diff line number Diff line
@@ -483,7 +483,7 @@ void DoCMilPlus_init(struct mtd_info *mtd) 
	mtd->size = 0;



	mtd->erasesize = 0;

	mtd->oobblock = 512;

	mtd->writesize = 512;

	mtd->oobsize = 16;

	mtd->owner = THIS_MODULE;

	mtd->erase = doc_erase;