aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--drivers/clk/clk-mux.c10
-rw-r--r--include/linux/clk-provider.h2
2 files changed, 11 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 = {
107}; 107};
108EXPORT_SYMBOL_GPL(clk_mux_ops); 108EXPORT_SYMBOL_GPL(clk_mux_ops);
109 109
110const struct clk_ops clk_mux_ro_ops = {
111 .get_parent = clk_mux_get_parent,
112};
113EXPORT_SYMBOL_GPL(clk_mux_ro_ops);
114
110struct clk *clk_register_mux_table(struct device *dev, const char *name, 115struct clk *clk_register_mux_table(struct device *dev, const char *name,
111 const char **parent_names, u8 num_parents, unsigned long flags, 116 const char **parent_names, u8 num_parents, unsigned long flags,
112 void __iomem *reg, u8 shift, u32 mask, 117 void __iomem *reg, u8 shift, u32 mask,
@@ -133,7 +138,10 @@ struct clk *clk_register_mux_table(struct device *dev, const char *name,
133 } 138 }
134 139
135 init.name = name; 140 init.name = name;
136 init.ops = &clk_mux_ops; 141 if (clk_mux_flags & CLK_MUX_READ_ONLY)
142 init.ops = &clk_mux_ro_ops;
143 else
144 init.ops = &clk_mux_ops;
137 init.flags = flags | CLK_IS_BASIC; 145 init.flags = flags | CLK_IS_BASIC;
138 init.parent_names = parent_names; 146 init.parent_names = parent_names;
139 init.num_parents = num_parents; 147 init.num_parents = num_parents;
diff --git a/include/linux/clk-provider.h b/include/linux/clk-provider.h
index 1ec14a732176..9487b96939e8 100644
--- a/include/linux/clk-provider.h
+++ b/include/linux/clk-provider.h
@@ -327,8 +327,10 @@ struct clk_mux {
327#define CLK_MUX_INDEX_ONE BIT(0) 327#define CLK_MUX_INDEX_ONE BIT(0)
328#define CLK_MUX_INDEX_BIT BIT(1) 328#define CLK_MUX_INDEX_BIT BIT(1)
329#define CLK_MUX_HIWORD_MASK BIT(2) 329#define CLK_MUX_HIWORD_MASK BIT(2)
330#define CLK_MUX_READ_ONLY BIT(3) /* mux setting cannot be changed */
330 331
331extern const struct clk_ops clk_mux_ops; 332extern const struct clk_ops clk_mux_ops;
333extern const struct clk_ops clk_mux_ro_ops;
332 334
333struct clk *clk_register_mux(struct device *dev, const char *name, 335struct clk *clk_register_mux(struct device *dev, const char *name,
334 const char **parent_names, u8 num_parents, unsigned long flags, 336 const char **parent_names, u8 num_parents, unsigned long flags,