kernel: update 4.4 kernel to 4.4.42

[openwrt/staging/mkresin.git] / target / linux / brcm2708 / patches-4.4 / 0345-clk-bcm2835-Mark-the-VPU-clock-as-critical.patch

diff --git a/target/linux/brcm2708/patches-4.4/0345-clk-bcm2835-Mark-the-VPU-clock-as-critical.patch b/target/linux/brcm2708/patches-4.4/0345-clk-bcm2835-Mark-the-VPU-clock-as-critical.patch
index 92b9501a133b2ae369948c6cf9535439091c9bf5..dcd6db28fa05b5f3d56f21a13cfdd9e674c7bd0e 100644 (file)
--- a/target/linux/brcm2708/patches-4.4/0345-clk-bcm2835-Mark-the-VPU-clock-as-critical.patch
+++ b/target/linux/brcm2708/patches-4.4/0345-clk-bcm2835-Mark-the-VPU-clock-as-critical.patch
@@ -1,4 +1,4 @@
-From 9f73459ac27903bb52d831db29cb70a95189fdba Mon Sep 17 00:00:00 2001
+From 9c899d1ac90b4f6357f0b531a29d8403c8a021c7 Mon Sep 17 00:00:00 2001
 From: Eric Anholt <eric@anholt.net>
 Date: Tue, 26 Apr 2016 11:44:59 -0700
 Subject: [PATCH] clk: bcm2835: Mark the VPU clock as critical
@@ -27,7 +27,7 @@ Signed-off-by: Eric Anholt <eric@anholt.net>
        bool is_vpu_clock;
        bool is_mash_clock;
  };
-@@ -1242,7 +1244,7 @@ static struct clk *bcm2835_register_cloc
+@@ -1244,7 +1246,7 @@ static struct clk *bcm2835_register_cloc
        init.parent_names = parents;
        init.num_parents = data->num_mux_parents;
        init.name = data->name;
@@ -36,7 +36,7 @@ Signed-off-by: Eric Anholt <eric@anholt.net>
  
        if (data->is_vpu_clock) {
                init.ops = &bcm2835_vpu_clock_clk_ops;
-@@ -1661,6 +1663,7 @@ static const struct bcm2835_clk_desc clk
+@@ -1663,6 +1665,7 @@ static const struct bcm2835_clk_desc clk
                .div_reg = CM_VPUDIV,
                .int_bits = 12,
                .frac_bits = 8,