aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/sunxi/patches-4.1/121-mtd-print-full-chipid.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/121-mtd-print-full-chipid.patch
parent8e69c9f7ef2e1ca40b33a4a33c76b460c1f62861 (diff)
downloadupstream-6be2305da83471c442dab83366c25be4dfb38793.tar.gz
upstream-6be2305da83471c442dab83366c25be4dfb38793.tar.bz2
upstream-6be2305da83471c442dab83366c25be4dfb38793.zip
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/121-mtd-print-full-chipid.patch')
-rw-r--r--target/linux/sunxi/patches-4.1/121-mtd-print-full-chipid.patch10
1 files changed, 4 insertions, 6 deletions
diff --git a/target/linux/sunxi/patches-4.1/121-mtd-print-full-chipid.patch b/target/linux/sunxi/patches-4.1/121-mtd-print-full-chipid.patch
index 6894cc5a92..3e293a983f 100644
--- a/target/linux/sunxi/patches-4.1/121-mtd-print-full-chipid.patch
+++ b/target/linux/sunxi/patches-4.1/121-mtd-print-full-chipid.patch
@@ -12,11 +12,9 @@ Signed-off-by: Hans de Goede <hdegoede@redhat.com>
drivers/mtd/nand/nand_base.c | 23 ++++++++++++++++++-----
1 file changed, 18 insertions(+), 5 deletions(-)
-diff --git a/drivers/mtd/nand/nand_base.c b/drivers/mtd/nand/nand_base.c
-index 5c6f465..05ec786 100644
--- a/drivers/mtd/nand/nand_base.c
+++ b/drivers/mtd/nand/nand_base.c
-@@ -4247,7 +4247,7 @@ static inline bool is_full_id_nand(struct nand_flash_dev *type)
+@@ -4247,7 +4247,7 @@ static inline bool is_full_id_nand(struc
}
static bool find_full_id_nand(struct mtd_info *mtd, struct nand_chip *chip,
@@ -25,7 +23,7 @@ index 5c6f465..05ec786 100644
{
if (!strncmp(type->id, id_data, type->id_len)) {
mtd->writesize = type->pagesize;
-@@ -4273,6 +4273,21 @@ static bool find_full_id_nand(struct mtd_info *mtd, struct nand_chip *chip,
+@@ -4273,6 +4273,21 @@ static bool find_full_id_nand(struct mtd
}
/*
@@ -47,7 +45,7 @@ index 5c6f465..05ec786 100644
* Get the flash and manufacturer id and lookup if the type is supported.
*/
static struct nand_flash_dev *nand_get_flash_type(struct mtd_info *mtd,
-@@ -4385,8 +4400,7 @@ static struct nand_flash_dev *nand_get_flash_type(struct mtd_info *mtd,
+@@ -4385,8 +4400,7 @@ ident_done:
* Check, if buswidth is correct. Hardware drivers should set
* chip correct!
*/
@@ -57,7 +55,7 @@ index 5c6f465..05ec786 100644
pr_info("%s %s\n", nand_manuf_ids[maf_idx].name, mtd->name);
pr_warn("bus width %d instead %d bit\n",
(chip->options & NAND_BUSWIDTH_16) ? 16 : 8,
-@@ -4424,8 +4438,7 @@ static struct nand_flash_dev *nand_get_flash_type(struct mtd_info *mtd,
+@@ -4424,8 +4438,7 @@ ident_done:
return ERR_PTR(err);
}