diff options
| author | Terry Lv <r65388@freescale.com> | 2010-11-04 22:20:06 +0800 |
|---|---|---|
| committer | Terry Lv <r65388@freescale.com> | 2010-11-18 18:30:59 +0800 |
| commit | 3a13770bd01f785ce7e587c398c47436b6fa703f (patch) | |
| tree | b2878101d171e3444525652783ad35ebc14cf2f2 /drivers | |
| parent | e8c198f66e017cd2adf8757ec7c5deee2766d2a4 (diff) | |
| download | u-boot-imx-3a13770bd01f785ce7e587c398c47436b6fa703f.zip u-boot-imx-3a13770bd01f785ce7e587c398c47436b6fa703f.tar.gz u-boot-imx-3a13770bd01f785ce7e587c398c47436b6fa703f.tar.bz2 | |
ENGR00133124: Add nand support for mx50 rdp
Add nand support for mx50 rdp.
Signed-off-by: Terry Lv <r65388@freescale.com>
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/mtd/nand/gpmi_nfc_hal.c | 7 | ||||
| -rw-r--r-- | drivers/mtd/nand/gpmi_nfc_mil.c | 16 |
2 files changed, 8 insertions, 15 deletions
diff --git a/drivers/mtd/nand/gpmi_nfc_hal.c b/drivers/mtd/nand/gpmi_nfc_hal.c index 23ce265..568e3c5 100644 --- a/drivers/mtd/nand/gpmi_nfc_hal.c +++ b/drivers/mtd/nand/gpmi_nfc_hal.c @@ -918,13 +918,6 @@ static int send_command(struct mtd_info *mtd, unsigned chip, MTDDEBUG(MTD_DEBUG_LEVEL2, "Chip: %d DMA Buf: 0x%08x Length: %d\n", chip, buffer, length); -#ifdef CONFIG_ARCH_MMU - /* FIXME: I don't know why this delay is needed. - * But with this delay, nand operations can be ok. - */ - udelay(200); -#endif - /* Compute the DMA channel. */ dma_channel = MXS_DMA_CHANNEL_AHB_APBH_GPMI0 + chip; diff --git a/drivers/mtd/nand/gpmi_nfc_mil.c b/drivers/mtd/nand/gpmi_nfc_mil.c index d5433f8..8d50da6 100644 --- a/drivers/mtd/nand/gpmi_nfc_mil.c +++ b/drivers/mtd/nand/gpmi_nfc_mil.c @@ -69,8 +69,8 @@ static void gpmi_nfc_cmd_ctrl(struct mtd_info *mtd, int data, unsigned int ctrl) if (!cmd_queue) { #ifdef CONFIG_ARCH_MMU cmd_queue = - (u8 *)ioremap_nocache((u32)iomem_to_phys((ulong)kmalloc(GPMI_NFC_COMMAND_BUFFER_SIZE, - GFP_KERNEL)), + (u8 *)ioremap_nocache((u32)iomem_to_phys((ulong)memalign(MXS_DMA_ALIGNMENT, + GPMI_NFC_COMMAND_BUFFER_SIZE)), MXS_DMA_ALIGNMENT); #else cmd_queue = @@ -351,7 +351,7 @@ static int gpmi_nfc_ecc_read_page(struct mtd_info *mtd, MTDDEBUG(MTD_DEBUG_LEVEL1, "Buf: 0x%08x, data_buf: 0x%08x, " "oob_buf: 0x%08x", - buf, (u32)gpmi_info->data_buf, (u32)gpmi_info->oob_buf); + (u32)buf, (u32)gpmi_info->data_buf, (u32)gpmi_info->oob_buf); /* Ask the NFC. */ #ifdef CONFIG_ARCH_MMU error = nfc->read_page(mtd, gpmi_info->cur_chip, @@ -441,7 +441,7 @@ static void gpmi_nfc_ecc_write_page(struct mtd_info *mtd, MTDDEBUG(MTD_DEBUG_LEVEL3, "%s =>\n", __func__); MTDDEBUG(MTD_DEBUG_LEVEL1, "Buf: 0x%08x, data_buf: 0x%08x, " - "oob_buf: 0x%08x\n", buf, (u32)data_buf, (u32)oob_buf); + "oob_buf: 0x%08x\n", (u32)buf, (u32)data_buf, (u32)oob_buf); memcpy(data_buf, buf, mtd->writesize); memcpy(oob_buf, nand->oob_poi, mtd->oobsize); @@ -1116,11 +1116,11 @@ int board_nand_init(struct nand_chip *nand) */ chip->cmdfunc = NULL; chip->waitfunc = NULL; - chip->dev_ready = gpmi_nfc_dev_ready; + chip->dev_ready = gpmi_nfc_dev_ready; chip->select_chip = gpmi_nfc_select_chip; - chip->block_bad = gpmi_nfc_block_bad; + chip->block_bad = gpmi_nfc_block_bad; chip->block_markbad = NULL; - chip->read_byte = gpmi_nfc_read_byte; + chip->read_byte = gpmi_nfc_read_byte; /* * Low-level I/O * @@ -1129,7 +1129,7 @@ int board_nand_init(struct nand_chip *nand) * * We rely on the reference implentation of verify_buf. */ - chip->read_word = NULL; + chip->read_word = NULL; chip->write_buf = gpmi_nfc_write_buf; chip->read_buf = gpmi_nfc_read_buf; chip->verify_buf = NULL; |