MIPS: ath79: update devicetree clock support for AR9331
Signed-off-by: Antony Pavlov <antonynpavlov@gmail.com> Cc: Gabor Juhos <juhosg@openwrt.org> Cc: Alban Bedel <albeu@free.fr> Cc: Michael Turquette <mturquette@baylibre.com> Cc: Stephen Boyd <sboyd@codeaurora.org> Cc: Rob Herring <robh+dt@kernel.org> Cc: linux-clk@vger.kernel.org Cc: linux-mips@linux-mips.org Cc: devicetree@vger.kernel.org Patchwork: https://patchwork.linux-mips.org/patch/12879/ Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
This commit is contained in:
parent
1e6a3492e7
commit
5ae5c452e3
|
@ -137,15 +137,68 @@ static void __init ar724x_clocks_init(void)
|
||||||
clk_add_alias("uart", NULL, "ahb", NULL);
|
clk_add_alias("uart", NULL, "ahb", NULL);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
static void __init ar9330_clk_init(struct clk *ref_clk, void __iomem *pll_base)
|
||||||
|
{
|
||||||
|
u32 clock_ctrl;
|
||||||
|
u32 ref_div;
|
||||||
|
u32 ninit_mul;
|
||||||
|
u32 out_div;
|
||||||
|
|
||||||
|
u32 cpu_div;
|
||||||
|
u32 ddr_div;
|
||||||
|
u32 ahb_div;
|
||||||
|
|
||||||
|
clock_ctrl = __raw_readl(pll_base + AR933X_PLL_CLOCK_CTRL_REG);
|
||||||
|
if (clock_ctrl & AR933X_PLL_CLOCK_CTRL_BYPASS) {
|
||||||
|
ref_div = 1;
|
||||||
|
ninit_mul = 1;
|
||||||
|
out_div = 1;
|
||||||
|
|
||||||
|
cpu_div = 1;
|
||||||
|
ddr_div = 1;
|
||||||
|
ahb_div = 1;
|
||||||
|
} else {
|
||||||
|
u32 cpu_config;
|
||||||
|
u32 t;
|
||||||
|
|
||||||
|
cpu_config = __raw_readl(pll_base + AR933X_PLL_CPU_CONFIG_REG);
|
||||||
|
|
||||||
|
t = (cpu_config >> AR933X_PLL_CPU_CONFIG_REFDIV_SHIFT) &
|
||||||
|
AR933X_PLL_CPU_CONFIG_REFDIV_MASK;
|
||||||
|
ref_div = t;
|
||||||
|
|
||||||
|
ninit_mul = (cpu_config >> AR933X_PLL_CPU_CONFIG_NINT_SHIFT) &
|
||||||
|
AR933X_PLL_CPU_CONFIG_NINT_MASK;
|
||||||
|
|
||||||
|
t = (cpu_config >> AR933X_PLL_CPU_CONFIG_OUTDIV_SHIFT) &
|
||||||
|
AR933X_PLL_CPU_CONFIG_OUTDIV_MASK;
|
||||||
|
if (t == 0)
|
||||||
|
t = 1;
|
||||||
|
|
||||||
|
out_div = (1 << t);
|
||||||
|
|
||||||
|
cpu_div = ((clock_ctrl >> AR933X_PLL_CLOCK_CTRL_CPU_DIV_SHIFT) &
|
||||||
|
AR933X_PLL_CLOCK_CTRL_CPU_DIV_MASK) + 1;
|
||||||
|
|
||||||
|
ddr_div = ((clock_ctrl >> AR933X_PLL_CLOCK_CTRL_DDR_DIV_SHIFT) &
|
||||||
|
AR933X_PLL_CLOCK_CTRL_DDR_DIV_MASK) + 1;
|
||||||
|
|
||||||
|
ahb_div = ((clock_ctrl >> AR933X_PLL_CLOCK_CTRL_AHB_DIV_SHIFT) &
|
||||||
|
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);
|
||||||
|
}
|
||||||
|
|
||||||
static void __init ar933x_clocks_init(void)
|
static void __init ar933x_clocks_init(void)
|
||||||
{
|
{
|
||||||
|
struct clk *ref_clk;
|
||||||
unsigned long ref_rate;
|
unsigned long ref_rate;
|
||||||
unsigned long cpu_rate;
|
|
||||||
unsigned long ddr_rate;
|
|
||||||
unsigned long ahb_rate;
|
|
||||||
u32 clock_ctrl;
|
|
||||||
u32 cpu_config;
|
|
||||||
u32 freq;
|
|
||||||
u32 t;
|
u32 t;
|
||||||
|
|
||||||
t = ath79_reset_rr(AR933X_RESET_REG_BOOTSTRAP);
|
t = ath79_reset_rr(AR933X_RESET_REG_BOOTSTRAP);
|
||||||
|
@ -154,46 +207,14 @@ static void __init ar933x_clocks_init(void)
|
||||||
else
|
else
|
||||||
ref_rate = (25 * 1000 * 1000);
|
ref_rate = (25 * 1000 * 1000);
|
||||||
|
|
||||||
clock_ctrl = ath79_pll_rr(AR933X_PLL_CLOCK_CTRL_REG);
|
ref_clk = ath79_add_sys_clkdev("ref", ref_rate);
|
||||||
if (clock_ctrl & AR933X_PLL_CLOCK_CTRL_BYPASS) {
|
|
||||||
cpu_rate = ref_rate;
|
|
||||||
ahb_rate = ref_rate;
|
|
||||||
ddr_rate = ref_rate;
|
|
||||||
} else {
|
|
||||||
cpu_config = ath79_pll_rr(AR933X_PLL_CPU_CONFIG_REG);
|
|
||||||
|
|
||||||
t = (cpu_config >> AR933X_PLL_CPU_CONFIG_REFDIV_SHIFT) &
|
ar9330_clk_init(ref_clk, ath79_pll_base);
|
||||||
AR933X_PLL_CPU_CONFIG_REFDIV_MASK;
|
|
||||||
freq = ref_rate / t;
|
|
||||||
|
|
||||||
t = (cpu_config >> AR933X_PLL_CPU_CONFIG_NINT_SHIFT) &
|
/* just make happy plat_time_init() from arch/mips/ath79/setup.c */
|
||||||
AR933X_PLL_CPU_CONFIG_NINT_MASK;
|
clk_register_clkdev(clks[ATH79_CLK_CPU], "cpu", NULL);
|
||||||
freq *= t;
|
clk_register_clkdev(clks[ATH79_CLK_DDR], "ddr", NULL);
|
||||||
|
clk_register_clkdev(clks[ATH79_CLK_AHB], "ahb", NULL);
|
||||||
t = (cpu_config >> AR933X_PLL_CPU_CONFIG_OUTDIV_SHIFT) &
|
|
||||||
AR933X_PLL_CPU_CONFIG_OUTDIV_MASK;
|
|
||||||
if (t == 0)
|
|
||||||
t = 1;
|
|
||||||
|
|
||||||
freq >>= t;
|
|
||||||
|
|
||||||
t = ((clock_ctrl >> AR933X_PLL_CLOCK_CTRL_CPU_DIV_SHIFT) &
|
|
||||||
AR933X_PLL_CLOCK_CTRL_CPU_DIV_MASK) + 1;
|
|
||||||
cpu_rate = freq / t;
|
|
||||||
|
|
||||||
t = ((clock_ctrl >> AR933X_PLL_CLOCK_CTRL_DDR_DIV_SHIFT) &
|
|
||||||
AR933X_PLL_CLOCK_CTRL_DDR_DIV_MASK) + 1;
|
|
||||||
ddr_rate = freq / t;
|
|
||||||
|
|
||||||
t = ((clock_ctrl >> AR933X_PLL_CLOCK_CTRL_AHB_DIV_SHIFT) &
|
|
||||||
AR933X_PLL_CLOCK_CTRL_AHB_DIV_MASK) + 1;
|
|
||||||
ahb_rate = freq / t;
|
|
||||||
}
|
|
||||||
|
|
||||||
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);
|
|
||||||
|
|
||||||
clk_add_alias("wdt", NULL, "ahb", NULL);
|
clk_add_alias("wdt", NULL, "ahb", NULL);
|
||||||
clk_add_alias("uart", NULL, "ref", NULL);
|
clk_add_alias("uart", NULL, "ref", NULL);
|
||||||
|
@ -460,7 +481,6 @@ static void __init ath79_clocks_init_dt(struct device_node *np)
|
||||||
|
|
||||||
CLK_OF_DECLARE(ar7100, "qca,ar7100-pll", ath79_clocks_init_dt);
|
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(ar7240, "qca,ar7240-pll", ath79_clocks_init_dt);
|
||||||
CLK_OF_DECLARE(ar9330, "qca,ar9330-pll", ath79_clocks_init_dt);
|
|
||||||
CLK_OF_DECLARE(ar9340, "qca,ar9340-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);
|
CLK_OF_DECLARE(ar9550, "qca,qca9550-pll", ath79_clocks_init_dt);
|
||||||
|
|
||||||
|
@ -482,7 +502,14 @@ static void __init ath79_clocks_init_dt_ng(struct device_node *np)
|
||||||
goto err_clk;
|
goto err_clk;
|
||||||
}
|
}
|
||||||
|
|
||||||
ar724x_clk_init(ref_clk, pll_base);
|
if (of_device_is_compatible(np, "qca,ar9130-pll"))
|
||||||
|
ar724x_clk_init(ref_clk, pll_base);
|
||||||
|
else if (of_device_is_compatible(np, "qca,ar9330-pll"))
|
||||||
|
ar9330_clk_init(ref_clk, pll_base);
|
||||||
|
else {
|
||||||
|
pr_err("%s: could not find any appropriate clk_init()\n", dnfn);
|
||||||
|
goto err_clk;
|
||||||
|
}
|
||||||
|
|
||||||
if (of_clk_add_provider(np, of_clk_src_onecell_get, &clk_data)) {
|
if (of_clk_add_provider(np, of_clk_src_onecell_get, &clk_data)) {
|
||||||
pr_err("%s: could not register clk provider\n", dnfn);
|
pr_err("%s: could not register clk provider\n", dnfn);
|
||||||
|
@ -498,4 +525,5 @@ err:
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
CLK_OF_DECLARE(ar9130_clk, "qca,ar9130-pll", ath79_clocks_init_dt_ng);
|
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);
|
||||||
#endif
|
#endif
|
||||||
|
|
Loading…
Reference in New Issue