174ce4c56d
These are patches queued for 4.11. It adds support for even more hw and removes some annoying WARN_ONCE. Signed-off-by: Rafał Miłecki <rafal@milecki.pl>
35 lines
1.1 KiB
Diff
35 lines
1.1 KiB
Diff
From 5f0e0758efddef5b06994a76d8c7f0b8a4c1daae Mon Sep 17 00:00:00 2001
|
|
From: Ricardo Ribalda <ricardo.ribalda@gmail.com>
|
|
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 <ricardo.ribalda@gmail.com>
|
|
Acked-by: Marek Vasut <marek.vasut@gmail.com>
|
|
Signed-off-by: Cyrille Pitchen <cyrille.pitchen@atmel.com>
|
|
---
|
|
drivers/mtd/spi-nor/spi-nor.c | 9 ++++++---
|
|
1 file changed, 6 insertions(+), 3 deletions(-)
|
|
|
|
--- 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(st
|
|
*/
|
|
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;
|
|
}
|
|
|
|
/*
|