Merge "USB: dwc3-msm: Allow XO shutdown in HOST mode bus suspend" (95e93fb9) · Commits · e / devices / samsung / android_kernel_samsung_msm8916

drivers/usb/dwc3/dwc3-msm.c

+5 −10

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
		@@ -1329,16 +1329,12 @@ static int dwc3_msm_suspend(struct dwc3_msm *mdwc)
		if (!host_bus_suspend)
		dwc3_msm_config_gdsc(mdwc, 0);

		if (can_suspend_ssphy) {
		clk_disable_unprepare(mdwc->core_clk);
		mdwc->lpm_flags \|= MDWC3_PHY_REF_AND_CORECLK_OFF;
		}
		clk_disable_unprepare(mdwc->iface_clk);

		if (!host_bus_suspend)
		clk_disable_unprepare(mdwc->utmi_clk);

		if (!host_bus_suspend) {
		if (can_suspend_ssphy) {
		clk_disable_unprepare(mdwc->core_clk);
		mdwc->lpm_flags \|= MDWC3_PHY_REF_AND_CORECLK_OFF;
		/* USB PHY no more requires TCXO */
		clk_disable_unprepare(mdwc->xo_clk);
		mdwc->lpm_flags \|= MDWC3_TCXO_SHUTDOWN;
		@@ -1415,7 +1411,6 @@ static int dwc3_msm_resume(struct dwc3_msm *mdwc)
		if (!host_bus_suspend)
		dwc3_msm_config_gdsc(mdwc, 1);

		if (!host_bus_suspend)
		clk_prepare_enable(mdwc->utmi_clk);

		if (mdwc->lpm_flags & MDWC3_PHY_REF_AND_CORECLK_OFF)