diff options
| author | Mike Turquette <mturquette@linaro.org> | 2014-07-01 23:41:56 -0700 |
|---|---|---|
| committer | Mike Turquette <mturquette@linaro.org> | 2014-07-01 23:41:56 -0700 |
| commit | 5c726dcdd22d2fa007a87e258128393acfc364d2 (patch) | |
| tree | 8559800bd9a24d01f8c42d017c2c2161bc9ab389 | |
| parent | c3dcac875e35c2e67ccaef10ef62ae5b1410d29c (diff) | |
| parent | 7d5fc85d961b807c799786afd175f5d964a2109f (diff) | |
| download | linux-5c726dcdd22d2fa007a87e258128393acfc364d2.tar.gz linux-5c726dcdd22d2fa007a87e258128393acfc364d2.tar.bz2 linux-5c726dcdd22d2fa007a87e258128393acfc364d2.zip | |
Merge branch 'for-v3.16-rc/ti-clk-drv' of github.com:t-kristo/linux-pm into clk-fixes-ti
| -rw-r--r-- | drivers/clk/ti/apll.c | 8 | ||||
| -rw-r--r-- | drivers/clk/ti/mux.c | 2 |
2 files changed, 4 insertions, 6 deletions
diff --git a/drivers/clk/ti/apll.c b/drivers/clk/ti/apll.c index 5428c9c547cd..72d97279eae1 100644 --- a/drivers/clk/ti/apll.c +++ b/drivers/clk/ti/apll.c @@ -77,13 +77,11 @@ static int dra7_apll_enable(struct clk_hw *hw) if (i == MAX_APLL_WAIT_TRIES) { pr_warn("clock: %s failed transition to '%s'\n", clk_name, (state) ? "locked" : "bypassed"); - } else { + r = -EBUSY; + } else pr_debug("clock: %s transition to '%s' in %d loops\n", clk_name, (state) ? "locked" : "bypassed", i); - r = 0; - } - return r; } @@ -338,7 +336,7 @@ static void __init of_omap2_apll_setup(struct device_node *node) const char *parent_name; u32 val; - ad = kzalloc(sizeof(*clk_hw), GFP_KERNEL); + ad = kzalloc(sizeof(*ad), GFP_KERNEL); clk_hw = kzalloc(sizeof(*clk_hw), GFP_KERNEL); init = kzalloc(sizeof(*init), GFP_KERNEL); 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) { |