diff options
| author | Hauke Mehrtens <hauke@hauke-m.de> | 2014-12-28 19:31:40 +0000 |
|---|---|---|
| committer | Hauke Mehrtens <hauke@hauke-m.de> | 2014-12-28 19:31:40 +0000 |
| commit | f22aeccdd294a4ee5245ed6082d448595b70225d (patch) | |
| tree | 79a312c1769f87ac4a8c81d44e8737303a458964 /target/linux/ipq806x/patches/0126-clk-Add-safe-switch-hook.patch | |
| parent | c9e5aa0c1712ef83c496fcf1c24e1456213b43a0 (diff) | |
| download | master-31e0f0ae-f22aeccdd294a4ee5245ed6082d448595b70225d.tar.gz master-31e0f0ae-f22aeccdd294a4ee5245ed6082d448595b70225d.tar.bz2 master-31e0f0ae-f22aeccdd294a4ee5245ed6082d448595b70225d.zip | |
ipq806x: refresh patches
This makes the patchs apply again.
Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
SVN-Revision: 43792
Diffstat (limited to 'target/linux/ipq806x/patches/0126-clk-Add-safe-switch-hook.patch')
| -rw-r--r-- | target/linux/ipq806x/patches/0126-clk-Add-safe-switch-hook.patch | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/target/linux/ipq806x/patches/0126-clk-Add-safe-switch-hook.patch b/target/linux/ipq806x/patches/0126-clk-Add-safe-switch-hook.patch index 4ee9350180..a78319ff52 100644 --- a/target/linux/ipq806x/patches/0126-clk-Add-safe-switch-hook.patch +++ b/target/linux/ipq806x/patches/0126-clk-Add-safe-switch-hook.patch @@ -93,7 +93,7 @@ Signed-off-by: Stephen Boyd <sboyd@codeaurora.org> fail_clk = clk; } -@@ -1499,7 +1539,8 @@ static void clk_change_rate(struct clk * +@@ -1500,7 +1540,8 @@ static void clk_change_rate(struct clk * else if (clk->parent) best_parent_rate = clk->parent->rate; @@ -103,17 +103,17 @@ Signed-off-by: Stephen Boyd <sboyd@codeaurora.org> old_parent = __clk_set_parent_before(clk, clk->new_parent); if (clk->ops->set_rate_and_parent) { -@@ -1522,9 +1563,6 @@ static void clk_change_rate(struct clk * +@@ -1523,9 +1564,6 @@ static void clk_change_rate(struct clk * else clk->rate = best_parent_rate; - if (clk->notifier_count && old_rate != clk->rate) - __clk_notify(clk, POST_RATE_CHANGE, old_rate, clk->rate); - - hlist_for_each_entry(child, &clk->children, child_node) { - /* Skip children who will be reparented to another clock */ - if (child->new_parent && child->new_parent != clk) -@@ -1598,6 +1636,7 @@ int clk_set_rate(struct clk *clk, unsign + /* + * Use safe iteration, as change_rate can actually swap parents + * for certain clock types. +@@ -1603,6 +1641,7 @@ int clk_set_rate(struct clk *clk, unsign /* change the rates */ clk_change_rate(top); |