From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-9.0 required=3.0 tests=HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_PASS,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 1F7C3C43381 for ; Mon, 18 Feb 2019 11:23:48 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id E917521848 for ; Mon, 18 Feb 2019 11:23:47 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1730706AbfBRLXl (ORCPT ); Mon, 18 Feb 2019 06:23:41 -0500 Received: from szxga06-in.huawei.com ([45.249.212.32]:46874 "EHLO huawei.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1729630AbfBRLXf (ORCPT ); Mon, 18 Feb 2019 06:23:35 -0500 Received: from DGGEMS409-HUB.china.huawei.com (unknown [172.30.72.59]) by Forcepoint Email with ESMTP id C9EDA8A6DCBFA6768F0B; Mon, 18 Feb 2019 19:23:31 +0800 (CST) Received: from vm100-107-113-134.huawei.com (100.107.113.134) by DGGEMS409-HUB.china.huawei.com (10.3.19.209) with Microsoft SMTP Server id 14.3.408.0; Mon, 18 Feb 2019 19:23:22 +0800 From: Yu Chen To: , , CC: , , , , , , , , , , , , , , Yu Chen , Felipe Balbi , Greg Kroah-Hartman , "Heikki Krogerus" Subject: [PATCH v2 07/10] usb: dwc3: Registering a role switch in the DRD code. Date: Mon, 18 Feb 2019 19:23:07 +0800 Message-ID: <20190218112310.17860-8-chenyu56@huawei.com> X-Mailer: git-send-email 2.15.0-rc2 In-Reply-To: <20190218112310.17860-1-chenyu56@huawei.com> References: <20190218112310.17860-1-chenyu56@huawei.com> MIME-Version: 1.0 Content-Type: text/plain X-Originating-IP: [100.107.113.134] X-CFilter-Loop: Reflected Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 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 Cc: Felipe Balbi Cc: Greg Kroah-Hartman Cc: Heikki Krogerus Suggested-by: Heikki Krogerus Signed-off-by: Yu Chen --- 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 #include #include +#include #include #include @@ -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