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 10/16] usb: phy: tegra: Use device-tree notion of reset-GPIO's active-state
Date: Sat, 28 Dec 2019 23:33:52 +0300 [thread overview]
Message-ID: <20191228203358.23490-11-digetx@gmail.com> (raw)
In-Reply-To: <20191228203358.23490-1-digetx@gmail.com>
It is much more intuitive if reset is treated as asserted when GPIO value
is set to 1. All NVIDIA Tegra device-trees are properly specifying active
state of the reset-GPIO since 2013, let's clean up that part of the code.
Signed-off-by: Dmitry Osipenko <digetx@gmail.com>
---
drivers/usb/phy/phy-tegra-usb.c | 58 ++++++++-----------------------
include/linux/usb/tegra_usb_phy.h | 3 +-
2 files changed, 17 insertions(+), 44 deletions(-)
diff --git a/drivers/usb/phy/phy-tegra-usb.c b/drivers/usb/phy/phy-tegra-usb.c
index 1ecd9f7900af..cc6cca4dcecb 100644
--- a/drivers/usb/phy/phy-tegra-usb.c
+++ b/drivers/usb/phy/phy-tegra-usb.c
@@ -306,14 +306,7 @@ static int utmip_pad_close(struct tegra_usb_phy *phy)
static void ulpi_close(struct tegra_usb_phy *phy)
{
- int err;
-
- err = gpio_direction_output(phy->reset_gpio, 0);
- if (err) {
- dev_err(phy->u_phy.dev,
- "ULPI reset GPIO %d direction not asserted: %d\n",
- phy->reset_gpio, err);
- }
+ gpiod_set_value_cansleep(phy->reset_gpio, 1);
}
static int utmip_pad_power_on(struct tegra_usb_phy *phy)
@@ -703,12 +696,7 @@ static int ulpi_phy_power_on(struct tegra_usb_phy *phy)
u32 val;
int err;
- err = gpio_direction_output(phy->reset_gpio, 0);
- if (err) {
- dev_err(phy->u_phy.dev, "GPIO %d not set to 0: %d\n",
- phy->reset_gpio, err);
- return err;
- }
+ gpiod_set_value_cansleep(phy->reset_gpio, 1);
err = clk_prepare_enable(phy->clk);
if (err)
@@ -716,12 +704,7 @@ static int ulpi_phy_power_on(struct tegra_usb_phy *phy)
usleep_range(5000, 10000);
- err = gpio_direction_output(phy->reset_gpio, 1);
- if (err) {
- dev_err(phy->u_phy.dev, "GPIO %d not set to 1: %d\n",
- phy->reset_gpio, err);
- goto disable_clk;
- }
+ gpiod_set_value_cansleep(phy->reset_gpio, 0);
usleep_range(1000, 2000);
@@ -784,8 +767,9 @@ static int ulpi_phy_power_on(struct tegra_usb_phy *phy)
static int ulpi_phy_power_off(struct tegra_usb_phy *phy)
{
clk_disable_unprepare(phy->clk);
+ gpiod_set_value_cansleep(phy->reset_gpio, 1);
- return gpio_direction_output(phy->reset_gpio, 0);
+ return 0;
}
static void tegra_usb_phy_shutdown(struct usb_phy *u_phy)
@@ -837,15 +821,7 @@ static int tegra_usb_phy_set_suspend(struct usb_phy *u_phy, int suspend)
static int ulpi_open(struct tegra_usb_phy *phy)
{
- int err;
-
- err = gpio_direction_output(phy->reset_gpio, 0);
- if (err) {
- dev_err(phy->u_phy.dev,
- "ULPI reset GPIO %d direction not deasserted: %d\n",
- phy->reset_gpio, err);
- return err;
- }
+ gpiod_set_value_cansleep(phy->reset_gpio, 1);
return 0;
}
@@ -1081,6 +1057,7 @@ static int tegra_usb_phy_probe(struct platform_device *pdev)
struct tegra_usb_phy *tegra_phy;
enum usb_phy_interface phy_type;
struct reset_control *reset;
+ struct gpio_desc *gpiod;
struct resource *res;
struct usb_phy *phy;
int err;
@@ -1158,15 +1135,6 @@ static int tegra_usb_phy_probe(struct platform_device *pdev)
case USBPHY_INTERFACE_MODE_ULPI:
tegra_phy->is_ulpi_phy = true;
- tegra_phy->reset_gpio =
- of_get_named_gpio(np, "nvidia,phy-reset-gpio", 0);
-
- if (!gpio_is_valid(tegra_phy->reset_gpio)) {
- dev_err(&pdev->dev,
- "Invalid GPIO: %d\n", tegra_phy->reset_gpio);
- return tegra_phy->reset_gpio;
- }
-
tegra_phy->clk = devm_clk_get(&pdev->dev, "ulpi-link");
err = PTR_ERR_OR_ZERO(tegra_phy->clk);
if (err) {
@@ -1175,13 +1143,17 @@ static int tegra_usb_phy_probe(struct platform_device *pdev)
return err;
}
- err = devm_gpio_request(&pdev->dev, tegra_phy->reset_gpio,
- "ulpi_phy_reset_b");
+ gpiod = devm_gpiod_get_from_of_node(&pdev->dev, np,
+ "nvidia,phy-reset-gpio",
+ 0, GPIOD_OUT_HIGH,
+ "ulpi_phy_reset_b");
+ err = PTR_ERR_OR_ZERO(gpiod);
if (err) {
- dev_err(&pdev->dev, "Request failed for GPIO %d: %d\n",
- tegra_phy->reset_gpio, err);
+ dev_err(&pdev->dev,
+ "Request failed for reset GPIO: %d\n", err);
return err;
}
+ tegra_phy->reset_gpio = gpiod;
phy = devm_otg_ulpi_create(&pdev->dev,
&ulpi_viewport_access_ops, 0);
diff --git a/include/linux/usb/tegra_usb_phy.h b/include/linux/usb/tegra_usb_phy.h
index 0c5c3ea8b2d7..6b857fe13b35 100644
--- a/include/linux/usb/tegra_usb_phy.h
+++ b/include/linux/usb/tegra_usb_phy.h
@@ -17,6 +17,7 @@
#define __TEGRA_USB_PHY_H
#include <linux/clk.h>
+#include <linux/gpio.h>
#include <linux/reset.h>
#include <linux/usb/otg.h>
@@ -76,7 +77,7 @@ struct tegra_usb_phy {
struct usb_phy u_phy;
bool is_legacy_phy;
bool is_ulpi_phy;
- int reset_gpio;
+ struct gpio_desc *reset_gpio;
struct reset_control *pad_rst;
};
--
2.24.0
next prev parent reply other threads:[~2019-12-28 20:36 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 ` [PATCH v3 05/16] usb: phy: tegra: Use generic stub for a missing VBUS regulator Dmitry Osipenko
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 ` Dmitry Osipenko [this message]
2020-01-03 7:58 ` [PATCH v3 10/16] usb: phy: tegra: Use device-tree notion of reset-GPIO's active-state 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-11-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).