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

Commit c1b13dec authored by Kyle Yan's avatar Kyle Yan Committed by Gerrit - the friendly Code Review server
Browse files

Merge "clk: qcom: clk-rcg2: Correct the erroneous RCG configuration during enable" into msm-4.8

parents 783c47e7 dfd9e6e6

drivers/clk/qcom/clk-rcg2.c

+10 −1
Original line number Diff line number Diff line 
/*

 * Copyright (c) 2013, 2016, The Linux Foundation. All rights reserved.

 * Copyright (c) 2013, 2016-2017, The Linux Foundation. All rights reserved.

 *

 * This software is licensed under the terms of the GNU General Public

 * License version 2, as published by the Free Software Foundation, and
@@ -411,6 +411,15 @@ static int clk_rcg2_enable(struct clk_hw *hw) 
	if (!f)

		return -EINVAL;



	/*

	 * If CXO is not listed as a supported frequency in the frequency

	 * table, the above API would return the lowest supported frequency

	 * instead. This will lead to incorrect configuration of the RCG.

	 * Check if the RCG rate is CXO and configure it accordingly.

	 */

	if (rate == cxo_f.freq)

		f = &cxo_f;



	clk_rcg2_set_force_enable(hw);

	clk_rcg2_configure(rcg, f);

	clk_rcg2_clear_force_enable(hw);