diff options
| author | Hauke Mehrtens <hauke@hauke-m.de> | 2018-03-30 20:41:02 +0200 |
|---|---|---|
| committer | Hauke Mehrtens <hauke@hauke-m.de> | 2018-03-31 16:31:26 +0200 |
| commit | aed03d5d0f304cc85a8ccb4ef98684703fc027af (patch) | |
| tree | 213cf2340e8cfaf55deccea5054572dc25f71211 /target/linux/brcm2708/patches-4.9/950-0186-clk-bcm2835-Add-claim-clocks-property.patch | |
| parent | ef6939b0afec410dd2db6d4382edc2231baf9a4c (diff) | |
| download | upstream-aed03d5d0f304cc85a8ccb4ef98684703fc027af.tar.gz upstream-aed03d5d0f304cc85a8ccb4ef98684703fc027af.tar.bz2 upstream-aed03d5d0f304cc85a8ccb4ef98684703fc027af.zip | |
kernel: update kernel 4.9 to version 4.9.91
* Refreshed patches.
* Deleted 210-Revert-led-core-Fix-brightness-setting-when-setting-.patch (was accepted upstream)
* Deleted 812-pci-dwc-fix-enumeration.patch (was accepted upstream)
Compile and run tested on lantiq
Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
Diffstat (limited to 'target/linux/brcm2708/patches-4.9/950-0186-clk-bcm2835-Add-claim-clocks-property.patch')
| -rw-r--r-- | target/linux/brcm2708/patches-4.9/950-0186-clk-bcm2835-Add-claim-clocks-property.patch | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/target/linux/brcm2708/patches-4.9/950-0186-clk-bcm2835-Add-claim-clocks-property.patch b/target/linux/brcm2708/patches-4.9/950-0186-clk-bcm2835-Add-claim-clocks-property.patch index 09dcfa7a68..09d449a8c5 100644 --- a/target/linux/brcm2708/patches-4.9/950-0186-clk-bcm2835-Add-claim-clocks-property.patch +++ b/target/linux/brcm2708/patches-4.9/950-0186-clk-bcm2835-Add-claim-clocks-property.patch @@ -48,7 +48,7 @@ Signed-off-by: Phil Elwell <phil@raspberrypi.org> cma-192 = <0>,"-0+1-2-3-4"; --- a/drivers/clk/bcm/clk-bcm2835.c +++ b/drivers/clk/bcm/clk-bcm2835.c -@@ -1298,6 +1298,8 @@ static const struct clk_ops bcm2835_vpu_ +@@ -1302,6 +1302,8 @@ static const struct clk_ops bcm2835_vpu_ .debug_init = bcm2835_clock_debug_init, }; @@ -57,7 +57,7 @@ Signed-off-by: Phil Elwell <phil@raspberrypi.org> static struct clk_hw *bcm2835_register_pll(struct bcm2835_cprman *cprman, const struct bcm2835_pll_data *data) { -@@ -1314,6 +1316,9 @@ static struct clk_hw *bcm2835_register_p +@@ -1318,6 +1320,9 @@ static struct clk_hw *bcm2835_register_p init.ops = &bcm2835_pll_clk_ops; init.flags = CLK_IGNORE_UNUSED; @@ -67,7 +67,7 @@ Signed-off-by: Phil Elwell <phil@raspberrypi.org> pll = kzalloc(sizeof(*pll), GFP_KERNEL); if (!pll) return NULL; -@@ -1367,8 +1372,10 @@ bcm2835_register_pll_divider(struct bcm2 +@@ -1371,8 +1376,10 @@ bcm2835_register_pll_divider(struct bcm2 divider->div.table = NULL; if (!(cprman_read(cprman, data->cm_reg) & data->hold_mask)) { @@ -80,7 +80,7 @@ Signed-off-by: Phil Elwell <phil@raspberrypi.org> } divider->cprman = cprman; -@@ -2104,6 +2111,8 @@ static const struct bcm2835_clk_desc clk +@@ -2108,6 +2115,8 @@ static const struct bcm2835_clk_desc clk .ctl_reg = CM_PERIICTL), }; @@ -89,7 +89,7 @@ Signed-off-by: Phil Elwell <phil@raspberrypi.org> /* * Permanently take a reference on the parent of the SDRAM clock. * -@@ -2123,6 +2132,19 @@ static int bcm2835_mark_sdc_parent_criti +@@ -2127,6 +2136,19 @@ static int bcm2835_mark_sdc_parent_criti return clk_prepare_enable(parent); } @@ -109,7 +109,7 @@ Signed-off-by: Phil Elwell <phil@raspberrypi.org> static int bcm2835_clk_probe(struct platform_device *pdev) { struct device *dev = &pdev->dev; -@@ -2132,6 +2154,7 @@ static int bcm2835_clk_probe(struct plat +@@ -2136,6 +2158,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; @@ -117,7 +117,7 @@ Signed-off-by: Phil Elwell <phil@raspberrypi.org> int ret; cprman = devm_kzalloc(dev, sizeof(*cprman) + -@@ -2147,6 +2170,13 @@ static int bcm2835_clk_probe(struct plat +@@ -2151,6 +2174,13 @@ static int bcm2835_clk_probe(struct plat if (IS_ERR(cprman->regs)) return PTR_ERR(cprman->regs); |