From: Chunfeng Yun <chunfeng.yun@mediatek.com>
To: Greg Kroah-Hartman <gregkh@linuxfoundation.org>,
Rob Herring <robh+dt@kernel.org>, Felipe Balbi <balbi@kernel.org>
Cc: Chunfeng Yun <chunfeng.yun@mediatek.com>,
Matthias Brugger <matthias.bgg@gmail.com>,
Thinh Nguyen <Thinh.Nguyen@synopsys.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>,
Yuwen Ng <yuwen.ng@mediatek.com>,
Eddie Hung <eddie.hung@mediatek.com>
Subject: [PATCH 17/23] usb: mtu3: support option to disable usb2 ports
Date: Tue, 8 Jun 2021 15:57:43 +0800 [thread overview]
Message-ID: <1623139069-8173-18-git-send-email-chunfeng.yun@mediatek.com> (raw)
In-Reply-To: <1623139069-8173-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/mtu3/mtu3.h | 4 ++++
drivers/usb/mtu3/mtu3_host.c | 8 +++++++-
drivers/usb/mtu3/mtu3_plat.c | 11 +++++++++--
3 files changed, 20 insertions(+), 3 deletions(-)
diff --git a/drivers/usb/mtu3/mtu3.h b/drivers/usb/mtu3/mtu3.h
index b56284d28c71..710abe83ba1a 100644
--- a/drivers/usb/mtu3/mtu3.h
+++ b/drivers/usb/mtu3/mtu3.h
@@ -229,6 +229,9 @@ struct otg_switch_mtk {
* host only, device only or dual-role mode
* @u2_ports: number of usb2.0 host ports
* @u3_ports: number of usb3.0 host ports
+ * @u2p_dis_msk: mask of disabling usb2 ports, e.g. bit0==1 to
+ * disable u2port0, bit1==1 to disable u2port1,... etc,
+ * but when use dual-role mode, can't disable u2port0
* @u3p_dis_msk: mask of disabling usb3 ports, for example, bit0==1 to
* disable u3port0, bit1==1 to disable u3port1,... etc
* @dbgfs_root: only used when supports manual dual-role switch via debugfs
@@ -256,6 +259,7 @@ struct ssusb_mtk {
bool is_host;
int u2_ports;
int u3_ports;
+ int u2p_dis_msk;
int u3p_dis_msk;
struct dentry *dbgfs_root;
/* usb wakeup for host mode */
diff --git a/drivers/usb/mtu3/mtu3_host.c b/drivers/usb/mtu3/mtu3_host.c
index 93a1a4c11e1e..6185bac5fecf 100644
--- a/drivers/usb/mtu3/mtu3_host.c
+++ b/drivers/usb/mtu3/mtu3_host.c
@@ -155,6 +155,9 @@ int ssusb_host_enable(struct ssusb_mtk *ssusb)
/* power on and enable all u2 ports */
for (i = 0; i < num_u2p; i++) {
+ if ((0x1 << i) & ssusb->u2p_dis_msk)
+ continue;
+
value = mtu3_readl(ibase, SSUSB_U2_CTRL(i));
value &= ~(SSUSB_U2_PORT_PDN | SSUSB_U2_PORT_DIS);
value |= SSUSB_U2_PORT_HOST_SEL;
@@ -188,8 +191,11 @@ int ssusb_host_disable(struct ssusb_mtk *ssusb, bool suspend)
mtu3_writel(ibase, SSUSB_U3_CTRL(i), value);
}
- /* power down and disable all u2 ports */
+ /* power down and disable u2 ports except skipped ones */
for (i = 0; i < num_u2p; i++) {
+ if ((0x1 << i) & ssusb->u2p_dis_msk)
+ continue;
+
value = mtu3_readl(ibase, SSUSB_U2_CTRL(i));
value |= SSUSB_U2_PORT_PDN;
value |= suspend ? 0 : SSUSB_U2_PORT_DIS;
diff --git a/drivers/usb/mtu3/mtu3_plat.c b/drivers/usb/mtu3/mtu3_plat.c
index bbfabdc1e79b..93e52e6b6811 100644
--- a/drivers/usb/mtu3/mtu3_plat.c
+++ b/drivers/usb/mtu3/mtu3_plat.c
@@ -283,6 +283,8 @@ static int get_ssusb_rscs(struct platform_device *pdev, struct ssusb_mtk *ssusb)
/* optional property, ignore the error if it does not exist */
of_property_read_u32(node, "mediatek,u3p-dis-msk",
&ssusb->u3p_dis_msk);
+ of_property_read_u32(node, "mediatek,u2p-dis-msk",
+ &ssusb->u2p_dis_msk);
otg_sx->vbus = devm_regulator_get(dev, "vbus");
if (IS_ERR(otg_sx->vbus)) {
@@ -299,6 +301,9 @@ static int get_ssusb_rscs(struct platform_device *pdev, struct ssusb_mtk *ssusb)
of_property_read_bool(node, "enable-manual-drd");
otg_sx->role_sw_used = of_property_read_bool(node, "usb-role-switch");
+ /* can't disable port0 when use dual-role mode */
+ ssusb->u2p_dis_msk &= ~0x1;
+
if (otg_sx->role_sw_used || otg_sx->manual_drd_enabled)
goto out;
@@ -311,9 +316,11 @@ static int get_ssusb_rscs(struct platform_device *pdev, struct ssusb_mtk *ssusb)
}
out:
- dev_info(dev, "dr_mode: %d, is_u3_dr: %d, u3p_dis_msk: %x, drd: %s\n",
- ssusb->dr_mode, otg_sx->is_u3_drd, ssusb->u3p_dis_msk,
+ dev_info(dev, "dr_mode: %d, is_u3_dr: %d, drd: %s\n",
+ ssusb->dr_mode, otg_sx->is_u3_drd,
otg_sx->manual_drd_enabled ? "manual" : "auto");
+ dev_info(dev, "u2p_dis_msk: %x, u3p_dis_msk: %x\n",
+ ssusb->u2p_dis_msk, ssusb->u3p_dis_msk);
return 0;
}
--
2.18.0
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
next prev parent reply other threads:[~2021-06-08 8:23 UTC|newest]
Thread overview: 25+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-06-08 7:57 [PATCH 00/23] Add support gadget (runtime) PM Chunfeng Yun
2021-06-08 7:57 ` [PATCH 01/23] dt-bindings: usb: mtu3: remove support VBUS detection of extcon Chunfeng Yun
2021-06-08 7:57 ` [PATCH 02/23] dt-bindings: usb: mtu3: add optional property to disable usb2 ports Chunfeng Yun
2021-06-08 7:57 ` [PATCH 03/23] dt-bindings: usb: mtu3: add support property role-switch-default-mode Chunfeng Yun
2021-06-08 7:57 ` [PATCH 04/23] dt-bindings: usb: mtu3: add wakeup interrupt Chunfeng Yun
2021-06-08 7:57 ` [PATCH 05/23] usb: mtu3: power down device IP by default Chunfeng Yun
2021-06-08 7:57 ` [PATCH 06/23] usb: mtu3: power down port when power down device IP Chunfeng Yun
2021-06-08 7:57 ` [PATCH 07/23] usb: mtu3: remove wakelock Chunfeng Yun
2021-06-08 7:57 ` [PATCH 08/23] usb: mtu3: drop support vbus detection Chunfeng Yun
2021-06-08 7:57 ` [PATCH 09/23] usb: mtu3: use enum usb_role instead of private defined ones Chunfeng Yun
2021-06-08 7:57 ` [PATCH 10/23] usb: mtu3: rebuild role switch flow of extcon Chunfeng Yun
2021-06-08 7:57 ` [PATCH 11/23] usb: mtu3: add helper to get pointer of ssusb_mtk struct Chunfeng Yun
2021-06-08 7:57 ` [PATCH 12/23] usb: mtu3: use force mode for dual role switch Chunfeng Yun
2021-06-08 7:57 ` [PATCH 13/23] usb: mtu3: rebuild role switch get/set hooks Chunfeng Yun
2021-06-08 7:57 ` [PATCH 14/23] usb: common: add helper to get role-switch-default-mode Chunfeng Yun
2021-06-08 7:57 ` [PATCH 15/23] usb: dwc3: drd: use " Chunfeng Yun
2021-06-08 7:57 ` [PATCH 16/23] usb: mtu3: support property role-switch-default-mode Chunfeng Yun
2021-06-08 7:57 ` Chunfeng Yun [this message]
2021-06-08 7:57 ` [PATCH 18/23] usb: mtu3: add new helpers for host suspend/resume Chunfeng Yun
2021-06-08 7:57 ` [PATCH 19/23] usb: mtu3: support runtime PM for host mode Chunfeng Yun
2021-06-08 7:57 ` [PATCH 20/23] usb: mtu3: add helper to power on/down device Chunfeng Yun
2021-06-08 7:57 ` [PATCH 21/23] usb: mtu3: support suspend/resume for device mode Chunfeng Yun
2021-06-08 7:57 ` [PATCH 22/23] usb: mtu3: support suspend/resume for dual-role mode Chunfeng Yun
2021-06-08 7:57 ` [PATCH 23/23] usb: mtu3: use clock bulk to get clocks Chunfeng Yun
2021-06-15 13:46 ` [PATCH 00/23] Add support gadget (runtime) PM Greg Kroah-Hartman
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=1623139069-8173-18-git-send-email-chunfeng.yun@mediatek.com \
--to=chunfeng.yun@mediatek.com \
--cc=Thinh.Nguyen@synopsys.com \
--cc=balbi@kernel.org \
--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=matthias.bgg@gmail.com \
--cc=robh+dt@kernel.org \
--cc=yuwen.ng@mediatek.com \
/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).