diff options
| author | Mike Turquette <mturquette@linaro.org> | 2013-08-05 11:59:06 -0700 |
|---|---|---|
| committer | Mike Turquette <mturquette@linaro.org> | 2013-08-08 15:57:26 -0700 |
| commit | 5cfe9614f365915d9e75d110d4008b06a5c0b99e (patch) | |
| tree | 5fb6c7c7541363e286a97557fd845051feb48feb /drivers/clk/clk-mux.c | |
| parent | 6f9a4894c435bc9919dab31d90f69167d4638997 (diff) | |
| parent | 06dda9d770063c5fefc0b41c7bfcc1321e2649dd (diff) | |
| download | blackbird-op-linux-5cfe9614f365915d9e75d110d4008b06a5c0b99e.tar.gz blackbird-op-linux-5cfe9614f365915d9e75d110d4008b06a5c0b99e.zip | |
Merge branch 'clk-next-s3c64xx' into clk-next
Diffstat (limited to 'drivers/clk/clk-mux.c')
| -rw-r--r-- | drivers/clk/clk-mux.c | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/drivers/clk/clk-mux.c b/drivers/clk/clk-mux.c index 614444ca40cd..92f1a1be5319 100644 --- a/drivers/clk/clk-mux.c +++ b/drivers/clk/clk-mux.c @@ -107,6 +107,11 @@ const struct clk_ops clk_mux_ops = { }; EXPORT_SYMBOL_GPL(clk_mux_ops); +const struct clk_ops clk_mux_ro_ops = { + .get_parent = clk_mux_get_parent, +}; +EXPORT_SYMBOL_GPL(clk_mux_ro_ops); + struct clk *clk_register_mux_table(struct device *dev, const char *name, const char **parent_names, u8 num_parents, unsigned long flags, void __iomem *reg, u8 shift, u32 mask, @@ -133,7 +138,10 @@ struct clk *clk_register_mux_table(struct device *dev, const char *name, } init.name = name; - init.ops = &clk_mux_ops; + if (clk_mux_flags & CLK_MUX_READ_ONLY) + init.ops = &clk_mux_ro_ops; + else + init.ops = &clk_mux_ops; init.flags = flags | CLK_IS_BASIC; init.parent_names = parent_names; init.num_parents = num_parents; |
