summaryrefslogtreecommitdiff
path: root/target/linux/ipq806x
diff options
context:
space:
mode:
authorJonas Gorski <jogo@openwrt.org>2015-06-19 11:12:43 +0000
committerJonas Gorski <jogo@openwrt.org>2015-06-19 11:12:43 +0000
commit0f5b1a3ecae01bd64378b898246e006e22c9b539 (patch)
treefff9b91aaed0bc78fb8082de5b431cb9bc977cd5 /target/linux/ipq806x
parent631e98977b4a4dadde7671f3a35bf3f3a10d11dc (diff)
downloadmtk-20170518-0f5b1a3ecae01bd64378b898246e006e22c9b539.zip
mtk-20170518-0f5b1a3ecae01bd64378b898246e006e22c9b539.tar.gz
mtk-20170518-0f5b1a3ecae01bd64378b898246e006e22c9b539.tar.bz2
kernel: update 4.0 to 4.0.5
Changelog: * https://www.kernel.org/pub/linux/kernel/v4.x/ChangeLog-4.0.5 Signed-off-by: Jonas Gorski <jogo@openwrt.org> SVN-Revision: 46063
Diffstat (limited to 'target/linux/ipq806x')
-rw-r--r--target/linux/ipq806x/patches-4.0/126-add-rpm-to-ipq8064-dts.patch6
-rw-r--r--target/linux/ipq806x/patches-4.0/135-clk-Avoid-sending-high-rates-to-downstream-clocks-during-set_rate.patch10
-rw-r--r--target/linux/ipq806x/patches-4.0/136-clk-Add-safe-switch-hook.patch12
-rw-r--r--target/linux/ipq806x/patches-4.0/144-ARM-dts-qcom-Add-necessary-DT-data-for-Krait-cpufreq.patch8
4 files changed, 18 insertions, 18 deletions
diff --git a/target/linux/ipq806x/patches-4.0/126-add-rpm-to-ipq8064-dts.patch b/target/linux/ipq806x/patches-4.0/126-add-rpm-to-ipq8064-dts.patch
index 854131c..4fb62dd 100644
--- a/target/linux/ipq806x/patches-4.0/126-add-rpm-to-ipq8064-dts.patch
+++ b/target/linux/ipq806x/patches-4.0/126-add-rpm-to-ipq8064-dts.patch
@@ -7,8 +7,8 @@
+#include <dt-bindings/mfd/qcom-rpm.h>
#include <dt-bindings/soc/qcom,gsbi.h>
#include <dt-bindings/reset/qcom,gcc-ipq806x.h>
-
-@@ -75,6 +76,63 @@
+ #include <include/dt-bindings/interrupt-controller/arm-gic.h>
+@@ -76,6 +77,63 @@
ranges;
compatible = "simple-bus";
@@ -72,7 +72,7 @@
qcom_pinmux: pinmux@800000 {
compatible = "qcom,ipq8064-pinctrl";
reg = <0x800000 0x4000>;
-@@ -119,6 +177,12 @@
+@@ -120,6 +178,12 @@
reg = <0x02098000 0x1000>, <0x02008000 0x1000>;
};
diff --git a/target/linux/ipq806x/patches-4.0/135-clk-Avoid-sending-high-rates-to-downstream-clocks-during-set_rate.patch b/target/linux/ipq806x/patches-4.0/135-clk-Avoid-sending-high-rates-to-downstream-clocks-during-set_rate.patch
index f699521..52af413 100644
--- a/target/linux/ipq806x/patches-4.0/135-clk-Avoid-sending-high-rates-to-downstream-clocks-during-set_rate.patch
+++ b/target/linux/ipq806x/patches-4.0/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
-@@ -1688,21 +1688,24 @@ static struct clk_core *clk_propagate_ra
+@@ -1696,21 +1696,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);
-@@ -1722,7 +1725,7 @@ static void clk_change_rate(struct clk_c
+@@ -1730,7 +1733,7 @@ static void clk_change_rate(struct clk_c
if (!skip_set_rate && clk->ops->set_rate)
clk->ops->set_rate(clk->hw, clk->new_rate, best_parent_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);
-@@ -1735,12 +1738,13 @@ static void clk_change_rate(struct clk_c
+@@ -1743,12 +1746,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,
-@@ -1749,6 +1753,7 @@ static int clk_core_set_rate_nolock(stru
+@@ -1757,6 +1761,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;
-@@ -1774,8 +1779,13 @@ static int clk_core_set_rate_nolock(stru
+@@ -1782,8 +1787,13 @@ static int clk_core_set_rate_nolock(stru
return -EBUSY;
}
diff --git a/target/linux/ipq806x/patches-4.0/136-clk-Add-safe-switch-hook.patch b/target/linux/ipq806x/patches-4.0/136-clk-Add-safe-switch-hook.patch
index d3363f8..a5d9c41 100644
--- a/target/linux/ipq806x/patches-4.0/136-clk-Add-safe-switch-hook.patch
+++ b/target/linux/ipq806x/patches-4.0/136-clk-Add-safe-switch-hook.patch
@@ -47,7 +47,7 @@ handles that problem on Krait, but on other platforms it won't work.
struct clk_core *new_parent;
struct clk_core *new_child;
unsigned long flags;
-@@ -1549,7 +1552,8 @@ out:
+@@ -1557,7 +1560,8 @@ out:
static void clk_calc_subtree(struct clk_core *clk, unsigned long new_rate,
struct clk_core *new_parent, u8 p_index)
{
@@ -57,7 +57,7 @@ handles that problem on Krait, but on other platforms it won't work.
clk->new_rate = new_rate;
clk->new_parent = new_parent;
-@@ -1559,6 +1563,18 @@ static void clk_calc_subtree(struct clk_
+@@ -1567,6 +1571,18 @@ static void clk_calc_subtree(struct clk_
if (new_parent && new_parent != clk->parent)
new_parent->new_child = clk;
@@ -76,7 +76,7 @@ handles that problem on Krait, but on other platforms it won't work.
hlist_for_each_entry(child, &clk->children, child_node) {
child->new_rate = clk_recalc(child, new_rate);
clk_calc_subtree(child, child->new_rate, NULL, 0);
-@@ -1654,14 +1670,43 @@ static struct clk_core *clk_propagate_ra
+@@ -1662,14 +1678,43 @@ static struct clk_core *clk_propagate_ra
unsigned long event)
{
struct clk_core *child, *tmp_clk, *fail_clk = NULL;
@@ -123,7 +123,7 @@ handles that problem on Krait, but on other platforms it won't work.
fail_clk = clk;
}
-@@ -1707,7 +1752,8 @@ clk_change_rate(struct clk_core *clk, un
+@@ -1715,7 +1760,8 @@ clk_change_rate(struct clk_core *clk, un
old_rate = clk->rate;
@@ -133,7 +133,7 @@ handles that problem on Krait, but on other platforms it won't work.
old_parent = __clk_set_parent_before(clk, clk->new_parent);
if (clk->ops->set_rate_and_parent) {
-@@ -1727,9 +1773,6 @@ clk_change_rate(struct clk_core *clk, un
+@@ -1735,9 +1781,6 @@ clk_change_rate(struct clk_core *clk, un
clk->rate = clk->new_rate;
@@ -143,7 +143,7 @@ handles that problem on Krait, but on other platforms it won't work.
/*
* Use safe iteration, as change_rate can actually swap parents
* for certain clock types.
-@@ -1789,6 +1832,8 @@ static int clk_core_set_rate_nolock(stru
+@@ -1797,6 +1840,8 @@ static int clk_core_set_rate_nolock(stru
clk->req_rate = req_rate;
diff --git a/target/linux/ipq806x/patches-4.0/144-ARM-dts-qcom-Add-necessary-DT-data-for-Krait-cpufreq.patch b/target/linux/ipq806x/patches-4.0/144-ARM-dts-qcom-Add-necessary-DT-data-for-Krait-cpufreq.patch
index 9f8d8cb..a3c3bbf 100644
--- a/target/linux/ipq806x/patches-4.0/144-ARM-dts-qcom-Add-necessary-DT-data-for-Krait-cpufreq.patch
+++ b/target/linux/ipq806x/patches-4.0/144-ARM-dts-qcom-Add-necessary-DT-data-for-Krait-cpufreq.patch
@@ -1,6 +1,6 @@
--- a/arch/arm/boot/dts/qcom-ipq8064.dtsi
+++ b/arch/arm/boot/dts/qcom-ipq8064.dtsi
-@@ -23,6 +23,11 @@
+@@ -24,6 +24,11 @@
next-level-cache = <&L2>;
qcom,acc = <&acc0>;
qcom,saw = <&saw0>;
@@ -12,7 +12,7 @@
};
cpu@1 {
-@@ -33,11 +38,24 @@
+@@ -34,11 +39,24 @@
next-level-cache = <&L2>;
qcom,acc = <&acc1>;
qcom,saw = <&saw1>;
@@ -37,7 +37,7 @@
};
};
-@@ -70,6 +88,46 @@
+@@ -71,6 +89,46 @@
};
};
@@ -84,7 +84,7 @@
soc: soc {
#address-cells = <1>;
#size-cells = <1>;
-@@ -170,11 +228,13 @@
+@@ -171,11 +229,13 @@
acc0: clock-controller@2088000 {
compatible = "qcom,kpss-acc-v1";
reg = <0x02088000 0x1000>, <0x02008000 0x1000>;