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

[pandora-kernel.git] / drivers / mtd / nand / sh_flctl.c

diff --git a/drivers/mtd/nand/sh_flctl.c b/drivers/mtd/nand/sh_flctl.c
index dbc09a8..88c802c 100644 (file)
--- a/drivers/mtd/nand/sh_flctl.c
+++ b/drivers/mtd/nand/sh_flctl.c
@@ -1,10 +1,10 @@
 /*
  * SuperH FLCTL nand controller
  *
- * Copyright © 2008 Renesas Solutions Corp.
- * Copyright © 2008 Atom Create Engineering Co., Ltd.
+ * Copyright (c) 2008 Renesas Solutions Corp.
+ * Copyright (c) 2008 Atom Create Engineering Co., Ltd.
  *
- * Based on fsl_elbc_nand.c, Copyright © 2006-2007 Freescale Semiconductor
+ * Based on fsl_elbc_nand.c, Copyright (c) 2006-2007 Freescale Semiconductor
  *
  * 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
@@ -75,6 +75,11 @@ static void start_translation(struct sh_flctl *flctl)
        writeb(TRSTRT, FLTRCR(flctl));
 }
 
+static void timeout_error(struct sh_flctl *flctl, const char *str)
+{
+       dev_err(&flctl->pdev->dev, "Timeout occured in %s\n", str);
+}
+
 static void wait_completion(struct sh_flctl *flctl)
 {
        uint32_t timeout = LOOP_TIMEOUT_MAX;
@@ -87,7 +92,7 @@ static void wait_completion(struct sh_flctl *flctl)
                udelay(1);
        }
 
-       printk(KERN_ERR "wait_completion(): Timeout occured \n");
+       timeout_error(flctl, __func__);
        writeb(0x0, FLTRCR(flctl));
 }
 
@@ -100,6 +105,8 @@ static void set_addr(struct mtd_info *mtd, int column, int page_addr)
                addr = page_addr;       /* ERASE1 */
        } else if (page_addr != -1) {
                /* SEQIN, READ0, etc.. */
+               if (flctl->chip.options & NAND_BUSWIDTH_16)
+                       column >>= 1;
                if (flctl->page_size) {
                        addr = column & 0x0FFF;
                        addr |= (page_addr & 0xff) << 16;
@@ -132,7 +139,7 @@ static void wait_rfifo_ready(struct sh_flctl *flctl)
                        return;
                udelay(1);
        }
-       printk(KERN_ERR "wait_rfifo_ready(): Timeout occured \n");
+       timeout_error(flctl, __func__);
 }
 
 static void wait_wfifo_ready(struct sh_flctl *flctl)
@@ -146,7 +153,7 @@ static void wait_wfifo_ready(struct sh_flctl *flctl)
                        return;
                udelay(1);
        }
-       printk(KERN_ERR "wait_wfifo_ready(): Timeout occured \n");
+       timeout_error(flctl, __func__);
 }
 
 static int wait_recfifo_ready(struct sh_flctl *flctl, int sector_number)
@@ -198,7 +205,7 @@ static int wait_recfifo_ready(struct sh_flctl *flctl, int sector_number)
                writel(0, FL4ECCCR(flctl));
        }
 
-       printk(KERN_ERR "wait_recfifo_ready(): Timeout occured \n");
+       timeout_error(flctl, __func__);
        return 1;       /* timeout */
 }
 
@@ -214,7 +221,7 @@ static void wait_wecfifo_ready(struct sh_flctl *flctl)
                        return;
                udelay(1);
        }
-       printk(KERN_ERR "wait_wecfifo_ready(): Timeout occured \n");
+       timeout_error(flctl, __func__);
 }
 
 static void read_datareg(struct sh_flctl *flctl, int offset)
