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 tag 'clk-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/clk/linux
[linux-2.6-microblaze.git]
/
drivers
/
clk
/
mediatek
/
clk-mux.c
diff --git
a/drivers/clk/mediatek/clk-mux.c
b/drivers/clk/mediatek/clk-mux.c
index
b0c6170
..
855b0a1
100644
(file)
--- a/
drivers/clk/mediatek/clk-mux.c
+++ b/
drivers/clk/mediatek/clk-mux.c
@@
-116,7
+116,12
@@
static int mtk_clk_mux_set_parent_setclr_lock(struct clk_hw *hw, u8 index)
return 0;
}
return 0;
}
-static const struct clk_ops mtk_mux_ops = {
+const struct clk_ops mtk_mux_clr_set_upd_ops = {
+ .get_parent = mtk_clk_mux_get_parent,
+ .set_parent = mtk_clk_mux_set_parent_setclr_lock,
+};
+
+const struct clk_ops mtk_mux_gate_clr_set_upd_ops = {
.enable = mtk_clk_mux_enable_setclr,
.disable = mtk_clk_mux_disable_setclr,
.is_enabled = mtk_clk_mux_is_enabled,
.enable = mtk_clk_mux_enable_setclr,
.disable = mtk_clk_mux_disable_setclr,
.is_enabled = mtk_clk_mux_is_enabled,
@@
-140,7
+145,7
@@
static struct clk *mtk_clk_register_mux(const struct mtk_mux *mux,
init.flags = mux->flags | CLK_SET_RATE_PARENT;
init.parent_names = mux->parent_names;
init.num_parents = mux->num_parents;
init.flags = mux->flags | CLK_SET_RATE_PARENT;
init.parent_names = mux->parent_names;
init.num_parents = mux->num_parents;
- init.ops =
&mtk_mux_
ops;
+ init.ops =
mux->
ops;
clk_mux->regmap = regmap;
clk_mux->data = mux;
clk_mux->regmap = regmap;
clk_mux->data = mux;
@@
-165,7
+170,7
@@
int mtk_clk_register_muxes(const struct mtk_mux *muxes,
struct clk *clk;
int i;
struct clk *clk;
int i;
- regmap =
syscon
_node_to_regmap(node);
+ regmap =
device
_node_to_regmap(node);
if (IS_ERR(regmap)) {
pr_err("Cannot find regmap for %pOF: %ld\n", node,
PTR_ERR(regmap));
if (IS_ERR(regmap)) {
pr_err("Cannot find regmap for %pOF: %ld\n", node,
PTR_ERR(regmap));