aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/lantiq
diff options
context:
space:
mode:
authorHauke Mehrtens <hauke@hauke-m.de>2016-01-13 20:46:12 +0000
committerHauke Mehrtens <hauke@hauke-m.de>2016-01-13 20:46:12 +0000
commitcb6b7be43fef96727ff1692d9f1665fb4fa69936 (patch)
tree52f52dff415c2f5c2dc452ec1ab7da92782c2649 /target/linux/lantiq
parent5c5c60fec43e4127e053b938e0f563a34a5bb7ec (diff)
downloadupstream-cb6b7be43fef96727ff1692d9f1665fb4fa69936.tar.gz
upstream-cb6b7be43fef96727ff1692d9f1665fb4fa69936.tar.bz2
upstream-cb6b7be43fef96727ff1692d9f1665fb4fa69936.zip
lantiq: remove clk_round_rate() patch
This patch was merged into upstream Linux 4.1. This fixes #21587 and was introduced in r48223. Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de> SVN-Revision: 48229
Diffstat (limited to 'target/linux/lantiq')
-rw-r--r--target/linux/lantiq/patches-4.1/0050-MIPS-lantiq-add-clk_round_rate.patch43
1 files changed, 0 insertions, 43 deletions
diff --git a/target/linux/lantiq/patches-4.1/0050-MIPS-lantiq-add-clk_round_rate.patch b/target/linux/lantiq/patches-4.1/0050-MIPS-lantiq-add-clk_round_rate.patch
deleted file mode 100644
index c8288f925c..0000000000
--- a/target/linux/lantiq/patches-4.1/0050-MIPS-lantiq-add-clk_round_rate.patch
+++ /dev/null
@@ -1,43 +0,0 @@
-From b3c10c6c19a9a0ad2b967b6afc8d8302ff4e10f9 Mon Sep 17 00:00:00 2001
-From: Hauke Mehrtens <hauke@hauke-m.de>
-Date: Sun, 25 Oct 2015 21:47:23 +0100
-Subject: [PATCH] MIPS: lantiq: add clk_round_rate()
-
-This adds a basic implementation of clk_round_rate()
-The clk_round_rate() function is called by multiple drivers and
-subsystems now and the lantiq clk driver is supposed to export this,
-but doesn't do so, this causes linking problems like this one:
-ERROR: "clk_round_rate" [drivers/media/v4l2-core/videodev.ko] undefined!
-
-Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
-Cc: <stable@vger.kernel.org> # 4.1+
----
- arch/mips/lantiq/clk.c | 17 +++++++++++++++++
- 1 file changed, 17 insertions(+)
-
---- a/arch/mips/lantiq/clk.c
-+++ b/arch/mips/lantiq/clk.c
-@@ -116,6 +116,23 @@ long clk_round_rate(struct clk *clk, uns
- }
- EXPORT_SYMBOL(clk_round_rate);
-
-+long clk_round_rate(struct clk *clk, unsigned long rate)
-+{
-+ if (unlikely(!clk_good(clk)))
-+ return 0;
-+ if (clk->rates && *clk->rates) {
-+ unsigned long *r = clk->rates;
-+
-+ while (*r && (*r != rate))
-+ r++;
-+ if (!*r) {
-+ return clk->rate;
-+ }
-+ }
-+ return rate;
-+}
-+EXPORT_SYMBOL(clk_round_rate);
-+
- int clk_enable(struct clk *clk)
- {
- if (unlikely(!clk_good(clk)))