diff options
author | Josh Wu <josh.wu@atmel.com> | 2013-05-09 03:34:54 -0400 |
---|---|---|
committer | David Woodhouse <David.Woodhouse@intel.com> | 2013-08-05 15:55:42 -0400 |
commit | 71b94e2e866aa35f40945d9e820fc3214b792d1f (patch) | |
tree | 2747eb61ceeeda751671eaa3c1513eac0d386e19 /drivers/mtd/nand/atmel_nand.c | |
parent | d1cb556c3feb238f11dc47f8fa56df7880022908 (diff) |
mtd: atmel_nand: replace cpu_is_at32ap7000() with a nand platform data
The nand driver use cpu_is_at32ap7000() macro for a workaround. For the
multi-platform support, we will remove this cpu_is_xxx() macro.
This patch adds a boolean variable need_reset_workaround in structure
atmel_nand_data. Using this variable we can remove cpu_is_at32ap7000() macro.
Hans-Christian: Feel free to push this through the mtd tree, if they won't
accept it I'm working on getting my workflow up on the linux-avr32.git tree.
Signed-off-by: Josh Wu <josh.wu@atmel.com>
Acked-by: Hans-Christian Egtvedt <egtvedt@samfundet.no>
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/atmel_nand.c')
-rw-r--r-- | drivers/mtd/nand/atmel_nand.c | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/drivers/mtd/nand/atmel_nand.c b/drivers/mtd/nand/atmel_nand.c index 2d23d2929438..7bf912b5b969 100644 --- a/drivers/mtd/nand/atmel_nand.c +++ b/drivers/mtd/nand/atmel_nand.c | |||
@@ -1174,10 +1174,9 @@ static int atmel_nand_read_page(struct mtd_info *mtd, struct nand_chip *chip, | |||
1174 | * Workaround: Reset the parity registers before reading the | 1174 | * Workaround: Reset the parity registers before reading the |
1175 | * actual data. | 1175 | * actual data. |
1176 | */ | 1176 | */ |
1177 | if (cpu_is_at32ap7000()) { | 1177 | struct atmel_nand_host *host = chip->priv; |
1178 | struct atmel_nand_host *host = chip->priv; | 1178 | if (host->board.need_reset_workaround) |
1179 | ecc_writel(host->ecc, CR, ATMEL_ECC_RST); | 1179 | ecc_writel(host->ecc, CR, ATMEL_ECC_RST); |
1180 | } | ||
1181 | 1180 | ||
1182 | /* read the page */ | 1181 | /* read the page */ |
1183 | chip->read_buf(mtd, p, eccsize); | 1182 | chip->read_buf(mtd, p, eccsize); |
@@ -1298,11 +1297,11 @@ static int atmel_nand_correct(struct mtd_info *mtd, u_char *dat, | |||
1298 | */ | 1297 | */ |
1299 | static void atmel_nand_hwctl(struct mtd_info *mtd, int mode) | 1298 | static void atmel_nand_hwctl(struct mtd_info *mtd, int mode) |
1300 | { | 1299 | { |
1301 | if (cpu_is_at32ap7000()) { | 1300 | struct nand_chip *nand_chip = mtd->priv; |
1302 | struct nand_chip *nand_chip = mtd->priv; | 1301 | struct atmel_nand_host *host = nand_chip->priv; |
1303 | struct atmel_nand_host *host = nand_chip->priv; | 1302 | |
1303 | if (host->board.need_reset_workaround) | ||
1304 | ecc_writel(host->ecc, CR, ATMEL_ECC_RST); | 1304 | ecc_writel(host->ecc, CR, ATMEL_ECC_RST); |
1305 | } | ||
1306 | } | 1305 | } |
1307 | 1306 | ||
1308 | #if defined(CONFIG_OF) | 1307 | #if defined(CONFIG_OF) |