hollalinux
/
linux-sg2042
mirror of https://github.com/sophgo/linux-riscv.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

mtd: nand: denali: squash denali_enable_dma() helper into caller 

This helper just sets/clears a flag of DMA_ENABLE register (with
register read-back, I do not know why it is necessary).

Move the register write code to the caller, and remove the helper.
It works for me without the register read-back.

Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
Signed-off-by: Boris Brezillon <boris.brezillon@free-electrons.com>
This commit is contained in:
Masahiro Yamada 2017-09-22 12:46:41 +09:00 committed by Boris Brezillon
parent da4734be23
commit 586a2c5290
1 changed files with 3 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
drivers/mtd/nand/denali.c
View File

@ -465,13 +465,6 @@ static int denali_sw_ecc_fixup(struct mtd_info *mtd,
return max_bitflips; return max_bitflips;
} }
/* programs the controller to either enable/disable DMA transfers */
static void denali_enable_dma(struct denali_nand_info *denali, bool en)
{
iowrite32(en ? DMA_ENABLE__FLAG : 0, denali->reg + DMA_ENABLE);
ioread32(denali->reg + DMA_ENABLE);
}
static void denali_setup_dma64(struct denali_nand_info *denali, static void denali_setup_dma64(struct denali_nand_info *denali,
dma_addr_t dma_addr, int page, int write) dma_addr_t dma_addr, int page, int write)
{ {
@ -619,7 +612,7 @@ static int denali_dma_xfer(struct denali_nand_info *denali, void *buf,
ecc_err_mask = INTR__ECC_ERR; ecc_err_mask = INTR__ECC_ERR;
} }
denali_enable_dma(denali, true); iowrite32(DMA_ENABLE__FLAG, denali->reg + DMA_ENABLE);
denali_reset_irq(denali); denali_reset_irq(denali);
denali_setup_dma(denali, dma_addr, page, write); denali_setup_dma(denali, dma_addr, page, write);
@ -631,7 +624,8 @@ static int denali_dma_xfer(struct denali_nand_info *denali, void *buf,
else if (irq_status & ecc_err_mask) else if (irq_status & ecc_err_mask)
ret = -EBADMSG; ret = -EBADMSG;
denali_enable_dma(denali, false); iowrite32(0, denali->reg + DMA_ENABLE);
dma_unmap_single(denali->dev, dma_addr, size, dir); dma_unmap_single(denali->dev, dma_addr, size, dir);
if (irq_status & INTR__ERASED_PAGE) if (irq_status & INTR__ERASED_PAGE)