diff options
| author | Michael Turquette <mturquette@linaro.org> | 2014-11-24 17:45:33 -0800 |
|---|---|---|
| committer | Michael Turquette <mturquette@linaro.org> | 2014-11-24 17:45:33 -0800 |
| commit | da57b46010dd8d93aabc4c3e8d11751ac617d914 (patch) | |
| tree | 1fe26ac6679ea8e76276da87582fcb95210974ed /drivers/clk/rockchip | |
| parent | 7f615dd43ced8dc5424ad3fa95edd6b7fbbbc27c (diff) | |
| parent | dcf3d458304aafda3d12413ade39fdf19740dbc3 (diff) | |
Merge branch 'clk-fixes' into clk-next
Diffstat (limited to 'drivers/clk/rockchip')
| -rw-r--r-- | drivers/clk/rockchip/clk.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/drivers/clk/rockchip/clk.c b/drivers/clk/rockchip/clk.c index dec6f8d6dc13..70559fab36b6 100644 --- a/drivers/clk/rockchip/clk.c +++ b/drivers/clk/rockchip/clk.c @@ -90,9 +90,7 @@ static struct clk *rockchip_clk_register_branch(const char *name, div->width = div_width; div->lock = lock; div->table = div_table; - div_ops = (div_flags & CLK_DIVIDER_READ_ONLY) - ? &clk_divider_ro_ops - : &clk_divider_ops; + div_ops = &clk_divider_ops; } clk = clk_register_composite(NULL, name, parent_names, num_parents, |