db9e9e8382
Refreshed all patches. Altered patches: - 707-dpaa-ethernet-support-layerscape.patch Remove upstreamed: - 034-v4.20-MIPS-BCM47XX-Enable-USB-power-on-Netgear-WNDR3400v3.patch - 001-4.21-01-BCM63XX-fix-switch-core-reset-on-BCM6368.patch - 073-qcom-ipq4019-fix-cpu0-s-qcom-saw2-reg-value.patch Compile-tested on: cns3xxx Runtime-tested on: cns3xxx Signed-off-by: Koen Vandeputte <koen.vandeputte@ncentric.com>
54 lines
1.8 KiB
Diff
54 lines
1.8 KiB
Diff
From f97aa71fe34135e7fc8da6231e61ee06f79d739d Mon Sep 17 00:00:00 2001
|
|
From: Chunfeng Yun <chunfeng.yun@mediatek.com>
|
|
Date: Fri, 13 Oct 2017 16:26:34 +0800
|
|
Subject: [PATCH 127/224] usb: xhci-mtk: use ports count from xhci in
|
|
xhci_mtk_sch_init()
|
|
|
|
Make use of ports count from xhci but not from ippc in
|
|
xhci_mtk_sch_init()
|
|
|
|
Signed-off-by: Chunfeng Yun <chunfeng.yun@mediatek.com>
|
|
Acked-by: Mathias Nyman <mathias.nyman@linux.intel.com>
|
|
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
|
|
---
|
|
drivers/usb/host/xhci-mtk-sch.c | 3 ++-
|
|
drivers/usb/host/xhci-mtk.c | 3 ---
|
|
2 files changed, 2 insertions(+), 4 deletions(-)
|
|
|
|
--- a/drivers/usb/host/xhci-mtk-sch.c
|
|
+++ b/drivers/usb/host/xhci-mtk-sch.c
|
|
@@ -289,12 +289,13 @@ static bool need_bw_sch(struct usb_host_
|
|
|
|
int xhci_mtk_sch_init(struct xhci_hcd_mtk *mtk)
|
|
{
|
|
+ struct xhci_hcd *xhci = hcd_to_xhci(mtk->hcd);
|
|
struct mu3h_sch_bw_info *sch_array;
|
|
int num_usb_bus;
|
|
int i;
|
|
|
|
/* ss IN and OUT are separated */
|
|
- num_usb_bus = mtk->num_u3_ports * 2 + mtk->num_u2_ports;
|
|
+ num_usb_bus = xhci->num_usb3_ports * 2 + xhci->num_usb2_ports;
|
|
|
|
sch_array = kcalloc(num_usb_bus, sizeof(*sch_array), GFP_KERNEL);
|
|
if (sch_array == NULL)
|
|
--- a/drivers/usb/host/xhci-mtk.c
|
|
+++ b/drivers/usb/host/xhci-mtk.c
|
|
@@ -492,7 +492,6 @@ static void xhci_mtk_quirks(struct devic
|
|
/* called during probe() after chip reset completes */
|
|
static int xhci_mtk_setup(struct usb_hcd *hcd)
|
|
{
|
|
- struct xhci_hcd *xhci = hcd_to_xhci(hcd);
|
|
struct xhci_hcd_mtk *mtk = hcd_to_mtk(hcd);
|
|
int ret;
|
|
|
|
@@ -507,8 +506,6 @@ static int xhci_mtk_setup(struct usb_hcd
|
|
return ret;
|
|
|
|
if (usb_hcd_is_primary_hcd(hcd)) {
|
|
- mtk->num_u3_ports = xhci->num_usb3_ports;
|
|
- mtk->num_u2_ports = xhci->num_usb2_ports;
|
|
ret = xhci_mtk_sch_init(mtk);
|
|
if (ret)
|
|
return ret;
|