Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6

Conflicts:

	include/asm-x86/statfs.h

6 files changed, 84 insertions, 44 deletions

diff --git a/drivers/mtd/ftl.c b/drivers/mtd/ftl.c
index f34f20c78911..9bf581c4f740 100644
--- a/drivers/mtd/ftl.c
+++ b/drivers/mtd/ftl.c
@@ -1005,6 +1005,29 @@ static int ftl_writesect(struct mtd_blktrans_dev *dev,
         return ftl_write((void *)dev, buf, block, 1);
 }
 
+static int ftl_discardsect(struct mtd_blktrans_dev *dev,
+                           unsigned long sector, unsigned nr_sects)
+{
+        partition_t *part = (void *)dev;
+        uint32_t bsize = 1 << part->header.EraseUnitSize;
+
+        DEBUG(1, "FTL erase sector %ld for %d sectors\n",
+              sector, nr_sects);
+
+        while (nr_sects) {
+                uint32_t old_addr = part->VirtualBlockMap[sector];
+                if (old_addr != 0xffffffff) {
+                        part->VirtualBlockMap[sector] = 0xffffffff;
+                        part->EUNInfo[old_addr/bsize].Deleted++;
+                        if (set_bam_entry(part, old_addr, 0))
+                                return -EIO;
+                }
+                nr_sects--;
+                sector++;
+        }
+
+        return 0;
+}
 /*====================================================================*/
 
 static void ftl_freepart(partition_t *part)
