summaryrefslogtreecommitdiffstats
path: root/drivers/mtd
diff options
context:
space:
mode:
authorRicardo Ribalda <ricardo.ribalda@gmail.com>2017-01-18 17:40:16 +0100
committerCyrille Pitchen <cyrille.pitchen@atmel.com>2017-02-10 14:21:59 +0100
commit56c5c328962b26e6dc844b4e8e643f145974c04e (patch)
tree43d80286466abd44b1965514fd4d7b065fd3e838 /drivers/mtd
parentf40a2725ea720a6270d3970cf11472da66924624 (diff)
downloadop-kernel-dev-56c5c328962b26e6dc844b4e8e643f145974c04e.zip
op-kernel-dev-56c5c328962b26e6dc844b4e8e643f145974c04e.tar.gz
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@gmail.com> Acked-by: Marek Vasut <marek.vasut@gmail.com> Signed-off-by: Cyrille Pitchen <cyrille.pitchen@atmel.com>
Diffstat (limited to 'drivers/mtd')
-rw-r--r--drivers/mtd/spi-nor/spi-nor.c9
1 files 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;
}
/*
OpenPOWER on IntegriCloud