diff options
author | Jonas Gorski <jogo@openwrt.org> | 2015-08-05 13:55:14 +0000 |
---|---|---|
committer | Jonas Gorski <jogo@openwrt.org> | 2015-08-05 13:55:14 +0000 |
commit | 6afe475aba0d3c7cbf6b88f9d06fce1961de52f4 (patch) | |
tree | 0205a1bbe0f2e29a62e0c85e9ccc3469419c3c63 /target/linux/ipq806x/patches-4.1/135-clk-Avoid-sending-high-rates-to-downstream-clocks-during-set_rate.patch | |
parent | 554bdf8130a518481e26fb22123e42b6ba48343e (diff) | |
download | master-187ad058-6afe475aba0d3c7cbf6b88f9d06fce1961de52f4.tar.gz master-187ad058-6afe475aba0d3c7cbf6b88f9d06fce1961de52f4.tar.bz2 master-187ad058-6afe475aba0d3c7cbf6b88f9d06fce1961de52f4.zip |
kernel: update 4.1 to 4.1.4
Changelog:
* https://www.kernel.org/pub/linux/kernel/v4.x/ChangeLog-4.1.4
Signed-off-by: Daniel Golle <daniel@makrotopia.org>
[jogo: fix brcm2708 patches, refresh target patches]
Signed-off-by: Jonas Gorski <jogo@openwrt.org>
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@46560 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux/ipq806x/patches-4.1/135-clk-Avoid-sending-high-rates-to-downstream-clocks-during-set_rate.patch')
-rw-r--r-- | target/linux/ipq806x/patches-4.1/135-clk-Avoid-sending-high-rates-to-downstream-clocks-during-set_rate.patch | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/target/linux/ipq806x/patches-4.1/135-clk-Avoid-sending-high-rates-to-downstream-clocks-during-set_rate.patch b/target/linux/ipq806x/patches-4.1/135-clk-Avoid-sending-high-rates-to-downstream-clocks-during-set_rate.patch index 8063860985..143e0795f0 100644 --- a/target/linux/ipq806x/patches-4.1/135-clk-Avoid-sending-high-rates-to-downstream-clocks-during-set_rate.patch +++ b/target/linux/ipq806x/patches-4.1/135-clk-Avoid-sending-high-rates-to-downstream-clocks-during-set_rate.patch @@ -47,7 +47,7 @@ drivers/clk/clk.c | 34 ++++++++++++++++++++++------------ --- a/drivers/clk/clk.c +++ b/drivers/clk/clk.c -@@ -1743,21 +1743,24 @@ static struct clk_core *clk_propagate_ra +@@ -1744,21 +1744,24 @@ static struct clk_core *clk_propagate_ra * walk down a subtree and set the new rates notifying the rate * change on the way */ @@ -79,7 +79,7 @@ drivers/clk/clk.c | 34 ++++++++++++++++++++++------------ if (clk->new_parent && clk->new_parent != clk->parent) { old_parent = __clk_set_parent_before(clk, clk->new_parent); -@@ -1783,7 +1786,7 @@ static void clk_change_rate(struct clk_c +@@ -1784,7 +1787,7 @@ static void clk_change_rate(struct clk_c trace_clk_set_rate_complete(clk, clk->new_rate); @@ -88,7 +88,7 @@ drivers/clk/clk.c | 34 ++++++++++++++++++++++------------ if (clk->notifier_count && old_rate != clk->rate) __clk_notify(clk, POST_RATE_CHANGE, old_rate, clk->rate); -@@ -1796,12 +1799,13 @@ static void clk_change_rate(struct clk_c +@@ -1797,12 +1800,13 @@ static void clk_change_rate(struct clk_c /* Skip children who will be reparented to another clock */ if (child->new_parent && child->new_parent != clk) continue; @@ -105,7 +105,7 @@ drivers/clk/clk.c | 34 ++++++++++++++++++++++------------ } static int clk_core_set_rate_nolock(struct clk_core *clk, -@@ -1810,6 +1814,7 @@ static int clk_core_set_rate_nolock(stru +@@ -1811,6 +1815,7 @@ static int clk_core_set_rate_nolock(stru struct clk_core *top, *fail_clk; unsigned long rate = req_rate; int ret = 0; @@ -113,7 +113,7 @@ drivers/clk/clk.c | 34 ++++++++++++++++++++++------------ if (!clk) return 0; -@@ -1835,8 +1840,13 @@ static int clk_core_set_rate_nolock(stru +@@ -1836,8 +1841,13 @@ static int clk_core_set_rate_nolock(stru return -EBUSY; } |