@@ -1069,6 +1092,7 @@ static struct mtd_blktrans_ops ftl_tr = {
         .blksize        = SECTOR_SIZE,
         .readsect       = ftl_readsect,
         .writesect      = ftl_writesect,
+        .discard        = ftl_discardsect,
         .getgeo         = ftl_getgeo,
         .add_mtd        = ftl_add_mtd,
         .remove_dev     = ftl_remove_dev,
diff --git a/drivers/mtd/maps/sun_uflash.c b/drivers/mtd/maps/sun_uflash.c
index 0d7c88396c88..fd7a1017399a 100644
--- a/drivers/mtd/maps/sun_uflash.c
+++ b/drivers/mtd/maps/sun_uflash.c
@@ -1,13 +1,10 @@
-/*
- *
- * sun_uflash - Driver implementation for user-programmable flash
- * present on many Sun Microsystems SME boardsets.
+/* sun_uflash.c - Driver for user-programmable flash on
+ *                Sun Microsystems SME boardsets.
  *
  * This driver does NOT provide access to the OBP-flash for
  * safety reasons-- use <linux>/drivers/sbus/char/flash.c instead.
  *
  * Copyright (c) 2001 Eric Brower (ebrower@usa.net)
- *
  */
 
 #include <linux/kernel.h>
@@ -16,8 +13,8 @@
 #include <linux/errno.h>
 #include <linux/init.h>
 #include <linux/ioport.h>
-#include <asm/ebus.h>
-#include <asm/oplib.h>
+#include <linux/of.h>
+#include <linux/of_device.h>
 #include <asm/prom.h>
 #include <asm/uaccess.h>
 #include <asm/io.h>
@@ -26,67 +23,65 @@
 #include <linux/mtd/map.h>
 
 #define UFLASH_OBPNAME  "flashprom"
-#define UFLASH_DEVNAME  "userflash"
+#define DRIVER_NAME     "sun_uflash"
+#define PFX             DRIVER_NAME ": "
 
 #define UFLASH_WINDOW_SIZE      0x200000
 #define UFLASH_BUSWIDTH         1                       /* EBus is 8-bit */
 
 MODULE_AUTHOR("Eric Brower <ebrower@usa.net>");
 MODULE_DESCRIPTION("User-programmable flash device on Sun Microsystems boardsets");
-MODULE_SUPPORTED_DEVICE("userflash");
+MODULE_SUPPORTED_DEVICE(DRIVER_NAME);
 MODULE_LICENSE("GPL");
-MODULE_VERSION("2.0");
+MODULE_VERSION("2.1");
 
-static LIST_HEAD(device_list);
 struct uflash_dev {
         const char              *name;  /* device name */
         struct map_info         map;    /* mtd map info */
         struct mtd_info         *mtd;   /* mtd info */
 };
 
-
 struct map_info uflash_map_templ = {
         .name =         "SUNW,???-????",
         .size =         UFLASH_WINDOW_SIZE,
         .bankwidth =    UFLASH_BUSWIDTH,
 };
 
-int uflash_devinit(struct linux_ebus_device *edev, struct device_node *dp)
+int uflash_devinit(struct of_device *op, struct device_node *dp)
 {
         struct uflash_dev *up;
-        struct resource *res;
 
-        res = &edev->resource[0];
-
-        if (edev->num_addrs != 1) {
+        if (op->resource[1].flags) {
                 /* Non-CFI userflash device-- once I find one we
                  * can work on supporting it.
                  */
-                printk("%s: unsupported device at 0x%llx (%d regs): " \
-                        "email ebrower@usa.net\n",
-                       dp->full_name, (unsigned long long)res->start,
-                       edev->num_addrs);
+                printk(KERN_ERR PFX "Unsupported device at %s, 0x%llx\n",
+                       dp->full_name, (unsigned long long)op->resource[0].start);
 
                 return -ENODEV;
         }
 
         up = kzalloc(sizeof(struct uflash_dev), GFP_KERNEL);
-        if (!up)
+        if (!up) {
+                printk(KERN_ERR PFX "Cannot allocate struct uflash_dev\n");
                 return -ENOMEM;
+        }
 
         /* copy defaults and tweak parameters */
         memcpy(&up->map, &uflash_map_templ, sizeof(uflash_map_templ));
-        up->map.size = (res->end - res->start) + 1UL;
+
+        up->map.size = resource_size(&op->resource[0]);
 
         up->name = of_get_property(dp, "model", NULL);
         if (up->name && 0 < strlen(up->name))
                 up->map.name = (char *)up->name;
 
-        up->map.phys = res->start;
+        up->map.phys = op->resource[0].start;
 
-        up->map.virt = ioremap_nocache(res->start, up->map.size);
+        up->map.virt = of_ioremap(&op->resource[0], 0, up->map.size,
+                                  DRIVER_NAME);
         if (!up->map.virt) {
-                printk("%s: Failed to map device.\n", dp->full_name);
+                printk(KERN_ERR PFX "Failed to map device.\n");
                 kfree(up);
 
                 return -EINVAL;
@@ -97,7 +92,7 @@ int uflash_devinit(struct linux_ebus_device *edev, struct device_node *dp)
         /* MTD registration */
         up->mtd = do_map_probe("cfi_probe", &up->map);
         if (!up->mtd) {
-                iounmap(up->map.virt);
+                of_iounmap(&op->resource[0], up->map.virt, up->map.size);
                 kfree(up);
 
                 return -ENXIO;
@@ -107,32 +102,34 @@ int uflash_devinit(struct linux_ebus_device *edev, struct device_node *dp)
 
         add_mtd_device(up->mtd);
 
-        dev_set_drvdata(&edev->ofdev.dev, up);
+        dev_set_drvdata(&op->dev, up);
 
         return 0;
 }
 
-static int __devinit uflash_probe(struct of_device *dev, const struct of_device_id *match)
+static int __devinit uflash_probe(struct of_device *op, const struct of_device_id *match)
 {
-        struct linux_ebus_device *edev = to_ebus_device(&dev->dev);
-        struct device_node *dp = dev->node;
+        struct device_node *dp = op->node;
 
-        if (of_find_property(dp, "user", NULL))
+        /* Flashprom must have the "user" property in order to
+         * be used by this driver.
+         */
+        if (!of_find_property(dp, "user", NULL))
                 return -ENODEV;
 
-        return uflash_devinit(edev, dp);
+        return uflash_devinit(op, dp);
 }
 
-static int __devexit uflash_remove(struct of_device *dev)
+static int __devexit uflash_remove(struct of_device *op)
 {
-        struct uflash_dev *up = dev_get_drvdata(&dev->dev);
+        struct uflash_dev *up = dev_get_drvdata(&op->dev);
 
         if (up->mtd) {
                 del_mtd_device(up->mtd);
                 map_destroy(up->mtd);
         }
         if (up->map.virt) {
-                iounmap(up->map.virt);
+                of_iounmap(&op->resource[0], up->map.virt, up->map.size);
                 up->map.virt = NULL;
         }
 
@@ -141,7 +138,7 @@ static int __devexit uflash_remove(struct of_device *dev)
         return 0;
 }
 
-static struct of_device_id uflash_match[] = {
+static const struct of_device_id uflash_match[] = {
         {
                 .name = UFLASH_OBPNAME,
         },
@@ -151,7 +148,7 @@ static struct of_device_id uflash_match[] = {
 MODULE_DEVICE_TABLE(of, uflash_match);
 
 static struct of_platform_driver uflash_driver = {
-        .name           = UFLASH_DEVNAME,
+        .name           = DRIVER_NAME,
         .match_table    = uflash_match,
         .probe          = uflash_probe,
         .remove         = __devexit_p(uflash_remove),
@@ -159,7 +156,7 @@ static struct of_platform_driver uflash_driver = {
 
 static int __init uflash_init(void)
 {
-        return of_register_driver(&uflash_driver, &ebus_bus_type);
+        return of_register_driver(&uflash_driver, &of_bus_type);
 }
 
 static void __exit uflash_exit(void)
diff --git a/drivers/mtd/mtd_blkdevs.c b/drivers/mtd/mtd_blkdevs.c
index 9ff007c4962c..681d5aca2af4 100644
--- a/drivers/mtd/mtd_blkdevs.c
+++ b/drivers/mtd/mtd_blkdevs.c
@@ -32,6 +32,14 @@ struct mtd_blkcore_priv {
         spinlock_t queue_lock;
 };
 
+static int blktrans_discard_request(struct request_queue *q,
+                                    struct request *req)
+{
+        req->cmd_type = REQ_TYPE_LINUX_BLOCK;
+        req->cmd[0] = REQ_LB_OP_DISCARD;
+        return 0;
+}
+
 static int do_blktrans_request(struct mtd_blktrans_ops *tr,
                                struct mtd_blktrans_dev *dev,
                                struct request *req)
@@ -44,6 +52,10 @@ static int do_blktrans_request(struct mtd_blktrans_ops *tr,
 
         buf = req->buffer;
 
+        if (req->cmd_type == REQ_TYPE_LINUX_BLOCK &&
+            req->cmd[0] == REQ_LB_OP_DISCARD)
+                return !tr->discard(dev, block, nsect);
+
         if (!blk_fs_request(req))
                 return 0;
 
@@ -367,6 +379,10 @@ int register_mtd_blktrans(struct mtd_blktrans_ops *tr)
 
         tr->blkcore_priv->rq->queuedata = tr;
         blk_queue_hardsect_size(tr->blkcore_priv->rq, tr->blksize);
+        if (tr->discard)
+                blk_queue_set_discard(tr->blkcore_priv->rq,
+                                      blktrans_discard_request);
+
         tr->blkshift = ffs(tr->blksize) - 1;
 
         tr->blkcore_priv->thread = kthread_run(mtd_blktrans_thread, tr,
diff --git a/drivers/mtd/nand/atmel_nand_ecc.h b/drivers/mtd/nand/atmel_nand_ecc.h
index 1ee7f993db1c..578c776e1356 100644
--- a/drivers/mtd/nand/atmel_nand_ecc.h
+++ b/drivers/mtd/nand/atmel_nand_ecc.h
@@ -2,6 +2,9 @@
  * Error Corrected Code Controller (ECC) - System peripherals regsters.
  * Based on AT91SAM9260 datasheet revision B.
  *
+ * Copyright (C) 2007 Andrew Victor
+ * Copyright (C) 2007 Atmel Corporation.
+ *
  * This program is free software; you can redistribute it and/or modify it
  * under the terms of the GNU General Public License as published by the
  * Free Software Foundation; either version 2 of the License, or (at your
diff --git a/drivers/mtd/nand/cmx270_nand.c b/drivers/mtd/nand/cmx270_nand.c
index 9eba3f04783a..fa129c09bca8 100644
--- a/drivers/mtd/nand/cmx270_nand.c
+++ b/drivers/mtd/nand/cmx270_nand.c
@@ -156,7 +156,7 @@ static int cmx270_init(void)
         int mtd_parts_nb = 0;
         int ret;
 
-        if (!machine_is_armcore())
+        if (!(machine_is_armcore() && cpu_is_pxa27x()))
                 return -ENODEV;
 
         ret = gpio_request(GPIO_NAND_CS, "NAND CS");
diff --git a/drivers/mtd/nand/tmio_nand.c b/drivers/mtd/nand/tmio_nand.c
index cbab654b03c8..edb1e322113d 100644
--- a/drivers/mtd/nand/tmio_nand.c
+++ b/drivers/mtd/nand/tmio_nand.c
@@ -109,7 +109,7 @@ struct tmio_nand {
 
         void __iomem *ccr;
         void __iomem *fcr;
-        unsigned long fcr_phys;
+        unsigned long fcr_base;
 
         unsigned int irq;
 
@@ -316,8 +316,8 @@ static int tmio_hw_init(struct platform_device *dev, struct tmio_nand *tmio)
         tmio_iowrite8(0x81, tmio->ccr + CCR_ICC);
 
         /* (10h)BaseAddress    0x1000 spba.spba2 */
-        tmio_iowrite16(tmio->fcr_phys, tmio->ccr + CCR_BASE);
-        tmio_iowrite16(tmio->fcr_phys >> 16, tmio->ccr + CCR_BASE + 16);
+        tmio_iowrite16(tmio->fcr_base, tmio->ccr + CCR_BASE);
+        tmio_iowrite16(tmio->fcr_base >> 16, tmio->ccr + CCR_BASE + 2);
 
         /* (04h)Command Register I/O spcmd */
         tmio_iowrite8(0x02, tmio->ccr + CCR_COMMAND);
@@ -395,7 +395,7 @@ static int tmio_probe(struct platform_device *dev)
                 goto err_iomap_ccr;
         }
 
-        tmio->fcr_phys = (unsigned long)fcr->start;
+        tmio->fcr_base = fcr->start & 0xfffff;
         tmio->fcr = ioremap(fcr->start, fcr->end - fcr->start + 1);
         if (!tmio->fcr) {
                 retval = -EIO;