summaryrefslogtreecommitdiffstats
path: root/target/linux/brcm2708/patches-4.4/0258-clk-bcm2835-divider-value-has-to-be-1-or-more.patch
diff options
context:
space:
mode:
Diffstat (limited to 'target/linux/brcm2708/patches-4.4/0258-clk-bcm2835-divider-value-has-to-be-1-or-more.patch')
-rw-r--r--target/linux/brcm2708/patches-4.4/0258-clk-bcm2835-divider-value-has-to-be-1-or-more.patch36
1 files changed, 36 insertions, 0 deletions
diff --git a/target/linux/brcm2708/patches-4.4/0258-clk-bcm2835-divider-value-has-to-be-1-or-more.patch b/target/linux/brcm2708/patches-4.4/0258-clk-bcm2835-divider-value-has-to-be-1-or-more.patch
new file mode 100644
index 0000000000..f6140cba9c
--- /dev/null
+++ b/target/linux/brcm2708/patches-4.4/0258-clk-bcm2835-divider-value-has-to-be-1-or-more.patch
@@ -0,0 +1,36 @@
+From 54eece496d38fb701d9719169d9270d8798191cc Mon Sep 17 00:00:00 2001
+From: Martin Sperl <kernel@martin.sperl.org>
+Date: Mon, 29 Feb 2016 11:39:20 +0000
+Subject: [PATCH 258/304] clk: bcm2835: divider value has to be 1 or more
+
+Current clamping of a normal divider allows a value < 1 to be valid.
+
+A divider of < 1 would actually only be possible if we had a PLL...
+
+So this patch clamps the divider to 1.
+
+Fixes: 41691b8862e2 ("clk: bcm2835: Add support for programming the
+audio domain clocks")
+
+Signed-off-by: Martin Sperl <kernel@martin.sperl.org>
+Signed-off-by: Eric Anholt <eric@anholt.net>
+Reviewed-by: Eric Anholt <eric@anholt.net>
+(cherry picked from commit 997f16bd5d2e9b3456027f96fcadfe1e2bf12f4e)
+---
+ drivers/clk/bcm/clk-bcm2835.c | 5 +++--
+ 1 file changed, 3 insertions(+), 2 deletions(-)
+
+--- a/drivers/clk/bcm/clk-bcm2835.c
++++ b/drivers/clk/bcm/clk-bcm2835.c
+@@ -1202,8 +1202,9 @@ static u32 bcm2835_clock_choose_div(stru
+ div += unused_frac_mask + 1;
+ div &= ~unused_frac_mask;
+
+- /* Clamp to the limits. */
+- div = max(div, unused_frac_mask + 1);
++ /* clamp to min divider of 1 */
++ div = max_t(u32, div, 1 << CM_DIV_FRAC_BITS);
++ /* clamp to the highest possible fractional divider */
+ div = min_t(u32, div, GENMASK(data->int_bits + CM_DIV_FRAC_BITS - 1,
+ CM_DIV_FRAC_BITS - data->frac_bits));
+