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

Commit dd02a3d9 authored by Viresh Kumar's avatar Viresh Kumar Committed by Rafael J. Wysocki
Browse files

cpufreq: dt: No need to allocate resources anymore 



OPP layer manages it now and cpufreq-dt driver doesn't need it. But, we
still need to check for availability of resources for deferred probing.

Signed-off-by: default avatarViresh Kumar <viresh.kumar@linaro.org>
Reviewed-by: default avatarStephen Boyd <sboyd@codeaurora.org>
Signed-off-by: default avatarRafael J. Wysocki <rafael.j.wysocki@intel.com>
parent df2c8ec2

drivers/cpufreq/cpufreq-dt.c

+45 −67
Original line number Diff line number Diff line
@@ -31,7 +31,6 @@ 


struct private_data {

	struct device *cpu_dev;

	struct regulator *cpu_reg;

	struct thermal_cooling_device *cdev;

	const char *reg_name;

};
@@ -88,81 +87,66 @@ static const char *find_supply_name(struct device *dev) 
	return name;

}



static int allocate_resources(int cpu, struct device **cdev,

			      struct regulator **creg, struct clk **cclk)

static int resources_available(void)

{

	struct device *cpu_dev;

	struct regulator *cpu_reg;

	struct clk *cpu_clk;

	int ret = 0;

	char *reg_cpu0 = "cpu0", *reg_cpu = "cpu", *reg;

	const char *name;



	cpu_dev = get_cpu_device(cpu);

	cpu_dev = get_cpu_device(0);

	if (!cpu_dev) {

		pr_err("failed to get cpu%d device\n", cpu);

		pr_err("failed to get cpu0 device\n");

		return -ENODEV;

	}



	/* Try "cpu0" for older DTs */

	if (!cpu)

		reg = reg_cpu0;

	else

		reg = reg_cpu;



try_again:

	cpu_reg = regulator_get_optional(cpu_dev, reg);

	ret = PTR_ERR_OR_ZERO(cpu_reg);

	cpu_clk = clk_get(cpu_dev, NULL);

	ret = PTR_ERR_OR_ZERO(cpu_clk);

	if (ret) {

		/*

		 * If cpu's regulator supply node is present, but regulator is

		 * not yet registered, we should try defering probe.

		 * If cpu's clk node is present, but clock is not yet

		 * registered, we should try defering probe.

		 */

		if (ret == -EPROBE_DEFER) {

			dev_dbg(cpu_dev, "cpu%d regulator not ready, retry\n",

				cpu);

		if (ret == -EPROBE_DEFER)

			dev_dbg(cpu_dev, "clock not ready, retry\n");

		else

			dev_err(cpu_dev, "failed to get clock: %d\n", ret);



		return ret;

	}



		/* Try with "cpu-supply" */

		if (reg == reg_cpu0) {

			reg = reg_cpu;

			goto try_again;

		}

	clk_put(cpu_clk);



		dev_dbg(cpu_dev, "no regulator for cpu%d: %d\n", cpu, ret);

	}

	name = find_supply_name(cpu_dev);

	/* Platform doesn't require regulator */

	if (!name)

		return 0;



	cpu_clk = clk_get(cpu_dev, NULL);

	ret = PTR_ERR_OR_ZERO(cpu_clk);

	cpu_reg = regulator_get_optional(cpu_dev, name);

	ret = PTR_ERR_OR_ZERO(cpu_reg);

	if (ret) {

		/* put regulator */

		if (!IS_ERR(cpu_reg))

			regulator_put(cpu_reg);



		/*

		 * If cpu's clk node is present, but clock is not yet

		 * registered, we should try defering probe.

		 * If cpu's regulator supply node is present, but regulator is

		 * not yet registered, we should try defering probe.

		 */

		if (ret == -EPROBE_DEFER)

			dev_dbg(cpu_dev, "cpu%d clock not ready, retry\n", cpu);

			dev_dbg(cpu_dev, "cpu0 regulator not ready, retry\n");

		else

			dev_err(cpu_dev, "failed to get cpu%d clock: %d\n", cpu,

				ret);

	} else {

		*cdev = cpu_dev;

		*creg = cpu_reg;

		*cclk = cpu_clk;

	}

			dev_dbg(cpu_dev, "no regulator for cpu0: %d\n", ret);



		return ret;

	}



	regulator_put(cpu_reg);

	return 0;

}



