6 files changed, 102 insertions, 46 deletions

diff --git a/include/linux/mtd/concat.h b/include/linux/mtd/concat.h
index c02f3d264ecf..e80c674daeb3 100644
--- a/include/linux/mtd/concat.h
+++ b/include/linux/mtd/concat.h
@@ -13,7 +13,7 @@
 struct mtd_info *mtd_concat_create(
     struct mtd_info *subdev[],  /* subdevices to concatenate */
     int num_devs,               /* number of subdevices      */
-    char *name);                /* name for the new device   */
+    const char *name);          /* name for the new device   */
 
 void mtd_concat_destroy(struct mtd_info *mtd);
 
diff --git a/include/linux/mtd/ftl.h b/include/linux/mtd/ftl.h
index 0be442f881dd..0555f7a0b9ed 100644
--- a/include/linux/mtd/ftl.h
+++ b/include/linux/mtd/ftl.h
@@ -32,25 +32,25 @@
 #define _LINUX_FTL_H
 
 typedef struct erase_unit_header_t {
-    u_int8_t    LinkTargetTuple[5];
-    u_int8_t    DataOrgTuple[10];
-    u_int8_t    NumTransferUnits;
-    u_int32_t   EraseCount;
-    u_int16_t   LogicalEUN;
-    u_int8_t    BlockSize;
-    u_int8_t    EraseUnitSize;
-    u_int16_t   FirstPhysicalEUN;
-    u_int16_t   NumEraseUnits;
-    u_int32_t   FormattedSize;
-    u_int32_t   FirstVMAddress;
-    u_int16_t   NumVMPages;
-    u_int8_t    Flags;
-    u_int8_t    Code;
-    u_int32_t   SerialNumber;
-    u_int32_t   AltEUHOffset;
-    u_int32_t   BAMOffset;
-    u_int8_t    Reserved[12];
-    u_int8_t    EndTuple[2];
+    uint8_t     LinkTargetTuple[5];
+    uint8_t     DataOrgTuple[10];
+    uint8_t     NumTransferUnits;
+    uint32_t    EraseCount;
+    uint16_t    LogicalEUN;
+    uint8_t     BlockSize;
+    uint8_t     EraseUnitSize;
+    uint16_t    FirstPhysicalEUN;
+    uint16_t    NumEraseUnits;
+    uint32_t    FormattedSize;
+    uint32_t    FirstVMAddress;
+    uint16_t    NumVMPages;
+    uint8_t     Flags;
+    uint8_t     Code;
+    uint32_t    SerialNumber;
+    uint32_t    AltEUHOffset;
+    uint32_t    BAMOffset;
+    uint8_t     Reserved[12];
+    uint8_t     EndTuple[2];
 } erase_unit_header_t;
 
 /* Flags in erase_unit_header_t */
diff --git a/include/linux/mtd/mtd.h b/include/linux/mtd/mtd.h
index eae26bb6430a..adef674855f3 100644
--- a/include/linux/mtd/mtd.h
+++ b/include/linux/mtd/mtd.h
@@ -15,6 +15,8 @@
 #include <linux/mtd/compatmac.h>
 #include <mtd/mtd-abi.h>
 
+#include <asm/div64.h>
+
 #define MTD_CHAR_MAJOR 90
 #define MTD_BLOCK_MAJOR 31
 #define MAX_MTD_DEVICES 32
@@ -25,20 +27,20 @@
 #define MTD_ERASE_DONE          0x08
 #define MTD_ERASE_FAILED        0x10
 
