aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/brcm2708/patches-4.4/0252-clk-bcm2835-add-a-round-up-ability-to-the-clock-divi.patch
diff options
context:
space:
mode:
authorEtienne Haarsma <bladeoner112@gmail.com>2018-04-28 21:51:24 +0200
committerJohn Crispin <john@phrozen.org>2018-04-30 08:00:27 +0200
commit81573ea259247f1c6c1a7a490de174d0a6c48a64 (patch)
tree9dc8bb798d93cd52d2a47b3d699581bd2d69c78c /target/linux/brcm2708/patches-4.4/0252-clk-bcm2835-add-a-round-up-ability-to-the-clock-divi.patch
parentafa8873887664bbf42c8e7914dc572da2d3bcb79 (diff)
downloadupstream-81573ea259247f1c6c1a7a490de174d0a6c48a64.tar.gz
upstream-81573ea259247f1c6c1a7a490de174d0a6c48a64.tar.bz2
upstream-81573ea259247f1c6c1a7a490de174d0a6c48a64.zip
kernel: bump kernel 4.4 to 4.4.129 for 17.01
* Refreshed patches Compile-tested: ar71xx Run-tested: ar71xx Signed-off-by: Etienne Haarsma <bladeoner112@gmail.com>
Diffstat (limited to 'target/linux/brcm2708/patches-4.4/0252-clk-bcm2835-add-a-round-up-ability-to-the-clock-divi.patch')
-rw-r--r--target/linux/brcm2708/patches-4.4/0252-clk-bcm2835-add-a-round-up-ability-to-the-clock-divi.patch6
1 files changed, 3 insertions, 3 deletions
diff --git a/target/linux/brcm2708/patches-4.4/0252-clk-bcm2835-add-a-round-up-ability-to-the-clock-divi.patch b/target/linux/brcm2708/patches-4.4/0252-clk-bcm2835-add-a-round-up-ability-to-the-clock-divi.patch
index d9e82c78d2..8bf39adfbe 100644
--- a/target/linux/brcm2708/patches-4.4/0252-clk-bcm2835-add-a-round-up-ability-to-the-clock-divi.patch
+++ b/target/linux/brcm2708/patches-4.4/0252-clk-bcm2835-add-a-round-up-ability-to-the-clock-divi.patch
@@ -16,7 +16,7 @@ Signed-off-by: Michael Turquette <mturquette@baylibre.com>
--- a/drivers/clk/bcm/clk-bcm2835.c
+++ b/drivers/clk/bcm/clk-bcm2835.c
-@@ -1170,22 +1170,24 @@ static int bcm2835_clock_is_on(struct cl
+@@ -1172,22 +1172,24 @@ static int bcm2835_clock_is_on(struct cl
static u32 bcm2835_clock_choose_div(struct clk_hw *hw,
unsigned long rate,
@@ -49,7 +49,7 @@ Signed-off-by: Michael Turquette <mturquette@baylibre.com>
/* clamp to min divider of 1 */
div = max_t(u32, div, 1 << CM_DIV_FRAC_BITS);
-@@ -1225,7 +1227,7 @@ static long bcm2835_clock_round_rate(str
+@@ -1227,7 +1229,7 @@ static long bcm2835_clock_round_rate(str
unsigned long *parent_rate)
{
struct bcm2835_clock *clock = bcm2835_clock_from_hw(hw);
@@ -58,7 +58,7 @@ Signed-off-by: Michael Turquette <mturquette@baylibre.com>
return bcm2835_clock_rate_from_divisor(clock, *parent_rate, div);
}
-@@ -1294,7 +1296,7 @@ static int bcm2835_clock_set_rate(struct
+@@ -1296,7 +1298,7 @@ static int bcm2835_clock_set_rate(struct
struct bcm2835_clock *clock = bcm2835_clock_from_hw(hw);
struct bcm2835_cprman *cprman = clock->cprman;
const struct bcm2835_clock_data *data = clock->data;