diff options
author | Koen Vandeputte <koen.vandeputte@ncentric.com> | 2017-07-12 22:59:03 +0200 |
---|---|---|
committer | Hauke Mehrtens <hauke@hauke-m.de> | 2017-07-15 00:13:05 +0200 |
commit | cd54b2d42b39da8a7704b67c878eaec720df2cc9 (patch) | |
tree | c26babb22b0799448018e3fb803d26030624809b /target/linux/bcm53xx | |
parent | 027aea8af790c2741bcdd0f9b861765fcc1e23eb (diff) | |
download | mtk-20170518-cd54b2d42b39da8a7704b67c878eaec720df2cc9.zip mtk-20170518-cd54b2d42b39da8a7704b67c878eaec720df2cc9.tar.gz mtk-20170518-cd54b2d42b39da8a7704b67c878eaec720df2cc9.tar.bz2 |
kernel: update kernel 4.9 to 4.9.37
- Refreshed all patches
- Removed upstreamed
- Adapted 4 patches:
473-fix-marvell-phy-initialization-issues.patch
-----------------------------------------------
Removed hunk 5 which got upstreamed
403-net-phy-avoid-setting-unsupported-EEE-advertisments.patch
404-net-phy-restart-phy-autonegotiation-after-EEE-advert.patch
--------------------------------------------------------------
Adapted these 2 RFC patches, merging the delta's from an upstream commit
(see below) which made it before these 2.
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-
stable.git/commit/?h=v4.9.36&id=97ace183074d306942b903a148aebd5d061758f0
180-usb-xhci-add-support-for-performing-fake-doorbell.patch
-----------------------------------------------------------
- Moved fake_doorbell bitmask due to new item
Compile tested on: cns3xxx, imx6
Run tested on: cns3xxx, imx6
Signed-off-by: Koen Vandeputte <koen.vandeputte@ncentric.com>
Diffstat (limited to 'target/linux/bcm53xx')
2 files changed, 3 insertions, 51 deletions
diff --git a/target/linux/bcm53xx/patches-4.9/060-0001-net-phy-Initialize-mdio-clock-at-probe-function.patch b/target/linux/bcm53xx/patches-4.9/060-0001-net-phy-Initialize-mdio-clock-at-probe-function.patch deleted file mode 100644 index 7678a70..0000000 --- a/target/linux/bcm53xx/patches-4.9/060-0001-net-phy-Initialize-mdio-clock-at-probe-function.patch +++ /dev/null @@ -1,48 +0,0 @@ -From bb1a619735b4660f21bce3e728b937640024b4ad Mon Sep 17 00:00:00 2001 -From: Yendapally Reddy Dhananjaya Reddy <yendapally.reddy@broadcom.com> -Date: Wed, 8 Feb 2017 17:14:26 -0500 -Subject: [PATCH] net: phy: Initialize mdio clock at probe function - -USB PHYs need the MDIO clock divisor enabled earlier to work. -Initialize mdio clock divisor in probe function. The ext bus -bit available in the same register will be used by mdio mux -to enable external mdio. - -Signed-off-by: Yendapally Reddy Dhananjaya Reddy <yendapally.reddy@broadcom.com> -Fixes: ddc24ae1 ("net: phy: Broadcom iProc MDIO bus driver") -Reviewed-by: Florian Fainelli <f.fainelli@gmail.com> -Signed-off-by: Jon Mason <jon.mason@broadcom.com> -Signed-off-by: David S. Miller <davem@davemloft.net> ---- - drivers/net/phy/mdio-bcm-iproc.c | 6 ++---- - 1 file changed, 2 insertions(+), 4 deletions(-) - ---- a/drivers/net/phy/mdio-bcm-iproc.c -+++ b/drivers/net/phy/mdio-bcm-iproc.c -@@ -81,8 +81,6 @@ static int iproc_mdio_read(struct mii_bu - if (rc) - return rc; - -- iproc_mdio_config_clk(priv->base); -- - /* Prepare the read operation */ - cmd = (MII_DATA_TA_VAL << MII_DATA_TA_SHIFT) | - (reg << MII_DATA_RA_SHIFT) | -@@ -112,8 +110,6 @@ static int iproc_mdio_write(struct mii_b - if (rc) - return rc; - -- iproc_mdio_config_clk(priv->base); -- - /* Prepare the write operation */ - cmd = (MII_DATA_TA_VAL << MII_DATA_TA_SHIFT) | - (reg << MII_DATA_RA_SHIFT) | -@@ -163,6 +159,8 @@ static int iproc_mdio_probe(struct platf - bus->read = iproc_mdio_read; - bus->write = iproc_mdio_write; - -+ iproc_mdio_config_clk(priv->base); -+ - rc = of_mdiobus_register(bus, pdev->dev.of_node); - if (rc) { - dev_err(&pdev->dev, "MDIO bus registration failed\n"); diff --git a/target/linux/bcm53xx/patches-4.9/180-usb-xhci-add-support-for-performing-fake-doorbell.patch b/target/linux/bcm53xx/patches-4.9/180-usb-xhci-add-support-for-performing-fake-doorbell.patch index 7c91161..a00e70c 100644 --- a/target/linux/bcm53xx/patches-4.9/180-usb-xhci-add-support-for-performing-fake-doorbell.patch +++ b/target/linux/bcm53xx/patches-4.9/180-usb-xhci-add-support-for-performing-fake-doorbell.patch @@ -127,11 +127,11 @@ it on BCM4708 family. /* --- a/drivers/usb/host/xhci.h +++ b/drivers/usb/host/xhci.h -@@ -1660,6 +1660,7 @@ struct xhci_hcd { - /* For controller with a broken Port Disable implementation */ +@@ -1661,6 +1661,7 @@ struct xhci_hcd { #define XHCI_BROKEN_PORT_PED (1 << 25) #define XHCI_LIMIT_ENDPOINT_INTERVAL_7 (1 << 26) -+#define XHCI_FAKE_DOORBELL (1 << 27) + #define XHCI_U2_DISABLE_WAKE (1 << 27) ++#define XHCI_FAKE_DOORBELL (1 << 28) unsigned int num_active_eps; unsigned int limit_active_eps; |