mirror of
https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git
synced 2026-10-29 19:21:31 -04:00
devfreq: simple-dev: Make the freq-table property optional
The call to devfreq_add_device() tries to initialize frequency tables for simple-dev. This can be a more efficient way of setting up frequency tables in case there are multiple tables for a single device depending on hardware version. Make 'freq-tbl-khz' property an optional one so that probe doesn't fail in its absence and devfreq_add_device() also gets a chance to set up the freq table for simple-dev. Change-Id: I96b5c2d4aef2085512d94dc6792f5ba2711de64b Signed-off-by: Rohit Gupta <[email protected]> [[email protected]: made minor styling changes] Signed-off-by: Amir Vajid <[email protected]>
This commit is contained in:
parent
b89dc2a891
commit
6b881f24a9
1 changed files with 39 additions and 21 deletions
|
|
@ -1,6 +1,6 @@
|
|||
// SPDX-License-Identifier: GPL-2.0-only
|
||||
/*
|
||||
* Copyright (c) 2014-2015, 2019, The Linux Foundation. All rights reserved.
|
||||
* Copyright (c) 2014-2015, 2017, 2019, The Linux Foundation. All rights reserved.
|
||||
*/
|
||||
|
||||
#define pr_fmt(fmt) "devfreq-simple-dev: " fmt
|
||||
|
|
@ -26,6 +26,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,
|
||||
|
|
@ -57,7 +58,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);
|
||||
|
|
@ -75,39 +76,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)
|
||||
|
|
@ -134,6 +126,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 < 0)
|
||||
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);
|
||||
|
|
|
|||
Loading…
Reference in a new issue