6 files changed, 1315 insertions, 0 deletions

diff --git a/Documentation/blockdev/00-INDEX b/Documentation/blockdev/00-INDEX
index 86f054c47013..c08df56dd91b 100644
--- a/Documentation/blockdev/00-INDEX
+++ b/Documentation/blockdev/00-INDEX
@@ -8,6 +8,8 @@ cpqarray.txt
         - info on using Compaq's SMART2 Intelligent Disk Array Controllers.
 floppy.txt
         - notes and driver options for the floppy disk driver.
+mflash.txt
+        - info on mGine m(g)flash driver for linux.
 nbd.txt
         - info on a TCP implementation of a network block device.
 paride.txt
diff --git a/Documentation/blockdev/mflash.txt b/Documentation/blockdev/mflash.txt
new file mode 100644
index 000000000000..1f610ecf698a
--- /dev/null
+++ b/Documentation/blockdev/mflash.txt
@@ -0,0 +1,84 @@
+This document describes m[g]flash support in linux.
+
+Contents
+  1. Overview
+  2. Reserved area configuration
+  3. Example of mflash platform driver registration
+
+1. Overview
+
+Mflash and gflash are embedded flash drive. The only difference is mflash is
+MCP(Multi Chip Package) device. These two device operate exactly same way.
+So the rest mflash repersents mflash and gflash altogether.
+
+Internally, mflash has nand flash and other hardware logics and supports
+2 different operation (ATA, IO) modes. ATA mode doesn't need any new
+driver and currently works well under standard IDE subsystem. Actually it's
+one chip SSD. IO mode is ATA-like custom mode for the host that doesn't have
+IDE interface.
+
+Followings are brief descriptions about IO mode.
+A. IO mode based on ATA protocol and uses some custom command. (read confirm,
+write confirm)
+B. IO mode uses SRAM bus interface.
+C. IO mode supports 4kB boot area, so host can boot from mflash.
+
+2. Reserved area configuration
+If host boot from mflash, usually needs raw area for boot loader image. All of
+the mflash's block device operation will be taken this value as start offset.
+Note that boot loader's size of reserved area and kernel configuration value
+must be same.
+
+3. Example of mflash platform driver registration
+Working mflash is very straight forward. Adding platform device stuff to board
+configuration file is all. Here is some pseudo example.
+
+static struct mg_drv_data mflash_drv_data = {
+        /* If you want to polling driver set to 1 */
+        .use_polling = 0,
+        /* device attribution */
+        .dev_attr = MG_BOOT_DEV
+};
+
+static struct resource mg_mflash_rsc[] = {
+        /* Base address of mflash */
+        [0] = {
+                .start = 0x08000000,
+                .end = 0x08000000 + SZ_64K - 1,
+                .flags = IORESOURCE_MEM
+        },
+        /* mflash interrupt pin */
+        [1] = {
+                .start = IRQ_GPIO(84),
+                .end = IRQ_GPIO(84),
+                .flags = IORESOURCE_IRQ
+        },
+        /* mflash reset pin */
+        [2] = {
+                .start = 43,
+                .end = 43,
+                .name = MG_RST_PIN,
+                .flags = IORESOURCE_IO
+        },
+        /* mflash reset-out pin
+         * If you use mflash as storage device (i.e. other than MG_BOOT_DEV),
+         * should assign this */
+        [3] = {
+                .start = 51,
+                .end = 51,
+                .name = MG_RSTOUT_PIN,
+                .flags = IORESOURCE_IO
+        }
+};
+
+static struct platform_device mflash_dev = {
+        .name = MG_DEV_NAME,
+        .id = -1,
+        .dev = {
+                .platform_data = &mflash_drv_data,
+        },
+        .num_resources = ARRAY_SIZE(mg_mflash_rsc),
+        .resource = mg_mflash_rsc
+};
+
+platform_device_register(&mflash_dev);
diff --git a/drivers/block/Kconfig b/drivers/block/Kconfig
index e7b8aa0cb47c..ddea8e485cc9 100644
--- a/drivers/block/Kconfig
+++ b/drivers/block/Kconfig
@@ -410,6 +410,23 @@ config ATA_OVER_ETH
         This driver provides Support for ATA over Ethernet block
         devices like the Coraid EtherDrive (R) Storage Blade.
 
