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

Commit e8a89ceb 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: (79 commits)
  mtd: Remove obsolete <mtd/compatmac.h> include
  mtd: Update copyright notices
  jffs2: Update copyright notices
  mtd-physmap: add support users can assign the probe type in board files
  mtd: remove redwood map driver
  mxc_nand: Add v3 (i.MX51) Support
  mxc_nand: support 8bit ecc
  mxc_nand: fix correct_data function
  mxc_nand: add V1_V2 namespace to registers
  mxc_nand: factor out a check_int function
  mxc_nand: make some internally used functions overwriteable
  mxc_nand: rework get_dev_status
  mxc_nand: remove 0xe00 offset from registers
  mtd: denali: Add multi connected NAND support
  mtd: denali: Remove set_ecc_config function
  mtd: denali: Remove unuseful code in get_xx_nand_para functions
  mtd: denali: Remove device_info_tag structure
  mtd: m25p80: add support for the Winbond W25Q32 SPI flash chip
  mtd: m25p80: add support for the Intel/Numonyx {16,32,64}0S33B SPI flash chips
  mtd: m25p80: add support for the EON EN25P{32, 64} SPI flash chips
  ...

Fix up trivial conflicts in drivers/mtd/maps/{Kconfig,redwood.c} due to
redwood driver removal.
parents 8196867c 6ae0185f

arch/blackfin/include/asm/nand.h

+0 −3
Original line number Diff line number Diff line
@@ -15,8 +15,6 @@ 
 * partitions	 = mtd partition list

 */



#define NFC_PG_SIZE_256		0

#define NFC_PG_SIZE_512		1

#define NFC_PG_SIZE_OFFSET	9



#define NFC_NWIDTH_8		0
@@ -30,7 +28,6 @@ 


struct bf5xx_nand_platform {

	/* NAND chip information */

	unsigned short		page_size;

	unsigned short		data_width;



	/* RD/WR strobe delay timing information, all times in SCLK cycles */

drivers/mtd/Kconfig

+7 −5
Original line number Diff line number Diff line
@@ -311,15 +311,17 @@ config SM_FTL 
	select MTD_BLKDEVS

	select MTD_NAND_ECC

	help

	  This enables new and very EXPERMENTAL support for SmartMedia/xD

	  This enables EXPERIMENTAL R/W support for SmartMedia/xD

	  FTL (Flash translation layer).

	  Write support isn't yet well tested, therefore this code IS likely to

	  eat your card, so please don't use it together with valuable data.

	  Use readonly driver (CONFIG_SSFDC) instead.

	  Write support is only lightly tested, therefore this driver

	  isn't recommended to use with valuable data (anyway if you have

	  valuable data, do backups regardless of software/hardware you

	  use, because you never know what will eat your data...)

	  If you only need R/O access, you can use older R/O driver

	  (CONFIG_SSFDC)



config MTD_OOPS

	tristate "Log panic/oops to an MTD buffer"

	depends on MTD

	help

	  This enables panic and oops messages to be logged to a circular

	  buffer in a flash partition where it can be read back at some

drivers/mtd/afs.c

+1 −1
Original line number Diff line number Diff line
@@ -2,7 +2,7 @@ 


    drivers/mtd/afs.c: ARM Flash Layout/Partitioning



    Copyright (C) 2000 ARM Limited

    Copyright © 2000 ARM Limited



   This program is free software; you can redistribute it and/or modify

   it under the terms of the GNU General Public License as published by

drivers/mtd/chips/cfi_cmdset_0001.c

+20 −11
Original line number Diff line number Diff line
@@ -34,7 +34,6 @@ 
#include <linux/mtd/xip.h>

#include <linux/mtd/map.h>

#include <linux/mtd/mtd.h>

#include <linux/mtd/compatmac.h>

#include <linux/mtd/cfi.h>



