diff options
author | Stephen Boyd <sboyd@codeaurora.org> | 2017-11-14 10:07:38 -0800 |
---|---|---|
committer | Stephen Boyd <sboyd@codeaurora.org> | 2017-11-14 10:07:38 -0800 |
commit | ed9c62f75aef10297fb6da4e24292fb354cb8307 (patch) | |
tree | 373eb7afd5d079c84aaf1ebaa1a3df68dd846086 /drivers/clk/spear/clk-aux-synth.c | |
parent | Merge branch 'clk-sunxi' into clk-next (diff) | |
parent | clk: make clk_init_data const (diff) | |
download | linux-dev-ed9c62f75aef10297fb6da4e24292fb354cb8307.tar.xz linux-dev-ed9c62f75aef10297fb6da4e24292fb354cb8307.zip |
Merge branch 'clk-const' into clk-next
* clk-const:
clk: make clk_init_data const
clk: imx: make clk_ops const
clk: mmp: make clk_ops const
clk: hisilicon: make clk_ops const
clk: mxs: make clk_ops const
clk: sirf: make clk_ops const
clk: spear: make clk_ops const
CLK: SPEAr: make aux_clk_masks structures const
CLK: SPEAr: make structure field and function argument as const
Diffstat (limited to 'drivers/clk/spear/clk-aux-synth.c')
-rw-r--r-- | drivers/clk/spear/clk-aux-synth.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/clk/spear/clk-aux-synth.c b/drivers/clk/spear/clk-aux-synth.c index f271c350ef94..23a6b10e1d6a 100644 --- a/drivers/clk/spear/clk-aux-synth.c +++ b/drivers/clk/spear/clk-aux-synth.c @@ -29,7 +29,7 @@ #define to_clk_aux(_hw) container_of(_hw, struct clk_aux, hw) -static struct aux_clk_masks default_aux_masks = { +static const struct aux_clk_masks default_aux_masks = { .eq_sel_mask = AUX_EQ_SEL_MASK, .eq_sel_shift = AUX_EQ_SEL_SHIFT, .eq1_mask = AUX_EQ1_SEL, @@ -128,7 +128,7 @@ static int clk_aux_set_rate(struct clk_hw *hw, unsigned long drate, return 0; } -static struct clk_ops clk_aux_ops = { +static const struct clk_ops clk_aux_ops = { .recalc_rate = clk_aux_recalc_rate, .round_rate = clk_aux_round_rate, .set_rate = clk_aux_set_rate, @@ -136,7 +136,7 @@ static struct clk_ops clk_aux_ops = { struct clk *clk_register_aux(const char *aux_name, const char *gate_name, const char *parent_name, unsigned long flags, void __iomem *reg, - struct aux_clk_masks *masks, struct aux_rate_tbl *rtbl, + const struct aux_clk_masks *masks, struct aux_rate_tbl *rtbl, u8 rtbl_cnt, spinlock_t *lock, struct clk **gate_clk) { struct clk_aux *aux; |