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

* git://git.infradead.org/mtd-2.6: (226 commits)
  mtd: tests: annotate as DANGEROUS in Kconfig
  mtd: tests: don't use mtd0 as a default
  mtd: clean up usage of MTD_DOCPROBE_ADDRESS
  jffs2: add compr=lzo and compr=zlib options
  jffs2: implement mount option parsing and compression overriding
  mtd: nand: initialize ops.mode
  mtd: provide an alias for the redboot module name
  mtd: m25p80: don't probe device which has status of 'disabled'
  mtd: nand_h1900 never worked
  mtd: Add DiskOnChip G3 support
  mtd: m25p80: add EON flash EN25Q32B into spi flash id table
  mtd: mark block device queue as non-rotational
  mtd: r852: make r852_pm_ops static
  mtd: m25p80: add support for at25df321a spi data flash
  mtd: mxc_nand: preset_v1_v2: unlock all NAND flash blocks
  mtd: nand: switch `check_pattern()' to standard `memcmp()'
  mtd: nand: invalidate cache on unaligned reads
  mtd: nand: do not scan bad blocks with NAND_BBT_NO_OOB set
  mtd: nand: wait to set BBT version
  mtd: nand: scrub BBT on ECC errors
  ...

Fix up trivial conflicts:
 - arch/arm/mach-at91/board-usb-a9260.c
	Merged into board-usb-a926x.c
 - drivers/mtd/maps/lantiq-flash.c
	add_mtd_partitions -> mtd_device_register vs changed to use
	mtd_device_parse_register.

1 files changed, 5 insertions, 18 deletions

diff --git a/arch/arm/mach-ep93xx/ts72xx.c b/arch/arm/mach-ep93xx/ts72xx.c
index 1ade3c340507..8b2f1435bcac 100644
--- a/arch/arm/mach-ep93xx/ts72xx.c
+++ b/arch/arm/mach-ep93xx/ts72xx.c
@@ -116,8 +116,9 @@ static struct mtd_partition ts72xx_nand_parts[] = {
                 .mask_flags     = MTD_WRITEABLE,        /* force read-only */
         }, {
                 .name           = "Linux",
-                .offset         = MTDPART_OFS_APPEND,
-                .size           = 0,                    /* filled in later */
+                .offset         = MTDPART_OFS_RETAIN,
+                .size           = TS72XX_REDBOOT_PART_SIZE,
+                                /* leave so much for last partition */
         }, {
                 .name           = "RedBoot",
                 .offset         = MTDPART_OFS_APPEND,
@@ -126,28 +127,14 @@ static struct mtd_partition ts72xx_nand_parts[] = {
         },
 };
 
-static void ts72xx_nand_set_parts(uint64_t size,
-                                  struct platform_nand_chip *chip)
-{
-        /* Factory TS-72xx boards only come with 32MiB or 128MiB NAND options */
-        if (size == SZ_32M || size == SZ_128M) {
-                /* Set the "Linux" partition size */
-                ts72xx_nand_parts[1].size = size - TS72XX_REDBOOT_PART_SIZE;
-
-                chip->partitions = ts72xx_nand_parts;
-                chip->nr_partitions = ARRAY_SIZE(ts72xx_nand_parts);
-        } else {
-                pr_warning("Unknown nand disk size:%lluMiB\n", size >> 20);
-        }
-}
-
 static struct platform_nand_data ts72xx_nand_data = {
         .chip = {
                 .nr_chips       = 1,
                 .chip_offset    = 0,
                 .chip_delay     = 15,
                 .part_probe_types = ts72xx_nand_part_probes,
-                .set_parts      = ts72xx_nand_set_parts,
+                .partitions     = ts72xx_nand_parts,
+                .nr_partitions  = ARRAY_SIZE(ts72xx_nand_parts),
         },
         .ctrl = {
                 .cmd_ctrl       = ts72xx_nand_hwcontrol,