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 /include/linux | |
| parent | 6f9a4894c435bc9919dab31d90f69167d4638997 (diff) | |
| parent | 06dda9d770063c5fefc0b41c7bfcc1321e2649dd (diff) | |
Merge branch 'clk-next-s3c64xx' into clk-next
Diffstat (limited to 'include/linux')
| -rw-r--r-- | include/linux/clk-provider.h | 2 |
1 files changed, 2 insertions, 0 deletions
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 { #define CLK_MUX_INDEX_ONE BIT(0) #define CLK_MUX_INDEX_BIT BIT(1) #define CLK_MUX_HIWORD_MASK BIT(2) +#define CLK_MUX_READ_ONLY BIT(3) /* mux setting cannot be changed */ extern const struct clk_ops clk_mux_ops; +extern const struct clk_ops clk_mux_ro_ops; struct clk *clk_register_mux(struct device *dev, const char *name, const char **parent_names, u8 num_parents, unsigned long flags, |