+config MG_DISK
+        tristate "mGine mflash, gflash support"
+        depends on ARM && ATA && GPIOLIB
+        help
+          mGine mFlash(gFlash) block device driver
+
+config MG_DISK_RES
+        int "Size of reserved area before MBR"
+        depends on MG_DISK
+        default 0
+        help
+          Define size of reserved area that usually used for boot. Unit is KB.
+          All of the block device operation will be taken this value as start
+          offset
+          Examples:
+                        1024 => 1 MB
+
 config SUNVDC
         tristate "Sun Virtual Disk Client support"
         depends on SUN_LDOMS
diff --git a/drivers/block/Makefile b/drivers/block/Makefile
index 3145141cef72..7755a5e2a85e 100644
--- a/drivers/block/Makefile
+++ b/drivers/block/Makefile
@@ -21,6 +21,7 @@ obj-$(CONFIG_BLK_CPQ_CISS_DA)  += cciss.o
 obj-$(CONFIG_BLK_DEV_DAC960)    += DAC960.o
 obj-$(CONFIG_XILINX_SYSACE)     += xsysace.o
 obj-$(CONFIG_CDROM_PKTCDVD)     += pktcdvd.o
+obj-$(CONFIG_MG_DISK)           += mg_disk.o
 obj-$(CONFIG_SUNVDC)            += sunvdc.o
 
 obj-$(CONFIG_BLK_DEV_UMEM)      += umem.o
diff --git a/drivers/block/mg_disk.c b/drivers/block/mg_disk.c
new file mode 100644
index 000000000000..fb39d9aa3cdc
--- /dev/null
+++ b/drivers/block/mg_disk.c
@@ -0,0 +1,1005 @@
+/*
+ *  drivers/block/mg_disk.c
+ *
+ *  Support for the mGine m[g]flash IO mode.
+ *  Based on legacy hd.c
+ *
+ * (c) 2008 mGine Co.,LTD
+ * (c) 2008 unsik Kim <donari75@gmail.com>
+ *
+ *  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/kernel.h>
+#include <linux/module.h>
+#include <linux/fs.h>
+#include <linux/blkdev.h>
+#include <linux/hdreg.h>
+#include <linux/libata.h>
+#include <linux/interrupt.h>
+#include <linux/delay.h>
+#include <linux/platform_device.h>
+#include <linux/gpio.h>
+#include <linux/mg_disk.h>
+
+#define MG_RES_SEC (CONFIG_MG_DISK_RES << 1)
+
+static void mg_request(struct request_queue *);
+
+static void mg_dump_status(const char *msg, unsigned int stat,
+                struct mg_host *host)
+{
+        char *name = MG_DISK_NAME;
+        struct request *req;
+
+        if (host->breq) {
+                req = elv_next_request(host->breq);
+                if (req)
+                        name = req->rq_disk->disk_name;
+        }
+
+        printk(KERN_ERR "%s: %s: status=0x%02x { ", name, msg, stat & 0xff);
+        if (stat & MG_REG_STATUS_BIT_BUSY)
+                printk("Busy ");
+        if (stat & MG_REG_STATUS_BIT_READY)
+                printk("DriveReady ");
+        if (stat & MG_REG_STATUS_BIT_WRITE_FAULT)
+                printk("WriteFault ");
+        if (stat & MG_REG_STATUS_BIT_SEEK_DONE)
+                printk("SeekComplete ");
+        if (stat & MG_REG_STATUS_BIT_DATA_REQ)
+                printk("DataRequest ");