summaryrefslogtreecommitdiff
path: root/drivers/clk/rockchip/clk.c
diff options
context:
space:
mode:
authorMichael Turquette <mturquette@linaro.org>2014-11-25 01:45:33 (GMT)
committerMichael Turquette <mturquette@linaro.org>2014-11-25 01:45:33 (GMT)
commitda57b46010dd8d93aabc4c3e8d11751ac617d914 (patch)
tree1fe26ac6679ea8e76276da87582fcb95210974ed /drivers/clk/rockchip/clk.c
parent7f615dd43ced8dc5424ad3fa95edd6b7fbbbc27c (diff)
parentdcf3d458304aafda3d12413ade39fdf19740dbc3 (diff)
downloadlinux-da57b46010dd8d93aabc4c3e8d11751ac617d914.tar.xz
Merge branch 'clk-fixes' into clk-next
Diffstat (limited to 'drivers/clk/rockchip/clk.c')
-rw-r--r--drivers/clk/rockchip/clk.c4
1 files changed, 1 insertions, 3 deletions
diff --git a/drivers/clk/rockchip/clk.c b/drivers/clk/rockchip/clk.c
index dec6f8d6..70559fa 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,