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

Commit bd41e395 authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "clk: qcom: clk-rcg: Remove the src_freq and F_SLEW macro support" into msm-next

parents 1595b38f 41b1cdfb

drivers/clk/qcom/clk-rcg.h

+0 −2
Original line number Diff line number Diff line
@@ -23,8 +23,6 @@ struct freq_tbl { 
	u8 pre_div;

	u16 m;

	u16 n;

	unsigned long src_freq;

#define FIXED_FREQ_SRC   0

};



/**

drivers/clk/qcom/clk-rcg2.c

+1 −17
Original line number Diff line number Diff line
@@ -288,10 +288,9 @@ static int _freq_tbl_determine_rate(struct clk_hw *hw, const struct freq_tbl *f, 
				    enum freq_policy policy)

{

	unsigned long clk_flags, rate = req->rate;

	struct clk_rate_request parent_req = { };

	struct clk_hw *p;

	struct clk_rcg2 *rcg = to_clk_rcg2(hw);

	int index, ret = 0;

	int index;



	switch (policy) {

	case FLOOR:
@@ -332,21 +331,6 @@ static int _freq_tbl_determine_rate(struct clk_hw *hw, const struct freq_tbl *f, 
	req->best_parent_rate = rate;

	req->rate = f->freq;



	if (f->src_freq != FIXED_FREQ_SRC) {

		rate = parent_req.rate = f->src_freq;

		parent_req.best_parent_hw = p;

		ret = __clk_determine_rate(p, &parent_req);

		if (ret)

			return ret;



		ret = clk_set_rate(p->clk, parent_req.rate);

		if (ret) {

			pr_err("Failed set rate(%lu) on parent for non-fixed source\n",

							parent_req.rate);

			return ret;

		}

	}



	return 0;

}

drivers/clk/qcom/gcc-sdm855.c

+0 −1
Original line number Diff line number Diff line
@@ -37,7 +37,6 @@ 
#include "vdd-level.h"



#define F(f, s, h, m, n) { (f), (s), (2 * (h) - 1), (m), (n) }

#define F_SLEW(f, s, h, m, n, sf) { (f), (s), (2 * (h) - 1), (m), (n), (sf) }



#define GCC_APCS_CLOCK_SLEEP_ENA_VOTE_OFFSET	0x52008

#define CPUSS_AHB_CLK_SLEEP_ENA			BIT(21)