kernel: update 4.4 to 4.4.88
Refresh patches. Compile & run tested: ar71xx Archer C7 v2 Signed-off-by: Kevin Darbyshire-Bryant <ldir@darbyshire-bryant.me.uk>
This commit is contained in:
parent
ae57675bba
commit
820101873d
3 changed files with 22 additions and 22 deletions
|
@ -3,11 +3,11 @@
|
|||
LINUX_RELEASE?=1
|
||||
|
||||
LINUX_VERSION-3.18 = .43
|
||||
LINUX_VERSION-4.4 = .87
|
||||
LINUX_VERSION-4.4 = .88
|
||||
LINUX_VERSION-4.9 = .49
|
||||
|
||||
LINUX_KERNEL_HASH-3.18.43 = 1236e8123a6ce537d5029232560966feed054ae31776fe8481dd7d18cdd5492c
|
||||
LINUX_KERNEL_HASH-4.4.87 = 1ab05222c3c55e062c3f7418976137ee529f92174261ccb0cd5a7d3370ff6f5b
|
||||
LINUX_KERNEL_HASH-4.4.88 = 144fe8dd773ec317fa06109b8d7bd04141bf1941daa03799fb4f437bbbb919b4
|
||||
LINUX_KERNEL_HASH-4.9.49 = 57ecdcf180b56356b2e15264ca567a8fcd9eec993fc70286bec3bd0005e791fb
|
||||
|
||||
ifdef KERNEL_PATCHVER
|
||||
|
|
|
@ -86,7 +86,7 @@
|
|||
|
||||
--- a/drivers/net/phy/ar8216.c
|
||||
+++ b/drivers/net/phy/ar8216.c
|
||||
@@ -183,7 +183,7 @@ ar8xxx_phy_check_aneg(struct phy_device
|
||||
@@ -177,7 +177,7 @@ ar8xxx_phy_check_aneg(struct phy_device
|
||||
if (ret & BMCR_ANENABLE)
|
||||
return 0;
|
||||
|
||||
|
@ -95,7 +95,7 @@
|
|||
ret |= BMCR_ANENABLE | BMCR_ANRESTART;
|
||||
return phy_write(phydev, MII_BMCR, ret);
|
||||
}
|
||||
@@ -2054,7 +2054,7 @@ ar8xxx_phy_config_init(struct phy_device
|
||||
@@ -2007,7 +2007,7 @@ ar8xxx_phy_config_init(struct phy_device
|
||||
|
||||
priv->phy = phydev;
|
||||
|
||||
|
@ -104,7 +104,7 @@
|
|||
if (chip_is_ar8316(priv)) {
|
||||
/* switch device has been initialized, reinit */
|
||||
priv->dev.ports = (AR8216_NUM_PORTS - 1);
|
||||
@@ -2102,7 +2102,7 @@ ar8xxx_check_link_states(struct ar8xxx_p
|
||||
@@ -2055,7 +2055,7 @@ ar8xxx_check_link_states(struct ar8xxx_p
|
||||
/* flush ARL entries for this port if it went down*/
|
||||
if (!link_new)
|
||||
priv->chip->atu_flush_port(priv, i);
|
||||
|
@ -113,7 +113,7 @@
|
|||
i, link_new ? "up" : "down");
|
||||
}
|
||||
|
||||
@@ -2121,10 +2121,10 @@ ar8xxx_phy_read_status(struct phy_device
|
||||
@@ -2074,10 +2074,10 @@ ar8xxx_phy_read_status(struct phy_device
|
||||
if (phydev->state == PHY_CHANGELINK)
|
||||
ar8xxx_check_link_states(priv);
|
||||
|
||||
|
@ -126,7 +126,7 @@
|
|||
phydev->link = !!link.link;
|
||||
if (!phydev->link)
|
||||
return 0;
|
||||
@@ -2154,7 +2154,7 @@ ar8xxx_phy_read_status(struct phy_device
|
||||
@@ -2107,7 +2107,7 @@ ar8xxx_phy_read_status(struct phy_device
|
||||
static int
|
||||
ar8xxx_phy_config_aneg(struct phy_device *phydev)
|
||||
{
|
||||
|
@ -135,7 +135,7 @@
|
|||
return 0;
|
||||
|
||||
return genphy_config_aneg(phydev);
|
||||
@@ -2209,15 +2209,15 @@ ar8xxx_phy_probe(struct phy_device *phyd
|
||||
@@ -2162,15 +2162,15 @@ ar8xxx_phy_probe(struct phy_device *phyd
|
||||
int ret;
|
||||
|
||||
/* skip PHYs at unused adresses */
|
||||
|
@ -154,7 +154,7 @@
|
|||
goto found;
|
||||
|
||||
priv = ar8xxx_create();
|
||||
@@ -2226,7 +2226,7 @@ ar8xxx_phy_probe(struct phy_device *phyd
|
||||
@@ -2179,7 +2179,7 @@ ar8xxx_phy_probe(struct phy_device *phyd
|
||||
goto unlock;
|
||||
}
|
||||
|
||||
|
@ -163,7 +163,7 @@
|
|||
|
||||
ret = ar8xxx_probe_switch(priv);
|
||||
if (ret)
|
||||
@@ -2247,7 +2247,7 @@ ar8xxx_phy_probe(struct phy_device *phyd
|
||||
@@ -2200,7 +2200,7 @@ ar8xxx_phy_probe(struct phy_device *phyd
|
||||
found:
|
||||
priv->use_count++;
|
||||
|
||||
|
@ -172,7 +172,7 @@
|
|||
if (ar8xxx_has_gige(priv)) {
|
||||
phydev->supported = SUPPORTED_1000baseT_Full;
|
||||
phydev->advertising = ADVERTISED_1000baseT_Full;
|
||||
@@ -2335,21 +2335,33 @@ ar8xxx_phy_soft_reset(struct phy_device
|
||||
@@ -2288,21 +2288,33 @@ ar8xxx_phy_soft_reset(struct phy_device
|
||||
return 0;
|
||||
}
|
||||
|
||||
|
@ -464,7 +464,7 @@
|
|||
module_init(psb6970_init);
|
||||
--- a/drivers/net/phy/rtl8306.c
|
||||
+++ b/drivers/net/phy/rtl8306.c
|
||||
@@ -872,7 +872,7 @@ rtl8306_config_init(struct phy_device *p
|
||||
@@ -876,7 +876,7 @@ rtl8306_config_init(struct phy_device *p
|
||||
int err;
|
||||
|
||||
/* Only init the switch for the primary PHY */
|
||||
|
@ -473,7 +473,7 @@
|
|||
return 0;
|
||||
|
||||
val.value.i = 1;
|
||||
@@ -882,7 +882,7 @@ rtl8306_config_init(struct phy_device *p
|
||||
@@ -886,7 +886,7 @@ rtl8306_config_init(struct phy_device *p
|
||||
priv->dev.ops = &rtl8306_ops;
|
||||
priv->do_cpu = 0;
|
||||
priv->page = -1;
|
||||
|
@ -482,7 +482,7 @@
|
|||
|
||||
chipid = rtl_get(dev, RTL_REG_CHIPID);
|
||||
chipver = rtl_get(dev, RTL_REG_CHIPVER);
|
||||
@@ -928,13 +928,13 @@ rtl8306_fixup(struct phy_device *pdev)
|
||||
@@ -932,13 +932,13 @@ rtl8306_fixup(struct phy_device *pdev)
|
||||
u16 chipid;
|
||||
|
||||
/* Attach to primary LAN port and WAN port */
|
||||
|
@ -498,7 +498,7 @@
|
|||
chipid = rtl_get(&priv.dev, RTL_REG_CHIPID);
|
||||
if (chipid == 0x5988)
|
||||
pdev->phy_id = RTL8306_MAGIC;
|
||||
@@ -952,14 +952,14 @@ rtl8306_probe(struct phy_device *pdev)
|
||||
@@ -956,14 +956,14 @@ rtl8306_probe(struct phy_device *pdev)
|
||||
* share one rtl_priv instance between virtual phy
|
||||
* devices on the same bus
|
||||
*/
|
||||
|
@ -515,7 +515,7 @@
|
|||
|
||||
found:
|
||||
pdev->priv = priv;
|
||||
@@ -980,7 +980,7 @@ rtl8306_config_aneg(struct phy_device *p
|
||||
@@ -984,7 +984,7 @@ rtl8306_config_aneg(struct phy_device *p
|
||||
struct rtl_priv *priv = pdev->priv;
|
||||
|
||||
/* Only for WAN */
|
||||
|
@ -524,7 +524,7 @@
|
|||
return 0;
|
||||
|
||||
/* Restart autonegotiation */
|
||||
@@ -996,7 +996,7 @@ rtl8306_read_status(struct phy_device *p
|
||||
@@ -1000,7 +1000,7 @@ rtl8306_read_status(struct phy_device *p
|
||||
struct rtl_priv *priv = pdev->priv;
|
||||
struct switch_dev *dev = &priv->dev;
|
||||
|
||||
|
@ -533,7 +533,7 @@
|
|||
/* WAN */
|
||||
pdev->speed = rtl_get(dev, RTL_PORT_REG(4, SPEED)) ? SPEED_100 : SPEED_10;
|
||||
pdev->duplex = rtl_get(dev, RTL_PORT_REG(4, DUPLEX)) ? DUPLEX_FULL : DUPLEX_HALF;
|
||||
@@ -1037,6 +1037,7 @@ static struct phy_driver rtl8306_driver
|
||||
@@ -1041,6 +1041,7 @@ static struct phy_driver rtl8306_driver
|
||||
.config_init = &rtl8306_config_init,
|
||||
.config_aneg = &rtl8306_config_aneg,
|
||||
.read_status = &rtl8306_read_status,
|
||||
|
@ -541,7 +541,7 @@
|
|||
};
|
||||
|
||||
|
||||
@@ -1044,7 +1045,7 @@ static int __init
|
||||
@@ -1048,7 +1049,7 @@ static int __init
|
||||
rtl_init(void)
|
||||
{
|
||||
phy_register_fixup_for_id(PHY_ANY_ID, rtl8306_fixup);
|
||||
|
|
|
@ -10,7 +10,7 @@
|
|||
static struct amd_chipset_info {
|
||||
struct pci_dev *nb_dev;
|
||||
struct pci_dev *smbus_dev;
|
||||
@@ -457,6 +459,10 @@ void usb_amd_dev_put(void)
|
||||
@@ -458,6 +460,10 @@ void usb_amd_dev_put(void)
|
||||
}
|
||||
EXPORT_SYMBOL_GPL(usb_amd_dev_put);
|
||||
|
||||
|
@ -21,7 +21,7 @@
|
|||
/*
|
||||
* Make sure the controller is completely inactive, unable to
|
||||
* generate interrupts or do DMA.
|
||||
@@ -536,8 +542,17 @@ reset_needed:
|
||||
@@ -537,8 +543,17 @@ reset_needed:
|
||||
uhci_reset_hc(pdev, base);
|
||||
return 1;
|
||||
}
|
||||
|
@ -39,7 +39,7 @@
|
|||
static inline int io_type_enabled(struct pci_dev *pdev, unsigned int mask)
|
||||
{
|
||||
u16 cmd;
|
||||
@@ -1102,3 +1117,4 @@ static void quirk_usb_early_handoff(stru
|
||||
@@ -1103,3 +1118,4 @@ static void quirk_usb_early_handoff(stru
|
||||
}
|
||||
DECLARE_PCI_FIXUP_CLASS_FINAL(PCI_ANY_ID, PCI_ANY_ID,
|
||||
PCI_CLASS_SERIAL_USB, 8, quirk_usb_early_handoff);
|
||||
|
|
Loading…
Reference in a new issue