From: Nagarjuna Kristam <nkristam@nvidia.com>
To: jckuo <jckuo@nvidia.com>, <balbi@kernel.org>,
<gregkh@linuxfoundation.org>, <thierry.reding@gmail.com>,
<jonathanh@nvidia.com>, <mark.rutland@arm.com>,
<robh+dt@kernel.org>
Cc: <linux-tegra@vger.kernel.org>, <linux-usb@vger.kernel.org>,
<devicetree@vger.kernel.org>
Subject: Re: [Patch V3 3/8] phy: tegra: xusb: t210: add vbus override support
Date: Thu, 23 May 2019 16:45:01 +0530 [thread overview]
Message-ID: <8cbc7f4c-6514-3084-492d-0242dba5a2db@nvidia.com> (raw)
In-Reply-To: <5607de95-da90-8a56-892c-8529d1b386d7@nvidia.com>
On 21-05-2019 10:04, jckuo wrote:
> Hi Nagarjuna,
>
> Please check tegra_phy_xusb_utmi_port_reset().
>
> Thanks,
>
> JC
>
> On 5/16/19 2:39 PM, Nagarjuna Kristam wrote:
>> Tegra XUSB device control driver needs to control vbus override
>> during its operations, add API for the support.
>>
>> Signed-off-by: Nagarjuna Kristam <nkristam@nvidia.com>
>> ---
>> drivers/phy/tegra/xusb-tegra210.c | 59 +++++++++++++++++++++++++++++++++++++++
>> drivers/phy/tegra/xusb.c | 22 +++++++++++++++
>> drivers/phy/tegra/xusb.h | 2 ++
>> include/linux/phy/tegra/xusb.h | 6 ++--
>> 4 files changed, 87 insertions(+), 2 deletions(-)
>>
>> diff --git a/drivers/phy/tegra/xusb-tegra210.c b/drivers/phy/tegra/xusb-tegra210.c
>> index 829aca5..363d2aa 100644
>> --- a/drivers/phy/tegra/xusb-tegra210.c
>> +++ b/drivers/phy/tegra/xusb-tegra210.c
>> @@ -73,6 +73,10 @@
>> #define XUSB_PADCTL_USB3_PAD_MUX_PCIE_IDDQ_DISABLE(x) (1 << (1 + (x)))
>> #define XUSB_PADCTL_USB3_PAD_MUX_SATA_IDDQ_DISABLE(x) (1 << (8 + (x)))
>> +#define XUSB_PADCTL_USB2_BATTERY_CHRG_OTGPADX_CTL0(x) (0x080 + (x) * 0x40)
>> +#define XUSB_PADCTL_USB2_BATTERY_CHRG_OTGPAD_CTL0_ZIP (1 << 18)
>> +#define XUSB_PADCTL_USB2_BATTERY_CHRG_OTGPAD_CTL0_ZIN (1 << 22)
>> +
>> #define XUSB_PADCTL_USB2_BATTERY_CHRG_OTGPADX_CTL1(x) (0x084 + (x) * 0x40)
>> #define XUSB_PADCTL_USB2_BATTERY_CHRG_OTGPAD_CTL1_VREG_LEV_SHIFT 7
>> #define XUSB_PADCTL_USB2_BATTERY_CHRG_OTGPAD_CTL1_VREG_LEV_MASK 0x3
>> @@ -235,6 +239,12 @@
>> #define XUSB_PADCTL_UPHY_USB3_PADX_ECTL6(x) (0xa74 + (x) * 0x40)
>> #define XUSB_PADCTL_UPHY_USB3_PAD_ECTL6_RX_EQ_CTRL_H_VAL 0xfcf01368
>> +#define XUSB_PADCTL_USB2_VBUS_ID 0xc60
>> +#define XUSB_PADCTL_USB2_VBUS_ID_OVERRIDE_VBUS_ON (1 << 14)
>> +#define XUSB_PADCTL_USB2_VBUS_ID_OVERRIDE_SHIFT 18
>> +#define XUSB_PADCTL_USB2_VBUS_ID_OVERRIDE_MASK 0xf
>> +#define XUSB_PADCTL_USB2_VBUS_ID_OVERRIDE_FLOATING 8
>> +
>> struct tegra210_xusb_fuse_calibration {
>> u32 hs_curr_level[4];
>> u32 hs_term_range_adj;
>> @@ -2024,6 +2034,53 @@ static const struct tegra_xusb_port_ops tegra210_usb3_port_ops = {
>> .map = tegra210_usb3_port_map,
>> };
>> +static int tegra210_xusb_padctl_vbus_override(struct tegra_xusb_padctl *padctl,
>> + bool status)
>> +{
>> + u32 value;
>> +
>> + dev_dbg(padctl->dev, "%s vbus override\n", status ? "set" : "clear");
>> +
>> + value = padctl_readl(padctl, XUSB_PADCTL_USB2_VBUS_ID);
>> +
>> + if (status) {
>> + value |= XUSB_PADCTL_USB2_VBUS_ID_OVERRIDE_VBUS_ON;
>> + value &= ~(XUSB_PADCTL_USB2_VBUS_ID_OVERRIDE_MASK <<
>> + XUSB_PADCTL_USB2_VBUS_ID_OVERRIDE_SHIFT);
>> + value |= XUSB_PADCTL_USB2_VBUS_ID_OVERRIDE_FLOATING <<
>> + XUSB_PADCTL_USB2_VBUS_ID_OVERRIDE_SHIFT;
>> + } else
>> + value &= ~XUSB_PADCTL_USB2_VBUS_ID_OVERRIDE_VBUS_ON;
>> +
>> + padctl_writel(padctl, value, XUSB_PADCTL_USB2_VBUS_ID);
>> +
>> + return 0;
>> +}
>> +
>> +static int tegra210_utmi_port_reset(struct phy *phy)
>> +{
>> + struct tegra_xusb_padctl *padctl;
>> + struct tegra_xusb_lane *lane;
>> + struct device *dev;
>> + u32 value;
>> +
>> + lane = phy_get_drvdata(phy);
>> + padctl = lane->pad->padctl;
>> + dev = padctl->dev;
>> +
>> + value = padctl_readl(padctl,
>> + XUSB_PADCTL_USB2_BATTERY_CHRG_OTGPADX_CTL0(0));
> If we allow USB device mode to be enabled at any USB 2.0 port, we should read corresponding XUSB_PADCTL_USB2_BATTERY_CHRG_OTGPADX_CTL0(x) register.
Will correct accordingly, as plan is to support device mode on any usb 2.0 port.
-Nagarjuna
>> +
>> + if ((value & XUSB_PADCTL_USB2_BATTERY_CHRG_OTGPAD_CTL0_ZIP) ||
>> + (value & XUSB_PADCTL_USB2_BATTERY_CHRG_OTGPAD_CTL0_ZIN)) {
>> + tegra210_xusb_padctl_vbus_override(padctl, false);
>> + tegra210_xusb_padctl_vbus_override(padctl, true);
>> + return 1;
>> + }
next prev parent reply other threads:[~2019-05-23 11:13 UTC|newest]
Thread overview: 34+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-05-16 6:39 [Patch V3 0/8] Tegra XUSB gadget driver support Nagarjuna Kristam
2019-05-16 6:39 ` [Patch V3 1/8] phy: tegra: xusb: t210: add XUSB dual mode support Nagarjuna Kristam
2019-05-21 2:16 ` jckuo
2019-05-23 9:39 ` Thierry Reding
2019-05-16 6:39 ` [Patch V3 2/8] phy: tegra: xusb: t210: add usb3 port fake support Nagarjuna Kristam
2019-05-21 3:00 ` jckuo
2019-05-23 11:16 ` Nagarjuna Kristam
2019-05-23 10:01 ` Thierry Reding
2019-05-23 11:24 ` Nagarjuna Kristam
2019-05-16 6:39 ` [Patch V3 3/8] phy: tegra: xusb: t210: add vbus override support Nagarjuna Kristam
2019-05-21 4:34 ` jckuo
2019-05-23 11:15 ` Nagarjuna Kristam [this message]
2019-05-23 10:03 ` Thierry Reding
2019-05-23 11:13 ` Nagarjuna Kristam
2019-05-16 6:39 ` [Patch V3 4/8] dt-bindings: usb: Add NVIDIA Tegra XUSB device mode controller binding Nagarjuna Kristam
2019-05-21 6:08 ` JC Kuo
2019-05-23 10:13 ` Thierry Reding
2019-05-23 11:41 ` Nagarjuna Kristam
2019-06-13 21:32 ` Rob Herring
2019-06-18 6:18 ` Nagarjuna Kristam
2019-05-16 6:39 ` [Patch V3 5/8] arm64: tegra: Add xudc node for Tegra210 Nagarjuna Kristam
2019-05-21 6:08 ` JC Kuo
2019-05-23 10:15 ` Thierry Reding
2019-05-16 6:39 ` [Patch V3 6/8] arm64: tegra: Enable xudc on Jetson TX1 Nagarjuna Kristam
2019-05-21 6:11 ` JC Kuo
2019-05-16 6:39 ` [Patch V3 7/8] usb: gadget: Add UDC driver for tegra XUSB device mode controller Nagarjuna Kristam
2019-05-16 9:08 ` Chunfeng Yun
2019-05-24 6:50 ` Nagarjuna Kristam
2019-05-29 8:06 ` Chunfeng Yun
2019-05-23 10:26 ` Thierry Reding
2019-05-23 10:28 ` Thierry Reding
2019-05-16 6:39 ` [Patch V3 8/8] arm64: defconfig: Enable tegra XUDC driver Nagarjuna Kristam
2019-05-23 10:30 ` Thierry Reding
2019-05-24 8:01 ` Nagarjuna Kristam
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=8cbc7f4c-6514-3084-492d-0242dba5a2db@nvidia.com \
--to=nkristam@nvidia.com \
--cc=balbi@kernel.org \
--cc=devicetree@vger.kernel.org \
--cc=gregkh@linuxfoundation.org \
--cc=jckuo@nvidia.com \
--cc=jonathanh@nvidia.com \
--cc=linux-tegra@vger.kernel.org \
--cc=linux-usb@vger.kernel.org \
--cc=mark.rutland@arm.com \
--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).