diff options
author | Rafał Miłecki <rafal@milecki.pl> | 2017-02-07 13:09:50 +0100 |
---|---|---|
committer | Rafał Miłecki <rafal@milecki.pl> | 2017-02-07 15:35:39 +0100 |
commit | 174ce4c56d742712696e546eecee3d89e05c909a (patch) | |
tree | be0159e023e7ffe3c922ec183496768a0f2e4db9 /target/linux/generic/patches-4.9/062-v4.11-0007-mtd-spi-nor-Fix-S3AN-addressing-calculation.patch | |
parent | 6d5419d96ad7d6f2b6de112e8f8ba1f74ceb33d3 (diff) | |
download | upstream-174ce4c56d742712696e546eecee3d89e05c909a.tar.gz upstream-174ce4c56d742712696e546eecee3d89e05c909a.tar.bz2 upstream-174ce4c56d742712696e546eecee3d89e05c909a.zip |
kernel: update spi-nor in 4.9 to spi-nor tree version (next branch)
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>
Diffstat (limited to 'target/linux/generic/patches-4.9/062-v4.11-0007-mtd-spi-nor-Fix-S3AN-addressing-calculation.patch')
-rw-r--r-- | target/linux/generic/patches-4.9/062-v4.11-0007-mtd-spi-nor-Fix-S3AN-addressing-calculation.patch | 35 |
1 files changed, 35 insertions, 0 deletions
diff --git a/target/linux/generic/patches-4.9/062-v4.11-0007-mtd-spi-nor-Fix-S3AN-addressing-calculation.patch b/target/linux/generic/patches-4.9/062-v4.11-0007-mtd-spi-nor-Fix-S3AN-addressing-calculation.patch new file mode 100644 index 0000000000..f8d0541428 --- /dev/null +++ b/target/linux/generic/patches-4.9/062-v4.11-0007-mtd-spi-nor-Fix-S3AN-addressing-calculation.patch @@ -0,0 +1,35 @@ +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; + } + + /* |