projects
/
openwrt
/
staging
/
lynxis.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
kernel: bump 4.14 to 4.14.145
[openwrt/staging/lynxis.git]
/
target
/
linux
/
mediatek
/
patches-4.14
/
0166-mtd-nand-mtk-Support-different-MTK-NAND-flash-contro.patch
diff --git
a/target/linux/mediatek/patches-4.14/0166-mtd-nand-mtk-Support-different-MTK-NAND-flash-contro.patch
b/target/linux/mediatek/patches-4.14/0166-mtd-nand-mtk-Support-different-MTK-NAND-flash-contro.patch
index 437901c9432ee0f09058b8459b4bea1c466da761..63e1dad188893b855669324cb262cfa24932fcb9 100644
(file)
--- a/
target/linux/mediatek/patches-4.14/0166-mtd-nand-mtk-Support-different-MTK-NAND-flash-contro.patch
+++ b/
target/linux/mediatek/patches-4.14/0166-mtd-nand-mtk-Support-different-MTK-NAND-flash-contro.patch
@@
-312,7
+312,7
@@
Signed-off-by: Boris Brezillon <boris.brezillon@free-electrons.com>
nfi_writel(nfc, reg, NFI_CON);
nfi_writew(nfc, STAR_EN, NFI_STRDATA);
nfi_writel(nfc, reg, NFI_CON);
nfi_writew(nfc, STAR_EN, NFI_STRDATA);
-@@ -112
6,9 +1127
,11 @@ static void mtk_nfc_set_fdm(struct mtk_n
+@@ -112
5,9 +1126
,11 @@ static void mtk_nfc_set_fdm(struct mtk_n
{
struct nand_chip *nand = mtd_to_nand(mtd);
struct mtk_nfc_nand_chip *chip = to_mtk_nand(nand);
{
struct nand_chip *nand = mtd_to_nand(mtd);
struct mtk_nfc_nand_chip *chip = to_mtk_nand(nand);
@@
-325,7
+325,7
@@
Signed-off-by: Boris Brezillon <boris.brezillon@free-electrons.com>
fdm->reg_size = chip->spare_per_sector - ecc_bytes;
if (fdm->reg_size > NFI_FDM_MAX_SIZE)
fdm->reg_size = chip->spare_per_sector - ecc_bytes;
if (fdm->reg_size > NFI_FDM_MAX_SIZE)
-@@ -120
8,7 +1211
,8 @@ static int mtk_nfc_ecc_init(struct devic
+@@ -120
7,7 +1210
,8 @@ static int mtk_nfc_ecc_init(struct devic
* this controller only supports 512 and 1024 sizes
*/
if (nand->ecc.size < 1024) {
* this controller only supports 512 and 1024 sizes
*/
if (nand->ecc.size < 1024) {
@@
-335,7
+335,7
@@
Signed-off-by: Boris Brezillon <boris.brezillon@free-electrons.com>
nand->ecc.size = 1024;
nand->ecc.strength <<= 1;
} else {
nand->ecc.size = 1024;
nand->ecc.strength <<= 1;
} else {
-@@ -122
3,7 +1227
,8 @@ static int mtk_nfc_ecc_init(struct devic
+@@ -122
2,7 +1226
,8 @@ static int mtk_nfc_ecc_init(struct devic
return ret;
/* calculate oob bytes except ecc parity data */
return ret;
/* calculate oob bytes except ecc parity data */
@@
-345,7
+345,7
@@
Signed-off-by: Boris Brezillon <boris.brezillon@free-electrons.com>
free = spare - free;
/*
free = spare - free;
/*
-@@ -123
3,10 +1238
,12 @@ static int mtk_nfc_ecc_init(struct devic
+@@ -123
2,10 +1237
,12 @@ static int mtk_nfc_ecc_init(struct devic
*/
if (free > NFI_FDM_MAX_SIZE) {
spare -= NFI_FDM_MAX_SIZE;
*/
if (free > NFI_FDM_MAX_SIZE) {
spare -= NFI_FDM_MAX_SIZE;
@@
-360,7
+360,7
@@
Signed-off-by: Boris Brezillon <boris.brezillon@free-electrons.com>
}
}
}
}
-@@ -138
9,6 +1396
,8 @@ static const struct mtk_nfc_caps mtk_nfc
+@@ -138
8,6 +1395
,8 @@ static const struct mtk_nfc_caps mtk_nfc
.num_spare_size = 16,
.pageformat_spare_shift = 4,
.nfi_clk_div = 1,
.num_spare_size = 16,
.pageformat_spare_shift = 4,
.nfi_clk_div = 1,
@@
-369,7
+369,7
@@
Signed-off-by: Boris Brezillon <boris.brezillon@free-electrons.com>
};
static const struct mtk_nfc_caps mtk_nfc_caps_mt2712 = {
};
static const struct mtk_nfc_caps mtk_nfc_caps_mt2712 = {
-@@ -139
6,6 +1405
,8 @@ static const struct mtk_nfc_caps mtk_nfc
+@@ -139
5,6 +1404
,8 @@ static const struct mtk_nfc_caps mtk_nfc
.num_spare_size = 19,
.pageformat_spare_shift = 16,
.nfi_clk_div = 2,
.num_spare_size = 19,
.pageformat_spare_shift = 16,
.nfi_clk_div = 2,