diff options
| author | JC Kuo <jckuo@nvidia.com> | 2016-04-29 01:18:17 -0400 |
|---|---|---|
| committer | Bharat Nihalani <bnihalani@nvidia.com> | 2016-05-02 00:10:37 -0400 |
| commit | ba5cc1aa958182ee63e7e8bd0b541bba266ede8e (patch) | |
| tree | 5dbbac1d75e034e11255feebe0b1d24a46c2e561 /drivers/pinctrl | |
| parent | 8f3e7f748e1f4937750d1520dfb722030c92d2e5 (diff) | |
Revert "Revert "t186: padctrl-uphy: remove PD_CHG programming apis""
This reverts commit 83ddbd069e6944bf696485005d36693e7b5e2209.
K4.4 http://git-master/r/#/c/1134668/ removes calls to PD_CHG apis.
bug 200195598
Change-Id: I802dade346be713404830f4d2bc1904a788aff7d
Signed-off-by: JC Kuo <jckuo@nvidia.com>
Reviewed-on: http://git-master/r/1134743
GVS: Gerrit_Virtual_Submit
Reviewed-by: Bharat Nihalani <bnihalani@nvidia.com>
Diffstat (limited to 'drivers/pinctrl')
| -rw-r--r-- | drivers/pinctrl/pinctrl-tegra186-padctl-uphy.c | 36 |
1 files changed, 0 insertions, 36 deletions
diff --git a/drivers/pinctrl/pinctrl-tegra186-padctl-uphy.c b/drivers/pinctrl/pinctrl-tegra186-padctl-uphy.c index 8f1804271..59dd1a684 100644 --- a/drivers/pinctrl/pinctrl-tegra186-padctl-uphy.c +++ b/drivers/pinctrl/pinctrl-tegra186-padctl-uphy.c | |||
| @@ -3770,42 +3770,6 @@ void tegra_phy_xusb_utmi_pad_power_down(struct phy *phy) | |||
| 3770 | } | 3770 | } |
| 3771 | EXPORT_SYMBOL_GPL(tegra_phy_xusb_utmi_pad_power_down); | 3771 | EXPORT_SYMBOL_GPL(tegra_phy_xusb_utmi_pad_power_down); |
| 3772 | 3772 | ||
| 3773 | void tegra_phy_xusb_utmi_pad_chg_power_on(struct phy *phy) | ||
| 3774 | { | ||
| 3775 | struct tegra_padctl_uphy *uphy; | ||
| 3776 | int port; | ||
| 3777 | u32 reg; | ||
| 3778 | |||
| 3779 | if (!phy) | ||
| 3780 | return; | ||
| 3781 | |||
| 3782 | uphy = phy_get_drvdata(phy); | ||
| 3783 | port = utmi_phy_to_port(phy); | ||
| 3784 | |||
| 3785 | reg = padctl_readl(uphy, USB2_BATTERY_CHRG_OTGPADX_CTL0(port)); | ||
| 3786 | reg &= ~PD_CHG; | ||
| 3787 | padctl_writel(uphy, reg, USB2_BATTERY_CHRG_OTGPADX_CTL0(port)); | ||
| 3788 | } | ||
| 3789 | EXPORT_SYMBOL_GPL(tegra_phy_xusb_utmi_pad_chg_power_on); | ||
| 3790 | |||
| 3791 | void tegra_phy_xusb_utmi_pad_chg_power_down(struct phy *phy) | ||
| 3792 | { | ||
| 3793 | struct tegra_padctl_uphy *uphy; | ||
| 3794 | int port; | ||
| 3795 | u32 reg; | ||
| 3796 | |||
| 3797 | if (!phy) | ||
| 3798 | return; | ||
| 3799 | |||
| 3800 | uphy = phy_get_drvdata(phy); | ||
| 3801 | port = utmi_phy_to_port(phy); | ||
| 3802 | |||
| 3803 | reg = padctl_readl(uphy, USB2_BATTERY_CHRG_OTGPADX_CTL0(port)); | ||
| 3804 | reg |= PD_CHG; | ||
| 3805 | padctl_writel(uphy, reg, USB2_BATTERY_CHRG_OTGPADX_CTL0(port)); | ||
| 3806 | } | ||
| 3807 | EXPORT_SYMBOL_GPL(tegra_phy_xusb_utmi_pad_chg_power_down); | ||
| 3808 | |||
| 3809 | static int tegra186_utmi_phy_power_on(struct phy *phy) | 3773 | static int tegra186_utmi_phy_power_on(struct phy *phy) |
| 3810 | { | 3774 | { |
| 3811 | struct tegra_padctl_uphy *uphy = phy_get_drvdata(phy); | 3775 | struct tegra_padctl_uphy *uphy = phy_get_drvdata(phy); |
