summaryrefslogtreecommitdiff
path: root/target/linux/mvebu/patches-3.10/0145-mtd-nand-pxa3xx-Add-helper-function-to-set-page-addr.patch
diff options
context:
space:
mode:
Diffstat (limited to 'target/linux/mvebu/patches-3.10/0145-mtd-nand-pxa3xx-Add-helper-function-to-set-page-addr.patch')
-rw-r--r--target/linux/mvebu/patches-3.10/0145-mtd-nand-pxa3xx-Add-helper-function-to-set-page-addr.patch70
1 files changed, 70 insertions, 0 deletions
diff --git a/target/linux/mvebu/patches-3.10/0145-mtd-nand-pxa3xx-Add-helper-function-to-set-page-addr.patch b/target/linux/mvebu/patches-3.10/0145-mtd-nand-pxa3xx-Add-helper-function-to-set-page-addr.patch
new file mode 100644
index 0000000..a0a909e
--- /dev/null
+++ b/target/linux/mvebu/patches-3.10/0145-mtd-nand-pxa3xx-Add-helper-function-to-set-page-addr.patch
@@ -0,0 +1,70 @@
+From 09a84f8e89c3715160423701b0606ef99e2a05bf Mon Sep 17 00:00:00 2001
+From: Ezequiel Garcia <ezequiel.garcia@free-electrons.com>
+Date: Thu, 14 Nov 2013 18:25:31 -0300
+Subject: [PATCH 145/203] mtd: nand: pxa3xx: Add helper function to set page
+ address
+
+Let's simplify the code by first introducing a helper function
+to set the page address, as done by the READ0, READOOB and SEQIN
+commands.
+
+Signed-off-by: Ezequiel Garcia <ezequiel.garcia@free-electrons.com>
+Tested-by: Daniel Mack <zonque@gmail.com>
+Signed-off-by: Brian Norris <computersforpeace@gmail.com>
+---
+ drivers/mtd/nand/pxa3xx_nand.c | 36 +++++++++++++++++++++---------------
+ 1 file changed, 21 insertions(+), 15 deletions(-)
+
+--- a/drivers/mtd/nand/pxa3xx_nand.c
++++ b/drivers/mtd/nand/pxa3xx_nand.c
+@@ -587,6 +587,26 @@ static inline int is_buf_blank(uint8_t *
+ return 1;
+ }
+
++static void set_command_address(struct pxa3xx_nand_info *info,
++ unsigned int page_size, uint16_t column, int page_addr)
++{
++ /* small page addr setting */
++ if (page_size < PAGE_CHUNK_SIZE) {
++ info->ndcb1 = ((page_addr & 0xFFFFFF) << 8)
++ | (column & 0xFF);
++
++ info->ndcb2 = 0;
++ } else {
++ info->ndcb1 = ((page_addr & 0xFFFF) << 16)
++ | (column & 0xFFFF);
++
++ if (page_addr & 0xFF0000)
++ info->ndcb2 = (page_addr & 0xFF0000) >> 16;
++ else
++ info->ndcb2 = 0;
++ }
++}
++
+ static int prepare_command_pool(struct pxa3xx_nand_info *info, int command,
+ uint16_t column, int page_addr)
+ {
+@@ -650,22 +670,8 @@ static int prepare_command_pool(struct p
+ info->ndcb0 |= NDCB0_DBC | (NAND_CMD_READSTART << 8);
+
+ case NAND_CMD_SEQIN:
+- /* small page addr setting */
+- if (unlikely(mtd->writesize < PAGE_CHUNK_SIZE)) {
+- info->ndcb1 = ((page_addr & 0xFFFFFF) << 8)
+- | (column & 0xFF);
+-
+- info->ndcb2 = 0;
+- } else {
+- info->ndcb1 = ((page_addr & 0xFFFF) << 16)
+- | (column & 0xFFFF);
+-
+- if (page_addr & 0xFF0000)
+- info->ndcb2 = (page_addr & 0xFF0000) >> 16;
+- else
+- info->ndcb2 = 0;
+- }
+
++ set_command_address(info, mtd->writesize, column, page_addr);
+ info->buf_count = mtd->writesize + mtd->oobsize;
+ memset(info->data_buff, 0xFF, info->buf_count);
+