Skip to content

L
linux
Commit 9aca5cb5 authored by Felix Fietkau's avatar Felix Fietkau Committed by Paul Burton
Browse files
Options

MIPS: ath79: pass PLL base to clock init functions 

Preparation for passing the mapped base via DT
Signed-off-by: default avatarFelix Fietkau <nbd@nbd.name>
Signed-off-by: default avatarJohn Crispin <john@phrozen.org>
Signed-off-by: default avatarPaul Burton <paul.burton@mips.com>
Cc: Ralf Baechle <ralf@linux-mips.org>
Cc: James Hogan <jhogan@kernel.org>
Cc: Rob Herring <robh+dt@kernel.org>
Cc: Pengutronix Kernel Team <kernel@pengutronix.de>
Cc: linux-mips@vger.kernel.org
Cc: linux-kernel@vger.kernel.org
Cc: devicetree@vger.kernel.org
parent 4a0e89b9
Hide whitespace changes
Inline Side-by-side
Showing with 30 additions and 30 deletions
arch/mips/ath79/clock.c
View file @ 9aca5cb5
...@@ -80,7 +80,7 @@ static struct clk * __init ath79_set_ff_clk(int type, const char *parent, ...@@ -80,7 +80,7 @@ static struct clk * __init ath79_set_ff_clk(int type, const char *parent,
return clk; return clk;
} }
static void __init ar71xx_clocks_init(void) static void __init ar71xx_clocks_init(void __iomem *pll_base)
{ {
unsigned long ref_rate; unsigned long ref_rate;
unsigned long cpu_rate; unsigned long cpu_rate;
...@@ -92,7 +92,7 @@ static void __init ar71xx_clocks_init(void) ...@@ -92,7 +92,7 @@ static void __init ar71xx_clocks_init(void)
ref_rate = AR71XX_BASE_FREQ; ref_rate = AR71XX_BASE_FREQ;
pll = ath79_pll_rr(AR71XX_PLL_REG_CPU_CONFIG); pll = __raw_readl(pll_base + AR71XX_PLL_REG_CPU_CONFIG);
div = ((pll >> AR71XX_PLL_FB_SHIFT) & AR71XX_PLL_FB_MASK) + 1; div = ((pll >> AR71XX_PLL_FB_SHIFT) & AR71XX_PLL_FB_MASK) + 1;
freq = div * ref_rate; freq = div * ref_rate;
...@@ -130,13 +130,13 @@ static void __init ar724x_clk_init(struct clk *ref_clk, void __iomem *pll_base) ...@@ -130,13 +130,13 @@ static void __init ar724x_clk_init(struct clk *ref_clk, void __iomem *pll_base)
ath79_set_ff_clk(ATH79_CLK_AHB, "ref", mult, div * ahb_div); ath79_set_ff_clk(ATH79_CLK_AHB, "ref", mult, div * ahb_div);
} }
static void __init ar724x_clocks_init(void) static void __init ar724x_clocks_init(void __iomem *pll_base)
{ {
struct clk *ref_clk; struct clk *ref_clk;
ref_clk = ath79_set_clk(ATH79_CLK_REF, AR724X_BASE_FREQ); ref_clk = ath79_set_clk(ATH79_CLK_REF, AR724X_BASE_FREQ);
ar724x_clk_init(ref_clk, ath79_pll_base); ar724x_clk_init(ref_clk, pll_base);
} }
static void __init ar9330_clk_init(struct clk *ref_clk, void __iomem *pll_base) static void __init ar9330_clk_init(struct clk *ref_clk, void __iomem *pll_base)
...@@ -197,7 +197,7 @@ static void __init ar9330_clk_init(struct clk *ref_clk, void __iomem *pll_base) ...@@ -197,7 +197,7 @@ static void __init ar9330_clk_init(struct clk *ref_clk, void __iomem *pll_base)
ref_div * out_div * ahb_div); ref_div * out_div * ahb_div);
} }
static void __init ar933x_clocks_init(void) static void __init ar933x_clocks_init(void __iomem *pll_base)
{ {
struct clk *ref_clk; struct clk *ref_clk;
unsigned long ref_rate; unsigned long ref_rate;
...@@ -234,7 +234,7 @@ static u32 __init ar934x_get_pll_freq(u32 ref, u32 ref_div, u32 nint, u32 nfrac, ...@@ -234,7 +234,7 @@ static u32 __init ar934x_get_pll_freq(u32 ref, u32 ref_div, u32 nint, u32 nfrac,
return ret; return ret;
} }
static void __init ar934x_clocks_init(void) static void __init ar934x_clocks_init(void __iomem *pll_base)
{ {
unsigned long ref_rate; unsigned long ref_rate;
unsigned long cpu_rate; unsigned long cpu_rate;
...@@ -265,7 +265,7 @@ static void __init ar934x_clocks_init(void) ...@@ -265,7 +265,7 @@ static void __init ar934x_clocks_init(void)
AR934X_SRIF_DPLL1_REFDIV_MASK; AR934X_SRIF_DPLL1_REFDIV_MASK;
frac = 1 << 18; frac = 1 << 18;
} else { } else {
pll = ath79_pll_rr(AR934X_PLL_CPU_CONFIG_REG); pll = __raw_readl(pll_base + AR934X_PLL_CPU_CONFIG_REG);
out_div = (pll >> AR934X_PLL_CPU_CONFIG_OUTDIV_SHIFT) & out_div = (pll >> AR934X_PLL_CPU_CONFIG_OUTDIV_SHIFT) &
AR934X_PLL_CPU_CONFIG_OUTDIV_MASK; AR934X_PLL_CPU_CONFIG_OUTDIV_MASK;
ref_div = (pll >> AR934X_PLL_CPU_CONFIG_REFDIV_SHIFT) & ref_div = (pll >> AR934X_PLL_CPU_CONFIG_REFDIV_SHIFT) &
...@@ -292,7 +292,7 @@ static void __init ar934x_clocks_init(void) ...@@ -292,7 +292,7 @@ static void __init ar934x_clocks_init(void)
AR934X_SRIF_DPLL1_REFDIV_MASK; AR934X_SRIF_DPLL1_REFDIV_MASK;
frac = 1 << 18; frac = 1 << 18;
} else { } else {
pll = ath79_pll_rr(AR934X_PLL_DDR_CONFIG_REG); pll = __raw_readl(pll_base + AR934X_PLL_DDR_CONFIG_REG);
out_div = (pll >> AR934X_PLL_DDR_CONFIG_OUTDIV_SHIFT) & out_div = (pll >> AR934X_PLL_DDR_CONFIG_OUTDIV_SHIFT) &
AR934X_PLL_DDR_CONFIG_OUTDIV_MASK; AR934X_PLL_DDR_CONFIG_OUTDIV_MASK;
ref_div = (pll >> AR934X_PLL_DDR_CONFIG_REFDIV_SHIFT) & ref_div = (pll >> AR934X_PLL_DDR_CONFIG_REFDIV_SHIFT) &
...@@ -307,7 +307,7 @@ static void __init ar934x_clocks_init(void) ...@@ -307,7 +307,7 @@ static void __init ar934x_clocks_init(void)
ddr_pll = ar934x_get_pll_freq(ref_rate, ref_div, nint, ddr_pll = ar934x_get_pll_freq(ref_rate, ref_div, nint,
nfrac, frac, out_div); nfrac, frac, out_div);
clk_ctrl = ath79_pll_rr(AR934X_PLL_CPU_DDR_CLK_CTRL_REG); clk_ctrl = __raw_readl(pll_base + AR934X_PLL_CPU_DDR_CLK_CTRL_REG);
postdiv = (clk_ctrl >> AR934X_PLL_CPU_DDR_CLK_CTRL_CPU_POST_DIV_SHIFT) & postdiv = (clk_ctrl >> AR934X_PLL_CPU_DDR_CLK_CTRL_CPU_POST_DIV_SHIFT) &
AR934X_PLL_CPU_DDR_CLK_CTRL_CPU_POST_DIV_MASK; AR934X_PLL_CPU_DDR_CLK_CTRL_CPU_POST_DIV_MASK;
...@@ -347,7 +347,7 @@ static void __init ar934x_clocks_init(void) ...@@ -347,7 +347,7 @@ static void __init ar934x_clocks_init(void)
iounmap(dpll_base); iounmap(dpll_base);
} }
static void __init qca953x_clocks_init(void) static void __init qca953x_clocks_init(void __iomem *pll_base)
{ {
unsigned long ref_rate; unsigned long ref_rate;
unsigned long cpu_rate; unsigned long cpu_rate;
...@@ -363,7 +363,7 @@ static void __init qca953x_clocks_init(void) ...@@ -363,7 +363,7 @@ static void __init qca953x_clocks_init(void)
else else
ref_rate = 25 * 1000 * 1000; ref_rate = 25 * 1000 * 1000;
pll = ath79_pll_rr(QCA953X_PLL_CPU_CONFIG_REG); pll = __raw_readl(pll_base + QCA953X_PLL_CPU_CONFIG_REG);
out_div = (pll >> QCA953X_PLL_CPU_CONFIG_OUTDIV_SHIFT) & out_div = (pll >> QCA953X_PLL_CPU_CONFIG_OUTDIV_SHIFT) &
QCA953X_PLL_CPU_CONFIG_OUTDIV_MASK; QCA953X_PLL_CPU_CONFIG_OUTDIV_MASK;
ref_div = (pll >> QCA953X_PLL_CPU_CONFIG_REFDIV_SHIFT) & ref_div = (pll >> QCA953X_PLL_CPU_CONFIG_REFDIV_SHIFT) &
...@@ -377,7 +377,7 @@ static void __init qca953x_clocks_init(void) ...@@ -377,7 +377,7 @@ static void __init qca953x_clocks_init(void)
cpu_pll += frac * (ref_rate >> 6) / ref_div; cpu_pll += frac * (ref_rate >> 6) / ref_div;
cpu_pll /= (1 << out_div); cpu_pll /= (1 << out_div);
pll = ath79_pll_rr(QCA953X_PLL_DDR_CONFIG_REG); pll = __raw_readl(pll_base + QCA953X_PLL_DDR_CONFIG_REG);
out_div = (pll >> QCA953X_PLL_DDR_CONFIG_OUTDIV_SHIFT) & out_div = (pll >> QCA953X_PLL_DDR_CONFIG_OUTDIV_SHIFT) &
QCA953X_PLL_DDR_CONFIG_OUTDIV_MASK; QCA953X_PLL_DDR_CONFIG_OUTDIV_MASK;
ref_div = (pll >> QCA953X_PLL_DDR_CONFIG_REFDIV_SHIFT) & ref_div = (pll >> QCA953X_PLL_DDR_CONFIG_REFDIV_SHIFT) &
...@@ -391,7 +391,7 @@ static void __init qca953x_clocks_init(void) ...@@ -391,7 +391,7 @@ static void __init qca953x_clocks_init(void)
ddr_pll += frac * (ref_rate >> 6) / (ref_div << 4); ddr_pll += frac * (ref_rate >> 6) / (ref_div << 4);
ddr_pll /= (1 << out_div); ddr_pll /= (1 << out_div);
clk_ctrl = ath79_pll_rr(QCA953X_PLL_CLK_CTRL_REG); clk_ctrl = __raw_readl(pll_base + QCA953X_PLL_CLK_CTRL_REG);
postdiv = (clk_ctrl >> QCA953X_PLL_CLK_CTRL_CPU_POST_DIV_SHIFT) & postdiv = (clk_ctrl >> QCA953X_PLL_CLK_CTRL_CPU_POST_DIV_SHIFT) &
QCA953X_PLL_CLK_CTRL_CPU_POST_DIV_MASK; QCA953X_PLL_CLK_CTRL_CPU_POST_DIV_MASK;
...@@ -429,7 +429,7 @@ static void __init qca953x_clocks_init(void) ...@@ -429,7 +429,7 @@ static void __init qca953x_clocks_init(void)
ath79_set_clk(ATH79_CLK_AHB, ahb_rate); ath79_set_clk(ATH79_CLK_AHB, ahb_rate);
} }
static void __init qca955x_clocks_init(void) static void __init qca955x_clocks_init(void __iomem *pll_base)
{ {
unsigned long ref_rate; unsigned long ref_rate;
unsigned long cpu_rate; unsigned long cpu_rate;
...@@ -445,7 +445,7 @@ static void __init qca955x_clocks_init(void) ...@@ -445,7 +445,7 @@ static void __init qca955x_clocks_init(void)
else else
ref_rate = 25 * 1000 * 1000; ref_rate = 25 * 1000 * 1000;
pll = ath79_pll_rr(QCA955X_PLL_CPU_CONFIG_REG); pll = __raw_readl(pll_base + QCA955X_PLL_CPU_CONFIG_REG);
out_div = (pll >> QCA955X_PLL_CPU_CONFIG_OUTDIV_SHIFT) & out_div = (pll >> QCA955X_PLL_CPU_CONFIG_OUTDIV_SHIFT) &
QCA955X_PLL_CPU_CONFIG_OUTDIV_MASK; QCA955X_PLL_CPU_CONFIG_OUTDIV_MASK;
ref_div = (pll >> QCA955X_PLL_CPU_CONFIG_REFDIV_SHIFT) & ref_div = (pll >> QCA955X_PLL_CPU_CONFIG_REFDIV_SHIFT) &
...@@ -459,7 +459,7 @@ static void __init qca955x_clocks_init(void) ...@@ -459,7 +459,7 @@ static void __init qca955x_clocks_init(void)
cpu_pll += frac * ref_rate / (ref_div * (1 << 6)); cpu_pll += frac * ref_rate / (ref_div * (1 << 6));
cpu_pll /= (1 << out_div); cpu_pll /= (1 << out_div);
pll = ath79_pll_rr(QCA955X_PLL_DDR_CONFIG_REG); pll = __raw_readl(pll_base + QCA955X_PLL_DDR_CONFIG_REG);
out_div = (pll >> QCA955X_PLL_DDR_CONFIG_OUTDIV_SHIFT) & out_div = (pll >> QCA955X_PLL_DDR_CONFIG_OUTDIV_SHIFT) &
QCA955X_PLL_DDR_CONFIG_OUTDIV_MASK; QCA955X_PLL_DDR_CONFIG_OUTDIV_MASK;
ref_div = (pll >> QCA955X_PLL_DDR_CONFIG_REFDIV_SHIFT) & ref_div = (pll >> QCA955X_PLL_DDR_CONFIG_REFDIV_SHIFT) &
...@@ -473,7 +473,7 @@ static void __init qca955x_clocks_init(void) ...@@ -473,7 +473,7 @@ static void __init qca955x_clocks_init(void)
ddr_pll += frac * ref_rate / (ref_div * (1 << 10)); ddr_pll += frac * ref_rate / (ref_div * (1 << 10));
ddr_pll /= (1 << out_div); ddr_pll /= (1 << out_div);
clk_ctrl = ath79_pll_rr(QCA955X_PLL_CLK_CTRL_REG); clk_ctrl = __raw_readl(pll_base + QCA955X_PLL_CLK_CTRL_REG);
postdiv = (clk_ctrl >> QCA955X_PLL_CLK_CTRL_CPU_POST_DIV_SHIFT) & postdiv = (clk_ctrl >> QCA955X_PLL_CLK_CTRL_CPU_POST_DIV_SHIFT) &
QCA955X_PLL_CLK_CTRL_CPU_POST_DIV_MASK; QCA955X_PLL_CLK_CTRL_CPU_POST_DIV_MASK;
...@@ -511,7 +511,7 @@ static void __init qca955x_clocks_init(void) ...@@ -511,7 +511,7 @@ static void __init qca955x_clocks_init(void)
ath79_set_clk(ATH79_CLK_AHB, ahb_rate); ath79_set_clk(ATH79_CLK_AHB, ahb_rate);
} }
static void __init qca956x_clocks_init(void) static void __init qca956x_clocks_init(void __iomem *pll_base)
{ {
unsigned long ref_rate; unsigned long ref_rate;
unsigned long cpu_rate; unsigned long cpu_rate;
...@@ -537,13 +537,13 @@ static void __init qca956x_clocks_init(void) ...@@ -537,13 +537,13 @@ static void __init qca956x_clocks_init(void)
else else
ref_rate = 25 * 1000 * 1000; ref_rate = 25 * 1000 * 1000;
pll = ath79_pll_rr(QCA956X_PLL_CPU_CONFIG_REG); pll = __raw_readl(pll_base + QCA956X_PLL_CPU_CONFIG_REG);
out_div = (pll >> QCA956X_PLL_CPU_CONFIG_OUTDIV_SHIFT) & out_div = (pll >> QCA956X_PLL_CPU_CONFIG_OUTDIV_SHIFT) &
QCA956X_PLL_CPU_CONFIG_OUTDIV_MASK; QCA956X_PLL_CPU_CONFIG_OUTDIV_MASK;
ref_div = (pll >> QCA956X_PLL_CPU_CONFIG_REFDIV_SHIFT) & ref_div = (pll >> QCA956X_PLL_CPU_CONFIG_REFDIV_SHIFT) &
QCA956X_PLL_CPU_CONFIG_REFDIV_MASK; QCA956X_PLL_CPU_CONFIG_REFDIV_MASK;
pll = ath79_pll_rr(QCA956X_PLL_CPU_CONFIG1_REG); pll = __raw_readl(pll_base + QCA956X_PLL_CPU_CONFIG1_REG);
nint = (pll >> QCA956X_PLL_CPU_CONFIG1_NINT_SHIFT) & nint = (pll >> QCA956X_PLL_CPU_CONFIG1_NINT_SHIFT) &
QCA956X_PLL_CPU_CONFIG1_NINT_MASK; QCA956X_PLL_CPU_CONFIG1_NINT_MASK;
hfrac = (pll >> QCA956X_PLL_CPU_CONFIG1_NFRAC_H_SHIFT) & hfrac = (pll >> QCA956X_PLL_CPU_CONFIG1_NFRAC_H_SHIFT) &
...@@ -556,12 +556,12 @@ static void __init qca956x_clocks_init(void) ...@@ -556,12 +556,12 @@ static void __init qca956x_clocks_init(void)
cpu_pll += (hfrac >> 13) * ref_rate / ref_div; cpu_pll += (hfrac >> 13) * ref_rate / ref_div;
cpu_pll /= (1 << out_div); cpu_pll /= (1 << out_div);
pll = ath79_pll_rr(QCA956X_PLL_DDR_CONFIG_REG); pll = __raw_readl(pll_base + QCA956X_PLL_DDR_CONFIG_REG);
out_div = (pll >> QCA956X_PLL_DDR_CONFIG_OUTDIV_SHIFT) & out_div = (pll >> QCA956X_PLL_DDR_CONFIG_OUTDIV_SHIFT) &
QCA956X_PLL_DDR_CONFIG_OUTDIV_MASK; QCA956X_PLL_DDR_CONFIG_OUTDIV_MASK;
ref_div = (pll >> QCA956X_PLL_DDR_CONFIG_REFDIV_SHIFT) & ref_div = (pll >> QCA956X_PLL_DDR_CONFIG_REFDIV_SHIFT) &
QCA956X_PLL_DDR_CONFIG_REFDIV_MASK; QCA956X_PLL_DDR_CONFIG_REFDIV_MASK;
pll = ath79_pll_rr(QCA956X_PLL_DDR_CONFIG1_REG); pll = __raw_readl(pll_base + QCA956X_PLL_DDR_CONFIG1_REG);
nint = (pll >> QCA956X_PLL_DDR_CONFIG1_NINT_SHIFT) & nint = (pll >> QCA956X_PLL_DDR_CONFIG1_NINT_SHIFT) &
QCA956X_PLL_DDR_CONFIG1_NINT_MASK; QCA956X_PLL_DDR_CONFIG1_NINT_MASK;
hfrac = (pll >> QCA956X_PLL_DDR_CONFIG1_NFRAC_H_SHIFT) & hfrac = (pll >> QCA956X_PLL_DDR_CONFIG1_NFRAC_H_SHIFT) &
...@@ -574,7 +574,7 @@ static void __init qca956x_clocks_init(void) ...@@ -574,7 +574,7 @@ static void __init qca956x_clocks_init(void)
ddr_pll += (hfrac >> 13) * ref_rate / ref_div; ddr_pll += (hfrac >> 13) * ref_rate / ref_div;
ddr_pll /= (1 << out_div); ddr_pll /= (1 << out_div);
clk_ctrl = ath79_pll_rr(QCA956X_PLL_CLK_CTRL_REG); clk_ctrl = __raw_readl(pll_base + QCA956X_PLL_CLK_CTRL_REG);
postdiv = (clk_ctrl >> QCA956X_PLL_CLK_CTRL_CPU_POST_DIV_SHIFT) & postdiv = (clk_ctrl >> QCA956X_PLL_CLK_CTRL_CPU_POST_DIV_SHIFT) &
QCA956X_PLL_CLK_CTRL_CPU_POST_DIV_MASK; QCA956X_PLL_CLK_CTRL_CPU_POST_DIV_MASK;
...@@ -618,19 +618,19 @@ void __init ath79_clocks_init(void) ...@@ -618,19 +618,19 @@ void __init ath79_clocks_init(void)
const char *uart; const char *uart;
if (soc_is_ar71xx()) if (soc_is_ar71xx())
ar71xx_clocks_init(); ar71xx_clocks_init(ath79_pll_base);
else if (soc_is_ar724x() || soc_is_ar913x()) else if (soc_is_ar724x() || soc_is_ar913x())
ar724x_clocks_init(); ar724x_clocks_init(ath79_pll_base);
else if (soc_is_ar933x()) else if (soc_is_ar933x())
ar933x_clocks_init(); ar933x_clocks_init(ath79_pll_base);
else if (soc_is_ar934x()) else if (soc_is_ar934x())
ar934x_clocks_init(); ar934x_clocks_init(ath79_pll_base);
else if (soc_is_qca953x()) else if (soc_is_qca953x())
qca953x_clocks_init(); qca953x_clocks_init(ath79_pll_base);
else if (soc_is_qca955x()) else if (soc_is_qca955x())
qca955x_clocks_init(); qca955x_clocks_init(ath79_pll_base);
else if (soc_is_qca956x() || soc_is_tp9343()) else if (soc_is_qca956x() || soc_is_tp9343())
qca956x_clocks_init(); qca956x_clocks_init(ath79_pll_base);
else else
BUG(); BUG();
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7