From patchwork Thu Dec 12 01:42:28 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: John Stultz X-Patchwork-Id: 11286709 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 1E42814DB for ; Thu, 12 Dec 2019 01:43:12 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id F2ED32464B for ; Thu, 12 Dec 2019 01:43:11 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=linaro.org header.i=@linaro.org header.b="m+mTiQrt" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727620AbfLLBml (ORCPT ); Wed, 11 Dec 2019 20:42:41 -0500 Received: from mail-pj1-f67.google.com ([209.85.216.67]:38726 "EHLO mail-pj1-f67.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727613AbfLLBmk (ORCPT ); Wed, 11 Dec 2019 20:42:40 -0500 Received: by mail-pj1-f67.google.com with SMTP id l4so321621pjt.5 for ; Wed, 11 Dec 2019 17:42:39 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=32ma7jm/USpVtHg7Ie1n8hF+znRzdCi92DyYoi4rfjo=; b=m+mTiQrtpDWGf8kluPe58Em+efx6c+lCdtucq14oYvmCpsKuuTM8BUXaasXe14TZYn H6Tnrvxy9hRKBqwKqGUVUHcktLAxzgl9bnPjC8dOQLAG3TIGOMTMTPOJlsQX82RKIZYF 85UTwtwfUMAhZO3fAj9PeUoGJnIbRz8p0F/qD4JkkvXymwEMZpMxeoE2fIoC6Uhehbol gpfVQ/T/xagGQllRGVpT0qupuDtYnGHiin1ia/ZG0K7GT7qJtCqlNxw4hmwts5Cxw1uM o7ZzXtR961PKot2SEb2q/gyGr3a+13GlAP7UAD8VjGNexQXecbDhcglCwtYzWsp+2s2g RC0A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=32ma7jm/USpVtHg7Ie1n8hF+znRzdCi92DyYoi4rfjo=; b=h9m7dMLSA5XUNTtvHGaNzWgosKkISlMSoMFO9L51POMzHmd7q5gIc5ZV/OgkCQrTRC M/LJFokq2B909ixb8x7jMIHdXmexYEUbpmieBOlbSbWnhYsT6QgQSHlWmALnq5mjgBIZ yCu5lSxj0mqhcLF6sor1MlnVvXVNr3L2DZ50+QshoJkOVhfSdjL20O3+UKIjnS9wFD2J iT4GhxheXBgjUGPMoZY8Sqc5k1ET3iQ77YBP2UA733NWVuGrXHwy57g3iAc+BrB26neN x9u8pDiaYQC9j3PMlVP/FKcIhzllhoFoPUeWum91bRBNWmx9Q0BELDT0fPEmu+H/ghCV 32PQ== X-Gm-Message-State: APjAAAVEpxvCl0I2f9QjboFO8lVW9vbziJn9LdqnLyG+GWpBCEwqnxU/ o0eHnp6vFevk2llltC3Gxx+CuQ== X-Google-Smtp-Source: APXvYqxwMBPmGhcRAfOeLiir9tLLli4TVTdqLolBlxPaPpfE7Ngtm6Agj9aoLb0yUwDUnflxYeyX5g== X-Received: by 2002:a17:902:d204:: with SMTP id t4mr6880334ply.167.1576114959256; Wed, 11 Dec 2019 17:42:39 -0800 (PST) Received: from localhost.localdomain ([2601:1c2:680:1319:692:26ff:feda:3a81]) by smtp.gmail.com with ESMTPSA id p16sm4217996pgi.50.2019.12.11.17.42.38 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 11 Dec 2019 17:42:38 -0800 (PST) From: John Stultz To: lkml Cc: John Stultz , Greg Kroah-Hartman , Rob Herring , Mark Rutland , ShuFan Lee , Heikki Krogerus , Suzuki K Poulose , Chunfeng Yun , Yu Chen , Felipe Balbi , Hans de Goede , Andy Shevchenko , Jun Li , Valentin Schneider , Guillaume Gardet , Jack Pham , linux-usb@vger.kernel.org, devicetree@vger.kernel.org Subject: [PATCH v7 3/8] usb: dwc3: Add support for role-switch-default-mode binding Date: Thu, 12 Dec 2019 01:42:28 +0000 Message-Id: <20191212014233.32799-4-john.stultz@linaro.org> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20191212014233.32799-1-john.stultz@linaro.org> References: <20191212014233.32799-1-john.stultz@linaro.org> Sender: linux-usb-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-usb@vger.kernel.org Support the new role-switch-default-mode binding for configuring the default role the controller assumes as when the usb role is USB_ROLE_NONE This patch was split out from a larger patch originally by Yu Chen Cc: Greg Kroah-Hartman Cc: Rob Herring Cc: Mark Rutland CC: ShuFan Lee Cc: Heikki Krogerus Cc: Suzuki K Poulose Cc: Chunfeng Yun Cc: Yu Chen Cc: Felipe Balbi Cc: Hans de Goede Cc: Andy Shevchenko Cc: Jun Li Cc: Valentin Schneider Cc: Guillaume Gardet Cc: Jack Pham Cc: linux-usb@vger.kernel.org Cc: devicetree@vger.kernel.org Signed-off-by: John Stultz --- v3: Split this patch out from addition of usb-role-switch handling v5: Reworked to use string based role-switch-default-mode --- drivers/usb/dwc3/core.h | 3 +++ drivers/usb/dwc3/drd.c | 25 ++++++++++++++++++++++--- 2 files changed, 25 insertions(+), 3 deletions(-) diff --git a/drivers/usb/dwc3/core.h b/drivers/usb/dwc3/core.h index 6f19e9891767..3c879c9ab1aa 100644 --- a/drivers/usb/dwc3/core.h +++ b/drivers/usb/dwc3/core.h @@ -953,6 +953,8 @@ struct dwc3_scratchpad_array { * - USBPHY_INTERFACE_MODE_UTMI * - USBPHY_INTERFACE_MODE_UTMIW * @role_sw: usb_role_switch handle + * @role_switch_default_mode: default operation mode of controller while + * usb role is USB_ROLE_NONE. * @usb2_phy: pointer to USB2 PHY * @usb3_phy: pointer to USB3 PHY * @usb2_generic_phy: pointer to USB2 PHY @@ -1087,6 +1089,7 @@ struct dwc3 { struct notifier_block edev_nb; enum usb_phy_interface hsphy_mode; struct usb_role_switch *role_sw; + enum usb_dr_mode role_switch_default_mode; u32 fladj; u32 irq_gadget; diff --git a/drivers/usb/dwc3/drd.c b/drivers/usb/dwc3/drd.c index 331c6e997f0c..db68d48c2267 100644 --- a/drivers/usb/dwc3/drd.c +++ b/drivers/usb/dwc3/drd.c @@ -491,7 +491,10 @@ static int dwc3_usb_role_switch_set(struct device *dev, enum usb_role role) mode = DWC3_GCTL_PRTCAP_DEVICE; break; default: - mode = DWC3_GCTL_PRTCAP_DEVICE; + if (dwc->role_switch_default_mode == USB_DR_MODE_HOST) + mode = DWC3_GCTL_PRTCAP_HOST; + else + mode = DWC3_GCTL_PRTCAP_DEVICE; break; } @@ -517,7 +520,10 @@ static enum usb_role dwc3_usb_role_switch_get(struct device *dev) role = dwc->current_otg_role; break; default: - role = USB_ROLE_DEVICE; + if (dwc->role_switch_default_mode == USB_DR_MODE_HOST) + role = USB_ROLE_HOST; + else + role = USB_ROLE_DEVICE; break; } spin_unlock_irqrestore(&dwc->lock, flags); @@ -527,6 +533,19 @@ static enum usb_role dwc3_usb_role_switch_get(struct device *dev) static int dwc3_setup_role_switch(struct dwc3 *dwc) { struct usb_role_switch_desc dwc3_role_switch = {NULL}; + const char *str; + u32 mode; + int ret; + + ret = device_property_read_string(dwc->dev, "role-switch-default-mode", + &str); + if (ret >= 0 && !strncmp(str, "host", strlen("host"))) { + dwc->role_switch_default_mode = USB_DR_MODE_HOST; + mode = DWC3_GCTL_PRTCAP_HOST; + } else { + dwc->role_switch_default_mode = USB_DR_MODE_PERIPHERAL; + mode = DWC3_GCTL_PRTCAP_DEVICE; + } dwc3_role_switch.fwnode = dev_fwnode(dwc->dev); dwc3_role_switch.set = dwc3_usb_role_switch_set; @@ -535,7 +554,7 @@ static int dwc3_setup_role_switch(struct dwc3 *dwc) if (IS_ERR(dwc->role_sw)) return PTR_ERR(dwc->role_sw); - dwc3_set_mode(dwc, DWC3_GCTL_PRTCAP_DEVICE); + dwc3_set_mode(dwc, mode); return 0; } #else