aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/oxnas/patches-4.14/100-oxnas-clk-plla-pllb.patch
diff options
context:
space:
mode:
authorStijn Tintel <stijn@linux-ipv6.be>2018-06-04 20:06:00 +0300
committerStijn Tintel <stijn@linux-ipv6.be>2018-06-05 22:54:00 +0300
commite52f3e9b13763cbfbd92fca8db0b4d19dc1e309e (patch)
tree804a13ddc9ccf75e3f0ae38102ddbf950806ea79 /target/linux/oxnas/patches-4.14/100-oxnas-clk-plla-pllb.patch
parent7590c3c58f5e9d580c86da10473d1d29a2f081c9 (diff)
downloadupstream-e52f3e9b13763cbfbd92fca8db0b4d19dc1e309e.tar.gz
upstream-e52f3e9b13763cbfbd92fca8db0b4d19dc1e309e.tar.bz2
upstream-e52f3e9b13763cbfbd92fca8db0b4d19dc1e309e.zip
kernel: bump 4.14 to 4.14.48
Remove upstreamed patches: generic/pending/101-clocksource-mips-gic-timer-fix-clocksource-counter-w.patch generic/pending/103-MIPS-c-r4k-fix-data-corruption-related-to-cache-coherence.patch generic/pending/182-net-qmi_wwan-add-BroadMobi-BM806U-2020-2033.patch lantiq/0025-MIPS-lantiq-gphy-Remove-reboot-remove-reset-asserts.patch Update patches that no longer apply: generic/pending/811-pci_disable_usb_common_quirks.patch ath79/0009-MIPS-ath79-add-lots-of-missing-registers.patch Fixes CVE-2018-6412. Compile-tested: octeon, x86/64. Runtime-tested: octeon, x86/64. Signed-off-by: Stijn Tintel <stijn@linux-ipv6.be>
Diffstat (limited to 'target/linux/oxnas/patches-4.14/100-oxnas-clk-plla-pllb.patch')
-rw-r--r--target/linux/oxnas/patches-4.14/100-oxnas-clk-plla-pllb.patch4
1 files changed, 2 insertions, 2 deletions
diff --git a/target/linux/oxnas/patches-4.14/100-oxnas-clk-plla-pllb.patch b/target/linux/oxnas/patches-4.14/100-oxnas-clk-plla-pllb.patch
index f78ecb26b2..d3bf9a9e43 100644
--- a/target/linux/oxnas/patches-4.14/100-oxnas-clk-plla-pllb.patch
+++ b/target/linux/oxnas/patches-4.14/100-oxnas-clk-plla-pllb.patch
@@ -43,7 +43,7 @@
/* Standard regmap gate clocks */
struct clk_oxnas_gate {
struct clk_hw hw;
-@@ -49,6 +70,135 @@ struct oxnas_stdclk_data {
+@@ -47,6 +70,135 @@ struct oxnas_stdclk_data {
#define CLK_SET_REGOFFSET 0x2c
#define CLK_CLR_REGOFFSET 0x30
@@ -179,7 +179,7 @@
static inline struct clk_oxnas_gate *to_clk_oxnas_gate(struct clk_hw *hw)
{
return container_of(hw, struct clk_oxnas_gate, hw);
-@@ -262,3 +412,42 @@ static struct platform_driver oxnas_stdc
+@@ -260,3 +412,42 @@ static struct platform_driver oxnas_stdc
},
};
builtin_platform_driver(oxnas_stdclk_driver);