diff options
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 | 19 |
1 files changed, 5 insertions, 14 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 bda409363e..4ee9350180 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 @@ -19,11 +19,9 @@ Signed-off-by: Stephen Boyd <sboyd@codeaurora.org> include/linux/clk-provider.h | 1 + 3 files changed, 49 insertions(+), 7 deletions(-) -diff --git a/drivers/clk/clk.c b/drivers/clk/clk.c -index b94a311..0582068 100644 --- a/drivers/clk/clk.c +++ b/drivers/clk/clk.c -@@ -1356,6 +1356,7 @@ static void clk_calc_subtree(struct clk *clk, unsigned long new_rate, +@@ -1356,6 +1356,7 @@ static void clk_calc_subtree(struct clk struct clk *new_parent, u8 p_index) { struct clk *child; @@ -31,7 +29,7 @@ index b94a311..0582068 100644 clk->new_rate = new_rate; clk->new_parent = new_parent; -@@ -1365,6 +1366,17 @@ static void clk_calc_subtree(struct clk *clk, unsigned long new_rate, +@@ -1365,6 +1366,17 @@ static void clk_calc_subtree(struct clk if (new_parent && new_parent != clk->parent) new_parent->new_child = clk; @@ -95,7 +93,7 @@ index b94a311..0582068 100644 fail_clk = clk; } -@@ -1499,7 +1539,8 @@ static void clk_change_rate(struct clk *clk) +@@ -1499,7 +1539,8 @@ static void clk_change_rate(struct clk * else if (clk->parent) best_parent_rate = clk->parent->rate; @@ -105,7 +103,7 @@ index b94a311..0582068 100644 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 *clk) +@@ -1522,9 +1563,6 @@ static void clk_change_rate(struct clk * else clk->rate = best_parent_rate; @@ -115,7 +113,7 @@ index b94a311..0582068 100644 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, unsigned long rate) +@@ -1598,6 +1636,7 @@ int clk_set_rate(struct clk *clk, unsign /* change the rates */ clk_change_rate(top); @@ -123,8 +121,6 @@ index b94a311..0582068 100644 out: clk_prepare_unlock(); -diff --git a/include/linux/clk-private.h b/include/linux/clk-private.h -index efbf70b..f48684a 100644 --- a/include/linux/clk-private.h +++ b/include/linux/clk-private.h @@ -38,8 +38,10 @@ struct clk { @@ -138,8 +134,6 @@ index efbf70b..f48684a 100644 struct clk *new_parent; struct clk *new_child; unsigned long flags; -diff --git a/include/linux/clk-provider.h b/include/linux/clk-provider.h -index 939533d..300fcb8 100644 --- a/include/linux/clk-provider.h +++ b/include/linux/clk-provider.h @@ -157,6 +157,7 @@ struct clk_ops { @@ -150,6 +144,3 @@ index 939533d..300fcb8 100644 int (*set_rate)(struct clk_hw *hw, unsigned long, unsigned long); int (*set_rate_and_parent)(struct clk_hw *hw, --- -1.7.10.4 - |