Merge git://git.infradead.org/mtd-2.6

* git://git.infradead.org/mtd-2.6: (63 commits)
  mtd: OneNAND: Allow setting of boundary information when built as module
  jffs2: leaking jffs2_summary in function jffs2_scan_medium
  mtd: nand: Fix memory leak on txx9ndfmc probe failure.
  mtd: orion_nand: use burst reads with double word accesses
  mtd/nand: s3c6400 support for s3c2410 driver
  [MTD] [NAND] S3C2410: Use DIV_ROUND_UP
  [MTD] [NAND] S3C2410: Deal with unaligned lengths in S3C2440 buffer read/write
  [MTD] [NAND] S3C2410: Allow the machine code to get the BBT table from NAND
  [MTD] [NAND] S3C2410: Added a kerneldoc for s3c2410_nand_set
  mtd: physmap_of: Add multiple regions and concatenation support
  mtd: nand: max_retries off by one in mxc_nand
  mtd: nand: s3c2410_nand_setrate(): use correct macros for 2412/2440
  mtd: onenand: add bbt_wait & unlock_all as replaceable for some platform
  mtd: Flex-OneNAND support
  mtd: nand: add OMAP2/OMAP3 NAND driver
  mtd: maps: Blackfin async: fix memory leaks in probe/remove funcs
  mtd: uclinux: mark local stuff static
  mtd: uclinux: do not allow to be built as a module
  mtd: uclinux: allow systems to override map addr/size
  mtd: blackfin NFC: fix hang when using NAND on BF527-EZKITs
  ...

2 files changed, 135 insertions, 0 deletions

diff --git a/Documentation/ABI/testing/sysfs-class-mtd b/Documentation/ABI/testing/sysfs-class-mtd
new file mode 100644
index 000000000000..4d55a1888981
--- /dev/null
+++ b/Documentation/ABI/testing/sysfs-class-mtd
@@ -0,0 +1,125 @@
+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.
diff --git a/Documentation/kernel-parameters.txt b/Documentation/kernel-parameters.txt
index 5092a2be83c5..54ebf100e4e0 100644
--- a/Documentation/kernel-parameters.txt
+++ b/Documentation/kernel-parameters.txt
@@ -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