aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/mvebu/patches-3.18/019-mtd-nand-pxa3xx-Fix-PIO-FIFO-draining.patch
diff options
context:
space:
mode:
authorImre Kaloz <kaloz@openwrt.org>2015-02-16 12:48:05 +0000
committerImre Kaloz <kaloz@openwrt.org>2015-02-16 12:48:05 +0000
commit29130d39e3f002b684d4fdbcb3dff4ecc202be2c (patch)
tree481f328f8e8475fbd2b56a0a375da99e187d1cb9 /target/linux/mvebu/patches-3.18/019-mtd-nand-pxa3xx-Fix-PIO-FIFO-draining.patch
parent00d422fc600232d02f70877305288501d15ed07d (diff)
downloadupstream-29130d39e3f002b684d4fdbcb3dff4ecc202be2c.tar.gz
upstream-29130d39e3f002b684d4fdbcb3dff4ecc202be2c.tar.bz2
upstream-29130d39e3f002b684d4fdbcb3dff4ecc202be2c.zip
mvebu: refresh 3.18 patches
Signed-off-by: Imre Kaloz <kaloz@openwrt.org> SVN-Revision: 44462
Diffstat (limited to 'target/linux/mvebu/patches-3.18/019-mtd-nand-pxa3xx-Fix-PIO-FIFO-draining.patch')
-rw-r--r--target/linux/mvebu/patches-3.18/019-mtd-nand-pxa3xx-Fix-PIO-FIFO-draining.patch9
1 files changed, 2 insertions, 7 deletions
diff --git a/target/linux/mvebu/patches-3.18/019-mtd-nand-pxa3xx-Fix-PIO-FIFO-draining.patch b/target/linux/mvebu/patches-3.18/019-mtd-nand-pxa3xx-Fix-PIO-FIFO-draining.patch
index bf2006927e..a841f5eadd 100644
--- a/target/linux/mvebu/patches-3.18/019-mtd-nand-pxa3xx-Fix-PIO-FIFO-draining.patch
+++ b/target/linux/mvebu/patches-3.18/019-mtd-nand-pxa3xx-Fix-PIO-FIFO-draining.patch
@@ -20,8 +20,6 @@ Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com>
drivers/mtd/nand/pxa3xx_nand.c | 45 ++++++++++++++++++++++++++++++++++++------
1 file changed, 39 insertions(+), 6 deletions(-)
-diff --git a/drivers/mtd/nand/pxa3xx_nand.c b/drivers/mtd/nand/pxa3xx_nand.c
-index 96b0b1d27df1..e6918befb951 100644
--- a/drivers/mtd/nand/pxa3xx_nand.c
+++ b/drivers/mtd/nand/pxa3xx_nand.c
@@ -23,6 +23,7 @@
@@ -32,7 +30,7 @@ index 96b0b1d27df1..e6918befb951 100644
#include <linux/slab.h>
#include <linux/of.h>
#include <linux/of_device.h>
-@@ -480,6 +481,38 @@ static void disable_int(struct pxa3xx_nand_info *info, uint32_t int_mask)
+@@ -480,6 +481,38 @@ static void disable_int(struct pxa3xx_na
nand_writel(info, NDCR, ndcr | int_mask);
}
@@ -71,7 +69,7 @@ index 96b0b1d27df1..e6918befb951 100644
static void handle_data_pio(struct pxa3xx_nand_info *info)
{
unsigned int do_bytes = min(info->data_size, info->chunk_size);
-@@ -496,14 +529,14 @@ static void handle_data_pio(struct pxa3xx_nand_info *info)
+@@ -496,14 +529,14 @@ static void handle_data_pio(struct pxa3x
DIV_ROUND_UP(info->oob_size, 4));
break;
case STATE_PIO_READING:
@@ -92,6 +90,3 @@ index 96b0b1d27df1..e6918befb951 100644
break;
default:
dev_err(&info->pdev->dev, "%s: invalid state %d\n", __func__,
---
-2.2.2
-