From: Chunfeng Yun <chunfeng.yun@mediatek.com>
To: Rob Herring <robh+dt@kernel.org>,
Mathias Nyman <mathias.nyman@intel.com>
Cc: Chunfeng Yun <chunfeng.yun@mediatek.com>,
Greg Kroah-Hartman <gregkh@linuxfoundation.org>,
Matthias Brugger <matthias.bgg@gmail.com>,
<linux-usb@vger.kernel.org>,
<linux-arm-kernel@lists.infradead.org>,
<linux-mediatek@lists.infradead.org>,
<devicetree@vger.kernel.org>, <linux-kernel@vger.kernel.org>,
Eddie Hung <eddie.hung@mediatek.com>
Subject: [PATCH 06/11] usb: xhci-mtk: support option to disable usb2 ports
Date: Fri, 30 Jul 2021 16:49:57 +0800 [thread overview]
Message-ID: <1627635002-24521-6-git-send-email-chunfeng.yun@mediatek.com> (raw)
In-Reply-To: <1627635002-24521-1-git-send-email-chunfeng.yun@mediatek.com>
Add support to disable specific usb2 host ports, it's useful when
a usb2 port is disabled on some platforms, but enabled on others
for the same SoC.
Signed-off-by: Chunfeng Yun <chunfeng.yun@mediatek.com>
---
drivers/usb/host/xhci-mtk.c | 12 ++++++++++--
drivers/usb/host/xhci-mtk.h | 1 +
2 files changed, 11 insertions(+), 2 deletions(-)
diff --git a/drivers/usb/host/xhci-mtk.c b/drivers/usb/host/xhci-mtk.c
index f6d161670c4e..12b691547438 100644
--- a/drivers/usb/host/xhci-mtk.c
+++ b/drivers/usb/host/xhci-mtk.c
@@ -116,8 +116,11 @@ static int xhci_mtk_host_enable(struct xhci_hcd_mtk *mtk)
writel(value, &ippc->u3_ctrl_p[i]);
}
- /* power on and enable all u2 ports */
+ /* power on and enable all u2 ports except skipped ones */
for (i = 0; i < mtk->num_u2_ports; i++) {
+ if (BIT(i) & mtk->u2p_dis_msk)
+ continue;
+
value = readl(&ippc->u2_ctrl_p[i]);
value &= ~(CTRL_U2_PORT_PDN | CTRL_U2_PORT_DIS);
value |= CTRL_U2_PORT_HOST_SEL;
@@ -164,8 +167,11 @@ static int xhci_mtk_host_disable(struct xhci_hcd_mtk *mtk)
writel(value, &ippc->u3_ctrl_p[i]);
}
- /* power down all u2 ports */
+ /* power down all u2 ports except skipped ones */
for (i = 0; i < mtk->num_u2_ports; i++) {
+ if (BIT(i) & mtk->u2p_dis_msk)
+ continue;
+
value = readl(&ippc->u2_ctrl_p[i]);
value |= CTRL_U2_PORT_PDN;
writel(value, &ippc->u2_ctrl_p[i]);
@@ -445,6 +451,8 @@ static int xhci_mtk_probe(struct platform_device *pdev)
/* optional property, ignore the error if it does not exist */
of_property_read_u32(node, "mediatek,u3p-dis-msk",
&mtk->u3p_dis_msk);
+ of_property_read_u32(node, "mediatek,u2p-dis-msk",
+ &mtk->u2p_dis_msk);
ret = usb_wakeup_of_property_parse(mtk, node);
if (ret) {
diff --git a/drivers/usb/host/xhci-mtk.h b/drivers/usb/host/xhci-mtk.h
index ace432356c41..0466bc8f7500 100644
--- a/drivers/usb/host/xhci-mtk.h
+++ b/drivers/usb/host/xhci-mtk.h
@@ -138,6 +138,7 @@ struct xhci_hcd_mtk {
struct mu3c_ippc_regs __iomem *ippc_regs;
int num_u2_ports;
int num_u3_ports;
+ int u2p_dis_msk;
int u3p_dis_msk;
struct regulator *vusb33;
struct regulator *vbus;
--
2.18.0
next prev parent reply other threads:[~2021-07-30 8:51 UTC|newest]
Thread overview: 27+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-07-30 8:49 [PATCH 01/11] dt-bindings: usb: mtk-xhci: add support property 'tpl-support' Chunfeng Yun
2021-07-30 8:49 ` [PATCH 02/11] dt-bindings: usb: mtk-xhci: add optional property to disable usb2 ports Chunfeng Yun
2021-08-06 20:41 ` Rob Herring
2021-08-11 8:12 ` Chunfeng Yun (云春峰)
2021-07-30 8:49 ` [PATCH 03/11] dt-bindings: usb: mtk-xhci: add compatible for mt8195 Chunfeng Yun
2021-08-06 20:43 ` Rob Herring
2021-08-11 8:02 ` Chunfeng Yun (云春峰)
2021-08-18 14:20 ` Rob Herring
2021-08-19 11:36 ` Chunfeng Yun (云春峰)
2021-07-30 8:49 ` [PATCH 04/11] usb: xhci-mtk: fix use-after-free of mtk->hcd Chunfeng Yun
2021-08-13 5:26 ` Ikjoon Jang
2021-07-30 8:49 ` [PATCH 05/11] usb: xhci-mtk: add support 'tpl-support' Chunfeng Yun
2021-07-30 8:49 ` Chunfeng Yun [this message]
2021-07-30 8:49 ` [PATCH 07/11] usb: xhci-mtk: fix issue of out-of-bounds array access Chunfeng Yun
2021-07-30 8:49 ` [PATCH 08/11] usb: xhci-mtk: update fs bus bandwidth by bw_budget_table Chunfeng Yun
2021-08-03 6:05 ` Ikjoon Jang
2021-08-04 5:19 ` Chunfeng Yun
2021-08-04 14:06 ` Ikjoon Jang
2021-08-10 1:45 ` Chunfeng Yun (云春峰)
2021-07-30 8:50 ` [PATCH 09/11] usb: xhci-mtk: check boundary before check tt Chunfeng Yun
2021-08-09 7:32 ` Ikjoon Jang
2021-08-11 8:18 ` Chunfeng Yun (云春峰)
2021-07-30 8:50 ` [PATCH 10/11] usb: xhci-mtk: add a member of num_esit Chunfeng Yun
2021-07-30 8:50 ` [PATCH 11/11] usb: xhci-mtk: modify the SOF/ITP interval for mt8195 Chunfeng Yun
2021-08-06 20:37 ` [PATCH 01/11] dt-bindings: usb: mtk-xhci: add support property 'tpl-support' Rob Herring
2021-08-11 7:54 ` Chunfeng Yun (云春峰)
2021-08-12 2:28 ` Chunfeng Yun (云春峰)
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1627635002-24521-6-git-send-email-chunfeng.yun@mediatek.com \
--to=chunfeng.yun@mediatek.com \
--cc=devicetree@vger.kernel.org \
--cc=eddie.hung@mediatek.com \
--cc=gregkh@linuxfoundation.org \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-mediatek@lists.infradead.org \
--cc=linux-usb@vger.kernel.org \
--cc=mathias.nyman@intel.com \
--cc=matthias.bgg@gmail.com \
--cc=robh+dt@kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).