From ba5cc1aa958182ee63e7e8bd0b541bba266ede8e Mon Sep 17 00:00:00 2001 From: JC Kuo Date: Fri, 29 Apr 2016 13:18:17 +0800 Subject: 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 Reviewed-on: http://git-master/r/1134743 GVS: Gerrit_Virtual_Submit Reviewed-by: Bharat Nihalani --- drivers/pinctrl/pinctrl-tegra186-padctl-uphy.c | 36 -------------------------- 1 file changed, 36 deletions(-) (limited to 'drivers/pinctrl') 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) } EXPORT_SYMBOL_GPL(tegra_phy_xusb_utmi_pad_power_down); -void tegra_phy_xusb_utmi_pad_chg_power_on(struct phy *phy) -{ - struct tegra_padctl_uphy *uphy; - int port; - u32 reg; - - if (!phy) - return; - - uphy = phy_get_drvdata(phy); - port = utmi_phy_to_port(phy); - - reg = padctl_readl(uphy, USB2_BATTERY_CHRG_OTGPADX_CTL0(port)); - reg &= ~PD_CHG; - padctl_writel(uphy, reg, USB2_BATTERY_CHRG_OTGPADX_CTL0(port)); -} -EXPORT_SYMBOL_GPL(tegra_phy_xusb_utmi_pad_chg_power_on); - -void tegra_phy_xusb_utmi_pad_chg_power_down(struct phy *phy) -{ - struct tegra_padctl_uphy *uphy; - int port; - u32 reg; - - if (!phy) - return; - - uphy = phy_get_drvdata(phy); - port = utmi_phy_to_port(phy); - - reg = padctl_readl(uphy, USB2_BATTERY_CHRG_OTGPADX_CTL0(port)); - reg |= PD_CHG; - padctl_writel(uphy, reg, USB2_BATTERY_CHRG_OTGPADX_CTL0(port)); -} -EXPORT_SYMBOL_GPL(tegra_phy_xusb_utmi_pad_chg_power_down); - static int tegra186_utmi_phy_power_on(struct phy *phy) { struct tegra_padctl_uphy *uphy = phy_get_drvdata(phy); -- cgit v1.2.2