diff options
| author | Stijn Segers <foss@volatilesystems.org> | 2018-03-22 18:34:08 +0100 |
|---|---|---|
| committer | Hauke Mehrtens <hauke@hauke-m.de> | 2018-03-23 23:49:55 +0100 |
| commit | 41a881a8d9e7dc33b28768a8377ec67a7f8a0aae (patch) | |
| tree | b7c1d5a8a28186b8daee611a48ccc3675da1060c /target/linux/ramips | |
| parent | 4a788fcf63920769be3428d5c61eaa6f09d5291a (diff) | |
| download | upstream-41a881a8d9e7dc33b28768a8377ec67a7f8a0aae.tar.gz upstream-41a881a8d9e7dc33b28768a8377ec67a7f8a0aae.tar.bz2 upstream-41a881a8d9e7dc33b28768a8377ec67a7f8a0aae.zip | |
Kernel: bump 4.14 to 4.14.29
Right patch version this time, sorry!
* Patch 180-usb-xhci-add-support-for-performing-fake-doorbell.patch had to be adjusted slightly because of upstream adapted code.
* Refreshed patches.
Compile-tested: ramips/mt7621, x86/64
Run-tested: ramips/mt7621, x86/64
Signed-off-by: Stijn Segers <foss@volatilesystems.org>
Tested-by: Rosen Penev <rosenp@gmail.com>
Diffstat (limited to 'target/linux/ramips')
4 files changed, 10 insertions, 10 deletions
diff --git a/target/linux/ramips/patches-4.14/0034-NET-multi-phy-support.patch b/target/linux/ramips/patches-4.14/0034-NET-multi-phy-support.patch index 0bcb617ba1..7c2777c467 100644 --- a/target/linux/ramips/patches-4.14/0034-NET-multi-phy-support.patch +++ b/target/linux/ramips/patches-4.14/0034-NET-multi-phy-support.patch @@ -11,7 +11,7 @@ Signed-off-by: John Crispin <blogic@openwrt.org> --- a/drivers/net/phy/phy.c +++ b/drivers/net/phy/phy.c -@@ -984,7 +984,10 @@ void phy_state_machine(struct work_struc +@@ -981,7 +981,10 @@ void phy_state_machine(struct work_struc /* If the link is down, give up on negotiation for now */ if (!phydev->link) { phydev->state = PHY_NOLINK; @@ -23,7 +23,7 @@ Signed-off-by: John Crispin <blogic@openwrt.org> break; } -@@ -1071,7 +1074,10 @@ void phy_state_machine(struct work_struc +@@ -1068,7 +1071,10 @@ void phy_state_machine(struct work_struc phy_link_up(phydev); } else { phydev->state = PHY_NOLINK; @@ -35,7 +35,7 @@ Signed-off-by: John Crispin <blogic@openwrt.org> } if (phy_interrupt_is_valid(phydev)) -@@ -1081,7 +1087,10 @@ void phy_state_machine(struct work_struc +@@ -1078,7 +1084,10 @@ void phy_state_machine(struct work_struc case PHY_HALTED: if (phydev->link) { phydev->link = 0; diff --git a/target/linux/ramips/patches-4.14/0039-mtd-add-mt7621-nand-support.patch b/target/linux/ramips/patches-4.14/0039-mtd-add-mt7621-nand-support.patch index dae115dd13..97e4344665 100644 --- a/target/linux/ramips/patches-4.14/0039-mtd-add-mt7621-nand-support.patch +++ b/target/linux/ramips/patches-4.14/0039-mtd-add-mt7621-nand-support.patch @@ -4138,7 +4138,7 @@ Signed-off-by: John Crispin <blogic@openwrt.org> { struct nand_chip *chip = mtd_to_nand(mtd); -@@ -963,7 +963,7 @@ static void panic_nand_get_device(struct +@@ -968,7 +968,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.14/0040-nand-hack-restore-write_page.patch b/target/linux/ramips/patches-4.14/0040-nand-hack-restore-write_page.patch index 048e60441c..ec2afeaf0e 100644 --- a/target/linux/ramips/patches-4.14/0040-nand-hack-restore-write_page.patch +++ b/target/linux/ramips/patches-4.14/0040-nand-hack-restore-write_page.patch @@ -12,7 +12,7 @@ int (*onfi_get_features)(struct mtd_info *mtd, struct nand_chip *chip, --- a/drivers/mtd/nand/nand_base.c +++ b/drivers/mtd/nand/nand_base.c -@@ -2756,9 +2756,14 @@ static int nand_do_write_ops(struct mtd_ +@@ -2761,9 +2761,14 @@ static int nand_do_write_ops(struct mtd_ memset(chip->oob_poi, 0xff, mtd->oobsize); } @@ -30,7 +30,7 @@ if (ret) break; -@@ -4714,6 +4719,9 @@ int nand_scan_tail(struct mtd_info *mtd) +@@ -4719,6 +4724,9 @@ int nand_scan_tail(struct mtd_info *mtd) } } diff --git a/target/linux/ramips/patches-4.14/0040-nand-hack.patch b/target/linux/ramips/patches-4.14/0040-nand-hack.patch index 7b616eca46..ae6eed933f 100644 --- a/target/linux/ramips/patches-4.14/0040-nand-hack.patch +++ b/target/linux/ramips/patches-4.14/0040-nand-hack.patch @@ -1,6 +1,6 @@ --- a/drivers/mtd/nand/nand_base.c +++ b/drivers/mtd/nand/nand_base.c -@@ -1903,6 +1903,9 @@ static int nand_do_read_ops(struct mtd_i +@@ -1908,6 +1908,9 @@ static int nand_do_read_ops(struct mtd_i __func__, buf); read_retry: @@ -10,7 +10,7 @@ if (nand_standard_page_accessors(&chip->ecc)) chip->cmdfunc(mtd, NAND_CMD_READ0, 0x00, page); -@@ -1922,6 +1925,7 @@ read_retry: +@@ -1927,6 +1930,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 */ -@@ -3079,8 +3083,11 @@ int nand_erase_nand(struct mtd_info *mtd +@@ -3084,8 +3088,11 @@ int nand_erase_nand(struct mtd_info *mtd (page + pages_per_block)) chip->pagebuf = -1; @@ -31,7 +31,7 @@ /* See if block erase succeeded */ if (status & NAND_STATUS_FAIL) { pr_debug("%s: failed erase, page 0x%08x\n", -@@ -4210,6 +4217,7 @@ int nand_scan_ident(struct mtd_info *mtd +@@ -4215,6 +4222,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 */ |