From 56c5c328962b26e6dc844b4e8e643f145974c04e Mon Sep 17 00:00:00 2001 From: Ricardo Ribalda Date: Wed, 18 Jan 2017 17:40:16 +0100 Subject: [PATCH] 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 Acked-by: Marek Vasut Signed-off-by: Cyrille Pitchen --- 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 5f8b475255cd..c042320a76cb 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; } /* -- 2.30.2