3771176c9e
The following patches are dropped because they are merged upstream: -0001-tty-serial-drop-QCA-pecific-SoC-symbols.patch -0006-usb-drop-deprecated-symbols.patch -0009-MIPS-ath79-add-lots-of-missing-registers.patch -0010-MIPS-ath79-add-support-for-QCA953x-QCA956x-TP9343.patch -0014-MIPS-ath79-finetune-cpu-overrides.patch -0015-MIPS-ath79-enable-uart-during-early_prink.patch -0016-MIPS-ath79-get-PCIe-controller-out-of-reset.patch This patch is dropped due to the introduction of spi-mem framework: -461-spi-ath79-add-fast-flash-read.patch Thank to Michael Marley @mamarley for his work on this patch: -910-unaligned_access_hacks.patch Signed-off-by: Chuanhong Guo <gch981213@gmail.com> [synchronized kernel config with make kernel_oldconfig] Signed-off-by: Petr Štetiar <ynezz@true.cz>
96 lines
2.6 KiB
Diff
96 lines
2.6 KiB
Diff
From 00e4313da4609074fff134e61dd9ffe3fd37474d Mon Sep 17 00:00:00 2001
|
|
From: John Crispin <john@phrozen.org>
|
|
Date: Sun, 24 Jun 2018 09:39:41 +0200
|
|
Subject: [PATCH 31/33] MIPS: ath79: drop !OF clock code
|
|
|
|
With the target now being fully OF based, we can drop the legacy clock
|
|
registration code. All clocks are now probed via devicetree.
|
|
|
|
Signed-off-by: John Crispin <john@phrozen.org>
|
|
---
|
|
arch/mips/ath79/clock.c | 56 ------------------------------------------------
|
|
arch/mips/ath79/common.h | 3 ---
|
|
2 files changed, 59 deletions(-)
|
|
|
|
--- a/arch/mips/ath79/clock.c
|
|
+++ b/arch/mips/ath79/clock.c
|
|
@@ -617,60 +617,6 @@ static void __init qca956x_clocks_init(v
|
|
ath79_set_clk(ATH79_CLK_AHB, ahb_rate);
|
|
}
|
|
|
|
-void __init ath79_clocks_init(void)
|
|
-{
|
|
- const char *wdt;
|
|
- const char *uart;
|
|
-
|
|
- if (soc_is_ar71xx())
|
|
- ar71xx_clocks_init(ath79_pll_base);
|
|
- else if (soc_is_ar724x() || soc_is_ar913x())
|
|
- ar724x_clocks_init(ath79_pll_base);
|
|
- else if (soc_is_ar933x())
|
|
- ar933x_clocks_init(ath79_pll_base);
|
|
- else if (soc_is_ar934x())
|
|
- ar934x_clocks_init(ath79_pll_base);
|
|
- else if (soc_is_qca953x())
|
|
- qca953x_clocks_init(ath79_pll_base);
|
|
- else if (soc_is_qca955x())
|
|
- qca955x_clocks_init(ath79_pll_base);
|
|
- else if (soc_is_qca956x() || soc_is_tp9343())
|
|
- qca956x_clocks_init(ath79_pll_base);
|
|
- else
|
|
- BUG();
|
|
-
|
|
- if (soc_is_ar71xx() || soc_is_ar724x() || soc_is_ar913x()) {
|
|
- wdt = "ahb";
|
|
- uart = "ahb";
|
|
- } else if (soc_is_ar933x()) {
|
|
- wdt = "ahb";
|
|
- uart = "ref";
|
|
- } else {
|
|
- wdt = "ref";
|
|
- uart = "ref";
|
|
- }
|
|
-
|
|
- clk_add_alias("wdt", NULL, wdt, NULL);
|
|
- clk_add_alias("uart", NULL, uart, NULL);
|
|
-}
|
|
-
|
|
-unsigned long __init
|
|
-ath79_get_sys_clk_rate(const char *id)
|
|
-{
|
|
- struct clk *clk;
|
|
- unsigned long rate;
|
|
-
|
|
- clk = clk_get(NULL, id);
|
|
- if (IS_ERR(clk))
|
|
- panic("unable to get %s clock, err=%d", id, (int) PTR_ERR(clk));
|
|
-
|
|
- rate = clk_get_rate(clk);
|
|
- clk_put(clk);
|
|
-
|
|
- return rate;
|
|
-}
|
|
-
|
|
-#ifdef CONFIG_OF
|
|
static void __init ath79_clocks_init_dt(struct device_node *np)
|
|
{
|
|
struct clk *ref_clk;
|
|
@@ -727,5 +673,3 @@ CLK_OF_DECLARE(ar9340_clk, "qca,ar9340-p
|
|
CLK_OF_DECLARE(ar9530_clk, "qca,qca9530-pll", ath79_clocks_init_dt);
|
|
CLK_OF_DECLARE(ar9550_clk, "qca,qca9550-pll", ath79_clocks_init_dt);
|
|
CLK_OF_DECLARE(ar9560_clk, "qca,qca9560-pll", ath79_clocks_init_dt);
|
|
-
|
|
-#endif
|
|
--- a/arch/mips/ath79/common.h
|
|
+++ b/arch/mips/ath79/common.h
|
|
@@ -19,9 +19,6 @@
|
|
#define ATH79_MEM_SIZE_MIN (2 * 1024 * 1024)
|
|
#define ATH79_MEM_SIZE_MAX (256 * 1024 * 1024)
|
|
|
|
-void ath79_clocks_init(void);
|
|
-unsigned long ath79_get_sys_clk_rate(const char *id);
|
|
-
|
|
void ath79_ddr_ctrl_init(void);
|
|
|
|
#endif /* __ATH79_COMMON_H */
|