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, 34 deletions

diff --git a/drivers/mtd/nand/davinci_nand.c b/drivers/mtd/nand/davinci_nand.c
index 1f34951ae1a7..c153e1f77f90 100644
--- a/drivers/mtd/nand/davinci_nand.c
+++ b/drivers/mtd/nand/davinci_nand.c
@@ -57,7 +57,6 @@ struct davinci_nand_info {
 
         struct device           *dev;
         struct clk              *clk;
-        bool                    partitioned;
 
         bool                    is_readmode;
 
@@ -530,8 +529,6 @@ static int __init nand_davinci_probe(struct platform_device *pdev)
         int                             ret;
         uint32_t                        val;
         nand_ecc_modes_t                ecc_mode;
-        struct mtd_partition            *mtd_parts = NULL;
-        int                             mtd_parts_nb = 0;
 
         /* insist on board-specific configuration */
         if (!pdata)
@@ -581,7 +578,9 @@ static int __init nand_davinci_probe(struct platform_device *pdev)
         info->chip.chip_delay   = 0;
         info->chip.select_chip  = nand_davinci_select_chip;
 
-        /* options such as NAND_USE_FLASH_BBT or 16-bit widths */
+        /* options such as NAND_BBT_USE_FLASH */
+        info->chip.bbt_options  = pdata->bbt_options;
+        /* options such as 16-bit widths */
         info->chip.options      = pdata->options;
         info->chip.bbt_td       = pdata->bbt_td;
         info->chip.bbt_md       = pdata->bbt_md;
@@ -751,33 +750,8 @@ syndrome_done:
         if (ret < 0)
                 goto err_scan;
 
-        if (mtd_has_cmdlinepart()) {
-                static const char *probes[] __initconst = {
-                        "cmdlinepart", NULL
-                };
-
-                mtd_parts_nb = parse_mtd_partitions(&info->mtd, probes,
-                                                    &mtd_parts, 0);
-        }
-
-        if (mtd_parts_nb <= 0) {
-                mtd_parts = pdata->parts;
-                mtd_parts_nb = pdata->nr_parts;
-        }
-
-        /* Register any partitions */
-        if (mtd_parts_nb > 0) {
-                ret = mtd_device_register(&info->mtd, mtd_parts,
-                                          mtd_parts_nb);
-                if (ret == 0)
-                        info->partitioned = true;
-        }
-
-        /* If there's no partition info, just package the whole chip
-         * as a single MTD device.
-         */
-        if (!info->partitioned)
-                ret = mtd_device_register(&info->mtd, NULL, 0) ? -ENODEV : 0;
+        ret = mtd_device_parse_register(&info->mtd, NULL, 0,
+                        pdata->parts, pdata->nr_parts);
 
         if (ret < 0)
                 goto err_scan;
@@ -816,9 +790,6 @@ err_nomem:
 static int __exit nand_davinci_remove(struct platform_device *pdev)
 {
         struct davinci_nand_info *info = platform_get_drvdata(pdev);
-        int status;
-
-        status = mtd_device_unregister(&info->mtd);
 
         spin_lock_irq(&davinci_nand_lock);
         if (info->chip.ecc.mode == NAND_ECC_HW_SYNDROME)