devicetree.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Yu Chen <chenyu56@huawei.com>
To: linux-usb@vger.kernel.org, devicetree@vger.kernel.org,
	linux-kernel@vger.kernel.org
Cc: john.stultz@linaro.org, suzhuangluan@hisilicon.com,
	kongfei@hisilicon.com, liuyu712@hisilicon.com,
	wanghu17@hisilicon.com, butao@hisilicon.com,
	chenyao11@huawei.com, fangshengzhou@hisilicon.com,
	lipengcheng8@huawei.com, songxiaowei@hisilicon.com,
	xuyiping@hisilicon.com, xuyoujun4@huawei.com,
	yudongbin@hisilicon.com, zangleigang@hisilicon.com,
	Yu Chen <chenyu56@huawei.com>, Felipe Balbi <balbi@kernel.org>,
	Greg Kroah-Hartman <gregkh@linuxfoundation.org>,
	Heikki Krogerus <heikki.krogerus@linux.intel.com>
Subject: [PATCH v2 07/10] usb: dwc3: Registering a role switch in the DRD code.
Date: Mon, 18 Feb 2019 19:23:07 +0800	[thread overview]
Message-ID: <20190218112310.17860-8-chenyu56@huawei.com> (raw)
In-Reply-To: <20190218112310.17860-1-chenyu56@huawei.com>

The Type-C drivers use USB role switch API to inform the
system about the negotiated data role, so registering a role
switch in the DRD code in order to support platforms with
USB Type-C connectors.

Cc: John Stultz <john.stultz@linaro.org>
Cc: Felipe Balbi <balbi@kernel.org>
Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Cc: Heikki Krogerus <heikki.krogerus@linux.intel.com>
Suggested-by: Heikki Krogerus <heikki.krogerus@linux.intel.com>
Signed-off-by: Yu Chen <chenyu56@huawei.com>
---
v2:
* Assign fwnode in dwc3_role_switch.
---
---
 drivers/usb/dwc3/core.h |  2 ++
 drivers/usb/dwc3/drd.c  | 45 +++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 47 insertions(+)

diff --git a/drivers/usb/dwc3/core.h b/drivers/usb/dwc3/core.h
index 402b3c29eb26..7385544b9936 100644
--- a/drivers/usb/dwc3/core.h
+++ b/drivers/usb/dwc3/core.h
@@ -25,6 +25,7 @@
 #include <linux/usb/ch9.h>
 #include <linux/usb/gadget.h>
 #include <linux/usb/otg.h>
+#include <linux/usb/role.h>
 #include <linux/ulpi/interface.h>
 
 #include <linux/phy/phy.h>
@@ -1083,6 +1084,7 @@ struct dwc3 {
 	struct extcon_dev	*edev;
 	struct notifier_block	edev_nb;
 	enum usb_phy_interface	hsphy_mode;
+	struct usb_role_switch	*role_sw;
 
 	u32			fladj;
 	u32			irq_gadget;
diff --git a/drivers/usb/dwc3/drd.c b/drivers/usb/dwc3/drd.c
index 869725d15c74..cf977bb0d62e 100644
--- a/drivers/usb/dwc3/drd.c
+++ b/drivers/usb/dwc3/drd.c
@@ -474,8 +474,42 @@ static struct extcon_dev *dwc3_get_extcon(struct dwc3 *dwc)
 	return edev;
 }
 
+static int dwc3_usb_role_switch_set(struct device *dev, enum usb_role role)
+{
+	u32 mode;
+
+	switch (role) {
+	case USB_ROLE_HOST:
+		mode = DWC3_GCTL_PRTCAP_HOST;
+		break;
+	case USB_ROLE_DEVICE:
+		mode = DWC3_GCTL_PRTCAP_DEVICE;
+		break;
+	default:
+		mode = DWC3_GCTL_PRTCAP_HOST;
+		break;
+	};
+
+	dwc3_set_mode(dev_get_drvdata(dev), mode);
+	return 0;
+}
+
+static enum usb_role dwc3_usb_role_switch_get(struct device *dev)
+{
+	struct dwc3 *dwc = dev_get_drvdata(dev);
+	unsigned long flags;
+	enum usb_role role;
+
+	spin_lock_irqsave(&dwc->lock, flags);
+	role = dwc->current_otg_role;
+	spin_unlock_irqrestore(&dwc->lock, flags);
+
+	return role;
+}
+
 int dwc3_drd_init(struct dwc3 *dwc)
 {
+	struct usb_role_switch_desc dwc3_role_switch = {0};
 	int ret, irq;
 
 	dwc->edev = dwc3_get_extcon(dwc);
@@ -522,6 +556,15 @@ int dwc3_drd_init(struct dwc3 *dwc)
 		dwc3_set_mode(dwc, DWC3_GCTL_PRTCAP_OTG);
 	}
 
