From: Felipe Balbi <balbi@ti.com>
To: Venu Byravarasu <vbyravarasu@nvidia.com>
Cc: <gregkh@linuxfoundation.org>, <balbi@ti.com>,
<stern@rowland.harvard.edu>, <linux-usb@vger.kernel.org>,
<linux-kernel@vger.kernel.org>, <swarren@wwwdotorg.org>,
<linux-doc@vger.kernel.org>, <linux-tegra@vger.kernel.org>
Subject: Re: [PATCH 3/4] USB: PHY: Tegra: Get rid of instance number to differentiate PHY type
Date: Fri, 18 Jan 2013 20:34:57 +0200 [thread overview]
Message-ID: <20130118183457.GB1776@arwen.pp.htv.fi> (raw)
In-Reply-To: <1358343022-28919-4-git-send-email-vbyravarasu@nvidia.com>
[-- Attachment #1: Type: text/plain, Size: 4158 bytes --]
On Wed, Jan 16, 2013 at 07:00:21PM +0530, Venu Byravarasu wrote:
> Tegra20 USB has 3 PHY instances:
> Instance 1 and 3 are UTMI. Instance 2 is ULPI.
>
> As instance number was used to differentiate ULPI from UTMI,
> used DT param to get this info and processed accordingly.
>
> Signed-off-by: Venu Byravarasu <vbyravarasu@nvidia.com>
Acked-by: Felipe Balbi <balbi@ti.com>
> ---
> drivers/usb/phy/tegra_usb_phy.c | 23 +++++++++--------------
> include/linux/usb/tegra_usb_phy.h | 1 +
> 2 files changed, 10 insertions(+), 14 deletions(-)
>
> diff --git a/drivers/usb/phy/tegra_usb_phy.c b/drivers/usb/phy/tegra_usb_phy.c
> index 79280fe..ce1ff2a 100644
> --- a/drivers/usb/phy/tegra_usb_phy.c
> +++ b/drivers/usb/phy/tegra_usb_phy.c
> @@ -209,11 +209,6 @@ static struct tegra_utmip_config utmip_default[] = {
> },
> };
>
> -static inline bool phy_is_ulpi(struct tegra_usb_phy *phy)
> -{
> - return (phy->instance == 1);
> -}
> -
> static int utmip_pad_open(struct tegra_usb_phy *phy)
> {
> phy->pad_clk = clk_get_sys("utmip-pad", NULL);
> @@ -655,7 +650,7 @@ static int tegra_phy_init(struct usb_phy *x)
> struct tegra_ulpi_config *ulpi_config;
> int err;
>
> - if (phy_is_ulpi(phy)) {
> + if (phy->is_ulpi_phy) {
> ulpi_config = phy->config;
> phy->clk = clk_get_sys(NULL, ulpi_config->clk);
> if (IS_ERR(phy->clk)) {
> @@ -693,7 +688,7 @@ static void tegra_usb_phy_close(struct usb_phy *x)
> {
> struct tegra_usb_phy *phy = container_of(x, struct tegra_usb_phy, u_phy);
>
> - if (phy_is_ulpi(phy))
> + if (phy->is_ulpi_phy)
> clk_put(phy->clk);
> else
> utmip_pad_close(phy);
> @@ -704,7 +699,7 @@ static void tegra_usb_phy_close(struct usb_phy *x)
>
> static int tegra_usb_phy_power_on(struct tegra_usb_phy *phy)
> {
> - if (phy_is_ulpi(phy))
> + if (phy->is_ulpi_phy)
> return ulpi_phy_power_on(phy);
> else
> return utmi_phy_power_on(phy);
> @@ -712,7 +707,7 @@ static int tegra_usb_phy_power_on(struct tegra_usb_phy *phy)
>
> static int tegra_usb_phy_power_off(struct tegra_usb_phy *phy)
> {
> - if (phy_is_ulpi(phy))
> + if (phy->is_ulpi_phy)
> return ulpi_phy_power_off(phy);
> else
> return utmi_phy_power_off(phy);
> @@ -749,7 +744,7 @@ struct tegra_usb_phy *tegra_usb_phy_open(struct device *dev, int instance,
> of_property_read_bool(np, "nvidia,has-legacy-mode");
>
> if (!phy->config) {
> - if (phy_is_ulpi(phy)) {
> + if (phy->is_ulpi_phy) {
> pr_err("%s: ulpi phy configuration missing", __func__);
> err = -EINVAL;
> goto err0;
> @@ -796,14 +791,14 @@ EXPORT_SYMBOL_GPL(tegra_usb_phy_open);
>
> void tegra_usb_phy_preresume(struct tegra_usb_phy *phy)
> {
> - if (!phy_is_ulpi(phy))
> + if (!phy->is_ulpi_phy)
> utmi_phy_preresume(phy);
> }
> EXPORT_SYMBOL_GPL(tegra_usb_phy_preresume);
>
> void tegra_usb_phy_postresume(struct tegra_usb_phy *phy)
> {
> - if (!phy_is_ulpi(phy))
> + if (!phy->is_ulpi_phy)
> utmi_phy_postresume(phy);
> }
> EXPORT_SYMBOL_GPL(tegra_usb_phy_postresume);
> @@ -811,14 +806,14 @@ EXPORT_SYMBOL_GPL(tegra_usb_phy_postresume);
> void tegra_ehci_phy_restore_start(struct tegra_usb_phy *phy,
> enum tegra_usb_phy_port_speed port_speed)
> {
> - if (!phy_is_ulpi(phy))
> + if (!phy->is_ulpi_phy)
> utmi_phy_restore_start(phy, port_speed);
> }
> EXPORT_SYMBOL_GPL(tegra_ehci_phy_restore_start);
>
> void tegra_ehci_phy_restore_end(struct tegra_usb_phy *phy)
> {
> - if (!phy_is_ulpi(phy))
> + if (!phy->is_ulpi_phy)
> utmi_phy_restore_end(phy);
> }
> EXPORT_SYMBOL_GPL(tegra_ehci_phy_restore_end);
> diff --git a/include/linux/usb/tegra_usb_phy.h b/include/linux/usb/tegra_usb_phy.h
> index f03e157..a6a89d4 100644
> --- a/include/linux/usb/tegra_usb_phy.h
> +++ b/include/linux/usb/tegra_usb_phy.h
> @@ -60,6 +60,7 @@ struct tegra_usb_phy {
> struct usb_phy u_phy;
> struct device *dev;
> bool is_legacy_phy;
> + bool is_ulpi_phy;
> };
>
> struct tegra_usb_phy *tegra_usb_phy_open(struct device *dev, int instance,
> --
> 1.7.0.4
>
--
balbi
[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 836 bytes --]
next prev parent reply other threads:[~2013-01-18 18:35 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-01-16 13:30 [PATCH 0/4] usb: Supporting patches for registering Tegra USB PHY as a platform driver Venu Byravarasu
2013-01-16 13:30 ` [PATCH 1/4] arm: tegra: Add DT nodes for Tegra USB PHY Venu Byravarasu
2013-01-16 21:49 ` Stephen Warren
2013-01-16 13:30 ` [PATCH 2/4] USB: PHY: Get rid of instance number to differentiate legacy controller Venu Byravarasu
2013-01-18 18:34 ` Felipe Balbi
2013-01-16 13:30 ` [PATCH 3/4] USB: PHY: Tegra: Get rid of instance number to differentiate PHY type Venu Byravarasu
2013-01-18 17:04 ` Stephen Warren
2013-01-18 17:07 ` Stephen Warren
2013-01-18 18:34 ` Felipe Balbi [this message]
2013-01-16 13:30 ` [PATCH 4/4] usb: Add APIs to access host registers from Tegra PHY Venu Byravarasu
2013-01-16 15:08 ` Alan Stern
2013-01-16 21:56 ` Stephen Warren
2013-01-16 22:25 ` Alan Stern
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=20130118183457.GB1776@arwen.pp.htv.fi \
--to=balbi@ti.com \
--cc=gregkh@linuxfoundation.org \
--cc=linux-doc@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-tegra@vger.kernel.org \
--cc=linux-usb@vger.kernel.org \
--cc=stern@rowland.harvard.edu \
--cc=swarren@wwwdotorg.org \
--cc=vbyravarasu@nvidia.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
all inboxes | Powered by JetHome®