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

Commit b93099bb authored by Taniya Das's avatar Taniya Das
Browse files

clk: msm: clock-a7: Update opp support for CPU clocks 



Update the opp logic to register for frequencies which are required from
CPU clock driver with the OPP framework.

Change-Id: I1987760eedb9ce135c0449cf5c1453d77491646b
Signed-off-by: default avatarTaniya Das <tdas@codeaurora.org>
parent ccf21f85

drivers/clk/msm/clock-a7.c

+31 −31
Original line number Diff line number Diff line
@@ -32,7 +32,7 @@ 


#include "clock.h"



DEFINE_VDD_REGS_INIT(vdd_cpu, 1);

static DEFINE_VDD_REGS_INIT(vdd_cpu, 1);



static struct mux_div_clk a7ssmux = {

	.ops = &rcg_mux_div_ops,
@@ -88,52 +88,51 @@ static void print_opp_table(int a7_cpu) 
	rcu_read_unlock();

}



static int add_opp(struct clk *c, struct device *cpudev, struct device *vregdev,

static int add_opp(struct clk *c, struct device *dev,

					unsigned long max_rate)

{

	unsigned long rate = 0;

	int level;

	long ret, uv, corner;

	int uv;

	long ret;

	bool first = true;

	int j = 1;



	while (1) {

		ret = clk_round_rate(c, rate + 1);

		if (ret < 0) {

			pr_warn("clock-cpu: round_rate failed at %lu\n", rate);

			return ret;

		}



		rate = ret;

		rate = c->fmax[j++];



		level = find_vdd_level(c, rate);

		if (level <= 0) {

			pr_warn("clock-cpu: no uv for %lu.\n", rate);

			pr_warn("clock-cpu: no corner for %lu\n", rate);

			return -EINVAL;

		}



		uv = corner = c->vdd_class->vdd_uv[level];



		/*

		 * Populate both CPU and regulator devices with the

		 * freq-to-corner OPP table to maintain backward

		 * compatibility.

		 */

		ret = dev_pm_opp_add(cpudev, rate, corner);

		if (ret) {

			pr_warn("clock-cpu: couldn't add OPP for %lu\n",

					rate);

			return ret;

		uv = c->vdd_class->vdd_uv[level];

		if (uv < 0) {

			pr_warn("clock-cpu: no uv for %lu\n", rate);

			return -EINVAL;

		}



		ret = dev_pm_opp_add(vregdev, rate, corner);

		ret = dev_pm_opp_add(dev, rate, uv);

		if (ret) {

			pr_warn("clock-cpu: couldn't add OPP for %lu\n",

			pr_warn("clock-cpu: failed to add OPP for %lu\n",

					rate);

			return ret;

		}



		if (rate >= max_rate)

		/*

		 * The OPP pair for the lowest and highest frequency for

		 * each device that we're populating. This is important since

		 * this information will be used by thermal mitigation and the

		 * scheduler.

		 */

		if ((rate >= max_rate) || first) {

			if (first)

				first = false;

			else

				break;

		}

	}



	return 0;

}
@@ -142,6 +141,7 @@ static void populate_opp_table(struct platform_device *pdev) 
{

	struct platform_device *apc_dev;

	struct device_node *apc_node;

	struct device *dev;

	unsigned long apc_fmax;

	int cpu, a7_cpu = 0;
@@ -161,13 +161,13 @@ static void populate_opp_table(struct platform_device *pdev) 


	for_each_possible_cpu(cpu) {

		a7_cpu = cpu;

		if (!get_cpu_device(cpu)) {

		dev = get_cpu_device(cpu);

		if (!dev) {

			pr_err("can't find cpu device for attaching OPPs\n");

			return;

		}



		WARN(add_opp(&a7ssmux.c, get_cpu_device(cpu),

					&apc_dev->dev, apc_fmax),

		WARN(add_opp(&a7ssmux.c, dev, apc_fmax),

				"Failed to add OPP levels for A7\n");

	}