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: 181375 Delivered-To: patches@linaro.org Received: by 2002:a92:3001:0:0:0:0:0 with SMTP id x1csp280365ile; Wed, 11 Dec 2019 17:42:39 -0800 (PST) X-Received: by 2002:a62:b402:: with SMTP id h2mr7055884pfn.55.1576114959668; Wed, 11 Dec 2019 17:42:39 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1576114959; cv=none; d=google.com; s=arc-20160816; b=0ANx2ihVmHCafxNYog+v/FGaZnGfrfDwIFcfeOUh+A2YspPJlz2mLsK3j/BVkkB2pX q8XJM/ml3xyQkaVQtt3jxAXTO4zDlB8kURZUqOl7klijfz5bv6QAt5chjNco0xvWsMvj J3Y83ox5W0aKkEGefYrXETtxS0yAt1eU0nNh0Qd3eWUieJM9EAIsjFiuHypisfcMeJ98 k3I9gZpOh6lSvTvtWnam7CAHwjQYwhK7SQXRK1kMtBrgH6+OGOGq5Y6XMDGRoMCS1Pbs h6VvjNHBhd6wgKmZFk9i4qM+HSCDYYzJReqjwKInTV/YFtUOZmemHnS9X0nJFTARSo06 EV5A== 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=32ma7jm/USpVtHg7Ie1n8hF+znRzdCi92DyYoi4rfjo=; b=uqsu+jobEEyQZfUbvuBcIi3jU51n+J0mvTdEG+Ughuss9GlvJZ99lX4V4H3hQQ0wOK P2asr3UWmf5llII7VYhPOxWhqnSm6kUWBa6qiAIAAaCe1tgWs/iBWyqOd/qhnz1Jpc6Q jvoCF56SKY9bU7SE75vaq1vaO531acffkx4CPeKCGY4uoz2IMqBi2DqAvqFdUdwv3ylb r3p6boqqjGpCC0muGX3p56N9QaHk7WIWDIQsLK3CylsvYJTA9CXSizuIrOVVmRZgClJ2 GEZoWuX99R5w6RWv7PhiX+BaCkpOWKpnfMOIsHx6P0DVzRZzzc13o5JvOBY1gR4Fs+c6 wV9Q== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=m+mTiQrt; 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 o3sor4447535plk.35.2019.12.11.17.42.39 for (Google Transport Security); Wed, 11 Dec 2019 17:42:39 -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=m+mTiQrt; 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=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=eq2dSgdONiO8iSMhtoF3AWyPyURiDzMIASWDk4nQUBOMNz0eruRQDLmRH53fqLlbd7 isbNKvFWRksBN3GWt58MOezcaubMHKWvcPJSfTQFaMRYA3EF+zDPqQpFBFnouZsm7q1P dKzIq6CJxc7qzlvkz/c/AnxnqU9Qr1RXuV9Abpq+j/gHCga7lUrKV5D4hPdZ3iMQ9QF1 0SxeoDVfUV2QTgjdlStHfQVHWxvsLoIIhLf1sIc6tfsqvU8QKvJ0sl7z5iQ1V17t4ymc UzK0NzgG9pY94BzEkdIsoz/AAhJMQGROnAvtZJ9pi1U1HPT+8WeQnkP27Eb4pFEuzTE0 JL2A== X-Gm-Message-State: APjAAAVdGQ9YUdKWeKftQnnX466O5a/yJYEqKjIXxkARsywo+hxE1TmM V6NyetLOSF/WgbvMEdMXSf5MiQns 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) Return-Path: 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> 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(-) -- 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 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