mtd: nand: Fix page adressing

fschrempf · Dec 21, 2017 · 8013696 · 8013696
1 parent 937a162
commit 8013696
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 6 deletions.
diff --git a/drivers/mtd/nand/core.c b/drivers/mtd/nand/core.c
@@ -184,9 +184,7 @@ int nanddev_init(struct nand_device *nand, const struct nand_ops *ops,
 	    !memorg->ntargets)
 		return -EINVAL;
 
-	nand->rowconv.eraseblock_addr_shift = fls(memorg->pagesize);
-	nand->rowconv.lun_addr_shift = fls(memorg->eraseblocks_per_lun) +
-				       nand->rowconv.eraseblock_addr_shift;
+	nand->rowconv.eraseblock_addr_shift = fls(memorg->pages_per_eraseblock) - 1;
 
 	nand->ops = ops;
 

diff --git a/include/linux/mtd/nand.h b/include/linux/mtd/nand.h
@@ -391,9 +391,8 @@ static inline loff_t nanddev_pos_to_offs(struct nand_device *nand,
 static inline unsigned int nanddev_pos_to_row(struct nand_device *nand,
 					      const struct nand_pos *pos)
 {
-	return (pos->lun << nand->rowconv.lun_addr_shift) |
-	       (pos->eraseblock << nand->rowconv.eraseblock_addr_shift) |
-	       pos->page;
+	return (pos->eraseblock << nand->rowconv.eraseblock_addr_shift) |
+	        pos->page;
 }
 
 static inline void nanddev_pos_next_target(struct nand_device *nand,