From: John Crispin <john@phrozen.org>
To: James Hogan <jhogan@kernel.org>, Ralf Baechle <ralf@linux-mips.org>
Cc: linux-mips@linux-mips.org, Felix Fietkau <nbd@nbd.name>
Subject: [PATCH 15/25] MIPS: ath79: move legacy "wdt" and "uart" clock aliases out of soc init
Date: Mon, 25 Jun 2018 19:15:39 +0200 [thread overview]
Message-ID: <20180625171549.4618-16-john@phrozen.org> (raw)
In-Reply-To: <20180625171549.4618-1-john@phrozen.org>
From: Felix Fietkau <nbd@nbd.name>
Preparation for reusing functions for DT
Signed-off-by: Felix Fietkau <nbd@nbd.name>
---
arch/mips/ath79/clock.c | 38 +++++++++++++++++---------------------
1 file changed, 17 insertions(+), 21 deletions(-)
diff --git a/arch/mips/ath79/clock.c b/arch/mips/ath79/clock.c
index 50bc3b01a4c4..e02b819b2f5d 100644
--- a/arch/mips/ath79/clock.c
+++ b/arch/mips/ath79/clock.c
@@ -110,9 +110,6 @@ static void __init ar71xx_clocks_init(void)
ath79_set_clk(ATH79_CLK_CPU, cpu_rate);
ath79_set_clk(ATH79_CLK_DDR, ddr_rate);
ath79_set_clk(ATH79_CLK_AHB, ahb_rate);
-
- clk_add_alias("wdt", NULL, "ahb", NULL);
- clk_add_alias("uart", NULL, "ahb", NULL);
}
static void __init ar724x_clk_init(struct clk *ref_clk, void __iomem *pll_base)
@@ -140,9 +137,6 @@ static void __init ar724x_clocks_init(void)
ref_clk = ath79_set_clk(ATH79_CLK_REF, AR724X_BASE_FREQ);
ar724x_clk_init(ref_clk, ath79_pll_base);
-
- clk_add_alias("wdt", NULL, "ahb", NULL);
- clk_add_alias("uart", NULL, "ahb", NULL);
}
static void __init ar9330_clk_init(struct clk *ref_clk, void __iomem *pll_base)
@@ -218,9 +212,6 @@ static void __init ar933x_clocks_init(void)
ref_clk = ath79_set_clk(ATH79_CLK_REF, ref_rate);
ar9330_clk_init(ref_clk, ath79_pll_base);
-
- clk_add_alias("wdt", NULL, "ahb", NULL);
- clk_add_alias("uart", NULL, "ref", NULL);
}
static u32 __init ar934x_get_pll_freq(u32 ref, u32 ref_div, u32 nint, u32 nfrac,
@@ -353,9 +344,6 @@ static void __init ar934x_clocks_init(void)
ath79_set_clk(ATH79_CLK_DDR, ddr_rate);
ath79_set_clk(ATH79_CLK_AHB, ahb_rate);
- clk_add_alias("wdt", NULL, "ref", NULL);
- clk_add_alias("uart", NULL, "ref", NULL);
-
iounmap(dpll_base);
}
@@ -439,9 +427,6 @@ static void __init qca953x_clocks_init(void)
ath79_set_clk(ATH79_CLK_CPU, cpu_rate);
ath79_set_clk(ATH79_CLK_DDR, ddr_rate);
ath79_set_clk(ATH79_CLK_AHB, ahb_rate);
-
- clk_add_alias("wdt", NULL, "ref", NULL);
- clk_add_alias("uart", NULL, "ref", NULL);
}
static void __init qca955x_clocks_init(void)
@@ -524,9 +509,6 @@ static void __init qca955x_clocks_init(void)
ath79_set_clk(ATH79_CLK_CPU, cpu_rate);
ath79_set_clk(ATH79_CLK_DDR, ddr_rate);
ath79_set_clk(ATH79_CLK_AHB, ahb_rate);
-
- clk_add_alias("wdt", NULL, "ref", NULL);
- clk_add_alias("uart", NULL, "ref", NULL);
}
static void __init qca956x_clocks_init(void)
@@ -628,13 +610,13 @@ static void __init qca956x_clocks_init(void)
ath79_set_clk(ATH79_CLK_CPU, cpu_rate);
ath79_set_clk(ATH79_CLK_DDR, ddr_rate);
ath79_set_clk(ATH79_CLK_AHB, ahb_rate);
-
- clk_add_alias("wdt", NULL, "ref", NULL);
- clk_add_alias("uart", NULL, "ref", NULL);
}
void __init ath79_clocks_init(void)
{
+ const char *wdt;
+ const char *uart;
+
if (soc_is_ar71xx())
ar71xx_clocks_init();
else if (soc_is_ar724x() || soc_is_ar913x())
@@ -651,6 +633,20 @@ void __init ath79_clocks_init(void)
qca956x_clocks_init();
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
--
2.11.0
next prev parent reply other threads:[~2018-06-25 17:25 UTC|newest]
Thread overview: 35+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-06-25 17:15 [PATCH 00/25] MIPS: ath79: convert target to pure OF John Crispin
2018-06-25 17:15 ` [PATCH 01/25] MIPS: ath79: add lots of missing registers John Crispin
2018-06-27 22:57 ` Paul Burton
2018-06-25 17:15 ` [PATCH 02/25] MIPS: ath79: add support for QCA953x QCA956x TP9343 John Crispin
2018-06-27 22:55 ` Paul Burton
2018-06-25 17:15 ` [PATCH 03/25] MIPS: ath79: select the PINCTRL subsystem John Crispin
2018-06-25 17:15 ` [PATCH 04/25] MIPS: ath79: fix register address in ath79_ddr_wb_flush() John Crispin
2018-06-28 18:51 ` Paul Burton
2018-06-28 20:03 ` John Crispin
2018-06-25 17:15 ` [PATCH 05/25] MIPS: ath79: Avoid using unitialized 'reg' variable John Crispin
2018-06-27 23:05 ` Paul Burton
2018-06-25 17:15 ` [PATCH 06/25] MIPS: ath79: fix system restart John Crispin
2018-06-25 17:15 ` [PATCH 07/25] MIPS: ath79: finetune cpu-overrides John Crispin
2018-06-25 17:15 ` [PATCH 08/25] MIPS: ath79: enable uart during early_prink John Crispin
2018-06-25 17:15 ` [PATCH 09/25] MIPS: ath79: get PCIe controller out of reset John Crispin
2018-06-25 17:15 ` [PATCH 10/25] dt-bindings: PCI: qcom,ar7100: adds binding doc John Crispin
2018-06-25 18:06 ` Sergei Shtylyov
2018-06-26 7:13 ` John Crispin
2018-07-03 22:05 ` Rob Herring
2018-06-25 17:15 ` [PATCH 11/25] MIPS: pci-ar71xx: convert to OF John Crispin
2018-06-25 17:15 ` [PATCH 12/25] dt-bindings: PCI: qcom,ar7240: adds binding doc John Crispin
2018-07-03 22:08 ` Rob Herring
2018-06-25 17:15 ` [PATCH 13/25] MIPS: pci-ar724x: convert to OF John Crispin
2018-06-25 17:15 ` [PATCH 14/25] MIPS: ath79: add helpers for setting clocks and expose the ref clock John Crispin
2018-06-25 17:15 ` John Crispin [this message]
2018-06-25 17:15 ` [PATCH 16/25] MIPS: ath79: pass PLL base to clock init functions John Crispin
2018-06-25 17:15 ` [PATCH 17/25] MIPS: ath79: make specifying the reference clock in DT optional John Crispin
2018-06-25 17:15 ` [PATCH 18/25] MIPS: ath79: support setting up clock via DT on all SoC types John Crispin
2018-06-25 17:15 ` [PATCH 19/25] MIPS: ath79: export switch MDIO reference clock John Crispin
2018-06-25 17:15 ` [PATCH 20/25] MIPS: ath79: drop legacy IRQ code John Crispin
2018-06-25 17:15 ` [PATCH 21/25] MIPS: ath79: drop machfiles John Crispin
2018-06-25 17:15 ` [PATCH 22/25] MIPS: ath79: drop legacy pci code John Crispin
2018-06-25 17:15 ` [PATCH 23/25] MIPS: ath79: drop platform device registration code John Crispin
2018-06-25 17:15 ` [PATCH 24/25] MIPS: ath79: drop !OF clock code John Crispin
2018-06-25 17:15 ` [PATCH 25/25] MIPS: ath79: sanitize symbols John Crispin
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20180625171549.4618-16-john@phrozen.org \
--to=john@phrozen.org \
--cc=jhogan@kernel.org \
--cc=linux-mips@linux-mips.org \
--cc=nbd@nbd.name \
--cc=ralf@linux-mips.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox