diff options
| author | Bastian Hecht | 2012-03-01 10:48:40 +0100 |
|---|---|---|
| committer | David Woodhouse | 2012-03-27 01:43:08 +0200 |
| commit | 3f2e924b26989bbe1ad600a83fdc72a3056104d1 (patch) | |
| tree | 2fb1cefdca093b69d184fbf2601db00bee899c9f /drivers/mtd | |
| parent | mtd: sh_flctl: Use cached register value for FLCMNCR (diff) | |
| download | kernel-qcow2-linux-3f2e924b26989bbe1ad600a83fdc72a3056104d1.tar.gz kernel-qcow2-linux-3f2e924b26989bbe1ad600a83fdc72a3056104d1.tar.xz kernel-qcow2-linux-3f2e924b26989bbe1ad600a83fdc72a3056104d1.zip | |
mtd: sh_flctl: Add FLHOLDCR register
Add a register used in new FLCTL hardware and a feature flag for it.
Signed-off-by: Bastian Hecht <hechtb@gmail.com>
Acked-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Signed-off-by: Artem Bityutskiy <artem.bityutskiy@linux.intel.com>
Signed-off-by: David Woodhouse <David.Woodhouse@intel.com>
Diffstat (limited to 'drivers/mtd')
| -rw-r--r-- | drivers/mtd/nand/sh_flctl.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/drivers/mtd/nand/sh_flctl.c b/drivers/mtd/nand/sh_flctl.c index 48d5da0ec758..d0f1f3c13e76 100644 --- a/drivers/mtd/nand/sh_flctl.c +++ b/drivers/mtd/nand/sh_flctl.c @@ -693,6 +693,8 @@ static void flctl_select_chip(struct mtd_info *mtd, int chipnr) case 0: flctl->flcmncr_base |= CE0_ENABLE; writel(flctl->flcmncr_base, FLCMNCR(flctl)); + if (flctl->holden) + writel(HOLDEN, FLHOLDCR(flctl)); break; default: BUG(); @@ -849,6 +851,7 @@ static int __devinit flctl_probe(struct platform_device *pdev) flctl->pdev = pdev; flctl->flcmncr_base = pdata->flcmncr_val; flctl->hwecc = pdata->has_hwecc; + flctl->holden = pdata->use_holden; nand->options = NAND_NO_AUTOINCR; |