Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit af59eb9c authored Nov 26, 2015 by Manu Gautam

USB: ci13xxx_msm_hsic: Allow turning off Core clocks in suspend



Commit 4316bfd9e4a5b ("usb: ci13xxx_msm_hsic: Fix HSIC Connect
sequence") removed usage of core_clk_always_on_workaround but
it also introduced this bug to not turn off core clocks during
suspend.

Change-Id: Ia50ceed467e73e9d5f2881b11a5218913ba3d511
Signed-off-by: Manu Gautam <mgautam@codeaurora.org>

parent c76afea1

drivers/usb/gadget/ci13xxx_msm_hsic.c

+5 −8

Original line number	Diff line number	Diff line
		@@ -435,10 +435,9 @@ static int msm_hsic_suspend(struct msm_hsic_per *mhsic)
		dev_dbg(mhsic->dev, "%s SKIP PHY suspend\n", __func__);
		}

		if (!mhsic->connected) {
		clk_disable_unprepare(mhsic->iface_clk);
		clk_disable_unprepare(mhsic->core_clk);
		}

		clk_disable_unprepare(mhsic->phy_clk);
		clk_disable_unprepare(mhsic->cal_clk);
		clk_disable_unprepare(mhsic->alt_core_clk);
		@@ -497,10 +496,8 @@ static int msm_hsic_resume(struct msm_hsic_per *mhsic)
		dev_err(mhsic->dev,
		"unable to set nominal vddcx voltage (no VDD MIN)\n");

		if (!mhsic->connected) {
		clk_prepare_enable(mhsic->iface_clk);
		clk_prepare_enable(mhsic->core_clk);
		}

		clk_prepare_enable(mhsic->phy_clk);
		clk_prepare_enable(mhsic->cal_clk);

include/linux/usb/msm_hsusb.h

+0 −10

Original line number	Diff line number	Diff line
		@@ -600,16 +600,6 @@ struct msm_usb_host_platform_data {
		int pm_qos_latency;
		};

		/**
		* struct msm_hsic_peripheral_platform_data: HSIC peripheral
		* platform data.
		* @core_clk_always_on_workaround: Don't disable core_clk when
		* HSIC enters LPM.
		*/
		struct msm_hsic_peripheral_platform_data {
		bool core_clk_always_on_workaround;
		};

		/**
		* struct usb_ext_notification: event notification structure
		* @notify: pointer to client function to call when ID event is detected.