Merge "usb: phy: hsusb: Fix usb suspend/resume for mdm9635" (7a7604fd) · Commits · e / devices / android_kernel_sony_msm8994_rework

drivers/usb/phy/phy-msm-hsusb.c

+10 −3

Original line number	Diff line number	Diff line
		/*
		* Copyright (c) 2012-2013, The Linux Foundation. All rights reserved.
		* Copyright (c) 2012-2014, The Linux Foundation. All rights reserved.
		*
		* This program is free software; you can redistribute it and/or modify
		* it under the terms of the GNU General Public License version 2 and
		@@ -376,10 +376,17 @@ static int msm_hsphy_set_suspend(struct usb_phy *uphy, int suspend)
		msm_hsusb_ldo_enable(phy, 1);
		}

		if (phy->core_ver >= MSM_CORE_VER_120)
		if (phy->core_ver >= MSM_CORE_VER_120) {
		if (phy->set_pllbtune) {
		msm_usb_write_readback(phy->base,
		HS_PHY_CTRL_COMMON_REG,
		FSEL_MASK, 0);
		} else {
		msm_usb_write_readback(phy->base,
		HS_PHY_CTRL_COMMON_REG,
		FSEL_MASK, FSEL_DEFAULT);
		}
		}

		if (!phy->ext_vbus_id)
		/* Disable HV interrupts */