diff options
| author | Álvaro Fernández Rojas <noltari@gmail.com> | 2016-06-12 11:49:46 +0200 |
|---|---|---|
| committer | Álvaro Fernández Rojas <noltari@gmail.com> | 2016-06-12 15:51:54 +0200 |
| commit | 0aa6c7df60d0d4a4fa01dc1b185df31ffb2c53f6 (patch) | |
| tree | 51382c24cd68a4129cf7bdbbedd84b24c70e47b1 /target/linux/brcm2708/patches-4.4/0252-clk-bcm2835-add-a-round-up-ability-to-the-clock-divi.patch | |
| parent | 1da87516e584a86d1d056f6b58bfa3050cc875b9 (diff) | |
| download | upstream-0aa6c7df60d0d4a4fa01dc1b185df31ffb2c53f6.tar.gz upstream-0aa6c7df60d0d4a4fa01dc1b185df31ffb2c53f6.tar.bz2 upstream-0aa6c7df60d0d4a4fa01dc1b185df31ffb2c53f6.zip | |
kernel: update kernel 4.4 to version 4.4.13
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.patch | 10 |
1 files changed, 5 insertions, 5 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 b83cd8be56..5866df4d38 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 -@@ -1154,22 +1154,24 @@ static int bcm2835_clock_is_on(struct cl +@@ -1164,22 +1164,24 @@ static int bcm2835_clock_is_on(struct cl static u32 bcm2835_clock_choose_div(struct clk_hw *hw, unsigned long rate, @@ -48,9 +48,9 @@ Signed-off-by: Michael Turquette <mturquette@baylibre.com> + div += unused_frac_mask + 1; + div &= ~unused_frac_mask; - /* Clamp to the limits. */ - div = max(div, unused_frac_mask + 1); -@@ -1208,7 +1210,7 @@ static long bcm2835_clock_round_rate(str + /* clamp to min divider of 1 */ + div = max_t(u32, div, 1 << CM_DIV_FRAC_BITS); +@@ -1219,7 +1221,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); } -@@ -1277,7 +1279,7 @@ static int bcm2835_clock_set_rate(struct +@@ -1288,7 +1290,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; |