summaryrefslogtreecommitdiff
path: root/target/linux/sunxi/patches-4.1/128-2-mtd-nand-support-non-ONFI-timings.patch
diff options
context:
space:
mode:
authorJonas Gorski <jogo@openwrt.org>2015-08-14 13:06:33 +0000
committerJonas Gorski <jogo@openwrt.org>2015-08-14 13:06:33 +0000
commit6be2305da83471c442dab83366c25be4dfb38793 (patch)
tree30cfe6f3fc964dca1936646468c87367b509e929 /target/linux/sunxi/patches-4.1/128-2-mtd-nand-support-non-ONFI-timings.patch
parent8e69c9f7ef2e1ca40b33a4a33c76b460c1f62861 (diff)
downloadmtk-20170518-6be2305da83471c442dab83366c25be4dfb38793.zip
mtk-20170518-6be2305da83471c442dab83366c25be4dfb38793.tar.gz
mtk-20170518-6be2305da83471c442dab83366c25be4dfb38793.tar.bz2
kernel: update 4.1 to 4.1.5
Changelog: * https://www.kernel.org/pub/linux/kernel/v4.x/ChangeLog-4.1.5 Signed-off-by: Jonas Gorski <jogo@openwrt.org> SVN-Revision: 46598
Diffstat (limited to 'target/linux/sunxi/patches-4.1/128-2-mtd-nand-support-non-ONFI-timings.patch')
-rw-r--r--target/linux/sunxi/patches-4.1/128-2-mtd-nand-support-non-ONFI-timings.patch8
1 files changed, 2 insertions, 6 deletions
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 d7a3963..03c7f26 100644
--- 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
-@@ -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);
@@ -18,11 +16,9 @@ index f561c68..8e636df 100644
*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
-@@ -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;