+	dwc3_role_switch.fwnode = dev_fwnode(dwc->dev);
+	dwc3_role_switch.set = dwc3_usb_role_switch_set;
+	dwc3_role_switch.get = dwc3_usb_role_switch_get;
+	dwc->role_sw = usb_role_switch_register(dwc->dev, &dwc3_role_switch);
+	if (ret) {
+		dwc3_drd_exit(dwc);
+		return PTR_ERR(dwc->role_sw);
+	}
+
 	return 0;
 }
 
@@ -557,4 +600,6 @@ void dwc3_drd_exit(struct dwc3 *dwc)
 
 	if (!dwc->edev)
 		free_irq(dwc->otg_irq, dwc);
+
+	usb_role_switch_unregister(dwc->role_sw);
 }
-- 
2.15.0-rc2

  parent reply	other threads:[~2019-02-18 11:23 UTC|newest]

Thread overview: 31+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2019-02-18 11:23 [PATCH v2 00/10] Add support for usb on Hikey960 Yu Chen
2019-02-18 11:23 ` [PATCH v2 01/10] dt-bindings: phy: Add support for HiSilicon's hi3660 USB PHY Yu Chen
2019-02-18 20:18   ` Rob Herring
2019-02-19  1:50     ` Chen Yu
2019-02-19  3:03       ` Chunfeng Yun
2019-02-19  3:55         ` Chen Yu
2019-02-19 14:22         ` Rob Herring
2019-02-18 11:23 ` [PATCH v2 02/10] dt-bindings: misc: Add bindings for HiSilicon usb hub and data role switch functionality on HiKey960 Yu Chen
2019-02-19  8:25   ` Sergei Shtylyov
2019-02-20  2:34     ` Chen Yu
2019-02-18 11:23 ` [PATCH v2 03/10] usb: dwc3: dwc3-of-simple: Add support for dwc3 of Hisilicon Soc Platform Yu Chen
2019-02-18 11:23 ` [PATCH v2 04/10] usb: dwc3: Add two quirks for Hisilicon Kirin " Yu Chen
2019-02-18 12:21   ` Andy Shevchenko
2019-02-18 12:31     ` Chen Yu
2019-02-18 11:23 ` [PATCH v2 05/10] phy: Add usb phy support for hi3660 Soc of Hisilicon Yu Chen
2019-02-18 11:23 ` [PATCH v2 06/10] usb: roles: Add usb role switch notifier Yu Chen
2019-02-18 11:23 ` Yu Chen [this message]
2019-02-18 17:30   ` [PATCH v2 07/10] usb: dwc3: Registering a role switch in the DRD code Valentin Schneider
2019-02-19  1:40     ` Chen Yu
2019-02-19  2:57   ` Jun Li
2019-02-19  3:37     ` Chen Yu
2019-02-18 11:23 ` [PATCH v2 08/10] hikey960: Support usb functionality of Hikey960 Yu Chen
2019-02-19  2:50   ` Chunfeng Yun
2019-02-19  3:20     ` Chen Yu
2019-02-22  7:32       ` Chunfeng Yun
2019-03-02  1:02         ` Chen Yu
2019-02-18 11:23 ` [PATCH v2 09/10] usb: gadget: Add configfs attribuite for controling match_existing_only Yu Chen
2019-02-18 11:23 ` [PATCH v2 10/10] dts: hi3660: Add support for usb on Hikey960 Yu Chen
2019-02-18 17:30 ` [PATCH v2 00/10] " Valentin Schneider
2019-02-19  1:34   ` Chen Yu
2019-02-19 11:31     ` Valentin Schneider

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=20190218112310.17860-8-chenyu56@huawei.com \
    --to=chenyu56@huawei.com \
    --cc=balbi@kernel.org \
    --cc=butao@hisilicon.com \
    --cc=chenyao11@huawei.com \
    --cc=devicetree@vger.kernel.org \
    --cc=fangshengzhou@hisilicon.com \
    --cc=gregkh@linuxfoundation.org \
    --cc=heikki.krogerus@linux.intel.com \
    --cc=john.stultz@linaro.org \
    --cc=kongfei@hisilicon.com \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-usb@vger.kernel.org \
    --cc=lipengcheng8@huawei.com \
    --cc=liuyu712@hisilicon.com \
    --cc=songxiaowei@hisilicon.com \
    --cc=suzhuangluan@hisilicon.com \
    --cc=wanghu17@hisilicon.com \
    --cc=xuyiping@hisilicon.com \
    --cc=xuyoujun4@huawei.com \
    --cc=yudongbin@hisilicon.com \
    --cc=zangleigang@hisilicon.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).