mirror of
https://github.com/openwrt/openwrt.git
synced 2024-12-30 02:29:01 +00:00
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>
78 lines
2.9 KiB
Diff
78 lines
2.9 KiB
Diff
From 6325626de001df98aebe51f3008b1aca05798d19 Mon Sep 17 00:00:00 2001
|
|
From: Felix Fietkau <nbd@nbd.name>
|
|
Date: Tue, 6 Mar 2018 13:26:27 +0100
|
|
Subject: [PATCH 25/33] MIPS: ath79: support setting up clock via DT on all SoC
|
|
types
|
|
|
|
Use the same functions as the legacy code
|
|
|
|
Signed-off-by: Felix Fietkau <nbd@nbd.name>
|
|
Signed-off-by: John Crispin <john@phrozen.org>
|
|
---
|
|
arch/mips/ath79/clock.c | 39 ++++++++++++++++++++++-----------------
|
|
1 file changed, 22 insertions(+), 17 deletions(-)
|
|
|
|
--- a/arch/mips/ath79/clock.c
|
|
+++ b/arch/mips/ath79/clock.c
|
|
@@ -669,16 +669,6 @@ ath79_get_sys_clk_rate(const char *id)
|
|
#ifdef CONFIG_OF
|
|
static void __init ath79_clocks_init_dt(struct device_node *np)
|
|
{
|
|
- of_clk_add_provider(np, of_clk_src_onecell_get, &clk_data);
|
|
-}
|
|
-
|
|
-CLK_OF_DECLARE(ar7100, "qca,ar7100-pll", ath79_clocks_init_dt);
|
|
-CLK_OF_DECLARE(ar7240, "qca,ar7240-pll", ath79_clocks_init_dt);
|
|
-CLK_OF_DECLARE(ar9340, "qca,ar9340-pll", ath79_clocks_init_dt);
|
|
-CLK_OF_DECLARE(ar9550, "qca,qca9550-pll", ath79_clocks_init_dt);
|
|
-
|
|
-static void __init ath79_clocks_init_dt_ng(struct device_node *np)
|
|
-{
|
|
struct clk *ref_clk;
|
|
void __iomem *pll_base;
|
|
|
|
@@ -692,14 +682,21 @@ static void __init ath79_clocks_init_dt_
|
|
goto err_clk;
|
|
}
|
|
|
|
- if (of_device_is_compatible(np, "qca,ar9130-pll"))
|
|
+ if (of_device_is_compatible(np, "qca,ar7100-pll"))
|
|
+ ar71xx_clocks_init(pll_base);
|
|
+ else if (of_device_is_compatible(np, "qca,ar7240-pll") ||
|
|
+ of_device_is_compatible(np, "qca,ar9130-pll"))
|
|
ar724x_clocks_init(pll_base);
|
|
else if (of_device_is_compatible(np, "qca,ar9330-pll"))
|
|
ar933x_clocks_init(pll_base);
|
|
- else {
|
|
- pr_err("%pOF: could not find any appropriate clk_init()\n", np);
|
|
- goto err_iounmap;
|
|
- }
|
|
+ else if (of_device_is_compatible(np, "qca,ar9340-pll"))
|
|
+ ar934x_clocks_init(pll_base);
|
|
+ else if (of_device_is_compatible(np, "qca,qca9530-pll"))
|
|
+ qca953x_clocks_init(pll_base);
|
|
+ else if (of_device_is_compatible(np, "qca,qca9550-pll"))
|
|
+ qca955x_clocks_init(pll_base);
|
|
+ else if (of_device_is_compatible(np, "qca,qca9560-pll"))
|
|
+ qca956x_clocks_init(pll_base);
|
|
|
|
if (of_clk_add_provider(np, of_clk_src_onecell_get, &clk_data)) {
|
|
pr_err("%pOF: could not register clk provider\n", np);
|
|
@@ -714,6 +711,14 @@ err_iounmap:
|
|
err_clk:
|
|
clk_put(ref_clk);
|
|
}
|
|
-CLK_OF_DECLARE(ar9130_clk, "qca,ar9130-pll", ath79_clocks_init_dt_ng);
|
|
-CLK_OF_DECLARE(ar9330_clk, "qca,ar9330-pll", ath79_clocks_init_dt_ng);
|
|
+
|
|
+CLK_OF_DECLARE(ar7100_clk, "qca,ar7100-pll", ath79_clocks_init_dt);
|
|
+CLK_OF_DECLARE(ar7240_clk, "qca,ar7240-pll", ath79_clocks_init_dt);
|
|
+CLK_OF_DECLARE(ar9130_clk, "qca,ar9130-pll", ath79_clocks_init_dt);
|
|
+CLK_OF_DECLARE(ar9330_clk, "qca,ar9330-pll", ath79_clocks_init_dt);
|
|
+CLK_OF_DECLARE(ar9340_clk, "qca,ar9340-pll", ath79_clocks_init_dt);
|
|
+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
|