evie/android_kernel_oneplus_msm8998
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge "clk: msm: Fix dummy clock fixed rate setting issue"

Browse source
This commit is contained in:
Linux Build Service Account 2017-10-13 12:12:16 -07:00 • committed by Gerrit - the friendly Code Review server
commit 1d91519ac5
1 changed files with 5 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
drivers/clk/msm/clock-dummy.c
View file

@ -64,7 +64,6 @@ struct clk dummy_clk = {
static void *dummy_clk_dt_parser(struct device *dev, struct device_node *np)
{
struct clk *c;
u32 rate;
c = devm_kzalloc(dev, sizeof(*c), GFP_KERNEL);
if (!c) {
@ -73,9 +72,6 @@ static void *dummy_clk_dt_parser(struct device *dev, struct device_node *np)
}
c->ops = &clk_ops_dummy;
if (!of_property_read_u32(np, "clock-frequency", &rate))
c->rate = rate;
return msmclk_generic_clk_init(dev, np, c);
}
MSMCLK_PARSER(dummy_clk_dt_parser, "qcom,dummy-clk", 0);
@ -83,6 +79,11 @@ MSMCLK_PARSER(dummy_clk_dt_parser, "qcom,dummy-clk", 0);
static struct clk *of_dummy_get(struct of_phandle_args *clkspec,
void *data)
{
u32 rate;
if (!of_property_read_u32(clkspec->np, "clock-frequency", &rate))
dummy_clk.rate = rate;
return &dummy_clk;
}