Merge remote-tracking branch 'clk/clk-next'

[karo-tx-linux.git] / drivers / clk / rockchip / clk.c

diff --git a/drivers/clk/rockchip/clk.c b/drivers/clk/rockchip/clk.c
index ab505247887013d8b5eac570c996e96627165f26..ec06350c78c4808c7dc6a849f157428402cccf0f 100644 (file)
--- a/drivers/clk/rockchip/clk.c
+++ b/drivers/clk/rockchip/clk.c
@@ -90,7 +90,9 @@ static struct clk *rockchip_clk_register_branch(const char *name,
                div->width = div_width;
                div->lock = lock;
                div->table = div_table;
-               div_ops = &clk_divider_ops;
+               div_ops = (div_flags & CLK_DIVIDER_READ_ONLY)
+                                               ? &clk_divider_ro_ops
+                                               : &clk_divider_ops;
        }
 
        clk = clk_register_composite(NULL, name, parent_names, num_parents,