|
Oliver Neukum |
ee299c |
From 26f94fe8e739641e96c50f70eb6e78ef1693d9ca Mon Sep 17 00:00:00 2001
|
|
Oliver Neukum |
ee299c |
From: Chunfeng Yun <chunfeng.yun@mediatek.com>
|
|
Oliver Neukum |
ee299c |
Date: Thu, 15 Jul 2021 17:07:51 +0800
|
|
Oliver Neukum |
ee299c |
Subject: [PATCH] usb: dwc3: drd: use helper to get role-switch-default-mode
|
|
Oliver Neukum |
ee299c |
Git-commit: 26f94fe8e739641e96c50f70eb6e78ef1693d9ca
|
|
Oliver Neukum |
ee299c |
References: git-fixes
|
|
Oliver Neukum |
ee299c |
Patch-mainline: v5.15-rc1
|
|
Oliver Neukum |
ee299c |
|
|
Oliver Neukum |
ee299c |
Use the new helper usb_get_role_switch_default_mode() to
|
|
Oliver Neukum |
ee299c |
get property of "role-switch-default-mode"
|
|
Oliver Neukum |
ee299c |
|
|
Oliver Neukum |
ee299c |
Signed-off-by: Chunfeng Yun <chunfeng.yun@mediatek.com>
|
|
Oliver Neukum |
ee299c |
Link: https://lore.kernel.org/r/1626340078-29111-7-git-send-email-chunfeng.yun@mediatek.com
|
|
Oliver Neukum |
ee299c |
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
|
|
Oliver Neukum |
ee299c |
Signed-off-by: Oliver Neukum <oneukum@suse.com>
|
|
Oliver Neukum |
ee299c |
---
|
|
Oliver Neukum |
ee299c |
drivers/usb/dwc3/drd.c | 8 ++------
|
|
Oliver Neukum |
ee299c |
1 file changed, 2 insertions(+), 6 deletions(-)
|
|
Oliver Neukum |
ee299c |
|
|
Oliver Neukum |
ee299c |
diff --git a/drivers/usb/dwc3/drd.c b/drivers/usb/dwc3/drd.c
|
|
Oliver Neukum |
ee299c |
index 8fcbac10510c..d7f76835137f 100644
|
|
Oliver Neukum |
ee299c |
--- a/drivers/usb/dwc3/drd.c
|
|
Oliver Neukum |
ee299c |
+++ b/drivers/usb/dwc3/drd.c
|
|
Oliver Neukum |
ee299c |
@@ -541,14 +541,10 @@ static enum usb_role dwc3_usb_role_switch_get(struct usb_role_switch *sw)
|
|
Oliver Neukum |
ee299c |
static int dwc3_setup_role_switch(struct dwc3 *dwc)
|
|
Oliver Neukum |
ee299c |
{
|
|
Oliver Neukum |
ee299c |
struct usb_role_switch_desc dwc3_role_switch = {NULL};
|
|
Oliver Neukum |
ee299c |
- const char *str;
|
|
Oliver Neukum |
ee299c |
u32 mode;
|
|
Oliver Neukum |
ee299c |
- int ret;
|
|
Oliver Neukum |
ee299c |
|
|
Oliver Neukum |
ee299c |
- ret = device_property_read_string(dwc->dev, "role-switch-default-mode",
|
|
Oliver Neukum |
ee299c |
- &str);
|
|
Oliver Neukum |
ee299c |
- if (ret >= 0 && !strncmp(str, "host", strlen("host"))) {
|
|
Oliver Neukum |
ee299c |
- dwc->role_switch_default_mode = USB_DR_MODE_HOST;
|
|
Oliver Neukum |
ee299c |
+ dwc->role_switch_default_mode = usb_get_role_switch_default_mode(dwc->dev);
|
|
Oliver Neukum |
ee299c |
+ if (dwc->role_switch_default_mode == USB_DR_MODE_HOST) {
|
|
Oliver Neukum |
ee299c |
mode = DWC3_GCTL_PRTCAP_HOST;
|
|
Oliver Neukum |
ee299c |
} else {
|
|
Oliver Neukum |
ee299c |
dwc->role_switch_default_mode = USB_DR_MODE_PERIPHERAL;
|
|
Oliver Neukum |
ee299c |
--
|
|
Oliver Neukum |
ee299c |
2.40.1
|
|
Oliver Neukum |
ee299c |
|