Author: kaloz Date: 2015-03-31 21:21:13 +0200 (Tue, 31 Mar 2015) New Revision: 45197
Removed: trunk/target/linux/mvebu/patches-3.18/210-xhci_move_marvell_quirks.patch Modified: trunk/include/kernel-version.mk trunk/target/linux/generic/patches-3.18/643-bridge_remove_ipv6_dependency.patch trunk/target/linux/generic/patches-3.18/701-phy_extension.patch Log: generic/3.18: upgrade to 3.18.10 Signed-off-by: Imre Kaloz <[email protected]> Modified: trunk/include/kernel-version.mk =================================================================== --- trunk/include/kernel-version.mk 2015-03-31 19:18:03 UTC (rev 45196) +++ trunk/include/kernel-version.mk 2015-03-31 19:21:13 UTC (rev 45197) @@ -6,14 +6,14 @@ LINUX_VERSION-3.10 = .58 LINUX_VERSION-3.13 = .7 LINUX_VERSION-3.14 = .35 -LINUX_VERSION-3.18 = .9 +LINUX_VERSION-3.18 = .10 LINUX_VERSION-4.0 = -rc5 LINUX_KERNEL_MD5SUM-3.8.13 = 2af19d06cd47ec459519159cdd10542d LINUX_KERNEL_MD5SUM-3.10.58 = 3ff3478b6351143cef22d4b81cf48b01 LINUX_KERNEL_MD5SUM-3.13.7 = 370adced5e5c1cb1d0d621c2dae2723f LINUX_KERNEL_MD5SUM-3.14.35 = e5e92c40d14bc8ae9a8701db4e1cbb27 -LINUX_KERNEL_MD5SUM-3.18.9 = 44cd16ada5eb03589f696f083cd2323b +LINUX_KERNEL_MD5SUM-3.18.10 = 1e8ad8a122e332e429d4c786ece4582e LINUX_KERNEL_MD5SUM-4.0-rc5 = b26150c980099ef554b26d07f470e647 ifdef KERNEL_PATCHVER Modified: trunk/target/linux/generic/patches-3.18/643-bridge_remove_ipv6_dependency.patch =================================================================== --- trunk/target/linux/generic/patches-3.18/643-bridge_remove_ipv6_dependency.patch 2015-03-31 19:18:03 UTC (rev 45196) +++ trunk/target/linux/generic/patches-3.18/643-bridge_remove_ipv6_dependency.patch 2015-03-31 19:21:13 UTC (rev 45197) @@ -52,7 +52,7 @@ int __ipv6_get_lladdr(struct inet6_dev *idev, struct in6_addr *addr, u32 banned_flags) -@@ -5434,6 +5433,9 @@ int __init addrconf_init(void) +@@ -5451,6 +5450,9 @@ int __init addrconf_init(void) ipv6_addr_label_rtnl_register(); @@ -62,7 +62,7 @@ return 0; errout: rtnl_af_unregister(&inet6_ops); -@@ -5453,6 +5455,9 @@ void addrconf_cleanup(void) +@@ -5470,6 +5472,9 @@ void addrconf_cleanup(void) struct net_device *dev; int i; Modified: trunk/target/linux/generic/patches-3.18/701-phy_extension.patch =================================================================== --- trunk/target/linux/generic/patches-3.18/701-phy_extension.patch 2015-03-31 19:18:03 UTC (rev 45196) +++ trunk/target/linux/generic/patches-3.18/701-phy_extension.patch 2015-03-31 19:21:13 UTC (rev 45197) @@ -1,6 +1,6 @@ --- a/drivers/net/phy/phy.c +++ b/drivers/net/phy/phy.c -@@ -338,6 +338,50 @@ int phy_ethtool_gset(struct phy_device * +@@ -357,6 +357,50 @@ int phy_ethtool_gset(struct phy_device * } EXPORT_SYMBOL(phy_ethtool_gset); Deleted: trunk/target/linux/mvebu/patches-3.18/210-xhci_move_marvell_quirks.patch =================================================================== --- trunk/target/linux/mvebu/patches-3.18/210-xhci_move_marvell_quirks.patch 2015-03-31 19:18:03 UTC (rev 45196) +++ trunk/target/linux/mvebu/patches-3.18/210-xhci_move_marvell_quirks.patch 2015-03-31 19:21:13 UTC (rev 45197) @@ -1,61 +0,0 @@ -From 1e7e4fb66489cc84366656ca5318f1cb61afd4ba Mon Sep 17 00:00:00 2001 -From: Maxime Ripard <[email protected]> -Date: Tue, 24 Feb 2015 18:27:00 +0200 -Subject: usb: XHCI: platform: Move the Marvell quirks after the enabling the - clocks - -The commit 973747928514 ("usb: host: xhci-plat: add support for the Armada -375/38x XHCI controllers") extended the xhci-plat driver to support the Armada -375/38x SoCs, mostly by adding a quirk configuring the MBUS window. - -However, that quirk was run before the clock the controllers needs has been -enabled. This usually worked because the clock was first enabled by the -bootloader, and left as such until the driver is probe, where it tries to -access the MBUS configuration registers before enabling the clock. - -Things get messy when EPROBE_DEFER is involved during the probe, since as part -of its error path, the driver will rightfully disable the clock. When the -driver will be reprobed, it will retry to access the MBUS registers, but this -time with the clock disabled, which hangs forever. - -Fix this by running the quirks after the clock has been enabled by the driver. - -Signed-off-by: Maxime Ripard <[email protected]> -Cc: <[email protected]> # v3.16+ -Signed-off-by: Mathias Nyman <[email protected]> -Signed-off-by: Greg Kroah-Hartman <[email protected]> - ---- a/drivers/usb/host/xhci-plat.c -+++ b/drivers/usb/host/xhci-plat.c -@@ -87,15 +87,6 @@ static int xhci_plat_probe(struct platfo - if (!res) - return -ENODEV; - -- if (of_device_is_compatible(pdev->dev.of_node, -- "marvell,armada-375-xhci") || -- of_device_is_compatible(pdev->dev.of_node, -- "marvell,armada-380-xhci")) { -- ret = xhci_mvebu_mbus_init_quirk(pdev); -- if (ret) -- return ret; -- } -- - /* Initialize dma_mask and coherent_dma_mask to 32-bits */ - ret = dma_set_coherent_mask(&pdev->dev, DMA_BIT_MASK(32)); - if (ret) -@@ -129,6 +120,15 @@ static int xhci_plat_probe(struct platfo - goto put_hcd; - } - -+ if (of_device_is_compatible(pdev->dev.of_node, -+ "marvell,armada-375-xhci") || -+ of_device_is_compatible(pdev->dev.of_node, -+ "marvell,armada-380-xhci")) { -+ ret = xhci_mvebu_mbus_init_quirk(pdev); -+ if (ret) -+ return ret; -+ } -+ - ret = usb_add_hcd(hcd, irq, IRQF_SHARED); - if (ret) - goto disable_clk; _______________________________________________ openwrt-commits mailing list [email protected] https://lists.openwrt.org/cgi-bin/mailman/listinfo/openwrt-commits
