From patchwork Fri Nov 8 01:17:23 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: John Stultz X-Patchwork-Id: 178842 Delivered-To: patches@linaro.org Received: by 2002:a92:38d5:0:0:0:0:0 with SMTP id g82csp1924280ilf; Thu, 7 Nov 2019 17:17:31 -0800 (PST) X-Received: by 2002:a63:252:: with SMTP id 79mr8357159pgc.434.1573175851164; Thu, 07 Nov 2019 17:17:31 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1573175851; cv=none; d=google.com; s=arc-20160816; b=rYVNUUOY+vI28CfmGHubAgeFhSZ9ETlWY/fUJKaZrs0g0ZqjSqiBoCfhA/rbsE6RI2 nPLqK58XNeAQgZUMvh1kwcm0b12jKtyubqwdJZSWSXFltBV1N2x0u4CrYt70dL4k8vy4 oBm9REPCwr+ut65N96M921T8YSGIZKDDBIcRtIEmds0GPoKtoyrjVdn2ZbD573pzPiL1 IvLIEcPq3Yt8oVj/AUm8aOJrbx6r9ic7dGB/NaafvPhGVohFb70JByy6YQ7sqe2VPiir KRpexXg8IzjmFpmTOzPwm+QvsHPZAos42P0flaaX+3CpR6RvVJYcKxeGdZvZHP+4cDsK /11A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=YbemW7AL+I9zYGvxXlbJg+1m1dDalQtynuOAJrGAmWs=; b=BeERKcXTlxZN+n698Gu0LC6XCmlA1DzbhqbfoXhC8CrGHRRIZBhjedUGl6LPMXVQ4W KH5pEUXlbw9/fL8G0ie872oLoljNxo9NX2MIljsV1Cdinzg552c8/8Z1Q09Pk/k+x9Il JZjePsY98K2JMQdG8ofteKK00C+fCVIH2LCpuLZlOu9JcUT8RbJiUnbIAKjkTmO+4EVh gdB4Q/V5DN4jo1Y0Uxl/ls5lGGFm2ok9hiTuvQY83fMO9SHpKO5lXAtM1SnGLJhzmuSV oqlXQawMnRmz8taXrwKFyWACZtcB6tC2V1QK6bUAf/4R4bZ+4jmoxFVuSpqLxEssMwXb /dzw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=ACJVwJRk; spf=pass (google.com: domain of john.stultz@linaro.org designates 209.85.220.65 as permitted sender) smtp.mailfrom=john.stultz@linaro.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from mail-sor-f65.google.com (mail-sor-f65.google.com. [209.85.220.65]) by mx.google.com with SMTPS id c69sor5422038pfc.14.2019.11.07.17.17.31 for (Google Transport Security); Thu, 07 Nov 2019 17:17:31 -0800 (PST) Received-SPF: pass (google.com: domain of john.stultz@linaro.org designates 209.85.220.65 as permitted sender) client-ip=209.85.220.65; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=ACJVwJRk; spf=pass (google.com: domain of john.stultz@linaro.org designates 209.85.220.65 as permitted sender) smtp.mailfrom=john.stultz@linaro.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org 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=YbemW7AL+I9zYGvxXlbJg+1m1dDalQtynuOAJrGAmWs=; b=ACJVwJRkBGFF/+sRj9R7QOdB9bAbJ6DEyprQOIneKcH3rKcMgobDzmL8cbBhYlFlhK UG2Ts4IPnKEi0BvogIAVPjdl0GyD/nmlUMJ8j3nrOqWM4sZhl4iScMGH6pMgUdIp3agF bAhVgzQJJibox07IVXnsi/E0RBsgmbS4Be+JPffq8vWgbVwBcK/204cFgjRz8+tYE+AW NyEqeFkwbX6OcClJTe51TB9TQpaxHfkYHRX9N6XVF/cffjl/FHsbZQGK/bFdbMs7MisO s6FQbdYw7P81hKyHCx5wpCeqZldGJFTnOsLYsjfKnKeWzlWpzvYZBckyZBX1n6C8/3tY 3rog== 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=YbemW7AL+I9zYGvxXlbJg+1m1dDalQtynuOAJrGAmWs=; b=hNP4V2kp/tSaefXq4IKRmoMTbJhMn/ZFvYPUBTayZMxbuYpHlCPoLym6SykO4M8R00 3N1753ABEyGp6EwatRdb21jHzFUXROaojx63Fdbjml55OSSMzNUyQm8bSBrr7h32v4Ux MYDCXTjZGwnYuNofo+g7z21K8dK1yhvWFPRaBD5oP4xKU6c2Vz/aNFZBAtkU+YNa4DU9 PE9jB+kibXNf9dpBpF7A+rU8+zHgMMYk0BUhSRUmi9ZSLgO5uJP0ieSWVgNcuIKNwIqS b4IVngLEy5oAQQw+/YQM4TaqQ0W+De2NdBBNPhq3SRU9QoAAkJ0lUuRtyQxwywPaV7XL cBxA== X-Gm-Message-State: APjAAAXWhNmcVDNCLav7rLXCUBIVEbg+wO3TmjzokF8kJi6vZLFVqNVP 9MAZiaec0pVwt2Fz3Ae8ZsU66htA X-Google-Smtp-Source: APXvYqyDhmgyCW2jRU4VkuvCxHq08LF27f3i1nfLBp9RaV09aT68CPvXaoPm9q4dclh6MPOcwKx78Q== X-Received: by 2002:a63:e84d:: with SMTP id a13mr8340878pgk.226.1573175850634; Thu, 07 Nov 2019 17:17:30 -0800 (PST) Return-Path: Received: from localhost.localdomain (c-67-170-172-113.hsd1.or.comcast.net. [67.170.172.113]) by smtp.gmail.com with ESMTPSA id s23sm3801627pgh.21.2019.11.07.17.17.29 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 07 Nov 2019 17:17:30 -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 , Jack Pham , linux-usb@vger.kernel.org, devicetree@vger.kernel.org Subject: [PATCH v5 3/3] usb: dwc3: Add support for role-switch-default-mode binding Date: Fri, 8 Nov 2019 01:17:23 +0000 Message-Id: <20191108011723.32390-4-john.stultz@linaro.org> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20191108011723.32390-1-john.stultz@linaro.org> References: <20191108011723.32390-1-john.stultz@linaro.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: 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(-) -- 2.17.1 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 cd43dc2a96c6..dbb881863297 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