e52f3e9b13
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>
64 lines
1.7 KiB
Diff
64 lines
1.7 KiB
Diff
From 552ed4955c1fee1109bf5ba137dc35a411a1448c Mon Sep 17 00:00:00 2001
|
|
From: Daniel Golle <daniel@makrotopia.org>
|
|
Date: Fri, 1 Jun 2018 02:41:15 +0200
|
|
Subject: [PATCH] arm: ox820: remove left-overs
|
|
|
|
Signed-off-by: Daniel Golle <daniel@makrotopia.org>
|
|
---
|
|
drivers/clk/clk-oxnas.c | 2 --
|
|
include/dt-bindings/clock/oxsemi,ox820.h | 32 +++++++++++-------------
|
|
2 files changed, 14 insertions(+), 20 deletions(-)
|
|
|
|
--- a/drivers/clk/clk-oxnas.c
|
|
+++ b/drivers/clk/clk-oxnas.c
|
|
@@ -40,8 +40,6 @@ struct oxnas_stdclk_data {
|
|
struct clk_hw_onecell_data *onecell_data;
|
|
struct clk_oxnas_gate **gates;
|
|
unsigned int ngates;
|
|
- struct clk_oxnas_pll **plls;
|
|
- unsigned int nplls;
|
|
};
|
|
|
|
/* Regmap offsets */
|
|
--- a/include/dt-bindings/clock/oxsemi,ox820.h
|
|
+++ b/include/dt-bindings/clock/oxsemi,ox820.h
|
|
@@ -17,24 +17,20 @@
|
|
#ifndef DT_CLOCK_OXSEMI_OX820_H
|
|
#define DT_CLOCK_OXSEMI_OX820_H
|
|
|
|
-/* PLLs */
|
|
-#define CLK_820_PLLA 0
|
|
-#define CLK_820_PLLB 1
|
|
-
|
|
/* Gate Clocks */
|
|
-#define CLK_820_LEON 2
|
|
-#define CLK_820_DMA_SGDMA 3
|
|
-#define CLK_820_CIPHER 4
|
|
-#define CLK_820_SD 5
|
|
-#define CLK_820_SATA 6
|
|
-#define CLK_820_AUDIO 7
|
|
-#define CLK_820_USBMPH 8
|
|
-#define CLK_820_ETHA 9
|
|
-#define CLK_820_PCIEA 10
|
|
-#define CLK_820_NAND 11
|
|
-#define CLK_820_PCIEB 12
|
|
-#define CLK_820_ETHB 13
|
|
-#define CLK_820_REF600 14
|
|
-#define CLK_820_USBDEV 15
|
|
+#define CLK_820_LEON 0
|
|
+#define CLK_820_DMA_SGDMA 1
|
|
+#define CLK_820_CIPHER 2
|
|
+#define CLK_820_SD 3
|
|
+#define CLK_820_SATA 4
|
|
+#define CLK_820_AUDIO 5
|
|
+#define CLK_820_USBMPH 6
|
|
+#define CLK_820_ETHA 7
|
|
+#define CLK_820_PCIEA 8
|
|
+#define CLK_820_NAND 9
|
|
+#define CLK_820_PCIEB 10
|
|
+#define CLK_820_ETHB 11
|
|
+#define CLK_820_REF600 12
|
|
+#define CLK_820_USBDEV 13
|
|
|
|
#endif /* DT_CLOCK_OXSEMI_OX820_H */
|