@@ -275,7 +282,7 @@ static void write_fiforeg(struct sh_flctl *flctl, int rlen, int offset)
 static void set_cmd_regs(struct mtd_info *mtd, uint32_t cmd, uint32_t flcmcdr_val)
 {
        struct sh_flctl *flctl = mtd_to_flctl(mtd);
-       uint32_t flcmncr_val = readl(FLCMNCR(flctl));
+       uint32_t flcmncr_val = readl(FLCMNCR(flctl)) & ~SEL_16BIT;
        uint32_t flcmdcr_val, addr_len_bytes = 0;
 
        /* Set SNAND bit if page size is 2048byte */
@@ -297,6 +304,8 @@ static void set_cmd_regs(struct mtd_info *mtd, uint32_t cmd, uint32_t flcmcdr_va
        case NAND_CMD_READOOB:
                addr_len_bytes = flctl->rw_ADRCNT;
                flcmdcr_val |= CDSRC_E;
+               if (flctl->chip.options & NAND_BUSWIDTH_16)
+                       flcmncr_val |= SEL_16BIT;
                break;
        case NAND_CMD_SEQIN:
                /* This case is that cmd is READ0 or READ1 or READ00 */
@@ -305,6 +314,8 @@ static void set_cmd_regs(struct mtd_info *mtd, uint32_t cmd, uint32_t flcmcdr_va
        case NAND_CMD_PAGEPROG:
                addr_len_bytes = flctl->rw_ADRCNT;
                flcmdcr_val |= DOCMD2_E | CDSRC_E | SELRW;
+               if (flctl->chip.options & NAND_BUSWIDTH_16)
+                       flcmncr_val |= SEL_16BIT;
                break;
        case NAND_CMD_READID:
                flcmncr_val &= ~SNAND_E;
@@ -523,6 +534,8 @@ static void flctl_cmdfunc(struct mtd_info *mtd, unsigned int command,
                set_addr(mtd, 0, page_addr);
 
                flctl->read_bytes = mtd->writesize + mtd->oobsize;
+               if (flctl->chip.options & NAND_BUSWIDTH_16)
+                       column >>= 1;
                flctl->index += column;
                goto read_normal_exit;
 
@@ -686,6 +699,18 @@ static uint8_t flctl_read_byte(struct mtd_info *mtd)
        return data;
 }
 
+static uint16_t flctl_read_word(struct mtd_info *mtd)
+{
+       struct sh_flctl *flctl = mtd_to_flctl(mtd);
+       int index = flctl->index;
+       uint16_t data;
+       uint16_t *buf = (uint16_t *)&flctl->done_buff[index];
+
+       data = *buf;
+       flctl->index += 2;
+       return data;
+}
+
 static void flctl_read_buf(struct mtd_info *mtd, uint8_t *buf, int len)
 {
        int i;
@@ -769,38 +794,36 @@ static int flctl_chip_init_tail(struct mtd_info *mtd)
        return 0;
 }
 
-static int __init flctl_probe(struct platform_device *pdev)
+static int __devinit flctl_probe(struct platform_device *pdev)
 {
        struct resource *res;
        struct sh_flctl *flctl;
        struct mtd_info *flctl_mtd;
        struct nand_chip *nand;
        struct sh_flctl_platform_data *pdata;
-       int ret;
+       int ret = -ENXIO;
 
        pdata = pdev->dev.platform_data;
        if (pdata == NULL) {
-               printk(KERN_ERR "sh_flctl platform_data not found.\n");
-               return -ENODEV;
+               dev_err(&pdev->dev, "no platform data defined\n");
+               return -EINVAL;
        }
 
        flctl = kzalloc(sizeof(struct sh_flctl), GFP_KERNEL);
        if (!flctl) {
-               printk(KERN_ERR "Unable to allocate NAND MTD dev structure.\n");
+               dev_err(&pdev->dev, "failed to allocate driver data\n");
                return -ENOMEM;
        }
 
        res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
        if (!res) {
-               printk(KERN_ERR "%s: resource not found.\n", __func__);
-               ret = -ENODEV;
+               dev_err(&pdev->dev, "failed to get I/O memory\n");
                goto err;
        }
 
        flctl->reg = ioremap(res->start, resource_size(res));
        if (flctl->reg == NULL) {
-               printk(KERN_ERR "%s: ioremap error.\n", __func__);
-               ret = -ENOMEM;
+               dev_err(&pdev->dev, "failed to remap I/O memory\n");
                goto err;
        }
 
@@ -808,6 +831,7 @@ static int __init flctl_probe(struct platform_device *pdev)
        flctl_mtd = &flctl->mtd;
        nand = &flctl->chip;
        flctl_mtd->priv = nand;
+       flctl->pdev = pdev;
        flctl->hwecc = pdata->has_hwecc;
 
        flctl_register_init(flctl, pdata->flcmncr_val);
@@ -825,6 +849,11 @@ static int __init flctl_probe(struct platform_device *pdev)
        nand->select_chip = flctl_select_chip;
        nand->cmdfunc = flctl_cmdfunc;
 
+       if (pdata->flcmncr_val & SEL_16BIT) {
+               nand->options |= NAND_BUSWIDTH_16;
+               nand->read_word = flctl_read_word;
+       }
+
        ret = nand_scan_ident(flctl_mtd, 1, NULL);
        if (ret)
                goto err;
@@ -846,7 +875,7 @@ err:
        return ret;
 }
 
-static int __exit flctl_remove(struct platform_device *pdev)
+static int __devexit flctl_remove(struct platform_device *pdev)
 {
        struct sh_flctl *flctl = platform_get_drvdata(pdev);