static int cpufreq_init(struct cpufreq_policy *policy)

{

	struct cpufreq_frequency_table *freq_table;

	struct private_data *priv;

	struct device *cpu_dev;

	struct regulator *cpu_reg;

	struct clk *cpu_clk;

	struct dev_pm_opp *suspend_opp;

	unsigned int transition_latency;
@@ -170,9 +154,16 @@ static int cpufreq_init(struct cpufreq_policy *policy) 
	const char *name;

	int ret;



	ret = allocate_resources(policy->cpu, &cpu_dev, &cpu_reg, &cpu_clk);

	if (ret) {

		pr_err("%s: Failed to allocate resources: %d\n", __func__, ret);

	cpu_dev = get_cpu_device(policy->cpu);

	if (!cpu_dev) {

		pr_err("failed to get cpu%d device\n", policy->cpu);

		return -ENODEV;

	}



	cpu_clk = clk_get(cpu_dev, NULL);

	if (IS_ERR(cpu_clk)) {

		ret = PTR_ERR(cpu_clk);

		dev_err(cpu_dev, "%s: failed to get clk: %d\n", __func__, ret);

		return ret;

	}
@@ -186,7 +177,7 @@ static int cpufreq_init(struct cpufreq_policy *policy) 
		if (ret == -ENOENT)

			opp_v1 = true;

		else

			goto out_put_reg_clk;

			goto out_put_clk;

	}



	/*
@@ -199,7 +190,7 @@ static int cpufreq_init(struct cpufreq_policy *policy) 
		if (ret) {

			dev_err(cpu_dev, "Failed to set regulator for cpu%d: %d\n",

				policy->cpu, ret);

			goto out_put_reg_clk;

			goto out_put_clk;

		}

	}
@@ -257,9 +248,7 @@ static int cpufreq_init(struct cpufreq_policy *policy) 
	}



	priv->cpu_dev = cpu_dev;

	priv->cpu_reg = cpu_reg;

	policy->driver_data = priv;



	policy->clk = cpu_clk;



	rcu_read_lock();
@@ -300,10 +289,8 @@ static int cpufreq_init(struct cpufreq_policy *policy) 
	dev_pm_opp_of_cpumask_remove_table(policy->cpus);

	if (name)

		dev_pm_opp_put_regulator(cpu_dev);

out_put_reg_clk:

out_put_clk:

	clk_put(cpu_clk);

	if (!IS_ERR(cpu_reg))

		regulator_put(cpu_reg);



	return ret;

}
@@ -319,8 +306,6 @@ static int cpufreq_exit(struct cpufreq_policy *policy) 
		dev_pm_opp_put_regulator(priv->cpu_dev);



	clk_put(policy->clk);

	if (!IS_ERR(priv->cpu_reg))

		regulator_put(priv->cpu_reg);

	kfree(priv);



	return 0;
@@ -373,9 +358,6 @@ static struct cpufreq_driver dt_cpufreq_driver = { 


static int dt_cpufreq_probe(struct platform_device *pdev)

{

	struct device *cpu_dev;

	struct regulator *cpu_reg;

	struct clk *cpu_clk;

	int ret;



	/*
@@ -385,19 +367,15 @@ static int dt_cpufreq_probe(struct platform_device *pdev) 
	 *

	 * FIXME: Is checking this only for CPU0 sufficient ?

	 */

	ret = allocate_resources(0, &cpu_dev, &cpu_reg, &cpu_clk);

	ret = resources_available();

	if (ret)

		return ret;



	clk_put(cpu_clk);

	if (!IS_ERR(cpu_reg))

		regulator_put(cpu_reg);



	dt_cpufreq_driver.driver_data = dev_get_platdata(&pdev->dev);



	ret = cpufreq_register_driver(&dt_cpufreq_driver);

	if (ret)

		dev_err(cpu_dev, "failed register driver: %d\n", ret);

		dev_err(&pdev->dev, "failed register driver: %d\n", ret);



	return ret;

}