aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/brcm2708/patches-4.4/0431-clk-bcm2835-Mark-the-CM-SDRAM-clock-s-parent-as-crit.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/0431-clk-bcm2835-Mark-the-CM-SDRAM-clock-s-parent-as-crit.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/0431-clk-bcm2835-Mark-the-CM-SDRAM-clock-s-parent-as-crit.patch')
-rw-r--r--target/linux/brcm2708/patches-4.4/0431-clk-bcm2835-Mark-the-CM-SDRAM-clock-s-parent-as-crit.patch6
1 files changed, 3 insertions, 3 deletions
diff --git a/target/linux/brcm2708/patches-4.4/0431-clk-bcm2835-Mark-the-CM-SDRAM-clock-s-parent-as-crit.patch b/target/linux/brcm2708/patches-4.4/0431-clk-bcm2835-Mark-the-CM-SDRAM-clock-s-parent-as-crit.patch
index b456bf5f92..7eaa99f64e 100644
--- a/target/linux/brcm2708/patches-4.4/0431-clk-bcm2835-Mark-the-CM-SDRAM-clock-s-parent-as-crit.patch
+++ b/target/linux/brcm2708/patches-4.4/0431-clk-bcm2835-Mark-the-CM-SDRAM-clock-s-parent-as-crit.patch
@@ -26,7 +26,7 @@ Signed-off-by: Eric Anholt <eric@anholt.net>
#include <linux/clk/bcm2835.h>
#include <linux/debugfs.h>
#include <linux/module.h>
-@@ -1845,6 +1846,25 @@ static const struct bcm2835_clk_desc clk
+@@ -1847,6 +1848,25 @@ static const struct bcm2835_clk_desc clk
.ctl_reg = CM_PERIICTL),
};
@@ -52,7 +52,7 @@ Signed-off-by: Eric Anholt <eric@anholt.net>
static int bcm2835_clk_probe(struct platform_device *pdev)
{
struct device *dev = &pdev->dev;
-@@ -1854,6 +1874,7 @@ static int bcm2835_clk_probe(struct plat
+@@ -1856,6 +1876,7 @@ static int bcm2835_clk_probe(struct plat
const struct bcm2835_clk_desc *desc;
const size_t asize = ARRAY_SIZE(clk_desc_array);
size_t i;
@@ -60,7 +60,7 @@ Signed-off-by: Eric Anholt <eric@anholt.net>
cprman = devm_kzalloc(dev,
sizeof(*cprman) + asize * sizeof(*clks),
-@@ -1884,6 +1905,10 @@ static int bcm2835_clk_probe(struct plat
+@@ -1886,6 +1907,10 @@ static int bcm2835_clk_probe(struct plat
clks[i] = desc->clk_register(cprman, desc->data);
}