aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/ipq806x/patches/0163-clk-return-probe-defer-when-DT-clock-not-yet-ready.patch
diff options
context:
space:
mode:
authorJohn Crispin <blogic@openwrt.org>2015-02-11 10:09:23 +0000
committerJohn Crispin <blogic@openwrt.org>2015-02-11 10:09:23 +0000
commit74dc0649ff0097f75faa26f4b85e61e334b458a4 (patch)
tree7816568a18d29fffe8df1bf103d8c47aa2e225a0 /target/linux/ipq806x/patches/0163-clk-return-probe-defer-when-DT-clock-not-yet-ready.patch
parent32c88d568cd4e7fc2ec035dff1ae51d3740cabf7 (diff)
downloadmaster-187ad058-74dc0649ff0097f75faa26f4b85e61e334b458a4.tar.gz
master-187ad058-74dc0649ff0097f75faa26f4b85e61e334b458a4.tar.bz2
master-187ad058-74dc0649ff0097f75faa26f4b85e61e334b458a4.zip
ipq806x: update target to v3.18
Patches in the ipq806x/patches folder were out of tree in v3.14. The newest patch at the time was from June, so we can safely assume that either the patches have been merged, or they have been rejected for a good reason. If patches are seen missing, we'll cherry-pick them on a per-needed basis. This new kernel have been tested on AP148, which seems to works fine. Signed-off-by: Mathieu Olivari <mathieu@codeaurora.org> git-svn-id: svn://svn.openwrt.org/openwrt/trunk@44386 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux/ipq806x/patches/0163-clk-return-probe-defer-when-DT-clock-not-yet-ready.patch')
-rw-r--r--target/linux/ipq806x/patches/0163-clk-return-probe-defer-when-DT-clock-not-yet-ready.patch42
1 files changed, 0 insertions, 42 deletions
diff --git a/target/linux/ipq806x/patches/0163-clk-return-probe-defer-when-DT-clock-not-yet-ready.patch b/target/linux/ipq806x/patches/0163-clk-return-probe-defer-when-DT-clock-not-yet-ready.patch
deleted file mode 100644
index 76956d5b9b..0000000000
--- a/target/linux/ipq806x/patches/0163-clk-return-probe-defer-when-DT-clock-not-yet-ready.patch
+++ /dev/null
@@ -1,42 +0,0 @@
-From 1ce8667062bc7b8813adf6103ad2374d9dd52fb0 Mon Sep 17 00:00:00 2001
-From: Jean-Francois Moine <moinejf@free.fr>
-Date: Mon, 25 Nov 2013 19:47:04 +0100
-Subject: [PATCH 163/182] clk: return probe defer when DT clock not yet ready
-
-At probe time, a clock device may not be ready when some other device
-wants to use it.
-
-This patch lets the functions clk_get/devm_clk_get return a probe defer
-when the clock is defined in the DT but not yet available.
-
-Signed-off-by: Jean-Francois Moine <moinejf@free.fr>
-Reviewed-by: Sylwester Nawrocki <s.nawrocki@samsung.com>
-Tested-by: Sylwester Nawrocki <s.nawrocki@samsung.com>
-Signed-off-by: Mike Turquette <mturquette@linaro.org>
----
- drivers/clk/clk.c | 2 +-
- drivers/clk/clkdev.c | 2 ++
- 2 files changed, 3 insertions(+), 1 deletion(-)
-
---- a/drivers/clk/clk.c
-+++ b/drivers/clk/clk.c
-@@ -2507,7 +2507,7 @@ EXPORT_SYMBOL_GPL(of_clk_del_provider);
- struct clk *__of_clk_get_from_provider(struct of_phandle_args *clkspec)
- {
- struct of_clk_provider *provider;
-- struct clk *clk = ERR_PTR(-ENOENT);
-+ struct clk *clk = ERR_PTR(-EPROBE_DEFER);
-
- /* Check if we have such a provider in our array */
- list_for_each_entry(provider, &of_clk_providers, link) {
---- a/drivers/clk/clkdev.c
-+++ b/drivers/clk/clkdev.c
-@@ -167,6 +167,8 @@ struct clk *clk_get(struct device *dev,
- clk = of_clk_get_by_name(dev->of_node, con_id);
- if (!IS_ERR(clk))
- return clk;
-+ if (PTR_ERR(clk) == -EPROBE_DEFER)
-+ return clk;
- }
-
- return clk_get_sys(dev_id, con_id);