diff options
author | Bastian Hecht <hechtb@googlemail.com> | 2012-03-01 04:48:40 -0500 |
---|---|---|
committer | David Woodhouse <David.Woodhouse@intel.com> | 2012-03-26 19:43:08 -0400 |
commit | 3f2e924b26989bbe1ad600a83fdc72a3056104d1 (patch) | |
tree | 2fb1cefdca093b69d184fbf2601db00bee899c9f /drivers/mtd/nand | |
parent | 0b3f0d12eff1ed23496fcf4cf468e1d317516e53 (diff) |
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/nand')
-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) | |||
693 | case 0: | 693 | case 0: |
694 | flctl->flcmncr_base |= CE0_ENABLE; | 694 | flctl->flcmncr_base |= CE0_ENABLE; |
695 | writel(flctl->flcmncr_base, FLCMNCR(flctl)); | 695 | writel(flctl->flcmncr_base, FLCMNCR(flctl)); |
696 | if (flctl->holden) | ||
697 | writel(HOLDEN, FLHOLDCR(flctl)); | ||
696 | break; | 698 | break; |
697 | default: | 699 | default: |
698 | BUG(); | 700 | BUG(); |
@@ -849,6 +851,7 @@ static int __devinit flctl_probe(struct platform_device *pdev) | |||
849 | flctl->pdev = pdev; | 851 | flctl->pdev = pdev; |
850 | flctl->flcmncr_base = pdata->flcmncr_val; | 852 | flctl->flcmncr_base = pdata->flcmncr_val; |
851 | flctl->hwecc = pdata->has_hwecc; | 853 | flctl->hwecc = pdata->has_hwecc; |
854 | flctl->holden = pdata->use_holden; | ||
852 | 855 | ||
853 | nand->options = NAND_NO_AUTOINCR; | 856 | nand->options = NAND_NO_AUTOINCR; |
854 | 857 | ||