From aed03d5d0f304cc85a8ccb4ef98684703fc027af Mon Sep 17 00:00:00 2001 From: Hauke Mehrtens Date: Fri, 30 Mar 2018 20:41:02 +0200 Subject: kernel: update kernel 4.9 to version 4.9.91 * Refreshed patches. * Deleted 210-Revert-led-core-Fix-brightness-setting-when-setting-.patch (was accepted upstream) * Deleted 812-pci-dwc-fix-enumeration.patch (was accepted upstream) Compile and run tested on lantiq Signed-off-by: Hauke Mehrtens --- .../linux/ramips/patches-4.9/0032-USB-dwc2-add-device_reset.patch | 2 +- .../ramips/patches-4.9/0039-mtd-add-mt7621-nand-support.patch | 2 +- target/linux/ramips/patches-4.9/0040-nand-hack.patch | 8 ++++---- target/linux/ramips/patches-4.9/0901-spansion_nand_id_fix.patch | 4 ++-- 4 files changed, 8 insertions(+), 8 deletions(-) (limited to 'target/linux/ramips/patches-4.9') diff --git a/target/linux/ramips/patches-4.9/0032-USB-dwc2-add-device_reset.patch b/target/linux/ramips/patches-4.9/0032-USB-dwc2-add-device_reset.patch index efb3b802d2..6f7bffc65f 100644 --- a/target/linux/ramips/patches-4.9/0032-USB-dwc2-add-device_reset.patch +++ b/target/linux/ramips/patches-4.9/0032-USB-dwc2-add-device_reset.patch @@ -18,7 +18,7 @@ Signed-off-by: John Crispin #include #include -@@ -4982,6 +4983,8 @@ int dwc2_hcd_init(struct dwc2_hsotg *hso +@@ -4983,6 +4984,8 @@ int dwc2_hcd_init(struct dwc2_hsotg *hso retval = -ENOMEM; diff --git a/target/linux/ramips/patches-4.9/0039-mtd-add-mt7621-nand-support.patch b/target/linux/ramips/patches-4.9/0039-mtd-add-mt7621-nand-support.patch index f5b1d82347..9239581cd7 100644 --- a/target/linux/ramips/patches-4.9/0039-mtd-add-mt7621-nand-support.patch +++ b/target/linux/ramips/patches-4.9/0039-mtd-add-mt7621-nand-support.patch @@ -4137,7 +4137,7 @@ Signed-off-by: John Crispin { struct nand_chip *chip = mtd_to_nand(mtd); -@@ -921,7 +921,7 @@ static void panic_nand_get_device(struct +@@ -926,7 +926,7 @@ static void panic_nand_get_device(struct * * Get the device and lock it for exclusive access */ diff --git a/target/linux/ramips/patches-4.9/0040-nand-hack.patch b/target/linux/ramips/patches-4.9/0040-nand-hack.patch index 5bc00b16b5..c3e358cd0b 100644 --- a/target/linux/ramips/patches-4.9/0040-nand-hack.patch +++ b/target/linux/ramips/patches-4.9/0040-nand-hack.patch @@ -1,6 +1,6 @@ --- a/drivers/mtd/nand/nand_base.c +++ b/drivers/mtd/nand/nand_base.c -@@ -2022,6 +2022,9 @@ static int nand_do_read_ops(struct mtd_i +@@ -2027,6 +2027,9 @@ static int nand_do_read_ops(struct mtd_i __func__, buf); read_retry: @@ -10,7 +10,7 @@ chip->cmdfunc(mtd, NAND_CMD_READ0, 0x00, page); /* -@@ -2040,6 +2043,7 @@ read_retry: +@@ -2045,6 +2048,7 @@ read_retry: else ret = chip->ecc.read_page(mtd, chip, bufpoi, oob_required, page); @@ -18,7 +18,7 @@ if (ret < 0) { if (use_bufpoi) /* Invalidate page cache */ -@@ -3209,8 +3213,11 @@ int nand_erase_nand(struct mtd_info *mtd +@@ -3214,8 +3218,11 @@ int nand_erase_nand(struct mtd_info *mtd (page + pages_per_block)) chip->pagebuf = -1; @@ -31,7 +31,7 @@ /* * See if operation failed and additional status checks are * available -@@ -4404,6 +4411,7 @@ int nand_scan_ident(struct mtd_info *mtd +@@ -4409,6 +4416,7 @@ int nand_scan_ident(struct mtd_info *mtd * cmdfunc() both expect cmd_ctrl() to be populated, * so we need to check that that's the case */ diff --git a/target/linux/ramips/patches-4.9/0901-spansion_nand_id_fix.patch b/target/linux/ramips/patches-4.9/0901-spansion_nand_id_fix.patch index fa5b1274ef..d57e65c56c 100644 --- a/target/linux/ramips/patches-4.9/0901-spansion_nand_id_fix.patch +++ b/target/linux/ramips/patches-4.9/0901-spansion_nand_id_fix.patch @@ -13,7 +13,7 @@ Signed-off-by: Nikolay Martynov --- a/drivers/mtd/nand/nand_base.c +++ b/drivers/mtd/nand/nand_base.c -@@ -3856,6 +3856,7 @@ static void nand_decode_ext_id(struct mt +@@ -3861,6 +3861,7 @@ static void nand_decode_ext_id(struct mt /* * Field definitions are in the following datasheets: * Old style (4,5 byte ID): Samsung K9GAG08U0M (p.32) @@ -21,7 +21,7 @@ Signed-off-by: Nikolay Martynov * New Samsung (6 byte ID): Samsung K9GAG08U0F (p.44) * Hynix MLC (6 byte ID): Hynix H27UBG8T2B (p.22) * -@@ -3953,6 +3954,19 @@ static void nand_decode_ext_id(struct mt +@@ -3958,6 +3959,19 @@ static void nand_decode_ext_id(struct mt *busw = (extid & 0x01) ? NAND_BUSWIDTH_16 : 0; /* -- cgit v1.2.3