Commit 18bd8bff authored by Dmitry Osipenko's avatar Dmitry Osipenko Committed by Greg Kroah-Hartman
Browse files

usb: phy: tegra: Keep track of power on-off state 



The PHY driver should keep track of the enable state, otherwise enable
refcount is screwed if USB driver tries to enable PHY when it is already
enabled. This will be the case for ChipIdea and Tegra EHCI drivers once
PHY driver will gain support for the init/shutdown callbacks.

Signed-off-by: default avatarDmitry Osipenko <digetx@gmail.com>
Link: https://lore.kernel.org/r/20200106013416.9604-5-digetx@gmail.com


Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 28d190ac

drivers/usb/phy/phy-tegra-usb.c

+26 −4
Original line number Diff line number Diff line
@@ -785,18 +785,40 @@ static void tegra_usb_phy_close(struct tegra_usb_phy *phy) 


static int tegra_usb_phy_power_on(struct tegra_usb_phy *phy)

{

	int err;



	if (phy->powered_on)

		return 0;



	if (phy->is_ulpi_phy)

		return ulpi_phy_power_on(phy);

		err = ulpi_phy_power_on(phy);

	else

		return utmi_phy_power_on(phy);

		err = utmi_phy_power_on(phy);

	if (err)

		return err;



	phy->powered_on = true;



	return 0;

}



static int tegra_usb_phy_power_off(struct tegra_usb_phy *phy)

{

	int err;



	if (!phy->powered_on)

		return 0;



	if (phy->is_ulpi_phy)

		return ulpi_phy_power_off(phy);

		err = ulpi_phy_power_off(phy);

	else

		return utmi_phy_power_off(phy);

		err = utmi_phy_power_off(phy);

	if (err)

		return err;



	phy->powered_on = false;



	return 0;

}



static int	tegra_usb_phy_suspend(struct usb_phy *x, int suspend)

include/linux/usb/tegra_usb_phy.h

+1 −0
Original line number Diff line number Diff line
@@ -78,6 +78,7 @@ struct tegra_usb_phy { 
	bool is_ulpi_phy;

	int reset_gpio;

	struct reset_control *pad_rst;

	bool powered_on;

};



void tegra_usb_phy_preresume(struct usb_phy *phy);