Skip to content

Commit

Permalink
MIPS: ath79: drop !OF clock code
Browse files Browse the repository at this point in the history
With the target now being fully OF based, we can drop the legacy clock
registration code. All clocks are now probed via devicetree.

Signed-off-by: John Crispin <john@phrozen.org>
Signed-off-by: Paul 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
Cc: Felix Fietkau <nbd@nbd.name>
  • Loading branch information
John Crispin authored and Paul Burton committed Jan 22, 2019
1 parent 85b9686 commit 427be6a
Show file tree
Hide file tree
Showing 2 changed files with 0 additions and 59 deletions.
56 changes: 0 additions & 56 deletions arch/mips/ath79/clock.c
Original file line number Diff line number Diff line change
Expand Up @@ -617,60 +617,6 @@ static void __init qca956x_clocks_init(void __iomem *pll_base)
ath79_set_clk(ATH79_CLK_AHB, ahb_rate);
}

void __init ath79_clocks_init(void)
{
const char *wdt;
const char *uart;

if (soc_is_ar71xx())
ar71xx_clocks_init(ath79_pll_base);
else if (soc_is_ar724x() || soc_is_ar913x())
ar724x_clocks_init(ath79_pll_base);
else if (soc_is_ar933x())
ar933x_clocks_init(ath79_pll_base);
else if (soc_is_ar934x())
ar934x_clocks_init(ath79_pll_base);
else if (soc_is_qca953x())
qca953x_clocks_init(ath79_pll_base);
else if (soc_is_qca955x())
qca955x_clocks_init(ath79_pll_base);
else if (soc_is_qca956x() || soc_is_tp9343())
qca956x_clocks_init(ath79_pll_base);
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
ath79_get_sys_clk_rate(const char *id)
{
struct clk *clk;
unsigned long rate;

clk = clk_get(NULL, id);
if (IS_ERR(clk))
panic("unable to get %s clock, err=%d", id, (int) PTR_ERR(clk));

rate = clk_get_rate(clk);
clk_put(clk);

return rate;
}

#ifdef CONFIG_OF
static void __init ath79_clocks_init_dt(struct device_node *np)
{
struct clk *ref_clk;
Expand Down Expand Up @@ -727,5 +673,3 @@ 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
3 changes: 0 additions & 3 deletions arch/mips/ath79/common.h
Original file line number Diff line number Diff line change
Expand Up @@ -19,9 +19,6 @@
#define ATH79_MEM_SIZE_MIN (2 * 1024 * 1024)
#define ATH79_MEM_SIZE_MAX (256 * 1024 * 1024)

void ath79_clocks_init(void);
unsigned long ath79_get_sys_clk_rate(const char *id);

void ath79_ddr_ctrl_init(void);

#endif /* __ATH79_COMMON_H */

0 comments on commit 427be6a

Please sign in to comment.