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:
authorÁlvaro Fernández Rojas <noltari@gmail.com>2016-06-02 15:34:34 +0200
committerÁlvaro Fernández Rojas <noltari@gmail.com>2016-06-02 15:34:34 +0200
commita105eac4dd424fafdea3a72c270ef9cf9cdc1433 (patch)
tree64d2b476c58e5a3be8fce7bf778910ee31003e70 /target/linux/brcm2708/patches-4.4/0252-clk-bcm2835-add-a-round-up-ability-to-the-clock-divi.patch
parent794383b801516896c352b94b99010c86e9a06b9c (diff)
downloadupstream-a105eac4dd424fafdea3a72c270ef9cf9cdc1433.tar.gz
upstream-a105eac4dd424fafdea3a72c270ef9cf9cdc1433.tar.bz2
upstream-a105eac4dd424fafdea3a72c270ef9cf9cdc1433.zip
kernel: update kernel 4.4 to version 4.4.12
Signed-off-by: Álvaro Fernández Rojas <noltari@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 99bb5dbfd3..55680acc95 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
@@ -17,7 +17,7 @@ Signed-off-by: Michael Turquette <mturquette@baylibre.com>
--- a/drivers/clk/bcm/clk-bcm2835.c
+++ b/drivers/clk/bcm/clk-bcm2835.c
-@@ -1150,22 +1150,24 @@ static int bcm2835_clock_is_on(struct cl
+@@ -1154,22 +1154,24 @@ static int bcm2835_clock_is_on(struct cl
static u32 bcm2835_clock_choose_div(struct clk_hw *hw,
unsigned long rate,
@@ -50,7 +50,7 @@ Signed-off-by: Michael Turquette <mturquette@baylibre.com>
/* Clamp to the limits. */
div = max(div, unused_frac_mask + 1);
-@@ -1204,7 +1206,7 @@ static long bcm2835_clock_round_rate(str
+@@ -1208,7 +1210,7 @@ static long bcm2835_clock_round_rate(str
unsigned long *parent_rate)
{
struct bcm2835_clock *clock = bcm2835_clock_from_hw(hw);
@@ -59,7 +59,7 @@ Signed-off-by: Michael Turquette <mturquette@baylibre.com>
return bcm2835_clock_rate_from_divisor(clock, *parent_rate, div);
}
-@@ -1273,7 +1275,7 @@ static int bcm2835_clock_set_rate(struct
+@@ -1277,7 +1279,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;