projects
/
librecmc
/
librecmc.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
mvebu: backport upstream ethernet driver improvements and enable buffer manager support
[librecmc/librecmc.git]
/
target
/
linux
/
mvebu
/
patches-4.4
/
022-mtd-pxa3xx_nand-Fix-initial-controller-configuration.patch
diff --git
a/target/linux/mvebu/patches-4.4/022-mtd-pxa3xx_nand-Fix-initial-controller-configuration.patch
b/target/linux/mvebu/patches-4.4/022-mtd-pxa3xx_nand-Fix-initial-controller-configuration.patch
index 260e7dc1bc4b879c45996bb097ff327efac354b4..7d07fb94233c93794dc506544679f3faf39b4596 100644
(file)
--- a/
target/linux/mvebu/patches-4.4/022-mtd-pxa3xx_nand-Fix-initial-controller-configuration.patch
+++ b/
target/linux/mvebu/patches-4.4/022-mtd-pxa3xx_nand-Fix-initial-controller-configuration.patch
@@
-19,7
+19,7
@@
Signed-off-by: Brian Norris <computersforpeace@gmail.com>
--- a/drivers/mtd/nand/pxa3xx_nand.c
+++ b/drivers/mtd/nand/pxa3xx_nand.c
--- a/drivers/mtd/nand/pxa3xx_nand.c
+++ b/drivers/mtd/nand/pxa3xx_nand.c
-@@ -14
19,34 +1419
,43 @@ static int pxa3xx_nand_waitfunc(struct m
+@@ -14
20,34 +1420
,43 @@ static int pxa3xx_nand_waitfunc(struct m
return NAND_STATUS_READY;
}
return NAND_STATUS_READY;
}
@@
-71,7
+71,7
@@
Signed-off-by: Brian Norris <computersforpeace@gmail.com>
info->ndtr0cs0 = nand_readl(info, NDTR0CS0);
info->ndtr1cs0 = nand_readl(info, NDTR1CS0);
return 0;
info->ndtr0cs0 = nand_readl(info, NDTR0CS0);
info->ndtr1cs0 = nand_readl(info, NDTR1CS0);
return 0;
-@@ -163
5,10 +1644
,7 @@ static int pxa3xx_nand_scan(struct mtd_i
+@@ -163
6,10 +1645
,7 @@ static int pxa3xx_nand_scan(struct mtd_i
if (pdata->keep_config && !pxa3xx_nand_detect_config(info))
goto KEEP_CONFIG;
if (pdata->keep_config && !pxa3xx_nand_detect_config(info))
goto KEEP_CONFIG;
@@
-83,7
+83,7
@@
Signed-off-by: Brian Norris <computersforpeace@gmail.com>
if (ret)
return ret;
if (ret)
return ret;
-@@ -165
1,7 +1657
,6 @@ static int pxa3xx_nand_scan(struct mtd_i
+@@ -165
2,7 +1658
,6 @@ static int pxa3xx_nand_scan(struct mtd_i
}
KEEP_CONFIG:
}
KEEP_CONFIG:
@@
-91,7
+91,7
@@
Signed-off-by: Brian Norris <computersforpeace@gmail.com>
if (info->reg_ndcr & NDCR_DWIDTH_M)
chip->options |= NAND_BUSWIDTH_16;
if (info->reg_ndcr & NDCR_DWIDTH_M)
chip->options |= NAND_BUSWIDTH_16;
-@@ -173
6,6 +1741
,10 @@ KEEP_CONFIG:
+@@ -173
7,6 +1742
,10 @@ KEEP_CONFIG:
host->row_addr_cycles = 3;
else
host->row_addr_cycles = 2;
host->row_addr_cycles = 3;
else
host->row_addr_cycles = 2;