aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/sunxi
diff options
context:
space:
mode:
authorZoltan Herpai <wigyori@uid0.hu>2014-09-19 00:12:53 +0000
committerZoltan Herpai <wigyori@uid0.hu>2014-09-19 00:12:53 +0000
commit384ef8ece13b361c345e36feddca18e8ead77784 (patch)
treea1527c48c9ee4f3da30b86ad296d4e85a327b6b3 /target/linux/sunxi
parentaba8e9ceefa66afd2401b053c13ef587ee0f73d1 (diff)
downloadupstream-384ef8ece13b361c345e36feddca18e8ead77784.tar.gz
upstream-384ef8ece13b361c345e36feddca18e8ead77784.tar.bz2
upstream-384ef8ece13b361c345e36feddca18e8ead77784.zip
sunxi: backport late clock fixes from 3.15
Signed-off-by: Zoltan HERPAI <wigyori@uid0.hu> SVN-Revision: 42615
Diffstat (limited to 'target/linux/sunxi')
-rw-r--r--target/linux/sunxi/patches-3.14/275-clk-sunxi-late-clock-fixes.patch31
1 files changed, 31 insertions, 0 deletions
diff --git a/target/linux/sunxi/patches-3.14/275-clk-sunxi-late-clock-fixes.patch b/target/linux/sunxi/patches-3.14/275-clk-sunxi-late-clock-fixes.patch
new file mode 100644
index 0000000000..8f3333ab5f
--- /dev/null
+++ b/target/linux/sunxi/patches-3.14/275-clk-sunxi-late-clock-fixes.patch
@@ -0,0 +1,31 @@
+diff --git a/drivers/clk/sunxi/clk-sunxi.c b/drivers/clk/sunxi/clk-sunxi.c
+index a393df1..0393f85 100644
+--- a/drivers/clk/sunxi/clk-sunxi.c
++++ b/drivers/clk/sunxi/clk-sunxi.c
+@@ -326,7 +326,7 @@ static void sun4i_get_apb1_factors(u32 *freq, u32 parent_rate,
+ if (parent_rate < *freq)
+ *freq = parent_rate;
+
+- parent_rate = (parent_rate + (*freq - 1)) / *freq;
++ parent_rate = DIV_ROUND_UP(parent_rate, *freq);
+
+ /* Invalid rate! */
+ if (parent_rate > 32)
+@@ -371,7 +371,7 @@ static void sun4i_get_mod0_factors(u32 *freq, u32 parent_rate,
+ if (*freq > parent_rate)
+ *freq = parent_rate;
+
+- div = parent_rate / *freq;
++ div = DIV_ROUND_UP(parent_rate, *freq);
+
+ if (div < 16)
+ calcp = 0;
+@@ -412,7 +412,7 @@ static void sun7i_a20_get_out_factors(u32 *freq, u32 parent_rate,
+ if (*freq > parent_rate)
+ *freq = parent_rate;
+
+- div = parent_rate / *freq;
++ div = DIV_ROUND_UP(parent_rate, *freq);
+
+ if (div < 32)
+ calcp = 0;