-#define MTD_FAIL_ADDR_UNKNOWN 0xffffffff
+#define MTD_FAIL_ADDR_UNKNOWN -1LL
 
 /* If the erase fails, fail_addr might indicate exactly which block failed.  If
    fail_addr = MTD_FAIL_ADDR_UNKNOWN, the failure was not at the device level or was not
    specific to any particular block. */
 struct erase_info {
         struct mtd_info *mtd;
-        u_int32_t addr;
-        u_int32_t len;
-        u_int32_t fail_addr;
+        uint64_t addr;
+        uint64_t len;
+        uint64_t fail_addr;
         u_long time;
         u_long retries;
-        u_int dev;
-        u_int cell;
+        unsigned dev;
+        unsigned cell;
         void (*callback) (struct erase_info *self);
         u_long priv;
         u_char state;
@@ -46,9 +48,9 @@ struct erase_info {
 };
 
 struct mtd_erase_region_info {
-        u_int32_t offset;                       /* At which this region starts, from the beginning of the MTD */
-        u_int32_t erasesize;            /* For this region */
-        u_int32_t numblocks;            /* Number of blocks of erasesize in this region */
+        uint64_t offset;                        /* At which this region starts, from the beginning of the MTD */
+        uint32_t erasesize;             /* For this region */
+        uint32_t numblocks;             /* Number of blocks of erasesize in this region */
         unsigned long *lockmap;         /* If keeping bitmap of locks */
 };
 
@@ -100,14 +102,14 @@ struct mtd_oob_ops {
 
 struct mtd_info {
         u_char type;
-        u_int32_t flags;
-        u_int32_t size;  // Total size of the MTD
+        uint32_t flags;
+        uint64_t size;   // Total size of the MTD
 
         /* "Major" erase size for the device. Naïve users may take this
          * to be the only erase size available, or may use the more detailed
          * information below if they desire
          */
-        u_int32_t erasesize;
+        uint32_t erasesize;
         /* Minimal writable flash unit size. In case of NOR flash it is 1 (even
          * though individual bits can be cleared), in case of NAND flash it is
          * one NAND page (or half, or one-fourths of it), in case of ECC-ed NOR
@@ -115,10 +117,20 @@ struct mtd_info {
          * Any driver registering a struct mtd_info must ensure a writesize of
          * 1 or larger.
          */
-        u_int32_t writesize;
+        uint32_t writesize;
+
+        uint32_t oobsize;   // Amount of OOB data per block (e.g. 16)
+        uint32_t oobavail;  // Available OOB bytes per block
 
-        u_int32_t oobsize;   // Amount of OOB data per block (e.g. 16)
-        u_int32_t oobavail;  // Available OOB bytes per block
+        /*
+         * If erasesize is a power of 2 then the shift is stored in
+         * erasesize_shift otherwise erasesize_shift is zero. Ditto writesize.
+         */
+        unsigned int erasesize_shift;
+        unsigned int writesize_shift;
+        /* Masks based on erasesize_shift and writesize_shift */
+        unsigned int erasesize_mask;
+        unsigned int writesize_mask;
 
         // Kernel-only stuff starts here.
         const char *name;
@@ -190,8 +202,8 @@ struct mtd_info {
         void (*sync) (struct mtd_info *mtd);
 
         /* Chip-supported device locking */
-        int (*lock) (struct mtd_info *mtd, loff_t ofs, size_t len);
-        int (*unlock) (struct mtd_info *mtd, loff_t ofs, size_t len);
+        int (*lock) (struct mtd_info *mtd, loff_t ofs, uint64_t len);
+        int (*unlock) (struct mtd_info *mtd, loff_t ofs, uint64_t len);
 
         /* Power Management functions */
         int (*suspend) (struct mtd_info *mtd);
@@ -221,6 +233,35 @@ struct mtd_info {
         void (*put_device) (struct mtd_info *mtd);
 };
 
+static inline uint32_t mtd_div_by_eb(uint64_t sz, struct mtd_info *mtd)
+{
+        if (mtd->erasesize_shift)
+                return sz >> mtd->erasesize_shift;
+        do_div(sz, mtd->erasesize);
+        return sz;
+}
+
+static inline uint32_t mtd_mod_by_eb(uint64_t sz, struct mtd_info *mtd)
+{
+        if (mtd->erasesize_shift)
+                return sz & mtd->erasesize_mask;
+        return do_div(sz, mtd->erasesize);
+}
+
+static inline uint32_t mtd_div_by_ws(uint64_t sz, struct mtd_info *mtd)
+{
+        if (mtd->writesize_shift)
+                return sz >> mtd->writesize_shift;
+        do_div(sz, mtd->writesize);
+        return sz;
+}
+
+static inline uint32_t mtd_mod_by_ws(uint64_t sz, struct mtd_info *mtd)
+{
+        if (mtd->writesize_shift)
+                return sz & mtd->writesize_mask;
+        return do_div(sz, mtd->writesize);
+}
 
         /* Kernel-side ioctl definitions */
 
diff --git a/include/linux/mtd/nand.h b/include/linux/mtd/nand.h
index 733d3f3b4eb8..db5b63da2a7e 100644
--- a/include/linux/mtd/nand.h
+++ b/include/linux/mtd/nand.h
@@ -335,17 +335,12 @@ struct nand_buffers {
  * @erase_cmd:          [INTERN] erase command write function, selectable due to AND support
  * @scan_bbt:           [REPLACEABLE] function to scan bad block table
  * @chip_delay:         [BOARDSPECIFIC] chip dependent delay for transfering data from array to read regs (tR)
- * @wq:                 [INTERN] wait queue to sleep on if a NAND operation is in progress
  * @state:              [INTERN] the current state of the NAND device
  * @oob_poi:            poison value buffer
  * @page_shift:         [INTERN] number of address bits in a page (column address bits)
  * @phys_erase_shift:   [INTERN] number of address bits in a physical eraseblock
  * @bbt_erase_shift:    [INTERN] number of address bits in a bbt entry
  * @chip_shift:         [INTERN] number of address bits in one chip
- * @datbuf:             [INTERN] internal buffer for one page + oob
- * @oobbuf:             [INTERN] oob buffer for one eraseblock
- * @oobdirty:           [INTERN] indicates that oob_buf must be reinitialized
- * @data_poi:           [INTERN] pointer to a data buffer
  * @options:            [BOARDSPECIFIC] various chip options. They can partly be set to inform nand_scan about
  *                      special functionality. See the defines for further explanation
  * @badblockpos:        [INTERN] position of the bad block marker in the oob area
@@ -399,7 +394,7 @@ struct nand_chip {
         int             bbt_erase_shift;
         int             chip_shift;
         int             numchips;
-        unsigned long   chipsize;
+        uint64_t        chipsize;
         int             pagemask;
         int             pagebuf;
         int             subpagesize;
diff --git a/include/linux/mtd/partitions.h b/include/linux/mtd/partitions.h
index c92b4d439609..a45dd831b3f8 100644
--- a/include/linux/mtd/partitions.h
+++ b/include/linux/mtd/partitions.h
@@ -36,9 +36,9 @@
 
 struct mtd_partition {
         char *name;                     /* identifier string */
-        u_int32_t size;                 /* partition size */
-        u_int32_t offset;               /* offset within the master MTD space */
-        u_int32_t mask_flags;           /* master MTD flags to mask out for this partition */
+        uint64_t size;                  /* partition size */
+        uint64_t offset;                /* offset within the master MTD space */
+        uint32_t mask_flags;            /* master MTD flags to mask out for this partition */
         struct nand_ecclayout *ecclayout;       /* out of band layout for this partition (NAND only)*/
         struct mtd_info **mtdp;         /* pointer to store the MTD object */
 };
diff --git a/include/linux/mtd/sharpsl.h b/include/linux/mtd/sharpsl.h
new file mode 100644
index 000000000000..25f4d2a845c1
--- /dev/null
+++ b/include/linux/mtd/sharpsl.h
@@ -0,0 +1,20 @@
+/*
+ * SharpSL NAND support
+ *
+ * Copyright (C) 2008 Dmitry Baryshkov
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 as
+ * published by the Free Software Foundation.
+ */
+
+#include <linux/mtd/nand.h>
+#include <linux/mtd/nand_ecc.h>
+#include <linux/mtd/partitions.h>
+
+struct sharpsl_nand_platform_data {
+        struct nand_bbt_descr   *badblock_pattern;
+        struct nand_ecclayout   *ecc_layout;
+        struct mtd_partition    *partitions;
+        unsigned int            nr_partitions;
+};