From patchwork Mon Feb 22 11:51:48 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ray Chi X-Patchwork-Id: 12098409 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=-26.3 required=3.0 tests=BAYES_00,DKIMWL_WL_MED, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_CR_TRAILER,INCLUDES_PATCH,MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS, USER_AGENT_GIT,USER_IN_DEF_DKIM_WL 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 C342CC433E6 for ; Mon, 22 Feb 2021 11:53:33 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 7806564E12 for ; Mon, 22 Feb 2021 11:53:33 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230122AbhBVLxU (ORCPT ); Mon, 22 Feb 2021 06:53:20 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:53478 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230084AbhBVLxA (ORCPT ); Mon, 22 Feb 2021 06:53:00 -0500 Received: from mail-yb1-xb49.google.com (mail-yb1-xb49.google.com [IPv6:2607:f8b0:4864:20::b49]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id DE028C061574 for ; Mon, 22 Feb 2021 03:52:19 -0800 (PST) Received: by mail-yb1-xb49.google.com with SMTP id x4so16325209ybj.22 for ; Mon, 22 Feb 2021 03:52:19 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20161025; h=sender:date:in-reply-to:message-id:mime-version:references:subject :from:to:cc; bh=C7kw8jx64LApjlXr8YSHyVe3f0SwrG/CcJgwhfZRYVM=; b=AT4Vcn7CD2ooKlsMJvGdNfu9HkqU4a546cJWUY3m4AUuNnHB9fbNLkD7aq/URsDt8x XUhkP8YCkMoUFYIpPjK3vccLXCLSSeGBeJAfO6KgBV3GBOW2g1RJRl7Xgezcq1RyxySR mczoGFVdG6T6e1t2grHV4ROubyVArO0b1uPwOW1sI3dfgkExKdjNCrMMPKQFRYBUkRc+ cixHajqNv1AlBLX9db+fDtMtpHLxkqDuPR813tRHu2fAycSZkVGd8/UvIE5QGyLm4Q9Y 3wZsLS9nRiZAi0itOLAzahfQE7+AzFg7ilPB59iFHB9vk1tflxjH0MjWa4Ec4OWh4UVC 3ZBQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:date:in-reply-to:message-id:mime-version :references:subject:from:to:cc; bh=C7kw8jx64LApjlXr8YSHyVe3f0SwrG/CcJgwhfZRYVM=; b=gu8fWpN6FNapoMmghqyExIVgX4/OmmnJ3O3DdvKDGCaxj+VA0pASiMreR18ij4EFlj M6aUcyG3k3D2izHeMyOI9GHBRF2xIG01cnbmyhOLCqTA0Kx5OUKLZTL96QgKZe9Jf+yd 84DGq1y/4Kw3oznUUOZN/25uD8WOafq2513GTFbi5oLLPEc04T4wxRJq4B6fAt9ny1bO JYyVXYkhkODs98tpCEacaword6qxq8qiR1ATX2zEyXqOfqdbpegsyX3kA4W7E+toYL+G O4jk4AVX4KsVN0fkXpMVafzkyqaY42eqGbeFOE+dWFBE5JAxlWF2EXAKZpL2OOAjepfZ lSsg== X-Gm-Message-State: AOAM532+t2ylUxkijKYbiopLzoHzyrNOf6qxBMKf8WfgafbwK+zgD18I 6JLkQbt2+DZl6c3VNC5Kt7MavynbFYc= X-Google-Smtp-Source: ABdhPJxevbp8wPkx6Ynac/UjHwNCwxMtwswB0C2urmf+KQMq18bfqqo7raAlrfHy+IozE0P87m6iEZRH4CE= Sender: "raychi via sendgmr" X-Received: from raychi.tao.corp.google.com ([2401:fa00:fc:202:9c8c:8669:7daa:43ff]) (user=raychi job=sendgmr) by 2002:a5b:2c8:: with SMTP id h8mr31577758ybp.364.1613994739172; Mon, 22 Feb 2021 03:52:19 -0800 (PST) Date: Mon, 22 Feb 2021 19:51:48 +0800 In-Reply-To: <20210222115149.3606776-1-raychi@google.com> Message-Id: <20210222115149.3606776-2-raychi@google.com> Mime-Version: 1.0 References: <20210222115149.3606776-1-raychi@google.com> X-Mailer: git-send-email 2.30.0.617.g56c4b15f3c-goog Subject: [PATCH 1/2] usb: dwc3: add a power supply for current control From: Ray Chi To: balbi@kernel.org, gregkh@linuxfoundation.org Cc: linux-usb@vger.kernel.org, linux-kernel@vger.kernel.org, kyletso@google.com, badhri@google.com, Ray Chi Precedence: bulk List-ID: X-Mailing-List: linux-usb@vger.kernel.org Currently, VBUS draw callback does no action when the generic PHYs are used. This patch adds an additional path to control charging current through power supply interface. Signed-off-by: Ray Chi --- drivers/usb/dwc3/core.c | 15 +++++++++++++++ drivers/usb/dwc3/core.h | 4 ++++ 2 files changed, 19 insertions(+) diff --git a/drivers/usb/dwc3/core.c b/drivers/usb/dwc3/core.c index f2448d0a9d39..d15f065849cd 100644 --- a/drivers/usb/dwc3/core.c +++ b/drivers/usb/dwc3/core.c @@ -1238,6 +1238,8 @@ static void dwc3_get_properties(struct dwc3 *dwc) u8 rx_max_burst_prd; u8 tx_thr_num_pkt_prd; u8 tx_max_burst_prd; + const char *usb_psy_name; + int ret; /* default to highest possible threshold */ lpm_nyet_threshold = 0xf; @@ -1263,6 +1265,13 @@ static void dwc3_get_properties(struct dwc3 *dwc) else dwc->sysdev = dwc->dev; + ret = device_property_read_string(dev, "usb-psy-name", &usb_psy_name); + if (ret >= 0) { + dwc->usb_psy = power_supply_get_by_name(usb_psy_name); + if (!dwc->usb_psy) + dev_err(dev, "couldn't get usb power supply\n"); + } + dwc->has_lpm_erratum = device_property_read_bool(dev, "snps,has-lpm-erratum"); device_property_read_u8(dev, "snps,lpm-nyet-threshold", @@ -1619,6 +1628,9 @@ static int dwc3_probe(struct platform_device *pdev) assert_reset: reset_control_assert(dwc->reset); + if (!dwc->usb_psy) + power_supply_put(dwc->usb_psy); + return ret; } @@ -1641,6 +1653,9 @@ static int dwc3_remove(struct platform_device *pdev) dwc3_free_event_buffers(dwc); dwc3_free_scratch_buffers(dwc); + if (!dwc->usb_psy) + power_supply_put(dwc->usb_psy); + return 0; } diff --git a/drivers/usb/dwc3/core.h b/drivers/usb/dwc3/core.h index 052b20d52651..6708fdf358b3 100644 --- a/drivers/usb/dwc3/core.h +++ b/drivers/usb/dwc3/core.h @@ -30,6 +30,8 @@ #include +#include + #define DWC3_MSG_MAX 500 /* Global constants */ @@ -1125,6 +1127,8 @@ struct dwc3 { struct usb_role_switch *role_sw; enum usb_dr_mode role_switch_default_mode; + struct power_supply *usb_psy; + u32 fladj; u32 irq_gadget; u32 otg_irq; From patchwork Mon Feb 22 11:51:49 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ray Chi X-Patchwork-Id: 12098411 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=-26.3 required=3.0 tests=BAYES_00,DKIMWL_WL_MED, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_CR_TRAILER,INCLUDES_PATCH,MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS, USER_AGENT_GIT,USER_IN_DEF_DKIM_WL 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 343E6C4332B for ; Mon, 22 Feb 2021 11:53:34 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 0871B64F04 for ; Mon, 22 Feb 2021 11:53:33 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230138AbhBVLxX (ORCPT ); Mon, 22 Feb 2021 06:53:23 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:53514 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230114AbhBVLxJ (ORCPT ); Mon, 22 Feb 2021 06:53:09 -0500 Received: from mail-yb1-xb4a.google.com (mail-yb1-xb4a.google.com [IPv6:2607:f8b0:4864:20::b4a]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 94F62C06178B for ; Mon, 22 Feb 2021 03:52:29 -0800 (PST) Received: by mail-yb1-xb4a.google.com with SMTP id u1so16331579ybu.14 for ; Mon, 22 Feb 2021 03:52:29 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20161025; h=sender:date:in-reply-to:message-id:mime-version:references:subject :from:to:cc; bh=hkg7l7k09gSiXsklT0wb4ODJUDwROgdzJX4zhRCopXs=; b=nC+u7LeskQ5PqB96K0OZyaNc5ayCBRcJoQcjFlQGLUBQN68ZJ+WtC1kx4BONX0iQ0R ji7fGuiW2STK+GA8Bw93wQ+9HOmy+PU+Teo1jHk31GAYhYGXV8Ul+aDZF34A4Cxc+VND yN0VnmLXH15c3fcfSsgr92GMOuDnzVhhyX5HpCQpCPpEJqAlYIdt8/lNNd0hstbDMoaz J4x5ZxHco6+X+yirJB9XDwK5+4Ie1bjIRTdrJYarEirRxhmTGsi+ggnMqbmtoG+EdG2/ wmfbKlutlC77dWk3XkkR6g0sd6ROp8GxHnk8SvUbTBRV/RODgXh9bJPQK3FnoO2i+rdR HgnA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:date:in-reply-to:message-id:mime-version :references:subject:from:to:cc; bh=hkg7l7k09gSiXsklT0wb4ODJUDwROgdzJX4zhRCopXs=; b=KmAlZQyvfqBfbL47FFPdq/ydEnLcdoS1bl/VwQHW57SqYZllGRzLPlVHoqVFKjLSXv OYD8/rkqZuNNw+1zV7yn+Nl0NCahaWbsiuvNZW+5oOWlvbzWPu0aOwPGXxeBb2Cu9cIL OmNT/AQdbUkaNMnuBHIbnnDRpCdZd2RYPDXX6YAWKyvdmDaGe9A/2I2GOFSskzgA0MW+ itJvgkXKHW9G6wNYb+uBK+EyP++mfpAehp6K3tEjsbvoDZFXzEScKNgSxYJkfTj2utnz YyLyuJuDXEIOYAyX4uRWKgdszFrIF4/aJRAgOsymu1KyI/vs6y/AxvNLZ1AITGT2uQVN Ag8Q== X-Gm-Message-State: AOAM532KGkdxI6CbG8Uk/71ixslEs4iaol3blPjt9uhnolG+spu7oqym QlaIcjL9Kd2igqSibyD4Q9rJLFqH2Uc= X-Google-Smtp-Source: ABdhPJwClJrjWHmfghcvmp5t/JdruNppK7yh4zkWeNZm8ur+iROqDeX8KnFGgrNGmFFqE/GYTbCRvtFja3s= Sender: "raychi via sendgmr" X-Received: from raychi.tao.corp.google.com ([2401:fa00:fc:202:9c8c:8669:7daa:43ff]) (user=raychi job=sendgmr) by 2002:a25:9902:: with SMTP id z2mr30927267ybn.339.1613994748863; Mon, 22 Feb 2021 03:52:28 -0800 (PST) Date: Mon, 22 Feb 2021 19:51:49 +0800 In-Reply-To: <20210222115149.3606776-1-raychi@google.com> Message-Id: <20210222115149.3606776-3-raychi@google.com> Mime-Version: 1.0 References: <20210222115149.3606776-1-raychi@google.com> X-Mailer: git-send-email 2.30.0.617.g56c4b15f3c-goog Subject: [PATCH 2/2] usb: dwc3: add an alternate path in vbus_draw callback From: Ray Chi To: balbi@kernel.org, gregkh@linuxfoundation.org Cc: linux-usb@vger.kernel.org, linux-kernel@vger.kernel.org, kyletso@google.com, badhri@google.com, Ray Chi Precedence: bulk List-ID: X-Mailing-List: linux-usb@vger.kernel.org This patch adds an alternate path in vbus_draw callback through power supply property POWER_SUPPLY_PROP_INPUT_CURRENT_LIMIT. Signed-off-by: Ray Chi --- drivers/usb/dwc3/gadget.c | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/drivers/usb/dwc3/gadget.c b/drivers/usb/dwc3/gadget.c index aebcf8ec0716..47809835e163 100644 --- a/drivers/usb/dwc3/gadget.c +++ b/drivers/usb/dwc3/gadget.c @@ -2530,11 +2530,19 @@ static void dwc3_gadget_set_ssp_rate(struct usb_gadget *g, static int dwc3_gadget_vbus_draw(struct usb_gadget *g, unsigned int mA) { struct dwc3 *dwc = gadget_to_dwc(g); + union power_supply_propval val = {0}; + int ret; if (dwc->usb2_phy) return usb_phy_set_power(dwc->usb2_phy, mA); - return 0; + if (!dwc->usb_psy) + return -EOPNOTSUPP; + + val.intval = mA; + ret = power_supply_set_property(dwc->usb_psy, POWER_SUPPLY_PROP_INPUT_CURRENT_LIMIT, &val); + + return ret; } static const struct usb_gadget_ops dwc3_gadget_ops = {