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

Commit ba7cc09c 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: (21 commits)
  [MTD] [CHIPS] Remove MTD_OBSOLETE_CHIPS (jedec, amd_flash, sharp)
  [MTD] Delete allegedly obsolete "bank_size" field of mtd_info.
  [MTD] Remove unnecessary user space check from mtd.h.
  [MTD] [MAPS] Remove flash maps for no longer supported 405LP boards
  [MTD] [MAPS] Fix missing printk() parameter in physmap_of.c MTD driver
  [MTD] [NAND] platform NAND driver: add driver
  [MTD] [NAND] platform NAND driver: update header
  [JFFS2] Simplify and clean up jffs2_add_tn_to_tree() some more.
  [JFFS2] Remove another bogus optimisation in jffs2_add_tn_to_tree()
  [JFFS2] Remove broken insert_point optimisation in jffs2_add_tn_to_tree()
  [JFFS2] Remember to calculate overlap on nodes which replace older nodes
  [JFFS2] Don't advance c->wbuf_ofs to next eraseblock after wbuf flush
  [MTD] [NAND] at91_nand.c: CMDLINE_PARTS support
  [MTD] [NAND] Tidy up handling of page number in nand_block_bad()
  [MTD] block2mtd_paramline[] mustn't be __initdata
  [MTD] [NAND] Support multiple chips in CAFÉ driver
  [MTD] [NAND] Rename cafe.c to cafe_nand.c and remove the multi-obj magic
  [MTD] [NAND] Use rslib for CAFÉ ECC
  [RSLIB] Support non-canonical GF representations
  [JFFS2] Remove dead file histo_mips.h
  ...
parents d84c4124 b7aa48be

MAINTAINERS

+6 −0
Original line number Diff line number Diff line
@@ -2648,6 +2648,12 @@ M: corbet@lwn.net 
L:	video4linux-list@redhat.com

S:	Maintained



ONENAND FLASH DRIVER

P:	Kyungmin Park

M:	kyungmin.park@samsung.com

L:	linux-mtd@lists.infradead.org

S:	Maintained



ONSTREAM SCSI TAPE DRIVER

P:	Willem Riede

M:	osst@riede.org

drivers/mtd/chips/Kconfig

+0 −40
Original line number Diff line number Diff line 
# drivers/mtd/chips/Kconfig

# $Id: Kconfig,v 1.18 2005/11/07 11:14:22 gleixner Exp $



menu "RAM/ROM/Flash chip drivers"

	depends on MTD!=n
@@ -231,45 +230,6 @@ config MTD_ABSENT 
	  the system regardless of media presence.  Device nodes created

	  with this driver will return -ENODEV upon access.



config MTD_OBSOLETE_CHIPS

	bool "Older (theoretically obsoleted now) drivers for non-CFI chips"

	help

	  This option does not enable any code directly, but will allow you to

	  select some other chip drivers which are now considered obsolete,

	  because the generic CONFIG_JEDECPROBE code above should now detect

	  the chips which are supported by these drivers, and allow the generic

	  CFI-compatible drivers to drive the chips. Say 'N' here unless you have

	  already tried the CONFIG_JEDECPROBE method and reported its failure

	  to the MTD mailing list at <linux-mtd@lists.infradead.org>



config MTD_AMDSTD

	tristate "AMD compatible flash chip support (non-CFI)"

	depends on MTD_OBSOLETE_CHIPS && BROKEN

	help

	  This option enables support for flash chips using AMD-compatible

	  commands, including some which are not CFI-compatible and hence

	  cannot be used with the CONFIG_MTD_CFI_AMDSTD option.



	  It also works on AMD compatible chips that do conform to CFI.



config MTD_SHARP

	tristate "pre-CFI Sharp chip support"

	depends on MTD_OBSOLETE_CHIPS

	help

	  This option enables support for flash chips using Sharp-compatible

	  commands, including some which are not CFI-compatible and hence

	  cannot be used with the CONFIG_MTD_CFI_INTELxxx options.



config MTD_JEDEC

	tristate "JEDEC device support"

	depends on MTD_OBSOLETE_CHIPS && BROKEN

	help

	  Enable older JEDEC flash interface devices for self

	  programming flash.  It is commonly used in older AMD chips.  It is

	  only called JEDEC because the JEDEC association

	  <http://www.jedec.org/> distributes the identification codes for the

	  chips.



config MTD_XIP

	bool "XIP aware MTD support"

	depends on !SMP && (MTD_CFI_INTELEXT || MTD_CFI_AMDSTD) && EXPERIMENTAL && ARCH_MTD_XIP

drivers/mtd/chips/Makefile

+0 −4
Original line number Diff line number Diff line 
#

# linux/drivers/chips/Makefile

#

# $Id: Makefile.common,v 1.5 2005/11/07 11:14:22 gleixner Exp $



obj-$(CONFIG_MTD)		+= chipreg.o

obj-$(CONFIG_MTD_AMDSTD)	+= amd_flash.o

obj-$(CONFIG_MTD_CFI)		+= cfi_probe.o

obj-$(CONFIG_MTD_CFI_UTIL)	+= cfi_util.o

obj-$(CONFIG_MTD_CFI_STAA)	+= cfi_cmdset_0020.o

obj-$(CONFIG_MTD_CFI_AMDSTD)	+= cfi_cmdset_0002.o

obj-$(CONFIG_MTD_CFI_INTELEXT)	+= cfi_cmdset_0001.o

obj-$(CONFIG_MTD_GEN_PROBE)	+= gen_probe.o

obj-$(CONFIG_MTD_JEDEC)		+= jedec.o

obj-$(CONFIG_MTD_JEDECPROBE)	+= jedec_probe.o

obj-$(CONFIG_MTD_RAM)		+= map_ram.o

obj-$(CONFIG_MTD_ROM)		+= map_rom.o

obj-$(CONFIG_MTD_SHARP)		+= sharp.o

obj-$(CONFIG_MTD_ABSENT)	+= map_absent.o

drivers/mtd/chips/amd_flash.c

deleted100644 → 0
+0 −1396

File deleted.

Preview size limit exceeded, changes collapsed.

drivers/mtd/chips/jedec.c

deleted100644 → 0
+0 −935

File deleted.

Preview size limit exceeded, changes collapsed.