From: Dmitry Osipenko <digetx@gmail.com>
To: Rob Herring <robh+dt@kernel.org>,
Greg Kroah-Hartman <gregkh@linuxfoundation.org>,
Peter Chen <Peter.Chen@nxp.com>,
Thierry Reding <thierry.reding@gmail.com>,
Jonathan Hunter <jonathanh@nvidia.com>,
Felipe Balbi <balbi@kernel.org>
Cc: devicetree@vger.kernel.org, linux-usb@vger.kernel.org,
linux-tegra@vger.kernel.org, linux-kernel@vger.kernel.org
Subject: [PATCH v3 05/16] usb: phy: tegra: Use generic stub for a missing VBUS regulator
Date: Sat, 28 Dec 2019 23:33:47 +0300 [thread overview]
Message-ID: <20191228203358.23490-6-digetx@gmail.com> (raw)
In-Reply-To: <20191228203358.23490-1-digetx@gmail.com>
Regulator core provides dummy regulator if device-tree doesn't define VBUS
regulator.
Signed-off-by: Dmitry Osipenko <digetx@gmail.com>
---
drivers/usb/phy/phy-tegra-usb.c | 28 +++++++++-------------------
1 file changed, 9 insertions(+), 19 deletions(-)
diff --git a/drivers/usb/phy/phy-tegra-usb.c b/drivers/usb/phy/phy-tegra-usb.c
index 4d6d586c49cc..0a07efc9de06 100644
--- a/drivers/usb/phy/phy-tegra-usb.c
+++ b/drivers/usb/phy/phy-tegra-usb.c
@@ -798,9 +798,7 @@ static void tegra_usb_phy_shutdown(struct usb_phy *u_phy)
else
utmip_pad_close(phy);
- if (!IS_ERR(phy->vbus))
- regulator_disable(phy->vbus);
-
+ regulator_disable(phy->vbus);
clk_disable_unprepare(phy->pll_u);
phy->freq = NULL;
@@ -878,14 +876,11 @@ static int tegra_usb_phy_init(struct usb_phy *u_phy)
goto fail;
}
- if (!IS_ERR(phy->vbus)) {
- err = regulator_enable(phy->vbus);
- if (err) {
- dev_err(phy->u_phy.dev,
- "Failed to enable USB VBUS regulator: %d\n",
- err);
- goto fail;
- }
+ err = regulator_enable(phy->vbus);
+ if (err) {
+ dev_err(phy->u_phy.dev,
+ "Failed to enable USB VBUS regulator: %d\n", err);
+ goto fail;
}
if (phy->is_ulpi_phy)
@@ -1120,14 +1115,9 @@ static int tegra_usb_phy_probe(struct platform_device *pdev)
}
/* On some boards, the VBUS regulator doesn't need to be controlled */
- if (of_find_property(np, "vbus-supply", NULL)) {
- tegra_phy->vbus = devm_regulator_get(&pdev->dev, "vbus");
- if (IS_ERR(tegra_phy->vbus))
- return PTR_ERR(tegra_phy->vbus);
- } else {
- dev_notice(&pdev->dev, "no vbus regulator");
- tegra_phy->vbus = ERR_PTR(-ENODEV);
- }
+ tegra_phy->vbus = devm_regulator_get(&pdev->dev, "vbus");
+ if (IS_ERR(tegra_phy->vbus))
+ return PTR_ERR(tegra_phy->vbus);
tegra_phy->pll_u = devm_clk_get(&pdev->dev, "pll_u");
err = PTR_ERR_OR_ZERO(tegra_phy->pll_u);
--
2.24.0
next prev parent reply other threads:[~2019-12-28 20:37 UTC|newest]
Thread overview: 27+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-12-28 20:33 [PATCH v3 00/16] NVIDIA Tegra USB2 drivers clean up Dmitry Osipenko
2019-12-28 20:33 ` [PATCH v3 01/16] dt-binding: usb: ci-hdrc-usb2: Document NVIDIA Tegra support Dmitry Osipenko
2020-01-04 0:33 ` Rob Herring
2020-01-04 2:04 ` Dmitry Osipenko
2019-12-28 20:33 ` [PATCH v3 02/16] usb: phy: tegra: Hook up init/shutdown callbacks Dmitry Osipenko
2019-12-28 20:33 ` [PATCH v3 03/16] usb: phy: tegra: Perform general clean up of the code Dmitry Osipenko
2019-12-28 20:33 ` [PATCH v3 04/16] usb: phy: tegra: Use relaxed versions of readl/writel Dmitry Osipenko
2019-12-28 20:33 ` Dmitry Osipenko [this message]
2019-12-28 20:33 ` [PATCH v3 06/16] usb: ulpi: Add resource-managed variant of otg_ulpi_create() Dmitry Osipenko
2019-12-28 20:33 ` [PATCH v3 07/16] usb: phy: tegra: Use devm_otg_ulpi_create() Dmitry Osipenko
2019-12-28 20:33 ` [PATCH v3 08/16] usb: phy: tegra: Use u32 for hardware register variables Dmitry Osipenko
2019-12-28 20:33 ` [PATCH v3 09/16] usb: phy: tegra: Assert reset on ULPI close instead of deasserting it Dmitry Osipenko
2019-12-28 20:33 ` [PATCH v3 10/16] usb: phy: tegra: Use device-tree notion of reset-GPIO's active-state Dmitry Osipenko
2020-01-03 7:58 ` Michał Mirosław
2020-01-03 23:53 ` Dmitry Osipenko
2020-01-05 0:58 ` Dmitry Osipenko
2019-12-28 20:33 ` [PATCH v3 11/16] usb: phy: tegra: Disable VBUS regulator on tegra_usb_phy_init failure Dmitry Osipenko
2019-12-28 20:33 ` [PATCH v3 12/16] usb: phy: tegra: Move utmip_pad_count checking under lock Dmitry Osipenko
2019-12-28 20:33 ` [PATCH v3 13/16] usb: phy: tegra: Keep CPU interrupts enabled Dmitry Osipenko
2019-12-30 20:36 ` Michał Mirosław
2020-01-02 14:40 ` Dmitry Osipenko
2020-01-03 7:41 ` Michał Mirosław
2019-12-28 20:33 ` [PATCH v3 14/16] usb: chipidea: tegra: Stop managing PHY's power Dmitry Osipenko
2019-12-30 2:24 ` Peter Chen
2019-12-28 20:33 ` [PATCH v3 15/16] usb: chipidea: tegra: Add USB_TEGRA_PHY to driver's dependencies Dmitry Osipenko
2019-12-30 2:25 ` Peter Chen
2019-12-28 20:33 ` [PATCH v3 16/16] usb: host: ehci-tegra: Remove unused fields from tegra_ehci_hcd Dmitry Osipenko
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20191228203358.23490-6-digetx@gmail.com \
--to=digetx@gmail.com \
--cc=Peter.Chen@nxp.com \
--cc=balbi@kernel.org \
--cc=devicetree@vger.kernel.org \
--cc=gregkh@linuxfoundation.org \
--cc=jonathanh@nvidia.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-tegra@vger.kernel.org \
--cc=linux-usb@vger.kernel.org \
--cc=robh+dt@kernel.org \
--cc=thierry.reding@gmail.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).