Commit 25dcaf94 authored by Vinod Koul's avatar Vinod Koul
Browse files

Merge branch 'fixes' into next 

Merge the fixes to next as both carry qmp-phy patches
parents 0e089bb8 04948e75

MAINTAINERS

+1 −1
Original line number Diff line number Diff line
@@ -8595,8 +8595,8 @@ F: include/asm-generic/ 
F:	include/uapi/asm-generic/









GENERIC PHY FRAMEWORK









M:	Kishon Vijay Abraham I <kishon@ti.com>









M:	Vinod Koul <vkoul@kernel.org>









M:	Kishon Vijay Abraham I <kishon@kernel.org>









L:	linux-phy@lists.infradead.org









S:	Supported









Q:	https://patchwork.kernel.org/project/linux-phy/list/
































drivers/phy/qualcomm/phy-qcom-qmp-combo.c



+1
−1






























Original line number
Diff line number
Diff line







@@ -2150,7 +2150,7 @@ static void qmp_combo_enable_autonomous_mode(struct qmp_phy *qphy)







static void qmp_combo_disable_autonomous_mode(struct qmp_phy *qphy)









{









	const struct qmp_phy_cfg *cfg = qphy->cfg;









	void __iomem *pcs_usb = qphy->pcs_usb ?: qphy->pcs_usb;









	void __iomem *pcs_usb = qphy->pcs_usb ?: qphy->pcs;









	void __iomem *pcs_misc = qphy->pcs_misc;



















	/* Disable i/o clamp_n on resume for normal mode */
































drivers/phy/tegra/xusb.c



+16
−4






























Original line number
Diff line number
Diff line







@@ -1461,8 +1461,14 @@ EXPORT_SYMBOL_GPL(tegra_phy_xusb_utmi_port_reset);

















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_lane *lane;









	struct tegra_xusb_padctl *padctl;



















	if (!phy)









		return;



















	lane = phy_get_drvdata(phy);









	padctl = lane->pad->padctl;



















	if (padctl->soc->ops->utmi_pad_power_on)









		padctl->soc->ops->utmi_pad_power_on(phy);








@@ -1471,8 +1477,14 @@ EXPORT_SYMBOL_GPL(tegra_phy_xusb_utmi_pad_power_on);

















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_lane *lane;









	struct tegra_xusb_padctl *padctl;



















	if (!phy)









		return;



















	lane = phy_get_drvdata(phy);









	padctl = lane->pad->padctl;



















	if (padctl->soc->ops->utmi_pad_power_down)









		padctl->soc->ops->utmi_pad_power_down(phy);