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 16/23] usb: mtu3: support property role-switch-default-mode
Date: Tue, 8 Jun 2021 15:57:42 +0800 [thread overview]
Message-ID: <1623139069-8173-17-git-send-email-chunfeng.yun@mediatek.com> (raw)
In-Reply-To: <1623139069-8173-1-git-send-email-chunfeng.yun@mediatek.com>
Support default mode config when use usb-role-switch
Signed-off-by: Chunfeng Yun <chunfeng.yun@mediatek.com>
---
drivers/usb/mtu3/mtu3.h | 2 ++
drivers/usb/mtu3/mtu3_dr.c | 24 ++++++++++++++++++++----
2 files changed, 22 insertions(+), 4 deletions(-)
diff --git a/drivers/usb/mtu3/mtu3.h b/drivers/usb/mtu3/mtu3.h
index daf2b294ccdf..b56284d28c71 100644
--- a/drivers/usb/mtu3/mtu3.h
+++ b/drivers/usb/mtu3/mtu3.h
@@ -196,6 +196,7 @@ struct mtu3_gpd_ring {
* @id_nb : notifier for iddig(idpin) detection
* @dr_work : work for drd mode switch, used to avoid sleep in atomic context
* @desired_role : role desired to switch
+* @default_role : default mode while usb role is USB_ROLE_NONE
* @role_sw : use USB Role Switch to support dual-role switch, can't use
* extcon at the same time, and extcon is deprecated.
* @role_sw_used : true when the USB Role Switch is used.
@@ -209,6 +210,7 @@ struct otg_switch_mtk {
struct notifier_block id_nb;
struct work_struct dr_work;
enum usb_role desired_role;
+ enum usb_role default_role;
struct usb_role_switch *role_sw;
bool role_sw_used;
bool is_u3_drd;
diff --git a/drivers/usb/mtu3/mtu3_dr.c b/drivers/usb/mtu3/mtu3_dr.c
index 318fbc618137..30e7e5fc0f88 100644
--- a/drivers/usb/mtu3/mtu3_dr.c
+++ b/drivers/usb/mtu3/mtu3_dr.c
@@ -137,8 +137,12 @@ static void ssusb_mode_sw_work(struct work_struct *work)
current_role = ssusb->is_host ? USB_ROLE_HOST : USB_ROLE_DEVICE;
- if (desired_role == USB_ROLE_NONE)
+ if (desired_role == USB_ROLE_NONE) {
+ /* the default mode is host as probe does */
desired_role = USB_ROLE_HOST;
+ if (otg_sx->default_role == USB_ROLE_DEVICE)
+ desired_role = USB_ROLE_DEVICE;
+ }
if (current_role == desired_role)
return;
@@ -274,17 +278,29 @@ static int ssusb_role_sw_register(struct otg_switch_mtk *otg_sx)
{
struct usb_role_switch_desc role_sx_desc = { 0 };
struct ssusb_mtk *ssusb = otg_sx_to_ssusb(otg_sx);
+ struct device *dev = ssusb->dev;
+ enum usb_dr_mode mode;
if (!otg_sx->role_sw_used)
return 0;
+ mode = usb_get_role_switch_default_mode(dev);
+ if (mode == USB_DR_MODE_PERIPHERAL)
+ otg_sx->default_role = USB_ROLE_DEVICE;
+ else
+ otg_sx->default_role = USB_ROLE_HOST;
+
role_sx_desc.set = ssusb_role_sw_set;
role_sx_desc.get = ssusb_role_sw_get;
- role_sx_desc.fwnode = dev_fwnode(ssusb->dev);
+ role_sx_desc.fwnode = dev_fwnode(dev);
role_sx_desc.driver_data = ssusb;
- otg_sx->role_sw = usb_role_switch_register(ssusb->dev, &role_sx_desc);
+ otg_sx->role_sw = usb_role_switch_register(dev, &role_sx_desc);
+ if (IS_ERR(otg_sx->role_sw))
+ return PTR_ERR(otg_sx->role_sw);
- return PTR_ERR_OR_ZERO(otg_sx->role_sw);
+ ssusb_set_mode(otg_sx, otg_sx->default_role);
+
+ return 0;
}
int ssusb_otg_switch_init(struct ssusb_mtk *ssusb)
--
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:11 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 ` Chunfeng Yun [this message]
2021-06-08 7:57 ` [PATCH 17/23] usb: mtu3: support option to disable usb2 ports Chunfeng Yun
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-17-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).