kernel: bump 4.9 to 4.9.125
Refreshed all patches. Compile-tested on: ar71xx Runtime-tested on: ar71xx Signed-off-by: Koen Vandeputte <koen.vandeputte@ncentric.com>
This commit is contained in:
		@@ -2,11 +2,11 @@
 | 
			
		||||
 | 
			
		||||
LINUX_RELEASE?=1
 | 
			
		||||
 | 
			
		||||
LINUX_VERSION-4.9 = .124
 | 
			
		||||
LINUX_VERSION-4.14 = .67
 | 
			
		||||
LINUX_VERSION-4.9 = .125
 | 
			
		||||
 | 
			
		||||
LINUX_KERNEL_HASH-4.9.124 = 5ca6b0d48c8dd1265005169f1b97149a4e893668c0d8aa566a73c7663c8e4311
 | 
			
		||||
LINUX_KERNEL_HASH-4.14.67 = 3f4b056dc27233a78f7a4a35ed6fdcfd0a9680ec40b611a898bb6c8b905070ba
 | 
			
		||||
LINUX_KERNEL_HASH-4.9.125 = a764deef61bebfac1d07b2ed6890f93a12a9ab6d3fc3c53e3d850ed4681111cb
 | 
			
		||||
 | 
			
		||||
remove_uri_prefix=$(subst git://,,$(subst http://,,$(subst https://,,$(1))))
 | 
			
		||||
sanitize_uri=$(call qstrip,$(subst @,_,$(subst :,_,$(subst .,_,$(subst -,_,$(subst /,_,$(1)))))))
 | 
			
		||||
 
 | 
			
		||||
@@ -1,8 +1,6 @@
 | 
			
		||||
Index: linux-4.9.111/drivers/net/phy/at803x.c
 | 
			
		||||
===================================================================
 | 
			
		||||
--- linux-4.9.111.orig/drivers/net/phy/at803x.c
 | 
			
		||||
+++ linux-4.9.111/drivers/net/phy/at803x.c
 | 
			
		||||
@@ -461,12 +461,15 @@ static void at803x_link_change_notify(st
 | 
			
		||||
--- a/drivers/net/phy/at803x.c
 | 
			
		||||
+++ b/drivers/net/phy/at803x.c
 | 
			
		||||
@@ -460,12 +460,15 @@ static void at803x_link_change_notify(st
 | 
			
		||||
 
 | 
			
		||||
 static int at803x_aneg_done(struct phy_device *phydev)
 | 
			
		||||
 {
 | 
			
		||||
@@ -18,7 +16,7 @@ Index: linux-4.9.111/drivers/net/phy/at803x.c
 | 
			
		||||
 	/*
 | 
			
		||||
 	 * in SGMII mode, if copper side autoneg is successful,
 | 
			
		||||
 	 * also check SGMII side autoneg result
 | 
			
		||||
@@ -481,7 +484,8 @@ static int at803x_aneg_done(struct phy_d
 | 
			
		||||
@@ -480,7 +483,8 @@ static int at803x_aneg_done(struct phy_d
 | 
			
		||||
 	/* check if the SGMII link is OK. */
 | 
			
		||||
 	if (!(phy_read(phydev, AT803X_PSSR) & AT803X_PSSR_MR_AN_COMPLETE)) {
 | 
			
		||||
 		pr_warn("803x_aneg_done: SGMII link is not ok\n");
 | 
			
		||||
@@ -28,10 +26,8 @@ Index: linux-4.9.111/drivers/net/phy/at803x.c
 | 
			
		||||
 	}
 | 
			
		||||
 	/* switch back to copper page */
 | 
			
		||||
 	phy_write(phydev, AT803X_REG_CHIP_CONFIG, ccr | AT803X_BT_BX_REG_SEL);
 | 
			
		||||
Index: linux-4.9.111/include/linux/platform_data/phy-at803x.h
 | 
			
		||||
===================================================================
 | 
			
		||||
--- linux-4.9.111.orig/include/linux/platform_data/phy-at803x.h
 | 
			
		||||
+++ linux-4.9.111/include/linux/platform_data/phy-at803x.h
 | 
			
		||||
--- a/include/linux/platform_data/phy-at803x.h
 | 
			
		||||
+++ b/include/linux/platform_data/phy-at803x.h
 | 
			
		||||
@@ -7,6 +7,7 @@ struct at803x_platform_data {
 | 
			
		||||
 	int enable_rgmii_rx_delay:1;
 | 
			
		||||
 	int fixup_rgmii_tx_delay:1;
 | 
			
		||||
 
 | 
			
		||||
@@ -1,7 +1,5 @@
 | 
			
		||||
Index: linux-4.9.111/arch/mips/include/asm/mach-ath79/ar71xx_regs.h
 | 
			
		||||
===================================================================
 | 
			
		||||
--- linux-4.9.111.orig/arch/mips/include/asm/mach-ath79/ar71xx_regs.h
 | 
			
		||||
+++ linux-4.9.111/arch/mips/include/asm/mach-ath79/ar71xx_regs.h
 | 
			
		||||
--- a/arch/mips/include/asm/mach-ath79/ar71xx_regs.h
 | 
			
		||||
+++ b/arch/mips/include/asm/mach-ath79/ar71xx_regs.h
 | 
			
		||||
@@ -134,7 +134,7 @@
 | 
			
		||||
 #define QCA955X_PCI_CTRL_SIZE	0x100
 | 
			
		||||
 
 | 
			
		||||
 
 | 
			
		||||
@@ -8,7 +8,7 @@
 | 
			
		||||
 #include <asm/bootinfo.h>
 | 
			
		||||
 #include <asm/idle.h>
 | 
			
		||||
 #include <asm/prom.h>
 | 
			
		||||
@@ -231,6 +232,33 @@ static struct fixed_phy_status bcm47xx_f
 | 
			
		||||
@@ -225,6 +226,33 @@ static struct fixed_phy_status bcm47xx_f
 | 
			
		||||
 	.duplex	= DUPLEX_FULL,
 | 
			
		||||
 };
 | 
			
		||||
 
 | 
			
		||||
@@ -42,7 +42,7 @@
 | 
			
		||||
 static int __init bcm47xx_register_bus_complete(void)
 | 
			
		||||
 {
 | 
			
		||||
 	switch (bcm47xx_bus_type) {
 | 
			
		||||
@@ -250,6 +278,7 @@ static int __init bcm47xx_register_bus_c
 | 
			
		||||
@@ -244,6 +272,7 @@ static int __init bcm47xx_register_bus_c
 | 
			
		||||
 	bcm47xx_workarounds();
 | 
			
		||||
 
 | 
			
		||||
 	fixed_phy_add(PHY_POLL, 0, &bcm47xx_fixed_phy_status, -1);
 | 
			
		||||
 
 | 
			
		||||
@@ -302,7 +302,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
 | 
			
		||||
 	if (alx->flags & ALX_FLAG_USING_MSIX) {
 | 
			
		||||
--- a/drivers/net/ethernet/atheros/atl1c/atl1c_main.c
 | 
			
		||||
+++ b/drivers/net/ethernet/atheros/atl1c/atl1c_main.c
 | 
			
		||||
@@ -1885,7 +1885,7 @@ static int atl1c_clean(struct napi_struc
 | 
			
		||||
@@ -1886,7 +1886,7 @@ static int atl1c_clean(struct napi_struc
 | 
			
		||||
 
 | 
			
		||||
 	if (work_done < budget) {
 | 
			
		||||
 quit_polling:
 | 
			
		||||
 
 | 
			
		||||
@@ -1658,7 +1658,7 @@ Signed-off-by: Yangbo Lu <yangbo.lu@nxp.com>
 | 
			
		||||
 			return IRQ_HANDLED;
 | 
			
		||||
 		}
 | 
			
		||||
 	}
 | 
			
		||||
@@ -923,12 +932,32 @@ int usb_otg_start(struct platform_device
 | 
			
		||||
@@ -925,12 +934,32 @@ int usb_otg_start(struct platform_device
 | 
			
		||||
 	temp &= ~(PORTSC_PHY_TYPE_SEL | PORTSC_PTW);
 | 
			
		||||
 	switch (pdata->phy_mode) {
 | 
			
		||||
 	case FSL_USB2_PHY_ULPI:
 | 
			
		||||
 
 | 
			
		||||
		Reference in New Issue
	
	Block a user