/* #define CMDSET0001_DISABLE_ERASE_SUSPEND_ON_WRITE */
@@ -63,6 +62,8 @@ static int cfi_intelext_erase_varsize(struct mtd_info *, struct erase_info *); 
static void cfi_intelext_sync (struct mtd_info *);

static int cfi_intelext_lock(struct mtd_info *mtd, loff_t ofs, uint64_t len);

static int cfi_intelext_unlock(struct mtd_info *mtd, loff_t ofs, uint64_t len);

static int cfi_intelext_is_locked(struct mtd_info *mtd, loff_t ofs,

				  uint64_t len);

#ifdef CONFIG_MTD_OTP

static int cfi_intelext_read_fact_prot_reg (struct mtd_info *, loff_t, size_t, size_t *, u_char *);

static int cfi_intelext_read_user_prot_reg (struct mtd_info *, loff_t, size_t, size_t *, u_char *);
@@ -448,6 +449,7 @@ struct mtd_info *cfi_cmdset_0001(struct map_info *map, int primary) 
	mtd->sync    = cfi_intelext_sync;

	mtd->lock    = cfi_intelext_lock;

	mtd->unlock  = cfi_intelext_unlock;

	mtd->is_locked = cfi_intelext_is_locked;

	mtd->suspend = cfi_intelext_suspend;

	mtd->resume  = cfi_intelext_resume;

	mtd->flags   = MTD_CAP_NORFLASH;
