projects
/
linux-2.6-microblaze.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branches 'clk-imx', 'clk-samsung', 'clk-ti', 'clk-uniphier-gear' and 'clk-mmp2...
[linux-2.6-microblaze.git]
/
drivers
/
clk
/
ti
/
apll.c
diff --git
a/drivers/clk/ti/apll.c
b/drivers/clk/ti/apll.c
index
222f68b
..
015a657
100644
(file)
--- a/
drivers/clk/ti/apll.c
+++ b/
drivers/clk/ti/apll.c
@@
-165,7
+165,7
@@
static void __init omap_clk_register_apll(void *user,
ad->clk_bypass = __clk_get_hw(clk);
ad->clk_bypass = __clk_get_hw(clk);
- clk = ti_clk_register(NULL, &clk_hw->hw, node->name);
+ clk = ti_clk_register
_omap_hw
(NULL, &clk_hw->hw, node->name);
if (!IS_ERR(clk)) {
of_clk_add_provider(node, of_clk_src_simple_get, clk);
kfree(clk_hw->hw.init->parent_names);
if (!IS_ERR(clk)) {
of_clk_add_provider(node, of_clk_src_simple_get, clk);
kfree(clk_hw->hw.init->parent_names);
@@
-402,7
+402,7
@@
static void __init of_omap2_apll_setup(struct device_node *node)
if (ret)
goto cleanup;
if (ret)
goto cleanup;
- clk =
clk_register(NULL, &clk_hw->hw
);
+ clk =
ti_clk_register_omap_hw(NULL, &clk_hw->hw, node->name
);
if (!IS_ERR(clk)) {
of_clk_add_provider(node, of_clk_src_simple_get, clk);
kfree(init);
if (!IS_ERR(clk)) {
of_clk_add_provider(node, of_clk_src_simple_get, clk);
kfree(init);