aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/ath79/patches-4.14/0028-MIPS-ath79-add-helpers-for-setting-clocks-and-expose.patch
diff options
context:
space:
mode:
authorJohn Crispin <john@phrozen.org>2018-05-06 10:20:11 +0200
committerJohn Crispin <john@phrozen.org>2018-05-07 08:06:51 +0200
commit53c474abbdfef8eb3499e2d10c9ad491788b8a72 (patch)
treeacd19415420664f59bc63c1ceb4ad37bb7323027 /target/linux/ath79/patches-4.14/0028-MIPS-ath79-add-helpers-for-setting-clocks-and-expose.patch
parent3dc523f232ff01d31d59345f5fa6de508d5059ef (diff)
downloadupstream-53c474abbdfef8eb3499e2d10c9ad491788b8a72.tar.gz
upstream-53c474abbdfef8eb3499e2d10c9ad491788b8a72.tar.bz2
upstream-53c474abbdfef8eb3499e2d10c9ad491788b8a72.zip
ath79: add new OF only target for QCA MIPS silicon
This target aims to replace ar71xx mid-term. The big part that is still missing is making the MMIO/AHB wifi work using OF. NAND and mikrotik subtargets will follow. Signed-off-by: John Crispin <john@phrozen.org>
Diffstat (limited to 'target/linux/ath79/patches-4.14/0028-MIPS-ath79-add-helpers-for-setting-clocks-and-expose.patch')
-rw-r--r--target/linux/ath79/patches-4.14/0028-MIPS-ath79-add-helpers-for-setting-clocks-and-expose.patch238
1 files changed, 238 insertions, 0 deletions
diff --git a/target/linux/ath79/patches-4.14/0028-MIPS-ath79-add-helpers-for-setting-clocks-and-expose.patch b/target/linux/ath79/patches-4.14/0028-MIPS-ath79-add-helpers-for-setting-clocks-and-expose.patch
new file mode 100644
index 0000000000..4e73c0a7fd
--- /dev/null
+++ b/target/linux/ath79/patches-4.14/0028-MIPS-ath79-add-helpers-for-setting-clocks-and-expose.patch
@@ -0,0 +1,238 @@
+From: Felix Fietkau <nbd@nbd.name>
+Date: Tue, 6 Mar 2018 13:19:26 +0100
+Subject: [PATCH] MIPS: ath79: add helpers for setting clocks and expose
+ the ref clock
+
+Preparation for transitioning legacy the legacy clock setup code over
+to OF.
+
+Signed-off-by: Felix Fietkau <nbd@nbd.name>
+---
+
+--- a/arch/mips/ath79/clock.c
++++ b/arch/mips/ath79/clock.c
+@@ -36,20 +36,46 @@ static struct clk_onecell_data clk_data
+ .clk_num = ARRAY_SIZE(clks),
+ };
+
+-static struct clk *__init ath79_add_sys_clkdev(
+- const char *id, unsigned long rate)
++static const char * const clk_names[ATH79_CLK_END] = {
++ [ATH79_CLK_CPU] = "cpu",
++ [ATH79_CLK_DDR] = "ddr",
++ [ATH79_CLK_AHB] = "ahb",
++ [ATH79_CLK_REF] = "ref",
++};
++
++static const char * __init ath79_clk_name(int type)
+ {
+- struct clk *clk;
+- int err;
++ BUG_ON(type >= ARRAY_SIZE(clk_names) || !clk_names[type]);
++ return clk_names[type];
++}
+
+- clk = clk_register_fixed_rate(NULL, id, NULL, 0, rate);
++static void __init __ath79_set_clk(int type, const char *name, struct clk *clk)
++{
+ if (IS_ERR(clk))
+- panic("failed to allocate %s clock structure", id);
++ panic("failed to allocate %s clock structure", clk_names[type]);
+
+- err = clk_register_clkdev(clk, id, NULL);
+- if (err)
+- panic("unable to register %s clock device", id);
++ clks[type] = clk;
++ clk_register_clkdev(clk, name, NULL);
++}
++
++static struct clk * __init ath79_set_clk(int type, unsigned long rate)
++{
++ const char *name = ath79_clk_name(type);
++ struct clk *clk;
++
++ clk = clk_register_fixed_rate(NULL, name, NULL, 0, rate);
++ __ath79_set_clk(type, name, clk);
++ return clk;
++}
++
++static struct clk * __init ath79_set_ff_clk(int type, const char *parent,
++ unsigned int mult, unsigned int div)
++{
++ const char *name = ath79_clk_name(type);
++ struct clk *clk;
+
++ clk = clk_register_fixed_factor(NULL, name, parent, 0, mult, div);
++ __ath79_set_clk(type, name, clk);
+ return clk;
+ }
+
+@@ -79,27 +105,15 @@ static void __init ar71xx_clocks_init(vo
+ div = (((pll >> AR71XX_AHB_DIV_SHIFT) & AR71XX_AHB_DIV_MASK) + 1) * 2;
+ ahb_rate = cpu_rate / div;
+
+- ath79_add_sys_clkdev("ref", ref_rate);
+- clks[ATH79_CLK_CPU] = ath79_add_sys_clkdev("cpu", cpu_rate);
+- clks[ATH79_CLK_DDR] = ath79_add_sys_clkdev("ddr", ddr_rate);
+- clks[ATH79_CLK_AHB] = ath79_add_sys_clkdev("ahb", ahb_rate);
++ ath79_set_clk(ATH79_CLK_REF, ref_rate);
++ 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 struct clk * __init ath79_reg_ffclk(const char *name,
+- const char *parent_name, unsigned int mult, unsigned int div)
+-{
+- struct clk *clk;
+-
+- clk = clk_register_fixed_factor(NULL, name, parent_name, 0, mult, div);
+- if (IS_ERR(clk))
+- panic("failed to allocate %s clock structure", name);
+-
+- return clk;
+-}
+-
+ static void __init ar724x_clk_init(struct clk *ref_clk, void __iomem *pll_base)
+ {
+ u32 pll;
+@@ -113,24 +127,19 @@ static void __init ar724x_clk_init(struc
+ ddr_div = ((pll >> AR724X_DDR_DIV_SHIFT) & AR724X_DDR_DIV_MASK) + 1;
+ ahb_div = (((pll >> AR724X_AHB_DIV_SHIFT) & AR724X_AHB_DIV_MASK) + 1) * 2;
+
+- clks[ATH79_CLK_CPU] = ath79_reg_ffclk("cpu", "ref", mult, div);
+- clks[ATH79_CLK_DDR] = ath79_reg_ffclk("ddr", "ref", mult, div * ddr_div);
+- clks[ATH79_CLK_AHB] = ath79_reg_ffclk("ahb", "ref", mult, div * ahb_div);
++ ath79_set_ff_clk(ATH79_CLK_CPU, "ref", mult, div);
++ ath79_set_ff_clk(ATH79_CLK_DDR, "ref", mult, div * ddr_div);
++ ath79_set_ff_clk(ATH79_CLK_AHB, "ref", mult, div * ahb_div);
+ }
+
+ static void __init ar724x_clocks_init(void)
+ {
+ struct clk *ref_clk;
+
+- ref_clk = ath79_add_sys_clkdev("ref", AR724X_BASE_FREQ);
++ ref_clk = ath79_set_clk(ATH79_CLK_REF, AR724X_BASE_FREQ);
+
+ ar724x_clk_init(ref_clk, ath79_pll_base);
+
+- /* just make happy plat_time_init() from arch/mips/ath79/setup.c */
+- clk_register_clkdev(clks[ATH79_CLK_CPU], "cpu", NULL);
+- clk_register_clkdev(clks[ATH79_CLK_DDR], "ddr", NULL);
+- clk_register_clkdev(clks[ATH79_CLK_AHB], "ahb", NULL);
+-
+ clk_add_alias("wdt", NULL, "ahb", NULL);
+ clk_add_alias("uart", NULL, "ahb", NULL);
+ }
+@@ -185,12 +194,12 @@ static void __init ar9330_clk_init(struc
+ AR933X_PLL_CLOCK_CTRL_AHB_DIV_MASK) + 1;
+ }
+
+- clks[ATH79_CLK_CPU] = ath79_reg_ffclk("cpu", "ref",
+- ninit_mul, ref_div * out_div * cpu_div);
+- clks[ATH79_CLK_DDR] = ath79_reg_ffclk("ddr", "ref",
+- ninit_mul, ref_div * out_div * ddr_div);
+- clks[ATH79_CLK_AHB] = ath79_reg_ffclk("ahb", "ref",
+- ninit_mul, ref_div * out_div * ahb_div);
++ ath79_set_ff_clk(ATH79_CLK_CPU, "ref", ninit_mul,
++ ref_div * out_div * cpu_div);
++ ath79_set_ff_clk(ATH79_CLK_DDR, "ref", ninit_mul,
++ ref_div * out_div * ddr_div);
++ ath79_set_ff_clk(ATH79_CLK_AHB, "ref", ninit_mul,
++ ref_div * out_div * ahb_div);
+ }
+
+ static void __init ar933x_clocks_init(void)
+@@ -205,15 +214,10 @@ static void __init ar933x_clocks_init(vo
+ else
+ ref_rate = (25 * 1000 * 1000);
+
+- ref_clk = ath79_add_sys_clkdev("ref", ref_rate);
++ ref_clk = ath79_set_clk(ATH79_CLK_REF, ref_rate);
+
+ ar9330_clk_init(ref_clk, ath79_pll_base);
+
+- /* just make happy plat_time_init() from arch/mips/ath79/setup.c */
+- clk_register_clkdev(clks[ATH79_CLK_CPU], "cpu", NULL);
+- clk_register_clkdev(clks[ATH79_CLK_DDR], "ddr", NULL);
+- clk_register_clkdev(clks[ATH79_CLK_AHB], "ahb", NULL);
+-
+ clk_add_alias("wdt", NULL, "ahb", NULL);
+ clk_add_alias("uart", NULL, "ref", NULL);
+ }
+@@ -343,10 +347,10 @@ static void __init ar934x_clocks_init(vo
+ else
+ ahb_rate = cpu_pll / (postdiv + 1);
+
+- ath79_add_sys_clkdev("ref", ref_rate);
+- clks[ATH79_CLK_CPU] = ath79_add_sys_clkdev("cpu", cpu_rate);
+- clks[ATH79_CLK_DDR] = ath79_add_sys_clkdev("ddr", ddr_rate);
+- clks[ATH79_CLK_AHB] = ath79_add_sys_clkdev("ahb", ahb_rate);
++ ath79_set_clk(ATH79_CLK_REF, ref_rate);
++ 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);
+@@ -430,10 +434,10 @@ static void __init qca953x_clocks_init(v
+ else
+ ahb_rate = cpu_pll / (postdiv + 1);
+
+- ath79_add_sys_clkdev("ref", ref_rate);
+- ath79_add_sys_clkdev("cpu", cpu_rate);
+- ath79_add_sys_clkdev("ddr", ddr_rate);
+- ath79_add_sys_clkdev("ahb", ahb_rate);
++ ath79_set_clk(ATH79_CLK_REF, ref_rate);
++ 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);
+@@ -515,10 +519,10 @@ static void __init qca955x_clocks_init(v
+ else
+ ahb_rate = cpu_pll / (postdiv + 1);
+
+- ath79_add_sys_clkdev("ref", ref_rate);
+- clks[ATH79_CLK_CPU] = ath79_add_sys_clkdev("cpu", cpu_rate);
+- clks[ATH79_CLK_DDR] = ath79_add_sys_clkdev("ddr", ddr_rate);
+- clks[ATH79_CLK_AHB] = ath79_add_sys_clkdev("ahb", ahb_rate);
++ ath79_set_clk(ATH79_CLK_REF, ref_rate);
++ 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);
+@@ -609,10 +613,10 @@ static void __init qca956x_clocks_init(v
+ else
+ ahb_rate = cpu_pll / (postdiv + 1);
+
+- ath79_add_sys_clkdev("ref", ref_rate);
+- ath79_add_sys_clkdev("cpu", cpu_rate);
+- ath79_add_sys_clkdev("ddr", ddr_rate);
+- ath79_add_sys_clkdev("ahb", ahb_rate);
++ ath79_set_clk(ATH79_CLK_REF, ref_rate);
++ 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);
+--- a/include/dt-bindings/clock/ath79-clk.h
++++ b/include/dt-bindings/clock/ath79-clk.h
+@@ -13,7 +13,8 @@
+ #define ATH79_CLK_CPU 0
+ #define ATH79_CLK_DDR 1
+ #define ATH79_CLK_AHB 2
++#define ATH79_CLK_REF 3
+
+-#define ATH79_CLK_END 3
++#define ATH79_CLK_END 4
+
+ #endif /* __DT_BINDINGS_ATH79_CLK_H */