Tegra XUSB charger detect support
Subsystems (4)
v4 cover Tegra XUSB charger detect support
This patch series adds charger detect support on XUSB hardware used in Tegra210 and Tegra186 SoCs.
This patchset is composed with :
- dt bindings of XUSB Pad Controller
- Tegra XUSB device mode driver to add vbus_draw support
- Tegra PHY driver for charger detect support
Tests done:
- Connect USB cable from ubuntu host to micro-B port of DUT to detect SDP_TYPE charger
- Connect USB cable from external powered USB hub(which inturn connects to ubuntu host) to micro-B port of DUT to detect CDP_TYPE charger.
- Connect USB cable from USB charger to micro-B port of DUT to detect DCP_TYPE charger.
DUT: Jetson-tx1, Jetson tx2.
V4:
- Added ACKed-by details for PHY driver.
- Used BIT macro instead of (1 << index) usage as suggested by Chunfeng Yun.
V3:
- Added ACKed-by details for PHY driver and DT changes.
- Functions and its arguments are aligned.
- Tabs are used for alignment of MACRO's
- For vbus_draw USDC callback, usb_phy set_power error is propogated.
- Fixed various comments given by thierry.
V2:
- Added ACKed-by details for DT patches.
- All patches rebased.
Nagarjuna Kristam (7):
dt-bindings: phy: tegra-xusb: Add charger-detect property
phy: tegra: xusb: Add support for UTMI pad power control
phy: tegra: xusb: Add USB2 pad power control support for Tegra210
phy: tegra: xusb: Add soc ops API to enable UTMI PAD protection
phy: tegra: xusb: Add support for charger detect
phy: tegra: xusb: Enable charger detect for Tegra186
phy: tegra: xusb: Enable charger detect for Tegra210
.../bindings/phy/nvidia,tegra124-xusb-padctl.txt | 4 + drivers/phy/tegra/Makefile | 2 +- drivers/phy/tegra/cd.c | 283 +++++++++++++++++++++ drivers/phy/tegra/xusb-tegra186.c | 92 +++++-- drivers/phy/tegra/xusb-tegra210.c | 223 +++++++++++----- drivers/phy/tegra/xusb.c | 80 ++++++ drivers/phy/tegra/xusb.h | 22 ++ 7 files changed, 621 insertions(+), 85 deletions(-) create mode 100644 drivers/phy/tegra/cd.c
Signature · 1 line
2.7.4
PATCH v4 1/7 dt-bindings: phy: tegra-xusb: Add charger-detect property
Add nvidia,charger-detect boolean property for Tegra210 and Tegra186 platforms. This property is used to inform driver to perform charger detection on corresponding USB 2 port.
---
V4:
- No changes
---
V3:
- Added Acked-by updates to commit message.
---
V2:
- Added Acked-by updates to commit message.
--- Documentation/devicetree/bindings/phy/nvidia,tegra124-xusb-padctl.txt | 4 ++++ 1 file changed, 4 insertions(+)
Documentation/devicetree/bindings/phy/nvidia,tegra124-xusb-padctl.txt +4 -0
@@ -190,6 +190,10 @@ Required properties for OTG/Peripheral capable USB2 ports: and peripheral roles. Connector should be added as subnode. See usb/usb-conn-gpio.txt. +Optional properties for OTG/Peripheral capable USB2 ports: +- nvidia,charger-detect: A boolean property whose presence inform driver to + perform charger-detect activity. + Optional properties: - nvidia,internal: A boolean property whose presence determines that a port is internal. In the absence of this property the port is considered to be
Signature · 1 line
2.7.4
PATCH v4 2/7 phy: tegra: xusb: Add support for UTMI pad power control
In reply to Nagarjuna KristamAdd support for UTMI pad power on and off API's via soc ops. These API can be used by operations like charger detect to power on and off UTMI pad if needed. Update powered_on flag in the pad power control API's.
---
V4:
- No changes
---
V3:
- Added Acked-by updates to commit message.
---
V2:
- Patch re-based.
--- drivers/phy/tegra/xusb-tegra186.c | 51 ++++++++++++++++++--------------------- drivers/phy/tegra/xusb.h | 2 ++ 2 files changed, 26 insertions(+), 27 deletions(-)
drivers/phy/tegra/xusb-tegra186.c +24 -27
@@ -192,12 +192,8 @@ static void tegra186_utmi_bias_pad_power_on(struct tegra_xusb_padctl *padctl)u32 value;int err; -mutex_lock (&padctl->lock); - -if (priv->bias_pad_enable++ >0 ) { -mutex_unlock (&padctl->lock); +if (priv->bias_pad_enable++ >0 )return ; - } err =clk_prepare_enable (priv->usb2_trk_clk);if (err <0 )
@@ -221,8 +217,6 @@ static void tegra186_utmi_bias_pad_power_on(struct tegra_xusb_padctl *padctl) value =padctl_readl (padctl,XUSB_PADCTL_USB2_BIAS_PAD_CTL1 ); value &= ~USB2_PD_TRK ;padctl_writel (padctl, value,XUSB_PADCTL_USB2_BIAS_PAD_CTL1 ); - -mutex_unlock (&padctl->lock); }static void tegra186_utmi_bias_pad_power_off (struct tegra_xusb_padctl *padctl)
@@ -230,44 +224,29 @@ static void tegra186_utmi_bias_pad_power_off(struct tegra_xusb_padctl *padctl)struct tegra186_xusb_padctl *priv =to_tegra186_xusb_padctl (padctl);u32 value; -mutex_lock (&padctl->lock); - -if (WARN_ON (priv->bias_pad_enable ==0 )) { -mutex_unlock (&padctl->lock); +if (WARN_ON (priv->bias_pad_enable ==0 ))return ; - } -if (--priv->bias_pad_enable >0 ) { -mutex_unlock (&padctl->lock); +if (--priv->bias_pad_enable >0 )return ; - } value =padctl_readl (padctl,XUSB_PADCTL_USB2_BIAS_PAD_CTL1 ); value |=USB2_PD_TRK ;padctl_writel (padctl, value,XUSB_PADCTL_USB2_BIAS_PAD_CTL1 );clk_disable_unprepare (priv->usb2_trk_clk); - -mutex_unlock (&padctl->lock); }static void tegra_phy_xusb_utmi_pad_power_on (struct phy *phy) {struct tegra_xusb_lane *lane =phy_get_drvdata (phy);struct tegra_xusb_padctl *padctl = lane->pad->padctl; -struct tegra_xusb_usb2_port *port; -struct device *dev = padctl->dev; +struct tegra_xusb_usb2_lane *usb2 =to_usb2_lane (lane);unsigned int index = lane->index;u32 value; -if (!phy) -return ; - - port =tegra_xusb_find_usb2_port (padctl, index); -if (!port) { -dev_err (dev,"no port found for USB2 lane %u\n" , index); +if (!phy || usb2->powered_on)return ; - }tegra186_utmi_bias_pad_power_on (padctl);
@@ -280,16 +259,19 @@ static void tegra_phy_xusb_utmi_pad_power_on(struct phy *phy) value =padctl_readl (padctl,XUSB_PADCTL_USB2_OTG_PADX_CTL1 (index)); value &= ~USB2_OTG_PD_DR ;padctl_writel (padctl, value,XUSB_PADCTL_USB2_OTG_PADX_CTL1 (index)); + + usb2->powered_on = true; }static void tegra_phy_xusb_utmi_pad_power_down (struct phy *phy) {struct tegra_xusb_lane *lane =phy_get_drvdata (phy);struct tegra_xusb_padctl *padctl = lane->pad->padctl; +struct tegra_xusb_usb2_lane *usb2 =to_usb2_lane (lane);unsigned int index = lane->index;u32 value; -if (!phy) +if (!phy || !usb2->powered_on)return ; value =padctl_readl (padctl,XUSB_PADCTL_USB2_OTG_PADX_CTL0 (index));
@@ -303,6 +285,8 @@ static void tegra_phy_xusb_utmi_pad_power_down(struct phy *phy)udelay (2 );tegra186_utmi_bias_pad_power_off (padctl); + + usb2->powered_on = false; } static int tegra186_xusb_padctl_vbus_override(struct tegra_xusb_padctl *padctl,
@@ -413,6 +397,8 @@ static int tegra186_utmi_phy_power_on(struct phy *phy)return -ENODEV ; } +mutex_lock (&padctl->lock); + value =padctl_readl (padctl,XUSB_PADCTL_USB2_PAD_MUX ); value &= ~(USB2_PORT_MASK <<USB2_PORT_SHIFT (index)); value |= (PORT_XUSB <<USB2_PORT_SHIFT (index));
@@ -464,14 +450,23 @@ static int tegra186_utmi_phy_power_on(struct phy *phy)/* TODO: pad power saving */ tegra_phy_xusb_utmi_pad_power_on (phy); + +mutex_unlock (&padctl->lock);return 0 ; }static int tegra186_utmi_phy_power_off (struct phy *phy) { +struct tegra_xusb_lane *lane =phy_get_drvdata (phy); +struct tegra_xusb_padctl *padctl = lane->pad->padctl; + +mutex_lock (&padctl->lock); +/* TODO: pad power saving */ tegra_phy_xusb_utmi_pad_power_down (phy); +mutex_unlock (&padctl->lock); +return 0 ; }
@@ -938,6 +933,8 @@ static const struct tegra_xusb_padctl_ops tegra186_xusb_padctl_ops = { .probe = tegra186_xusb_padctl_probe, .remove = tegra186_xusb_padctl_remove, .vbus_override = tegra186_xusb_padctl_vbus_override, + .utmi_pad_power_on = tegra_phy_xusb_utmi_pad_power_on, + .utmi_pad_power_down = tegra_phy_xusb_utmi_pad_power_down, };#if IS_ENABLED (CONFIG_ARCH_TEGRA_186_SOC )
drivers/phy/tegra/xusb.h +2 -0
@@ -396,6 +396,8 @@ struct tegra_xusb_padctl_ops { unsigned int index, bool enable);int (*vbus_override)(struct tegra_xusb_padctl *padctl,bool set);int (*utmi_port_reset)(struct phy *phy); +void (*utmi_pad_power_on)(struct phy *phy); +void (*utmi_pad_power_down)(struct phy *phy); };struct tegra_xusb_padctl_soc {
Signature · 1 line
2.7.4
PATCH v4 3/7 phy: tegra: xusb: Add USB2 pad power control support for Tegra210
In reply to Nagarjuna KristamAdd USB2 pad power on and off API's for TEgra210 and provide its control via soc ops. It can be used by operations like charger detect to power on and off USB2 pad if needed.
---
V4:
- No changes
---
V3:
- Added Acked-by updates to commit message.
---
V2:
- Patch re-based.
--- drivers/phy/tegra/xusb-tegra210.c | 190 ++++++++++++++++++++++++++------------ 1 file changed, 133 insertions(+), 57 deletions(-)
drivers/phy/tegra/xusb-tegra210.c +133 -57
@@ -994,6 +994,128 @@ static int tegra210_xusb_padctl_id_override(struct tegra_xusb_padctl *padctl,return 0 ; } +static void tegra210_usb2_bias_pad_power_on (struct tegra_xusb_usb2_pad *pad) +{ +struct tegra_xusb_padctl *padctl = pad->base.padctl; +u32 value; + +if (pad->enable++ >0 ) +return ; + +dev_dbg (padctl->dev,"power on BIAS PAD & USB2 tracking\n" ); + +if (clk_prepare_enable (pad->clk)) +dev_warn (padctl->dev,"failed to enable BIAS PAD & USB2 tracking\n" ); + + value =padctl_readl (padctl,XUSB_PADCTL_USB2_BIAS_PAD_CTL1 ); + value &= ~((XUSB_PADCTL_USB2_BIAS_PAD_CTL1_TRK_START_TIMER_MASK << +XUSB_PADCTL_USB2_BIAS_PAD_CTL1_TRK_START_TIMER_SHIFT ) | + (XUSB_PADCTL_USB2_BIAS_PAD_CTL1_TRK_DONE_RESET_TIMER_MASK << +XUSB_PADCTL_USB2_BIAS_PAD_CTL1_TRK_DONE_RESET_TIMER_SHIFT )); + value |= (XUSB_PADCTL_USB2_BIAS_PAD_CTL1_TRK_START_TIMER_VAL << +XUSB_PADCTL_USB2_BIAS_PAD_CTL1_TRK_START_TIMER_SHIFT ) | + (XUSB_PADCTL_USB2_BIAS_PAD_CTL1_TRK_DONE_RESET_TIMER_VAL << +XUSB_PADCTL_USB2_BIAS_PAD_CTL1_TRK_DONE_RESET_TIMER_SHIFT ); +padctl_writel (padctl, value,XUSB_PADCTL_USB2_BIAS_PAD_CTL1 ); + + value =padctl_readl (padctl,XUSB_PADCTL_USB2_BIAS_PAD_CTL0 ); + value &= ~XUSB_PADCTL_USB2_BIAS_PAD_CTL0_PD ; +padctl_writel (padctl, value,XUSB_PADCTL_USB2_BIAS_PAD_CTL0 ); + +udelay (1 ); + + value =padctl_readl (padctl,XUSB_PADCTL_USB2_BIAS_PAD_CTL1 ); + value &= ~XUSB_PADCTL_USB2_BIAS_PAD_CTL1_PD_TRK ; +padctl_writel (padctl, value,XUSB_PADCTL_USB2_BIAS_PAD_CTL1 ); + +udelay (50 ); +} + +static void tegra210_usb2_bias_pad_power_off (struct tegra_xusb_usb2_pad *pad) +{ +struct tegra_xusb_padctl *padctl = pad->base.padctl; +u32 value; + +if (WARN_ON (pad->enable ==0 )) +return ; + +if (--pad->enable >0 ) +return ; + +dev_dbg (padctl->dev,"power off USB2 tracking\n" ); + + value =padctl_readl (padctl,XUSB_PADCTL_USB2_BIAS_PAD_CTL0 ); + value |=XUSB_PADCTL_USB2_BIAS_PAD_CTL0_PD ; +padctl_writel (padctl, value,XUSB_PADCTL_USB2_BIAS_PAD_CTL0 ); + +clk_disable_unprepare (pad->clk); +} + +/* must be called under padctl->lock */ +void tegra210_usb2_pad_power_on (struct phy *phy) +{ +struct tegra_xusb_lane *lane =phy_get_drvdata (phy); +struct tegra_xusb_usb2_lane *usb2 =to_usb2_lane (lane); +struct tegra_xusb_usb2_pad *pad =to_usb2_pad (lane->pad); +struct tegra_xusb_padctl *padctl = lane->pad->padctl; +unsigned int index = lane->index; +u32 value; + +if (!phy) +return ; + +if (usb2->powered_on) +return ; + +dev_info (padctl->dev,"power on UTMI pads %d\n" , index); + +tegra210_usb2_bias_pad_power_on (pad); + +udelay (2 ); + + value =padctl_readl (padctl,XUSB_PADCTL_USB2_OTG_PADX_CTL0 (index)); + value &= ~XUSB_PADCTL_USB2_OTG_PAD_CTL0_PD ; +padctl_writel (padctl, value,XUSB_PADCTL_USB2_OTG_PADX_CTL0 (index)); + + value =padctl_readl (padctl,XUSB_PADCTL_USB2_OTG_PADX_CTL1 (index)); + value &= ~XUSB_PADCTL_USB2_OTG_PAD_CTL1_PD_DR ; +padctl_writel (padctl, value,XUSB_PADCTL_USB2_OTG_PADX_CTL1 (index)); + + usb2->powered_on = true; +} + +/* must be called under padctl->lock */ +void tegra210_usb2_pad_power_down (struct phy *phy) +{ +struct tegra_xusb_lane *lane =phy_get_drvdata (phy); +struct tegra_xusb_usb2_lane *usb2 =to_usb2_lane (lane); +struct tegra_xusb_usb2_pad *pad =to_usb2_pad (lane->pad); +struct tegra_xusb_padctl *padctl = lane->pad->padctl; +unsigned int index = lane->index; +u32 value; + +if (!phy) +return ; + +if (!usb2->powered_on) +return ; + +dev_info (padctl->dev,"power down UTMI pad %d\n" , index); + + value =padctl_readl (padctl,XUSB_PADCTL_USB2_OTG_PADX_CTL0 (index)); + value |=XUSB_PADCTL_USB2_OTG_PAD_CTL0_PD ; +padctl_writel (padctl, value,XUSB_PADCTL_USB2_OTG_PADX_CTL0 (index)); + + value =padctl_readl (padctl,XUSB_PADCTL_USB2_OTG_PADX_CTL1 (index)); + value |=XUSB_PADCTL_USB2_OTG_PAD_CTL1_PD_DR ; +padctl_writel (padctl, value,XUSB_PADCTL_USB2_OTG_PADX_CTL1 (index)); + +udelay (2 ); + +tegra210_usb2_bias_pad_power_off (pad); + usb2->powered_on = false; +} +static int tegra210_usb2_phy_set_mode (struct phy *phy,enum phy_mode mode,int submode) {
@@ -1037,7 +1159,6 @@ static int tegra210_usb2_phy_power_on(struct phy *phy) {struct tegra_xusb_lane *lane =phy_get_drvdata (phy);struct tegra_xusb_usb2_lane *usb2 =to_usb2_lane (lane); -struct tegra_xusb_usb2_pad *pad =to_usb2_pad (lane->pad);struct tegra_xusb_padctl *padctl = lane->pad->padctl;struct tegra210_xusb_padctl *priv;struct tegra_xusb_usb2_port *port;
@@ -1053,6 +1174,8 @@ static int tegra210_usb2_phy_power_on(struct phy *phy) priv =to_tegra210_xusb_padctl (padctl); +mutex_lock (&padctl->lock); +if (port->usb3_port_fake !=-1 ) { value =padctl_readl (padctl,XUSB_PADCTL_SS_PORT_MAP ); value &= ~XUSB_PADCTL_SS_PORT_MAP_PORTX_MAP_MASK(
@@ -1148,62 +1271,21 @@ static int tegra210_usb2_phy_power_on(struct phy *phy)if (port->supply && port->mode ==USB_DR_MODE_HOST ) { err =regulator_enable (port->supply); -if (err) +if (err) { +mutex_unlock (&padctl->lock);return err; + } } -mutex_lock (&padctl->lock); - -if (pad->enable >0 ) { - pad->enable++; -mutex_unlock (&padctl->lock); -return 0 ; - } - - err =clk_prepare_enable (pad->clk); -if (err) - goto disable_regulator; +tegra210_usb2_pad_power_on (phy); - value =padctl_readl (padctl,XUSB_PADCTL_USB2_BIAS_PAD_CTL1 ); - value &= ~((XUSB_PADCTL_USB2_BIAS_PAD_CTL1_TRK_START_TIMER_MASK << -XUSB_PADCTL_USB2_BIAS_PAD_CTL1_TRK_START_TIMER_SHIFT ) | - (XUSB_PADCTL_USB2_BIAS_PAD_CTL1_TRK_DONE_RESET_TIMER_MASK << -XUSB_PADCTL_USB2_BIAS_PAD_CTL1_TRK_DONE_RESET_TIMER_SHIFT )); - value |= (XUSB_PADCTL_USB2_BIAS_PAD_CTL1_TRK_START_TIMER_VAL << -XUSB_PADCTL_USB2_BIAS_PAD_CTL1_TRK_START_TIMER_SHIFT ) | - (XUSB_PADCTL_USB2_BIAS_PAD_CTL1_TRK_DONE_RESET_TIMER_VAL << -XUSB_PADCTL_USB2_BIAS_PAD_CTL1_TRK_DONE_RESET_TIMER_SHIFT ); -padctl_writel (padctl, value,XUSB_PADCTL_USB2_BIAS_PAD_CTL1 ); - - value =padctl_readl (padctl,XUSB_PADCTL_USB2_BIAS_PAD_CTL0 ); - value &= ~XUSB_PADCTL_USB2_BIAS_PAD_CTL0_PD ; -padctl_writel (padctl, value,XUSB_PADCTL_USB2_BIAS_PAD_CTL0 ); - -udelay (1 ); - - value =padctl_readl (padctl,XUSB_PADCTL_USB2_BIAS_PAD_CTL1 ); - value &= ~XUSB_PADCTL_USB2_BIAS_PAD_CTL1_PD_TRK ; -padctl_writel (padctl, value,XUSB_PADCTL_USB2_BIAS_PAD_CTL1 ); - -udelay (50 ); - -clk_disable_unprepare (pad->clk); - - pad->enable++;mutex_unlock (&padctl->lock); -return 0 ; - -disable_regulator: -regulator_disable (port->supply); -mutex_unlock (&padctl->lock); -return err; }static int tegra210_usb2_phy_power_off (struct phy *phy) {struct tegra_xusb_lane *lane =phy_get_drvdata (phy); -struct tegra_xusb_usb2_pad *pad =to_usb2_pad (lane->pad);struct tegra_xusb_padctl *padctl = lane->pad->padctl;struct tegra_xusb_usb2_port *port;u32 value;
@@ -1217,6 +1299,8 @@ static int tegra210_usb2_phy_power_off(struct phy *phy)mutex_lock (&padctl->lock); +tegra210_usb2_pad_power_down (phy); +if (port->usb3_port_fake !=-1 ) { value =padctl_readl (padctl,XUSB_PADCTL_ELPG_PROGRAM1 ); value |= XUSB_PADCTL_ELPG_PROGRAM1_SSPX_ELPG_CLAMP_EN_EARLY(
@@ -1243,18 +1327,8 @@ static int tegra210_usb2_phy_power_off(struct phy *phy)padctl_writel (padctl, value,XUSB_PADCTL_SS_PORT_MAP ); } -if (WARN_ON (pad->enable ==0 )) - goto out; - -if (--pad->enable >0 ) - goto out; - - value =padctl_readl (padctl,XUSB_PADCTL_USB2_BIAS_PAD_CTL0 ); - value |=XUSB_PADCTL_USB2_BIAS_PAD_CTL0_PD ; -padctl_writel (padctl, value,XUSB_PADCTL_USB2_BIAS_PAD_CTL0 ); - -out:regulator_disable (port->supply); +mutex_unlock (&padctl->lock);return 0 ; }
@@ -2215,6 +2289,8 @@ static const struct tegra_xusb_padctl_ops tegra210_xusb_padctl_ops = { .hsic_set_idle = tegra210_hsic_set_idle, .vbus_override = tegra210_xusb_padctl_vbus_override, .utmi_port_reset = tegra210_utmi_port_reset, + .utmi_pad_power_on = tegra210_usb2_pad_power_on, + .utmi_pad_power_down = tegra210_usb2_pad_power_down, };static const char *const tegra210_xusb_padctl_supply_names[] = {
Signature · 1 line
2.7.4
kernel test robot
build botRe: [PATCH V4 3/7] phy: tegra: xusb: Add USB2 pad power control support for Tegra210
Thank you for the patch! Perhaps something to improve:
Hi Nagarjuna,
Thank you for the patch! Perhaps something to improve:
[auto build test WARNING on tegra/for-next]
[also build test WARNING on robh/for-next v5.8-rc2 next-20200626] [If your patch is applied to the wrong git tree, kindly drop us a note. And when submitting patch, we suggest to use as documented in
https://git-scm.com/docs/git-format-patch]
url: https://github.com/0day-ci/linux/commits/Nagarjuna-Kristam/Tegra-XUSB-charger-detect-support/20200626-182459 base: https://git.kernel.org/pub/scm/linux/kernel/git/tegra/linux.git for-next config: arm64-allyesconfig (attached as .config) compiler: aarch64-linux-gcc (GCC) 9.3.0
reproduce (this is a W=1 build):
wget https://raw.githubusercontent.com/intel/lkp-tests/master/sbin/make.cross -O ~/bin/make.cross chmod +x ~/bin/make.cross
# save the attached .config to linux build tree
COMPILER_INSTALL_PATH=$HOME/0day COMPILER=gcc-9.3.0 make.cross ARCH=arm64
If you fix the issue, kindly add following tag as appropriate
All warnings (new ones prefixed by >>):
>> drivers/phy/tegra/xusb-tegra210.c:1055:6: warning: no previous prototype for 'tegra210_usb2_pad_power_on' [-Wmissing-prototypes]
1055 | void tegra210_usb2_pad_power_on(struct phy *phy)
| ^~~~~~~~~~~~~~~~~~~~~~~~~~
>> drivers/phy/tegra/xusb-tegra210.c:1088:6: warning: no previous prototype for 'tegra210_usb2_pad_power_down' [-Wmissing-prototypes]
1088 | void tegra210_usb2_pad_power_down(struct phy *phy)
| ^~~~~~~~~~~~~~~~~~~~~~~~~~~~vim +/tegra210_usb2_pad_power_on +1055 drivers/phy/tegra/xusb-tegra210.c
1053
1054 /* must be called under padctl->lock */
> 1055 void tegra210_usb2_pad_power_on(struct phy *phy)
1056 {
1057 struct tegra_xusb_lane *lane = phy_get_drvdata(phy);
1058 struct tegra_xusb_usb2_lane *usb2 = to_usb2_lane(lane);
1059 struct tegra_xusb_usb2_pad *pad = to_usb2_pad(lane->pad);
1060 struct tegra_xusb_padctl *padctl = lane->pad->padctl;
1061 unsigned int index = lane->index;
1062 u32 value;
1063
1064 if (!phy)
1065 return;
1066
1067 if (usb2->powered_on)
1068 return;
1069
1070 dev_info(padctl->dev, "power on UTMI pads %d\n", index);
1071
1072 tegra210_usb2_bias_pad_power_on(pad);
1073
1074 udelay(2);
1075
1076 value = padctl_readl(padctl, XUSB_PADCTL_USB2_OTG_PADX_CTL0(index));
1077 value &= ~XUSB_PADCTL_USB2_OTG_PAD_CTL0_PD;
1078 padctl_writel(padctl, value, XUSB_PADCTL_USB2_OTG_PADX_CTL0(index));
1079
1080 value = padctl_readl(padctl, XUSB_PADCTL_USB2_OTG_PADX_CTL1(index));
1081 value &= ~XUSB_PADCTL_USB2_OTG_PAD_CTL1_PD_DR;
1082 padctl_writel(padctl, value, XUSB_PADCTL_USB2_OTG_PADX_CTL1(index));
1083
1084 usb2->powered_on = true;
1085 }
1086
1087 /* must be called under padctl->lock */
> 1088 void tegra210_usb2_pad_power_down(struct phy *phy) 1089 {
1090 struct tegra_xusb_lane *lane = phy_get_drvdata(phy);
1091 struct tegra_xusb_usb2_lane *usb2 = to_usb2_lane(lane);
1092 struct tegra_xusb_usb2_pad *pad = to_usb2_pad(lane->pad);
1093 struct tegra_xusb_padctl *padctl = lane->pad->padctl;
1094 unsigned int index = lane->index;
1095 u32 value;
1096
1097 if (!phy)
1098 return;
1099
1100 if (!usb2->powered_on)
1101 return;
1102
1103 dev_info(padctl->dev, "power down UTMI pad %d\n", index);
1104
1105 value = padctl_readl(padctl, XUSB_PADCTL_USB2_OTG_PADX_CTL0(index));
1106 value |= XUSB_PADCTL_USB2_OTG_PAD_CTL0_PD;
1107 padctl_writel(padctl, value, XUSB_PADCTL_USB2_OTG_PADX_CTL0(index));
1108
1109 value = padctl_readl(padctl, XUSB_PADCTL_USB2_OTG_PADX_CTL1(index));
1110 value |= XUSB_PADCTL_USB2_OTG_PAD_CTL1_PD_DR;
1111 padctl_writel(padctl, value, XUSB_PADCTL_USB2_OTG_PADX_CTL1(index));
1112
1113 udelay(2);
1114
1115 tegra210_usb2_bias_pad_power_off(pad);
1116 usb2->powered_on = false;
1117 }
1118
---
0-DAY CI Kernel Test Service, Intel Corporation
https://lists.01.org/hyperkitty/list/[email protected]
PATCH v4 4/7 phy: tegra: xusb: Add soc ops API to enable UTMI PAD protection
In reply to Nagarjuna KristamWhen USB charger is enabled, UTMI PAD needs to be protected according to the direction and current level. Add support for the same on Tegra210 and Tegra186.
---
V4:
- Added Acked-by updates to commit message.
---
V3:
- Alligned function and its arguments.
- Fixed other comments from Thierry.
---
V2:
- Commit message coorected.
- Patch re-based.
--- drivers/phy/tegra/xusb-tegra186.c | 40 +++++++++++++++++++++++++++++++++++++++ drivers/phy/tegra/xusb-tegra210.c | 32 +++++++++++++++++++++++++++++++ drivers/phy/tegra/xusb.h | 13 +++++++++++++ 3 files changed, 85 insertions(+)
drivers/phy/tegra/xusb-tegra186.c +40 -0
@@ -68,6 +68,13 @@#define PORTX_SPEED_SUPPORT_MASK (0x3)#define PORT_SPEED_SUPPORT_GEN1 (0x0) +#define USB2_BATTERY_CHRG_OTGPADX_CTL1 (x) (0x84 + (x) * 0x40) +#define PD_VREG (1 << 6) +#define VREG_LEV (x) (((x) & 0x3) << 7) +#define VREG_DIR (x) (((x) & 0x3) << 11) +#define VREG_DIR_IN VREG_DIR(1) +#define VREG_DIR_OUT VREG_DIR(2) +#define XUSB_PADCTL_USB2_OTG_PADX_CTL0 (x) (0x88 + (x) * 0x40)#define HS_CURR_LEVEL (x) ((x) & 0x3f)#define TERM_SEL BIT(25)
@@ -289,6 +296,37 @@ static void tegra_phy_xusb_utmi_pad_power_down(struct phy *phy) usb2->powered_on = false; } +static void +tegra186_xusb_padctl_utmi_pad_set_protection (struct tegra_xusb_port *port, +int level, +enum tegra_vbus_dir dir) +{ +u32 value; +struct tegra_xusb_padctl *padctl = port->padctl; +unsigned int index = port->index; + + value =padctl_readl (padctl,USB2_BATTERY_CHRG_OTGPADX_CTL1 (index)); + +if (level <0 ) { +/* disable pad protection */ + value |=PD_VREG ; + value &= ~VREG_LEV (~0 ); + value &= ~VREG_DIR (~0 ); + }else { +if (dir ==TEGRA_VBUS_SOURCE ) + value |=VREG_DIR_OUT ; +else if (dir ==TEGRA_VBUS_SINK ) + value |=VREG_DIR_IN ; + + value &= ~PD_VREG ; + value &= ~VREG_DIR (~0 ); + value &= ~VREG_LEV (~0 ); + value |=VREG_LEV (level); + } + +padctl_writel (padctl, value,USB2_BATTERY_CHRG_OTGPADX_CTL1 (index)); +} +static int tegra186_xusb_padctl_vbus_override (struct tegra_xusb_padctl *padctl,bool status) {
@@ -935,6 +973,8 @@ static const struct tegra_xusb_padctl_ops tegra186_xusb_padctl_ops = { .vbus_override = tegra186_xusb_padctl_vbus_override, .utmi_pad_power_on = tegra_phy_xusb_utmi_pad_power_on, .utmi_pad_power_down = tegra_phy_xusb_utmi_pad_power_down, + .utmi_pad_set_protection = + tegra186_xusb_padctl_utmi_pad_set_protection, };#if IS_ENABLED (CONFIG_ARCH_TEGRA_186_SOC )
drivers/phy/tegra/xusb-tegra210.c +32 -0
@@ -74,6 +74,8 @@#define XUSB_PADCTL_USB2_BATTERY_CHRG_OTGPAD_CTL1_VREG_LEV_MASK 0x3#define XUSB_PADCTL_USB2_BATTERY_CHRG_OTGPAD_CTL1_VREG_LEV_VAL 0x1#define XUSB_PADCTL_USB2_BATTERY_CHRG_OTGPAD_CTL1_VREG_FIX18 (1 << 6) +#define USB2_BATTERY_CHRG_OTGPAD_CTL1_VREG_LEV (x) (((x) & 0x3) << 7) +#define USB2_BATTERY_CHRG_OTGPAD_CTL1_VREG_DIR (x) (((x) & 0x3) << 11)#define XUSB_PADCTL_USB2_OTG_PADX_CTL0 (x) (0x088 + (x) * 0x40)#define XUSB_PADCTL_USB2_OTG_PAD_CTL0_PD_ZI (1 << 29)
@@ -1116,6 +1118,34 @@ void tegra210_usb2_pad_power_down(struct phy *phy) usb2->powered_on = false; } +static void +tegra210_xusb_padctl_utmi_pad_set_protection (struct tegra_xusb_port *port, +int level, +enum tegra_vbus_dir dir) +{ +u32 value; +struct tegra_xusb_padctl *padctl = port->padctl; +unsigned int index = port->index; + + value =padctl_readl (padctl, +XUSB_PADCTL_USB2_BATTERY_CHRG_OTGPADX_CTL1 (index)); + +if (level <0 ) { +/* disable pad protection */ + value |=XUSB_PADCTL_USB2_BATTERY_CHRG_OTGPAD_CTL1_VREG_FIX18 ; + value &=USB2_BATTERY_CHRG_OTGPAD_CTL1_VREG_LEV (~0 ); + value &= ~USB2_BATTERY_CHRG_OTGPAD_CTL1_VREG_DIR (~0 ); + }else { + value &= ~XUSB_PADCTL_USB2_BATTERY_CHRG_OTGPAD_CTL1_VREG_FIX18 ; + value &= ~USB2_BATTERY_CHRG_OTGPAD_CTL1_VREG_DIR (~0 ); + value &=USB2_BATTERY_CHRG_OTGPAD_CTL1_VREG_LEV (~0 ); + value |=USB2_BATTERY_CHRG_OTGPAD_CTL1_VREG_LEV (level); + } + +padctl_writel (padctl, value, +XUSB_PADCTL_USB2_BATTERY_CHRG_OTGPADX_CTL1 (index)); +} +static int tegra210_usb2_phy_set_mode (struct phy *phy,enum phy_mode mode,int submode) {
@@ -2291,6 +2321,8 @@ static const struct tegra_xusb_padctl_ops tegra210_xusb_padctl_ops = { .utmi_port_reset = tegra210_utmi_port_reset, .utmi_pad_power_on = tegra210_usb2_pad_power_on, .utmi_pad_power_down = tegra210_usb2_pad_power_down, + .utmi_pad_set_protection = + tegra210_xusb_padctl_utmi_pad_set_protection, };static const char *const tegra210_xusb_padctl_supply_names[] = {
drivers/phy/tegra/xusb.h +13 -0
@@ -259,6 +259,17 @@ to_sata_pad(struct tegra_xusb_pad *pad)*/ struct tegra_xusb_port_ops ; +/* +* Tegra OTG port VBUS direction: +* default (based on port capability) or +* as source or sink +*/ +enum tegra_vbus_dir { +TEGRA_VBUS_DEFAULT , +TEGRA_VBUS_SOURCE , +TEGRA_VBUS_SINK +}; +struct tegra_xusb_port {struct tegra_xusb_padctl *padctl;struct tegra_xusb_lane *lane;
@@ -398,6 +409,8 @@ struct tegra_xusb_padctl_ops {int (*utmi_port_reset)(struct phy *phy);void (*utmi_pad_power_on)(struct phy *phy);void (*utmi_pad_power_down)(struct phy *phy); +void (*utmi_pad_set_protection)(struct tegra_xusb_port *port, +int level,enum tegra_vbus_dir dir); };struct tegra_xusb_padctl_soc {
Signature · 1 line
2.7.4
PATCH v4 5/7 phy: tegra: xusb: Add support for charger detect
In reply to Nagarjuna KristamPerform charger-detect operation if corresponding dt property is enabled. Update usb-phy with the detected charger state and max current values. Register charger-detect API's of usb-phy to provide needed functionalities.
---
V4:
- Used BIT macro instead of (1 << index) usage as suggested by Chunfeng Yun.
- Added Acked-by updates to commit message.
---
V3:
- Allighed functions and its arguments.
- replaced spaced by tabs for MACRO definition allignments.
- Unified primary and secondary charger detect API's.
- Used readl_poll_timeout instead of while loop condition check for register.
- Fixed other comments as per inputs from Thierry.
---
V2:
- Patch re-based.
--- drivers/phy/tegra/Makefile | 2 +- drivers/phy/tegra/cd.c | 283 +++++++++++++++++++++++++++++++++++++++++++++ drivers/phy/tegra/xusb.c | 80 +++++++++++++ drivers/phy/tegra/xusb.h | 7 ++ 4 files changed, 371 insertions(+), 1 deletion(-) create mode 100644 drivers/phy/tegra/cd.c
drivers/phy/tegra/Makefile +1 -1
@@ -1,7 +1,7 @@ # SPDX-License-Identifier: GPL-2.0-only obj-$(CONFIG_PHY_TEGRA_XUSB) += phy-tegra-xusb.o -phy-tegra-xusb-y += xusb.o +phy-tegra-xusb-y += xusb.o cd.o phy-tegra-xusb-$(CONFIG_ARCH_TEGRA_124_SOC) += xusb-tegra124.o phy-tegra-xusb-$(CONFIG_ARCH_TEGRA_132_SOC) += xusb-tegra124.o phy-tegra-xusb-$(CONFIG_ARCH_TEGRA_210_SOC) += xusb-tegra210.o
drivers/phy/tegra/cd.c new file +283 -0
283 lines not on this page · raw message
drivers/phy/tegra/xusb.c +80 -0
119 lines not on this page · raw message
drivers/phy/tegra/xusb.h +7 -0
@@ -282,6 +282,9 @@ struct tegra_xusb_port {struct work_struct usb_phy_work;struct usb_phy usb_phy; +bool charger_detect; +enum usb_charger_type chrg_type; +const struct tegra_xusb_port_ops *ops; };
@@ -306,6 +309,9 @@ struct tegra_xusb_port * tegra_xusb_find_port(struct tegra_xusb_padctl *padctl, const char *type, unsigned int index); +enum usb_charger_type tegra_xusb_padctl_charger_detect ( +struct tegra_xusb_port *port); +struct tegra_xusb_usb2_port {struct tegra_xusb_port base;
@@ -430,6 +436,7 @@ struct tegra_xusb_padctl_soc {unsigned int num_supplies;bool supports_gen2;bool need_fake_usb3_port; +bool supports_charger_detect; };struct tegra_xusb_padctl {
Signature · 1 line
2.7.4
PATCH v4 6/7 phy: tegra: xusb: Enable charger detect for Tegra186
In reply to Nagarjuna KristamTegra186 SoC supports charger detect, set corresponding soc flag.
---
V4:
- No changes
---
V3:
- Used supports_charger_detect name instead of charger_detect.
- Added Acked-by updates to commit message.
---
V2:
- Patch re-based.
--- drivers/phy/tegra/xusb-tegra186.c | 1 + 1 file changed, 1 insertion(+)
drivers/phy/tegra/xusb-tegra186.c +1 -0
@@ -1041,6 +1041,7 @@ const struct tegra_xusb_padctl_soc tegra186_xusb_padctl_soc = { .ops = &tegra186_xusb_padctl_ops, .supply_names = tegra186_xusb_padctl_supply_names, .num_supplies = ARRAY_SIZE(tegra186_xusb_padctl_supply_names), + .supports_charger_detect = true, };EXPORT_SYMBOL_GPL (tegra186_xusb_padctl_soc);#endif
Signature · 1 line
2.7.4
PATCH v4 7/7 phy: tegra: xusb: Enable charger detect for Tegra210
In reply to Nagarjuna KristamTegra210 SoC supports charger detect, set corresponding soc flag.
---
V4:
- No changes
---
V3:
- Used supports_charger_detect name instead of charger_detect.
- Added Acked-by updates to commit message.
---
V2:
- Patch re-based.
--- drivers/phy/tegra/xusb-tegra210.c | 1 + 1 file changed, 1 insertion(+)
drivers/phy/tegra/xusb-tegra210.c +1 -0
@@ -2353,6 +2353,7 @@ const struct tegra_xusb_padctl_soc tegra210_xusb_padctl_soc = { .supply_names = tegra210_xusb_padctl_supply_names, .num_supplies = ARRAY_SIZE(tegra210_xusb_padctl_supply_names), .need_fake_usb3_port = true, + .supports_charger_detect = true, };EXPORT_SYMBOL_GPL (tegra210_xusb_padctl_soc);
Signature · 1 line
2.7.4
Quoted 39 lines · Nagarjuna Kristam
This patch series adds charger detect support on XUSB hardware used in Tegra210 and Tegra186 SoCs.
This patchset is composed with :
- dt bindings of XUSB Pad Controller
- Tegra XUSB device mode driver to addvbus_drawsupport
- Tegra PHY driver for charger detect supportTests done:
- Connect USB cable from ubuntu host to micro-B port of DUT to detectSDP_TYPEcharger
- Connect USB cable from external powered USB hub(which inturn connects to ubuntu host) to micro-B port of DUT to detectCDP_TYPEcharger.
- Connect USB cable from USB charger to micro-B port of DUT to detectDCP_TYPEcharger.
DUT: Jetson-tx1, Jetson tx2.V4:
- Added ACKed-by details for PHY driver.
- Used BIT macro instead of (1 << index) usage as suggested by Chunfeng Yun.
V3:
- Added ACKed-by details for PHY driver and DT changes.
- Functions and its arguments are aligned.
- Tabs are used for alignment of MACRO's
- Forvbus_drawUSDC callback,usb_physet_powererror is propogated.
- Fixed various comments given by thierry.
V2:
- Added ACKed-by details for DT patches.
- All patches rebased.Nagarjuna Kristam (7):
dt-bindings: phy: tegra-xusb: Add charger-detect property
phy: tegra: xusb: Add support for UTMI pad power control
phy: tegra: xusb: Add USB2 pad power control support for Tegra210
phy: tegra: xusb: Add soc ops API to enable UTMI PAD protection
phy: tegra: xusb: Add support for charger detect
phy: tegra: xusb: Enable charger detect for Tegra186
phy: tegra: xusb: Enable charger detect for Tegra210
Quoted 9 lines
.../bindings/phy/nvidia,tegra124-xusb-padctl.txt | 4 + drivers/phy/tegra/Makefile | 2 +- drivers/phy/tegra/cd.c | 283 +++++++++++++++++++++ drivers/phy/tegra/xusb-tegra186.c | 92 +++++-- drivers/phy/tegra/xusb-tegra210.c | 223 +++++++++++----- drivers/phy/tegra/xusb.c | 80 ++++++ drivers/phy/tegra/xusb.h | 22 ++ 7 files changed, 621 insertions(+), 85 deletions(-) create mode 100644 drivers/phy/tegra/cd.c
Hi Kishon, Vinod,
did you have any further comments on this series or is it good to go into v5.9?
Thanks,
Thierry
Vinod Koul
maintainerQuoted 4 lines · Thierry Reding
Hi Kishon, Vinod,
did you have any further comments on this series or is it good to go into v5.9?
I dont have this series in my inbox, can you please rebase and resend
Signature · 1 line
~Vinod