aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/ipq806x/patches-3.18/130-clk_mux-Fix-set_parent-doing-the-wrong-thing-when-IN.patch
diff options
context:
space:
mode:
authorJohn Crispin <blogic@openwrt.org>2015-05-29 12:26:01 +0000
committerJohn Crispin <blogic@openwrt.org>2015-05-29 12:26:01 +0000
commitb7e1d8878900efe4c94f8ec1f3dc8a42d526fe9d (patch)
tree149ce27633bd192ec3d1ed3ac5220455879ba7b1 /target/linux/ipq806x/patches-3.18/130-clk_mux-Fix-set_parent-doing-the-wrong-thing-when-IN.patch
parent3b223a0d0e1c7bdf53b0205da4b91712891d2191 (diff)
downloadmaster-187ad058-b7e1d8878900efe4c94f8ec1f3dc8a42d526fe9d.tar.gz
master-187ad058-b7e1d8878900efe4c94f8ec1f3dc8a42d526fe9d.tar.bz2
master-187ad058-b7e1d8878900efe4c94f8ec1f3dc8a42d526fe9d.zip
ipq806x: replace caf nss-gmac driver by upstream stmmac
This driver has been cherry-picked and backported from the following LKML thread: *https://lkml.org/lkml/2015/5/26/744 It also updates the DT accordingly. Signed-off-by: Mathieu Olivari <mathieu@codeaurora.org> git-svn-id: svn://svn.openwrt.org/openwrt/trunk@45831 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux/ipq806x/patches-3.18/130-clk_mux-Fix-set_parent-doing-the-wrong-thing-when-IN.patch')
-rw-r--r--target/linux/ipq806x/patches-3.18/130-clk_mux-Fix-set_parent-doing-the-wrong-thing-when-IN.patch7
1 files changed, 1 insertions, 6 deletions
diff --git a/target/linux/ipq806x/patches-3.18/130-clk_mux-Fix-set_parent-doing-the-wrong-thing-when-IN.patch b/target/linux/ipq806x/patches-3.18/130-clk_mux-Fix-set_parent-doing-the-wrong-thing-when-IN.patch
index d943ad511d..29f74b760d 100644
--- a/target/linux/ipq806x/patches-3.18/130-clk_mux-Fix-set_parent-doing-the-wrong-thing-when-IN.patch
+++ b/target/linux/ipq806x/patches-3.18/130-clk_mux-Fix-set_parent-doing-the-wrong-thing-when-IN.patch
@@ -42,11 +42,9 @@ Signed-off-by: Michael Turquette <mturquette@linaro.org>
drivers/clk/clk-mux.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
-diff --git a/drivers/clk/clk-mux.c b/drivers/clk/clk-mux.c
-index 4f96ff3..6e1ecf9 100644
--- a/drivers/clk/clk-mux.c
+++ b/drivers/clk/clk-mux.c
-@@ -77,7 +77,7 @@ static int clk_mux_set_parent(struct clk_hw *hw, u8 index)
+@@ -77,7 +77,7 @@ static int clk_mux_set_parent(struct clk
else {
if (mux->flags & CLK_MUX_INDEX_BIT)
@@ -55,6 +53,3 @@ index 4f96ff3..6e1ecf9 100644
if (mux->flags & CLK_MUX_INDEX_ONE)
index++;
---
-2.1.4
-