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

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

Merge "devfreq: simple-dev: Make the freq-table property optional"

parents 0375d287 aa422df8

Documentation/devicetree/bindings/devfreq/devfreq-simple-dev.txt

+2 −2
Original line number Diff line number Diff line
@@ -9,12 +9,12 @@ Required properties: 
- compatible:		Must be "devfreq-simple-dev"

- clock-names:		Must be "devfreq_clk"

- clocks:		Must refer to the clock that's fed to the device.

- freq-tbl-khz:		A list of usable frequencies (in KHz) for the device

			clock.

Optional properties:

- polling-ms:	Polling interval for the device in milliseconds. Default: 50

- governor:	Initial governor to user for the device. Default: "performance"

- qcom,prepare-clk:	Prepare the device clock during initialization.

- freq-tbl-khz:		A list of usable frequencies (in kHz) for the device

			clock.



Example:

drivers/devfreq/devfreq_simple_dev.c

+39 −21
Original line number Diff line number Diff line 
/*

 * Copyright (c) 2014-2015, The Linux Foundation. All rights reserved.

 * Copyright (c) 2014-2015, 2017, The Linux Foundation. All rights reserved.

 *

 * This program is free software; you can redistribute it and/or modify

 * it under the terms of the GNU General Public License version 2 and
@@ -34,6 +34,7 @@ struct dev_data { 
	struct clk *clk;

	struct devfreq *df;

	struct devfreq_dev_profile profile;

	bool freq_in_khz;

};



static void find_freq(struct devfreq_dev_profile *p, unsigned long *freq,
@@ -65,7 +66,7 @@ static int dev_target(struct device *dev, unsigned long *freq, u32 flags) 


	find_freq(&d->profile, freq, flags);



	rfreq = clk_round_rate(d->clk, *freq * 1000);

	rfreq = clk_round_rate(d->clk, d->freq_in_khz ? *freq * 1000 : *freq);

	if (IS_ERR_VALUE(rfreq)) {

		dev_err(dev, "devfreq: Cannot find matching frequency for %lu\n",

			*freq);
@@ -83,39 +84,30 @@ static int dev_get_cur_freq(struct device *dev, unsigned long *freq) 
	f = clk_get_rate(d->clk);

	if (IS_ERR_VALUE(f))

		return f;

	*freq = f / 1000;

	*freq = d->freq_in_khz ? f / 1000 : f;

	return 0;

}



#define PROP_TBL "freq-tbl-khz"

static int devfreq_clock_probe(struct platform_device *pdev)

static int parse_freq_table(struct device *dev, struct dev_data *d)

{

	struct device *dev = &pdev->dev;

	struct dev_data *d;

	struct devfreq_dev_profile *p;

	u32 *data, poll;

	const char *gov_name;

	struct devfreq_dev_profile *p = &d->profile;

	int ret, len, i, j;

	u32 *data;

	unsigned long f;



	d = devm_kzalloc(dev, sizeof(*d), GFP_KERNEL);

	if (!d)

		return -ENOMEM;

	platform_set_drvdata(pdev, d);



	d->clk = devm_clk_get(dev, "devfreq_clk");

	if (IS_ERR(d->clk))

		return PTR_ERR(d->clk);



	if (!of_find_property(dev->of_node, PROP_TBL, &len))

		return -EINVAL;

	if (!of_find_property(dev->of_node, PROP_TBL, &len)) {

		if (dev_pm_opp_get_opp_count(dev) <= 0)

			return -EPROBE_DEFER;

		return 0;

	}



	d->freq_in_khz = true;

	len /= sizeof(*data);

	data = devm_kzalloc(dev, len * sizeof(*data), GFP_KERNEL);

	if (!data)

		return -ENOMEM;



	p = &d->profile;

	p->freq_table = devm_kzalloc(dev, len * sizeof(*p->freq_table),

				     GFP_KERNEL);

	if (!p->freq_table)
@@ -142,6 +134,32 @@ static int devfreq_clock_probe(struct platform_device *pdev) 
		return -EINVAL;

	}



	return 0;

}



static int devfreq_clock_probe(struct platform_device *pdev)

{

	struct device *dev = &pdev->dev;

	struct dev_data *d;

	struct devfreq_dev_profile *p;

	u32 poll;

	const char *gov_name;

	int ret;



	d = devm_kzalloc(dev, sizeof(*d), GFP_KERNEL);

	if (!d)

		return -ENOMEM;

	platform_set_drvdata(pdev, d);



	d->clk = devm_clk_get(dev, "devfreq_clk");

	if (IS_ERR(d->clk))

		return PTR_ERR(d->clk);



	ret = parse_freq_table(dev, d);

	if (ret)

		return ret;



	p = &d->profile;

	p->target = dev_target;

	p->get_cur_freq = dev_get_cur_freq;

	ret = dev_get_cur_freq(dev, &p->initial_freq);