system/linux
system/linux
1
0
Fork 0
mirror of https://github.com/torvalds/linux synced 2024-11-05 18:23:50 +00:00
Code Issues Projects Releases Packages Wiki Activity

mtd: sh_flctl: Use cached register value for FLCMNCR

Browse source 
Instead of reading out the register, use a cached value. This will
make way for a proper runtime power management implementation.

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>
This commit is contained in:
Bastian Hecht 2012-03-01 10:48:39 +01:00 committed by David Woodhouse
parent dd5ab24832
commit 0b3f0d12ef
2 changed files with 8 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
drivers/mtd/nand/sh_flctl.c
View file

@ -283,7 +283,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) static void set_cmd_regs(struct mtd_info *mtd, uint32_t cmd, uint32_t flcmcdr_val)
{ {
struct sh_flctl *flctl = mtd_to_flctl(mtd); struct sh_flctl *flctl = mtd_to_flctl(mtd);
uint32_t flcmncr_val = readl(FLCMNCR(flctl)) & ~SEL_16BIT; uint32_t flcmncr_val = flctl->flcmncr_base & ~SEL_16BIT;
uint32_t flcmdcr_val, addr_len_bytes = 0; uint32_t flcmdcr_val, addr_len_bytes = 0;
/* Set SNAND bit if page size is 2048byte */ /* Set SNAND bit if page size is 2048byte */
@ -684,16 +684,15 @@ static void flctl_cmdfunc(struct mtd_info *mtd, unsigned int command,
static void flctl_select_chip(struct mtd_info *mtd, int chipnr) static void flctl_select_chip(struct mtd_info *mtd, int chipnr)
{ {
struct sh_flctl *flctl = mtd_to_flctl(mtd); struct sh_flctl *flctl = mtd_to_flctl(mtd);
uint32_t flcmncr_val = readl(FLCMNCR(flctl));
switch (chipnr) { switch (chipnr) {
case -1: case -1:
flcmncr_val &= ~CE0_ENABLE; flctl->flcmncr_base &= ~CE0_ENABLE;
writel(flcmncr_val, FLCMNCR(flctl)); writel(flctl->flcmncr_base, FLCMNCR(flctl));
break; break;
case 0: case 0:
flcmncr_val |= CE0_ENABLE; flctl->flcmncr_base |= CE0_ENABLE;
writel(flcmncr_val, FLCMNCR(flctl)); writel(flctl->flcmncr_base, FLCMNCR(flctl));
break; break;
default: default:
BUG(); BUG();
@ -751,11 +750,6 @@ static int flctl_verify_buf(struct mtd_info *mtd, const u_char *buf, int len)
return 0; return 0;
} }
static void flctl_register_init(struct sh_flctl *flctl, unsigned long val)
{
writel(val, FLCMNCR(flctl));
}
static int flctl_chip_init_tail(struct mtd_info *mtd) static int flctl_chip_init_tail(struct mtd_info *mtd)
{ {
struct sh_flctl *flctl = mtd_to_flctl(mtd); struct sh_flctl *flctl = mtd_to_flctl(mtd);
@ -807,8 +801,7 @@ static int flctl_chip_init_tail(struct mtd_info *mtd)
chip->ecc.mode = NAND_ECC_HW; chip->ecc.mode = NAND_ECC_HW;
/* 4 symbols ECC enabled */ /* 4 symbols ECC enabled */
writel(readl(FLCMNCR(flctl)) | _4ECCEN | ECCPOS2 | ECCPOS_02, flctl->flcmncr_base |= _4ECCEN | ECCPOS2 | ECCPOS_02;
FLCMNCR(flctl));
} else { } else {
chip->ecc.mode = NAND_ECC_SOFT; chip->ecc.mode = NAND_ECC_SOFT;
} }
@ -854,10 +847,9 @@ static int __devinit flctl_probe(struct platform_device *pdev)
nand = &flctl->chip; nand = &flctl->chip;
flctl_mtd->priv = nand; flctl_mtd->priv = nand;
flctl->pdev = pdev; flctl->pdev = pdev;
flctl->flcmncr_base = pdata->flcmncr_val;
flctl->hwecc = pdata->has_hwecc; flctl->hwecc = pdata->has_hwecc;
flctl_register_init(flctl, pdata->flcmncr_val);
nand->options = NAND_NO_AUTOINCR; nand->options = NAND_NO_AUTOINCR;
/* Set address of hardware control function */ /* Set address of hardware control function */

1
include/linux/mtd/sh_flctl.h
View file

@ -132,6 +132,7 @@ struct sh_flctl {
int erase1_page_addr; /* page_addr in ERASE1 cmd */ int erase1_page_addr; /* page_addr in ERASE1 cmd */
uint32_t erase_ADRCNT; /* bits of FLCMDCR in ERASE1 cmd */ uint32_t erase_ADRCNT; /* bits of FLCMDCR in ERASE1 cmd */
uint32_t rw_ADRCNT; /* bits of FLCMDCR in READ WRITE cmd */ uint32_t rw_ADRCNT; /* bits of FLCMDCR in READ WRITE cmd */
uint32_t flcmncr_base; /* base value of FLCMNCR */
int hwecc_cant_correct[4]; int hwecc_cant_correct[4];