Commit 00fc615f authored by Masahiro Yamada's avatar Masahiro Yamada Committed by Boris Brezillon

mtd: nand: denali: merge struct nand_buf into struct denali_nand_info

Now struct nand_buf has only two members, so I see no reason for the
separation.
Signed-off-by: default avatarMasahiro Yamada <yamada.masahiro@socionext.com>
Signed-off-by: default avatarBoris Brezillon <boris.brezillon@free-electrons.com>
parent 2291cb89
...@@ -695,7 +695,7 @@ static int write_page(struct mtd_info *mtd, struct nand_chip *chip, ...@@ -695,7 +695,7 @@ static int write_page(struct mtd_info *mtd, struct nand_chip *chip,
const uint8_t *buf, int page, bool raw_xfer) const uint8_t *buf, int page, bool raw_xfer)
{ {
struct denali_nand_info *denali = mtd_to_denali(mtd); struct denali_nand_info *denali = mtd_to_denali(mtd);
dma_addr_t addr = denali->buf.dma_buf; dma_addr_t addr = denali->dma_addr;
size_t size = mtd->writesize + mtd->oobsize; size_t size = mtd->writesize + mtd->oobsize;
uint32_t irq_status; uint32_t irq_status;
uint32_t irq_mask = INTR__DMA_CMD_COMP | INTR__PROGRAM_FAIL; uint32_t irq_mask = INTR__DMA_CMD_COMP | INTR__PROGRAM_FAIL;
...@@ -709,11 +709,11 @@ static int write_page(struct mtd_info *mtd, struct nand_chip *chip, ...@@ -709,11 +709,11 @@ static int write_page(struct mtd_info *mtd, struct nand_chip *chip,
setup_ecc_for_xfer(denali, !raw_xfer, raw_xfer); setup_ecc_for_xfer(denali, !raw_xfer, raw_xfer);
/* copy buffer into DMA buffer */ /* copy buffer into DMA buffer */
memcpy(denali->buf.buf, buf, mtd->writesize); memcpy(denali->buf, buf, mtd->writesize);
if (raw_xfer) { if (raw_xfer) {
/* transfer the data to the spare area */ /* transfer the data to the spare area */
memcpy(denali->buf.buf + mtd->writesize, memcpy(denali->buf + mtd->writesize,
chip->oob_poi, chip->oob_poi,
mtd->oobsize); mtd->oobsize);
} }
...@@ -790,7 +790,7 @@ static int denali_read_page(struct mtd_info *mtd, struct nand_chip *chip, ...@@ -790,7 +790,7 @@ static int denali_read_page(struct mtd_info *mtd, struct nand_chip *chip,
uint8_t *buf, int oob_required, int page) uint8_t *buf, int oob_required, int page)
{ {
struct denali_nand_info *denali = mtd_to_denali(mtd); struct denali_nand_info *denali = mtd_to_denali(mtd);
dma_addr_t addr = denali->buf.dma_buf; dma_addr_t addr = denali->dma_addr;
size_t size = mtd->writesize + mtd->oobsize; size_t size = mtd->writesize + mtd->oobsize;
uint32_t irq_status; uint32_t irq_status;
uint32_t irq_mask = denali->caps & DENALI_CAP_HW_ECC_FIXUP ? uint32_t irq_mask = denali->caps & DENALI_CAP_HW_ECC_FIXUP ?
...@@ -812,7 +812,7 @@ static int denali_read_page(struct mtd_info *mtd, struct nand_chip *chip, ...@@ -812,7 +812,7 @@ static int denali_read_page(struct mtd_info *mtd, struct nand_chip *chip,
dma_sync_single_for_cpu(denali->dev, addr, size, DMA_FROM_DEVICE); dma_sync_single_for_cpu(denali->dev, addr, size, DMA_FROM_DEVICE);
memcpy(buf, denali->buf.buf, mtd->writesize); memcpy(buf, denali->buf, mtd->writesize);
if (denali->caps & DENALI_CAP_HW_ECC_FIXUP) if (denali->caps & DENALI_CAP_HW_ECC_FIXUP)
stat = denali_hw_ecc_fixup(mtd, denali, &uncor_ecc_flags); stat = denali_hw_ecc_fixup(mtd, denali, &uncor_ecc_flags);
...@@ -837,7 +837,7 @@ static int denali_read_page_raw(struct mtd_info *mtd, struct nand_chip *chip, ...@@ -837,7 +837,7 @@ static int denali_read_page_raw(struct mtd_info *mtd, struct nand_chip *chip,
uint8_t *buf, int oob_required, int page) uint8_t *buf, int oob_required, int page)
{ {
struct denali_nand_info *denali = mtd_to_denali(mtd); struct denali_nand_info *denali = mtd_to_denali(mtd);
dma_addr_t addr = denali->buf.dma_buf; dma_addr_t addr = denali->dma_addr;
size_t size = mtd->writesize + mtd->oobsize; size_t size = mtd->writesize + mtd->oobsize;
uint32_t irq_mask = INTR__DMA_CMD_COMP; uint32_t irq_mask = INTR__DMA_CMD_COMP;
uint32_t irq_status; uint32_t irq_status;
...@@ -859,8 +859,8 @@ static int denali_read_page_raw(struct mtd_info *mtd, struct nand_chip *chip, ...@@ -859,8 +859,8 @@ static int denali_read_page_raw(struct mtd_info *mtd, struct nand_chip *chip,
denali_enable_dma(denali, false); denali_enable_dma(denali, false);
memcpy(buf, denali->buf.buf, mtd->writesize); memcpy(buf, denali->buf, mtd->writesize);
memcpy(chip->oob_poi, denali->buf.buf + mtd->writesize, mtd->oobsize); memcpy(chip->oob_poi, denali->buf + mtd->writesize, mtd->oobsize);
return 0; return 0;
} }
...@@ -1280,10 +1280,9 @@ int denali_init(struct denali_nand_info *denali) ...@@ -1280,10 +1280,9 @@ int denali_init(struct denali_nand_info *denali)
if (ret) if (ret)
goto disable_irq; goto disable_irq;
denali->buf.buf = devm_kzalloc(denali->dev, denali->buf = devm_kzalloc(denali->dev, mtd->writesize + mtd->oobsize,
mtd->writesize + mtd->oobsize,
GFP_KERNEL); GFP_KERNEL);
if (!denali->buf.buf) { if (!denali->buf) {
ret = -ENOMEM; ret = -ENOMEM;
goto disable_irq; goto disable_irq;
} }
...@@ -1296,10 +1295,10 @@ int denali_init(struct denali_nand_info *denali) ...@@ -1296,10 +1295,10 @@ int denali_init(struct denali_nand_info *denali)
goto disable_irq; goto disable_irq;
} }
denali->buf.dma_buf = dma_map_single(denali->dev, denali->buf.buf, denali->dma_addr = dma_map_single(denali->dev, denali->buf,
mtd->writesize + mtd->oobsize, mtd->writesize + mtd->oobsize,
DMA_BIDIRECTIONAL); DMA_BIDIRECTIONAL);
if (dma_mapping_error(denali->dev, denali->buf.dma_buf)) { if (dma_mapping_error(denali->dev, denali->dma_addr)) {
dev_err(denali->dev, "Failed to map DMA buffer\n"); dev_err(denali->dev, "Failed to map DMA buffer\n");
ret = -EIO; ret = -EIO;
goto disable_irq; goto disable_irq;
...@@ -1400,7 +1399,7 @@ void denali_remove(struct denali_nand_info *denali) ...@@ -1400,7 +1399,7 @@ void denali_remove(struct denali_nand_info *denali)
nand_release(mtd); nand_release(mtd);
denali_disable_irq(denali); denali_disable_irq(denali);
dma_unmap_single(denali->dev, denali->buf.dma_buf, bufsize, dma_unmap_single(denali->dev, denali->dma_addr, bufsize,
DMA_BIDIRECTIONAL); DMA_BIDIRECTIONAL);
} }
EXPORT_SYMBOL(denali_remove); EXPORT_SYMBOL(denali_remove);
...@@ -305,16 +305,10 @@ ...@@ -305,16 +305,10 @@
#define MODE_10 0x08000000 #define MODE_10 0x08000000
#define MODE_11 0x0C000000 #define MODE_11 0x0C000000
struct nand_buf {
uint8_t *buf;
dma_addr_t dma_buf;
};
struct denali_nand_info { struct denali_nand_info {
struct nand_chip nand; struct nand_chip nand;
unsigned long clk_x_rate; /* bus interface clock rate */ unsigned long clk_x_rate; /* bus interface clock rate */
int flash_bank; /* currently selected chip */ int flash_bank; /* currently selected chip */
struct nand_buf buf;
struct device *dev; struct device *dev;
void __iomem *flash_reg; /* Register Interface */ void __iomem *flash_reg; /* Register Interface */
void __iomem *flash_mem; /* Host Data/Command Interface */ void __iomem *flash_mem; /* Host Data/Command Interface */
...@@ -326,6 +320,8 @@ struct denali_nand_info { ...@@ -326,6 +320,8 @@ struct denali_nand_info {
uint32_t irq_status; uint32_t irq_status;
int irq; int irq;
void *buf;
dma_addr_t dma_addr;
int devnum; /* represent how many nands connected */ int devnum; /* represent how many nands connected */
int bbtskipbytes; int bbtskipbytes;
int max_banks; int max_banks;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment