Merge git://git.infradead.org/mtd-2.6 (ac1b7c37) · Commits · 戴 / test

Documentation/ABI/testing/sysfs-class-mtd

0 → 100644

+125 −0

Original line number	Diff line number	Diff line
		What: /sys/class/mtd/
		Date: April 2009
		KernelVersion: 2.6.29
		Contact: linux-mtd@lists.infradead.org
		Description:
		The mtd/ class subdirectory belongs to the MTD subsystem
		(MTD core).

		What: /sys/class/mtd/mtdX/
		Date: April 2009
		KernelVersion: 2.6.29
		Contact: linux-mtd@lists.infradead.org
		Description:
		The /sys/class/mtd/mtd{0,1,2,3,...} directories correspond
		to each /dev/mtdX character device. These may represent
		physical/simulated flash devices, partitions on a flash
		device, or concatenated flash devices. They exist regardless
		of whether CONFIG_MTD_CHAR is actually enabled.

		What: /sys/class/mtd/mtdXro/
		Date: April 2009
		KernelVersion: 2.6.29
		Contact: linux-mtd@lists.infradead.org
		Description:
		These directories provide the corresponding read-only device
		nodes for /sys/class/mtd/mtdX/ . They are only created
		(for the benefit of udev) if CONFIG_MTD_CHAR is enabled.

		What: /sys/class/mtd/mtdX/dev
		Date: April 2009
		KernelVersion: 2.6.29
		Contact: linux-mtd@lists.infradead.org
		Description:
		Major and minor numbers of the character device corresponding
		to this MTD device (in <major>:<minor> format). This is the
		read-write device so <minor> will be even.

		What: /sys/class/mtd/mtdXro/dev
		Date: April 2009
		KernelVersion: 2.6.29
		Contact: linux-mtd@lists.infradead.org
		Description:
		Major and minor numbers of the character device corresponding
		to the read-only variant of thie MTD device (in
		<major>:<minor> format). In this case <minor> will be odd.

		What: /sys/class/mtd/mtdX/erasesize
		Date: April 2009
		KernelVersion: 2.6.29
		Contact: linux-mtd@lists.infradead.org
		Description:
		"Major" erase size for the device. If numeraseregions is
		zero, this is the eraseblock size for the entire device.
		Otherwise, the MEMGETREGIONCOUNT/MEMGETREGIONINFO ioctls
		can be used to determine the actual eraseblock layout.

		What: /sys/class/mtd/mtdX/flags
		Date: April 2009
		KernelVersion: 2.6.29
		Contact: linux-mtd@lists.infradead.org
		Description:
		A hexadecimal value representing the device flags, ORed
		together:

		0x0400: MTD_WRITEABLE - device is writable
		0x0800: MTD_BIT_WRITEABLE - single bits can be flipped
		0x1000: MTD_NO_ERASE - no erase necessary
		0x2000: MTD_POWERUP_LOCK - always locked after reset

		What: /sys/class/mtd/mtdX/name
		Date: April 2009
		KernelVersion: 2.6.29
		Contact: linux-mtd@lists.infradead.org
		Description:
		A human-readable ASCII name for the device or partition.
		This will match the name in /proc/mtd .

		What: /sys/class/mtd/mtdX/numeraseregions
		Date: April 2009
		KernelVersion: 2.6.29
		Contact: linux-mtd@lists.infradead.org
		Description:
		For devices that have variable eraseblock sizes, this
		provides the total number of erase regions. Otherwise,
		it will read back as zero.

		What: /sys/class/mtd/mtdX/oobsize
		Date: April 2009
		KernelVersion: 2.6.29
		Contact: linux-mtd@lists.infradead.org
		Description:
		Number of OOB bytes per page.

		What: /sys/class/mtd/mtdX/size
		Date: April 2009
		KernelVersion: 2.6.29
		Contact: linux-mtd@lists.infradead.org
		Description:
		Total size of the device/partition, in bytes.

		What: /sys/class/mtd/mtdX/type
		Date: April 2009
		KernelVersion: 2.6.29
		Contact: linux-mtd@lists.infradead.org
		Description:
		One of the following ASCII strings, representing the device
		type:

		absent, ram, rom, nor, nand, dataflash, ubi, unknown

		What: /sys/class/mtd/mtdX/writesize
		Date: April 2009
		KernelVersion: 2.6.29
		Contact: linux-mtd@lists.infradead.org
		Description:
		Minimal writable flash unit size. This will always be
		a positive integer.

		In the case of NOR flash it is 1 (even though individual
		bits can be cleared).

		In the case of NAND flash it is one NAND page (or a
		half page, or a quarter page).

		In the case of ECC NOR, it is the ECC block size.

