mtd: spi-nor: Fix S3AN addressing calculation

[Linux-MTD Mailing List]

Gitweb:     http://git.infradead.org/?p=mtd-2.6.git;a=commit;h=56c5c328962b26e6dc844b4e8e643f145974c04e
Commit:     56c5c328962b26e6dc844b4e8e643f145974c04e
Parent:     f40a2725ea720a6270d3970cf11472da66924624
Author:     Ricardo Ribalda <ricardo.ribalda at gmail.com>
AuthorDate: Wed Jan 18 17:40:16 2017 +0100
Committer:  Cyrille Pitchen <cyrille.pitchen at atmel.com>
CommitDate: Fri Feb 10 14:21:59 2017 +0100

    mtd: spi-nor: Fix S3AN addressing calculation
    
    The page calculation under spi_nor_s3an_addr_convert() was wrong. On
    Default Address Mode we need to perform a divide by page_size.
    
    Signed-off-by: Ricardo Ribalda Delgado <ricardo.ribalda at gmail.com>
    Acked-by: Marek Vasut <marek.vasut at gmail.com>
    Signed-off-by: Cyrille Pitchen <cyrille.pitchen at atmel.com>
---
 drivers/mtd/spi-nor/spi-nor.c | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/drivers/mtd/spi-nor/spi-nor.c b/drivers/mtd/spi-nor/spi-nor.c
index 5f8b475..c042320 100644
--- a/drivers/mtd/spi-nor/spi-nor.c
+++ b/drivers/mtd/spi-nor/spi-nor.c
@@ -431,11 +431,14 @@ static void spi_nor_unlock_and_unprep(struct spi_nor *nor, enum spi_nor_ops ops)
  */
 static loff_t spi_nor_s3an_addr_convert(struct spi_nor *nor, unsigned int addr)
 {
-	unsigned int offset = addr;
+	unsigned int offset;
+	unsigned int page;
 
-	offset %= nor->page_size;
+	offset = addr % nor->page_size;
+	page = addr / nor->page_size;
+	page <<= (nor->page_size > 512) ? 10 : 9;
 
-	return ((addr - offset) << 1) | offset;
+	return page | offset;
 }
 
 /*