Updated from Linux LTS 3.10.21 to 3.10.22
This commit is contained in:
@@ -264,8 +264,6 @@ static void dma_irq_callback(void *param)
|
||||
struct gpmi_nand_data *this = param;
|
||||
struct completion *dma_c = &this->dma_done;
|
||||
|
||||
complete(dma_c);
|
||||
|
||||
switch (this->dma_type) {
|
||||
case DMA_FOR_COMMAND:
|
||||
dma_unmap_sg(this->dev, &this->cmd_sgl, 1, DMA_TO_DEVICE);
|
||||
@@ -290,6 +288,8 @@ static void dma_irq_callback(void *param)
|
||||
default:
|
||||
pr_err("in wrong DMA operation.\n");
|
||||
}
|
||||
|
||||
complete(dma_c);
|
||||
}
|
||||
|
||||
int start_dma_without_bch_irq(struct gpmi_nand_data *this,
|
||||
|
||||
@@ -2904,10 +2904,21 @@ static int nand_flash_detect_onfi(struct mtd_info *mtd, struct nand_chip *chip,
|
||||
sanitize_string(p->model, sizeof(p->model));
|
||||
if (!mtd->name)
|
||||
mtd->name = p->model;
|
||||
|
||||
mtd->writesize = le32_to_cpu(p->byte_per_page);
|
||||
mtd->erasesize = le32_to_cpu(p->pages_per_block) * mtd->writesize;
|
||||
|
||||
/*
|
||||
* pages_per_block and blocks_per_lun may not be a power-of-2 size
|
||||
* (don't ask me who thought of this...). MTD assumes that these
|
||||
* dimensions will be power-of-2, so just truncate the remaining area.
|
||||
*/
|
||||
mtd->erasesize = 1 << (fls(le32_to_cpu(p->pages_per_block)) - 1);
|
||||
mtd->erasesize *= mtd->writesize;
|
||||
|
||||
mtd->oobsize = le16_to_cpu(p->spare_bytes_per_page);
|
||||
chip->chipsize = le32_to_cpu(p->blocks_per_lun);
|
||||
|
||||
/* See erasesize comment */
|
||||
chip->chipsize = 1 << (fls(le32_to_cpu(p->blocks_per_lun)) - 1);
|
||||
chip->chipsize *= (uint64_t)mtd->erasesize * p->lun_count;
|
||||
*busw = 0;
|
||||
if (le16_to_cpu(p->features) & 1)
|
||||
|
||||
Reference in New Issue
Block a user