aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/bcm53xx
diff options
context:
space:
mode:
authorHauke Mehrtens <hauke@openwrt.org>2016-01-12 20:52:19 +0000
committerHauke Mehrtens <hauke@openwrt.org>2016-01-12 20:52:19 +0000
commit50ff51e118b8c1dc098fd2d26d2235bd1add458c (patch)
tree9c12efd0736e8aa581bc815fa08d4e87867d3428 /target/linux/bcm53xx
parent418c28764024a6ecf6bbd66315de6df006ac037a (diff)
downloadmaster-187ad058-50ff51e118b8c1dc098fd2d26d2235bd1add458c.tar.gz
master-187ad058-50ff51e118b8c1dc098fd2d26d2235bd1add458c.tar.bz2
master-187ad058-50ff51e118b8c1dc098fd2d26d2235bd1add458c.zip
kernel/4.3: update to version 4.3.3
Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de git-svn-id: svn://svn.openwrt.org/openwrt/trunk@48224 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux/bcm53xx')
-rw-r--r--target/linux/bcm53xx/patches-4.3/043-clk-iproc-Fix-PLL-output-frequency-calculation.patch59
-rw-r--r--target/linux/bcm53xx/patches-4.3/191-usb-xhci-add-Broadcom-specific-fake-doorbell.patch4
2 files changed, 2 insertions, 61 deletions
diff --git a/target/linux/bcm53xx/patches-4.3/043-clk-iproc-Fix-PLL-output-frequency-calculation.patch b/target/linux/bcm53xx/patches-4.3/043-clk-iproc-Fix-PLL-output-frequency-calculation.patch
deleted file mode 100644
index 20dd90e31c..0000000000
--- a/target/linux/bcm53xx/patches-4.3/043-clk-iproc-Fix-PLL-output-frequency-calculation.patch
+++ /dev/null
@@ -1,59 +0,0 @@
-From 63243a4da7d0dfa19dcacd0a529782eeb2f86f92 Mon Sep 17 00:00:00 2001
-From: Simran Rai <ssimran@broadcom.com>
-Date: Mon, 19 Oct 2015 15:27:19 -0700
-Subject: [PATCH] clk: iproc: Fix PLL output frequency calculation
-
-This patch affects the clocks that use fractional ndivider in their
-PLL output frequency calculation. Instead of 2^20 divide factor, the
-clock's ndiv integer shift was used. Fixed the bug by replacing ndiv
-integer shift with 2^20 factor.
-
-Signed-off-by: Simran Rai <ssimran@broadcom.com>
-Signed-off-by: Ray Jui <rjui@broadcom.com>
-Reviewed-by: Scott Branden <sbranden@broadcom.com>
-Fixes: 5fe225c105fd ("clk: iproc: add initial common clock support")
-Cc: <stable@vger.kernel.org> # v4.1+
-Signed-off-by: Michael Turquette <mturquette@baylibre.com>
----
- drivers/clk/bcm/clk-iproc-pll.c | 13 +++++--------
- 1 file changed, 5 insertions(+), 8 deletions(-)
-
---- a/drivers/clk/bcm/clk-iproc-pll.c
-+++ b/drivers/clk/bcm/clk-iproc-pll.c
-@@ -345,8 +345,8 @@ static unsigned long iproc_pll_recalc_ra
- struct iproc_pll *pll = clk->pll;
- const struct iproc_pll_ctrl *ctrl = pll->ctrl;
- u32 val;
-- u64 ndiv;
-- unsigned int ndiv_int, ndiv_frac, pdiv;
-+ u64 ndiv, ndiv_int, ndiv_frac;
-+ unsigned int pdiv;
-
- if (parent_rate == 0)
- return 0;
-@@ -366,22 +366,19 @@ static unsigned long iproc_pll_recalc_ra
- val = readl(pll->pll_base + ctrl->ndiv_int.offset);
- ndiv_int = (val >> ctrl->ndiv_int.shift) &
- bit_mask(ctrl->ndiv_int.width);
-- ndiv = (u64)ndiv_int << ctrl->ndiv_int.shift;
-+ ndiv = ndiv_int << 20;
-
- if (ctrl->flags & IPROC_CLK_PLL_HAS_NDIV_FRAC) {
- val = readl(pll->pll_base + ctrl->ndiv_frac.offset);
- ndiv_frac = (val >> ctrl->ndiv_frac.shift) &
- bit_mask(ctrl->ndiv_frac.width);
--
-- if (ndiv_frac != 0)
-- ndiv = ((u64)ndiv_int << ctrl->ndiv_int.shift) |
-- ndiv_frac;
-+ ndiv += ndiv_frac;
- }
-
- val = readl(pll->pll_base + ctrl->pdiv.offset);
- pdiv = (val >> ctrl->pdiv.shift) & bit_mask(ctrl->pdiv.width);
-
-- clk->rate = (ndiv * parent_rate) >> ctrl->ndiv_int.shift;
-+ clk->rate = (ndiv * parent_rate) >> 20;
-
- if (pdiv == 0)
- clk->rate *= 2;
diff --git a/target/linux/bcm53xx/patches-4.3/191-usb-xhci-add-Broadcom-specific-fake-doorbell.patch b/target/linux/bcm53xx/patches-4.3/191-usb-xhci-add-Broadcom-specific-fake-doorbell.patch
index ae70f429e9..a0cc267422 100644
--- a/target/linux/bcm53xx/patches-4.3/191-usb-xhci-add-Broadcom-specific-fake-doorbell.patch
+++ b/target/linux/bcm53xx/patches-4.3/191-usb-xhci-add-Broadcom-specific-fake-doorbell.patch
@@ -74,7 +74,7 @@ Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
/*
* Set the run bit and wait for the host to be running.
*/
-@@ -557,10 +590,25 @@ int xhci_init(struct usb_hcd *hcd)
+@@ -567,10 +600,25 @@ int xhci_init(struct usb_hcd *hcd)
static int xhci_run_finished(struct xhci_hcd *xhci)
{
@@ -103,7 +103,7 @@ Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
xhci->shared_hcd->state = HC_STATE_RUNNING;
xhci->cmd_ring_state = CMD_RING_STATE_RUNNING;
-@@ -570,6 +618,9 @@ static int xhci_run_finished(struct xhci
+@@ -580,6 +628,9 @@ static int xhci_run_finished(struct xhci
xhci_dbg_trace(xhci, trace_xhci_dbg_init,
"Finished xhci_run for USB3 roothub");
return 0;