mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-09-28 13:22:57 +00:00
phy: qcom-qmp-combo: fix runtime suspend
commitc7b98de745
upstream. Drop the confused runtime-suspend type check which effectively broke runtime PM if the DP child node happens to be parsed before the USB child node during probe (e.g. due to order of child nodes in the devicetree). Instead use the new driver data USB PHY pointer to access the USB configuration and resources. Fixes:52e013d0bf
("phy: qcom-qmp: Add support for DP in USB3+DP combo phy") Reviewed-by: Dmitry Baryshkov <dmitry.baryshkov@linaro.org> Signed-off-by: Johan Hovold <johan+linaro@kernel.org> Link: https://lore.kernel.org/r/20221114081346.5116-6-johan+linaro@kernel.org Signed-off-by: Vinod Koul <vkoul@kernel.org> Signed-off-by: Stephen Boyd <swboyd@chromium.org> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
parent
5288d522a9
commit
5f3dedbc3b
1 changed files with 2 additions and 10 deletions
|
@ -2296,15 +2296,11 @@ static void qmp_combo_disable_autonomous_mode(struct qmp_phy *qphy)
|
|||
static int __maybe_unused qmp_combo_runtime_suspend(struct device *dev)
|
||||
{
|
||||
struct qcom_qmp *qmp = dev_get_drvdata(dev);
|
||||
struct qmp_phy *qphy = qmp->phys[0];
|
||||
struct qmp_phy *qphy = qmp->usb_phy;
|
||||
const struct qmp_phy_cfg *cfg = qphy->cfg;
|
||||
|
||||
dev_vdbg(dev, "Suspending QMP phy, mode:%d\n", qphy->mode);
|
||||
|
||||
/* Supported only for USB3 PHY and luckily USB3 is the first phy */
|
||||
if (cfg->type != PHY_TYPE_USB3)
|
||||
return 0;
|
||||
|
||||
if (!qmp->init_count) {
|
||||
dev_vdbg(dev, "PHY not initialized, bailing out\n");
|
||||
return 0;
|
||||
|
@ -2321,16 +2317,12 @@ static int __maybe_unused qmp_combo_runtime_suspend(struct device *dev)
|
|||
static int __maybe_unused qmp_combo_runtime_resume(struct device *dev)
|
||||
{
|
||||
struct qcom_qmp *qmp = dev_get_drvdata(dev);
|
||||
struct qmp_phy *qphy = qmp->phys[0];
|
||||
struct qmp_phy *qphy = qmp->usb_phy;
|
||||
const struct qmp_phy_cfg *cfg = qphy->cfg;
|
||||
int ret = 0;
|
||||
|
||||
dev_vdbg(dev, "Resuming QMP phy, mode:%d\n", qphy->mode);
|
||||
|
||||
/* Supported only for USB3 PHY and luckily USB3 is the first phy */
|
||||
if (cfg->type != PHY_TYPE_USB3)
|
||||
return 0;
|
||||
|
||||
if (!qmp->init_count) {
|
||||
dev_vdbg(dev, "PHY not initialized, bailing out\n");
|
||||
return 0;
|
||||
|
|
Loading…
Reference in a new issue