diff options
| author | Mike Turquette <mturquette@linaro.org> | 2014-07-02 08:41:56 +0200 |
|---|---|---|
| committer | Mike Turquette <mturquette@linaro.org> | 2014-07-02 08:41:56 +0200 |
| commit | 5c726dcdd22d2fa007a87e258128393acfc364d2 (patch) | |
| tree | 8559800bd9a24d01f8c42d017c2c2161bc9ab389 /drivers/clk/ti/mux.c | |
| parent | clk: sunxi: fix devm_ioremap_resource error detection code (diff) | |
| parent | clk: ti: set CLK_SET_RATE_NO_REPARENT for ti,mux-clock (diff) | |
| download | linux-5c726dcdd22d2fa007a87e258128393acfc364d2.tar.xz linux-5c726dcdd22d2fa007a87e258128393acfc364d2.zip | |
Merge branch 'for-v3.16-rc/ti-clk-drv' of github.com:t-kristo/linux-pm into clk-fixes-ti
Diffstat (limited to 'drivers/clk/ti/mux.c')
| -rw-r--r-- | drivers/clk/ti/mux.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/clk/ti/mux.c b/drivers/clk/ti/mux.c index 0197a478720c..e9d650e51287 100644 --- a/drivers/clk/ti/mux.c +++ b/drivers/clk/ti/mux.c @@ -160,7 +160,7 @@ static void of_mux_clk_setup(struct device_node *node) u8 clk_mux_flags = 0; u32 mask = 0; u32 shift = 0; - u32 flags = 0; + u32 flags = CLK_SET_RATE_NO_REPARENT; num_parents = of_clk_get_parent_count(node); if (num_parents < 2) { |