diff options
| author | Koen Vandeputte <koen.vandeputte@ncentric.com> | 2020-11-10 15:33:17 +0100 |
|---|---|---|
| committer | Koen Vandeputte <koen.vandeputte@ncentric.com> | 2020-11-16 09:35:05 +0100 |
| commit | ac5297340e647c63f98278eadc2f189608d4cd62 (patch) | |
| tree | ab0ca9c4b4c1f962d790b2bd9d8055b2e041e80e /target/linux/brcm2708/patches-4.14/950-0027-clk-bcm2835-Add-claim-clocks-property.patch | |
| parent | 589c3cf4e08731e4971d2db6c83e16b5ab959878 (diff) | |
| download | upstream-ac5297340e647c63f98278eadc2f189608d4cd62.tar.gz upstream-ac5297340e647c63f98278eadc2f189608d4cd62.tar.bz2 upstream-ac5297340e647c63f98278eadc2f189608d4cd62.zip | |
kernel: bump 4.14 to 4.14.206
Refreshed all patches.
Altered patches:
- 210-dwc2_defaults.patch
- 708-mc-bus-support-layerscape.patch
Fixes:
- CVE-2020-25656
Compile-tested on: ar71xx, cns3xxx, imx6, x86_64
Runtime-tested on: ar71xx, cns3xxx, imx6
Signed-off-by: Koen Vandeputte <koen.vandeputte@ncentric.com>
Diffstat (limited to 'target/linux/brcm2708/patches-4.14/950-0027-clk-bcm2835-Add-claim-clocks-property.patch')
| -rw-r--r-- | target/linux/brcm2708/patches-4.14/950-0027-clk-bcm2835-Add-claim-clocks-property.patch | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/target/linux/brcm2708/patches-4.14/950-0027-clk-bcm2835-Add-claim-clocks-property.patch b/target/linux/brcm2708/patches-4.14/950-0027-clk-bcm2835-Add-claim-clocks-property.patch index 1e2bddcdb4..fb79013eea 100644 --- a/target/linux/brcm2708/patches-4.14/950-0027-clk-bcm2835-Add-claim-clocks-property.patch +++ b/target/linux/brcm2708/patches-4.14/950-0027-clk-bcm2835-Add-claim-clocks-property.patch @@ -36,7 +36,7 @@ Signed-off-by: Phil Elwell <phil@raspberrypi.org> pll = kzalloc(sizeof(*pll), GFP_KERNEL); if (!pll) return NULL; -@@ -1398,8 +1403,10 @@ bcm2835_register_pll_divider(struct bcm2 +@@ -1400,8 +1405,10 @@ bcm2835_register_pll_divider(struct bcm2 divider->div.table = NULL; if (!(cprman_read(cprman, data->cm_reg) & data->hold_mask)) { @@ -49,7 +49,7 @@ Signed-off-by: Phil Elwell <phil@raspberrypi.org> } divider->cprman = cprman; -@@ -2152,6 +2159,8 @@ static const struct bcm2835_clk_desc clk +@@ -2154,6 +2161,8 @@ static const struct bcm2835_clk_desc clk .ctl_reg = CM_PERIICTL), }; @@ -58,7 +58,7 @@ Signed-off-by: Phil Elwell <phil@raspberrypi.org> /* * Permanently take a reference on the parent of the SDRAM clock. * -@@ -2171,6 +2180,19 @@ static int bcm2835_mark_sdc_parent_criti +@@ -2173,6 +2182,19 @@ static int bcm2835_mark_sdc_parent_criti return clk_prepare_enable(parent); } @@ -78,7 +78,7 @@ Signed-off-by: Phil Elwell <phil@raspberrypi.org> static int bcm2835_clk_probe(struct platform_device *pdev) { struct device *dev = &pdev->dev; -@@ -2180,6 +2202,7 @@ static int bcm2835_clk_probe(struct plat +@@ -2182,6 +2204,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; @@ -86,7 +86,7 @@ Signed-off-by: Phil Elwell <phil@raspberrypi.org> int ret; cprman = devm_kzalloc(dev, sizeof(*cprman) + -@@ -2195,6 +2218,13 @@ static int bcm2835_clk_probe(struct plat +@@ -2197,6 +2220,13 @@ static int bcm2835_clk_probe(struct plat if (IS_ERR(cprman->regs)) return PTR_ERR(cprman->regs); |