UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

clk: composite: allow read-only clocks 

This allows readl-only composite clocks by making mux_ops->set_parent and
divider_ops->round_rate/set_rate optional.

Signed-off-by: Heiko Stuebner <heiko@sntech.de>
Acked-By: Max Schwarz <max.schwarz@online.de>
Tested-By: Max Schwarz <max.schwarz@online.de>
Signed-off-by: Mike Turquette <mturquette@linaro.org>
This commit is contained in:
Heiko Stübner 2014-07-03 01:57:30 +02:00 committed by Mike Turquette
parent 3eb635f1ca
commit 0c02cf2f1c
1 changed files with 3 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
drivers/clk/clk-composite.c
View File

@ -207,7 +207,7 @@ struct clk *clk_register_composite(struct device *dev, const char *name,
clk_composite_ops = &composite->ops; clk_composite_ops = &composite->ops;
if (mux_hw && mux_ops) { if (mux_hw && mux_ops) {
if (!mux_ops->get_parent || !mux_ops->set_parent) { if (!mux_ops->get_parent) {
clk = ERR_PTR(-EINVAL); clk = ERR_PTR(-EINVAL);
goto err; goto err;
} }
@ -215,7 +215,8 @@ struct clk *clk_register_composite(struct device *dev, const char *name,
composite->mux_hw = mux_hw; composite->mux_hw = mux_hw;
composite->mux_ops = mux_ops; composite->mux_ops = mux_ops;
clk_composite_ops->get_parent = clk_composite_get_parent; clk_composite_ops->get_parent = clk_composite_get_parent;
clk_composite_ops->set_parent = clk_composite_set_parent; if (mux_ops->set_parent)
clk_composite_ops->set_parent = clk_composite_set_parent;
if (mux_ops->determine_rate) if (mux_ops->determine_rate)
clk_composite_ops->determine_rate = clk_composite_determine_rate; clk_composite_ops->determine_rate = clk_composite_determine_rate;
} }
@ -232,10 +233,6 @@ struct clk *clk_register_composite(struct device *dev, const char *name,
if (rate_ops->set_rate) { if (rate_ops->set_rate) {
clk_composite_ops->set_rate = clk_composite_set_rate; clk_composite_ops->set_rate = clk_composite_set_rate;
} }
} else {
WARN(rate_ops->set_rate,
"%s: missing round_rate op is required\n",
__func__);
} }
composite->rate_hw = rate_hw; composite->rate_hw = rate_hw;