@@ -717,7 +719,7 @@ static int cfi_intelext_partition_fixup(struct mtd_info *mtd, 
		chip = &newcfi->chips[0];

		for (i = 0; i < cfi->numchips; i++) {

			shared[i].writing = shared[i].erasing = NULL;

			spin_lock_init(&shared[i].lock);

			mutex_init(&shared[i].lock);

			for (j = 0; j < numparts; j++) {

				*chip = cfi->chips[i];

				chip->start += j << partshift;
@@ -886,7 +888,7 @@ static int get_chip(struct map_info *map, struct flchip *chip, unsigned long adr 
		 */

		struct flchip_shared *shared = chip->priv;

		struct flchip *contender;

		spin_lock(&shared->lock);

		mutex_lock(&shared->lock);

		contender = shared->writing;

		if (contender && contender != chip) {

			/*
@@ -899,7 +901,7 @@ static int get_chip(struct map_info *map, struct flchip *chip, unsigned long adr 
			 * get_chip returns success we're clear to go ahead.

			 */

			ret = mutex_trylock(&contender->mutex);

			spin_unlock(&shared->lock);

			mutex_unlock(&shared->lock);

			if (!ret)

				goto retry;

			mutex_unlock(&chip->mutex);
@@ -914,7 +916,7 @@ static int get_chip(struct map_info *map, struct flchip *chip, unsigned long adr 
				mutex_unlock(&contender->mutex);

				return ret;

			}

			spin_lock(&shared->lock);

			mutex_lock(&shared->lock);



			/* We should not own chip if it is already

			 * in FL_SYNCING state. Put contender and retry. */
@@ -930,7 +932,7 @@ static int get_chip(struct map_info *map, struct flchip *chip, unsigned long adr 
		 * on this chip. Sleep. */

		if (mode == FL_ERASING && shared->erasing

		    && shared->erasing->oldstate == FL_ERASING) {

			spin_unlock(&shared->lock);

			mutex_unlock(&shared->lock);

			set_current_state(TASK_UNINTERRUPTIBLE);

			add_wait_queue(&chip->wq, &wait);

			mutex_unlock(&chip->mutex);
@@ -944,7 +946,7 @@ static int get_chip(struct map_info *map, struct flchip *chip, unsigned long adr 
		shared->writing = chip;

		if (mode == FL_ERASING)

			shared->erasing = chip;

		spin_unlock(&shared->lock);

		mutex_unlock(&shared->lock);

	}

	ret = chip_ready(map, chip, adr, mode);

	if (ret == -EAGAIN)
@@ -959,7 +961,7 @@ static void put_chip(struct map_info *map, struct flchip *chip, unsigned long ad 


	if (chip->priv) {

		struct flchip_shared *shared = chip->priv;

		spin_lock(&shared->lock);

		mutex_lock(&shared->lock);

		if (shared->writing == chip && chip->oldstate == FL_READY) {

			/* We own the ability to write, but we're done */

			shared->writing = shared->erasing;
@@ -967,7 +969,7 @@ static void put_chip(struct map_info *map, struct flchip *chip, unsigned long ad 
				/* give back ownership to who we loaned it from */

				struct flchip *loaner = shared->writing;

				mutex_lock(&loaner->mutex);

				spin_unlock(&shared->lock);

				mutex_unlock(&shared->lock);

				mutex_unlock(&chip->mutex);

				put_chip(map, loaner, loaner->start);

				mutex_lock(&chip->mutex);
@@ -985,11 +987,11 @@ static void put_chip(struct map_info *map, struct flchip *chip, unsigned long ad 
			 * Don't let the switch below mess things up since

			 * we don't have ownership to resume anything.

			 */

			spin_unlock(&shared->lock);

			mutex_unlock(&shared->lock);

			wake_up(&chip->wq);

			return;

		}

		spin_unlock(&shared->lock);

		mutex_unlock(&shared->lock);

	}



	switch(chip->oldstate) {
@@ -2139,6 +2141,13 @@ static int cfi_intelext_unlock(struct mtd_info *mtd, loff_t ofs, uint64_t len) 
	return ret;

}



static int cfi_intelext_is_locked(struct mtd_info *mtd, loff_t ofs,

				  uint64_t len)

{

	return cfi_varsize_frob(mtd, do_getlockstatus_oneblock,

				ofs, len, NULL) ? 1 : 0;

}



#ifdef CONFIG_MTD_OTP



typedef int (*otp_op_t)(struct map_info *map, struct flchip *chip,

drivers/mtd/chips/cfi_cmdset_0002.c

+13 −4
Original line number Diff line number Diff line
@@ -33,7 +33,6 @@ 
#include <linux/delay.h>

#include <linux/interrupt.h>

#include <linux/reboot.h>

#include <linux/mtd/compatmac.h>

#include <linux/mtd/map.h>

#include <linux/mtd/mtd.h>

#include <linux/mtd/cfi.h>
@@ -417,16 +416,26 @@ struct mtd_info *cfi_cmdset_0002(struct map_info *map, int primary) 
			 */

			cfi_fixup_major_minor(cfi, extp);



			/*

			 * Valid primary extension versions are: 1.0, 1.1, 1.2, 1.3, 1.4

			 * see: http://www.amd.com/us-en/assets/content_type/DownloadableAssets/cfi_r20.pdf, page 19

			 *      http://www.amd.com/us-en/assets/content_type/DownloadableAssets/cfi_100_20011201.pdf

			 *      http://www.spansion.com/Support/Datasheets/s29ws-p_00_a12_e.pdf

			 */

			if (extp->MajorVersion != '1' ||

			    (extp->MinorVersion < '0' || extp->MinorVersion > '4')) {

			    (extp->MajorVersion == '1' && (extp->MinorVersion < '0' || extp->MinorVersion > '4'))) {

				printk(KERN_ERR "  Unknown Amd/Fujitsu Extended Query "

				       "version %c.%c.\n",  extp->MajorVersion,

				       extp->MinorVersion);

				       "version %c.%c (%#02x/%#02x).\n",

				       extp->MajorVersion, extp->MinorVersion,

				       extp->MajorVersion, extp->MinorVersion);

				kfree(extp);

				kfree(mtd);

				return NULL;

			}



			printk(KERN_INFO "  Amd/Fujitsu Extended Query version %c.%c.\n",

			       extp->MajorVersion, extp->MinorVersion);



			/* Install our own private info structure */

			cfi->cmdset_priv = extp;