Documentation/kernel-parameters.txt

+10 −0

Original line number	Diff line number	Diff line
		@@ -1431,6 +1431,16 @@ and is between 256 and 4096 characters. It is defined in the file
		mtdparts= [MTD]
		See drivers/mtd/cmdlinepart.c.

		onenand.bdry= [HW,MTD] Flex-OneNAND Boundary Configuration

		Format: [die0_boundary][,die0_lock][,die1_boundary][,die1_lock]

		boundary - index of last SLC block on Flex-OneNAND.
		The remaining blocks are configured as MLC blocks.
		lock - Configure if Flex-OneNAND boundary should be locked.
		Once locked, the boundary cannot be changed.
		1 indicates lock status, 0 indicates unlock status.

		mtdset= [ARM]
		ARM/S3C2412 JIVE boot control

MAINTAINERS

+0 −1

Original line number	Diff line number	Diff line
		@@ -3252,7 +3252,6 @@ W: http://www.linux-mtd.infradead.org/doc/jffs2.html
		S: Maintained
		F: fs/jffs2/
		F: include/linux/jffs2.h
		F: include/mtd/jffs2-user.h

		JOURNALLING LAYER FOR BLOCK DEVICES (JBD)
		P: Stephen Tweedie

arch/arm/mach-davinci/include/mach/nand.h

+6 −2

Original line number	Diff line number	Diff line
		@@ -68,10 +68,14 @@ struct davinci_nand_pdata { /* platform_data */

		/* none == NAND_ECC_NONE (strongly not advised!!)
		* soft == NAND_ECC_SOFT
		* 1-bit == NAND_ECC_HW
		* 4-bit == NAND_ECC_HW_SYNDROME (not on all chips)
		* else == NAND_ECC_HW, according to ecc_bits
		*
		* All DaVinci-family chips support 1-bit hardware ECC.
		* Newer ones also support 4-bit ECC, but are awkward
		* using it with large page chips.
		*/
		nand_ecc_modes_t ecc_mode;
		u8 ecc_bits;

		/* e.g. NAND_BUSWIDTH_16 or NAND_USE_FLASH_BBT */
		unsigned options;

arch/arm/plat-s3c/include/plat/nand.h

+19 −12

Original line number	Diff line number	Diff line
		@@ -10,19 +10,26 @@
		* published by the Free Software Foundation.
		*/

		/* struct s3c2410_nand_set
		/**
		* struct s3c2410_nand_set - define a set of one or more nand chips
		* @disable_ecc: Entirely disable ECC - Dangerous
		* @flash_bbt: Openmoko u-boot can create a Bad Block Table
		* Setting this flag will allow the kernel to
		* look for it at boot time and also skip the NAND
		* scan.
		* @nr_chips: Number of chips in this set
		* @nr_partitions: Number of partitions pointed to by @partitions
		* @name: Name of set (optional)
		* @nr_map: Map for low-layer logical to physical chip numbers (option)
		* @partitions: The mtd partition list
		*
		* define an set of one or more nand chips registered with an unique mtd
		*
		* nr_chips = number of chips in this set
		* nr_partitions = number of partitions pointed to be partitoons (or zero)
		* name = name of set (optional)
		* nr_map = map for low-layer logical to physical chip numbers (option)
		* partitions = mtd partition list
		* define a set of one or more nand chips registered with an unique mtd. Also
		* allows to pass flag to the underlying NAND layer. 'disable_ecc' will trigger
		* a warning at boot time.
		*/

		struct s3c2410_nand_set {
		unsigned int disable_ecc:1;
		unsigned int flash_bbt:1;

		int nr_chips;
		int nr_partitions;

Admin message