Merge "usb: phy: qmp: Disable LDOs and clocks in error handling path" (26629e0a) · Commits · e / devices / android_kernel_oneplus_sm7250

drivers/usb/phy/phy-msm-ssusb-qmp.c

+12 −3

Original line number	Diff line number	Diff line
		// SPDX-License-Identifier: GPL-2.0-only
		/*
		* Copyright (c) 2013-2019, The Linux Foundation. All rights reserved.
		* Copyright (c) 2013-2020, The Linux Foundation. All rights reserved.
		*/

		#include <linux/module.h>
		@@ -482,7 +482,7 @@ static int msm_ssphy_qmp_init(struct usb_phy *uphy)
		ret = configure_phy_regs(uphy, reg);
		if (ret) {
		dev_err(uphy->dev, "Failed the main PHY configuration\n");
		return ret;
		goto fail;
		}

		/* perform software reset of PHY common logic */
		@@ -513,10 +513,19 @@ static int msm_ssphy_qmp_init(struct usb_phy *uphy)
		dev_err(uphy->dev, "USB3_PHY_PCS_STATUS:%x\n",
		readl_relaxed(phy->base +
		phy->phy_reg[USB3_PHY_PCS_STATUS]));
		return -EBUSY;
		ret = -EBUSY;
		goto fail;
		};

		return 0;
		fail:
		phy->in_suspend = true;
		writel_relaxed(0x00,
		phy->base + phy->phy_reg[USB3_PHY_POWER_DOWN_CONTROL]);
		msm_ssphy_qmp_enable_clks(phy, false);
		msm_ssusb_qmp_ldo_enable(phy, 0);

		return ret;
		}

		static int msm_ssphy_qmp_dp_combo_reset(struct usb_phy *uphy)