projects
/
openwrt
/
staging
/
chunkeey.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
kernel: update 4.1 to 4.1.5
[openwrt/staging/chunkeey.git]
/
target
/
linux
/
sunxi
/
patches-4.1
/
128-2-mtd-nand-support-non-ONFI-timings.patch
diff --git
a/target/linux/sunxi/patches-4.1/128-2-mtd-nand-support-non-ONFI-timings.patch
b/target/linux/sunxi/patches-4.1/128-2-mtd-nand-support-non-ONFI-timings.patch
index d7a396396fef97957a2e19fab4039558e1e660dd..03c7f265d267e03f5b097ab9a0f9e54afd1b957a 100644
(file)
--- a/
target/linux/sunxi/patches-4.1/128-2-mtd-nand-support-non-ONFI-timings.patch
+++ b/
target/linux/sunxi/patches-4.1/128-2-mtd-nand-support-non-ONFI-timings.patch
@@
-1,8
+1,6
@@
-diff --git a/drivers/mtd/nand/nand_base.c b/drivers/mtd/nand/nand_base.c
-index f561c68..8e636df 100644
--- a/drivers/mtd/nand/nand_base.c
+++ b/drivers/mtd/nand/nand_base.c
--- a/drivers/mtd/nand/nand_base.c
+++ b/drivers/mtd/nand/nand_base.c
-@@ -
3624,8 +3624,13 @@ static bool find_full_id_nand(struct mtd_info *mtd, struct nand_chip *chip,
+@@ -
4262,8 +4262,13 @@ static bool find_full_id_nand(struct mtd
chip->ecc_strength_ds = NAND_ECC_STRENGTH(type);
chip->ecc_step_ds = NAND_ECC_STEP(type);
chip->ecc_strength_ds = NAND_ECC_STRENGTH(type);
chip->ecc_step_ds = NAND_ECC_STEP(type);
@@
-18,11
+16,9
@@
index f561c68..8e636df 100644
*busw = type->options & NAND_BUSWIDTH_16;
*busw = type->options & NAND_BUSWIDTH_16;
-diff --git a/include/linux/mtd/nand.h b/include/linux/mtd/nand.h
-index 2eb92a3..7d9e599 100644
--- a/include/linux/mtd/nand.h
+++ b/include/linux/mtd/nand.h
--- a/include/linux/mtd/nand.h
+++ b/include/linux/mtd/nand.h
-@@ -
863,6 +863
,7 @@ struct nand_flash_dev {
+@@ -
988,6 +988
,7 @@ struct nand_flash_dev {
uint16_t step_ds;
} ecc;
int onfi_timing_mode_default;
uint16_t step_ds;
} ecc;
int onfi_timing_mode_default;