]> git.proxmox.com Git - mirror_ubuntu-hirsute-kernel.git/commitdiff
MIPS: ath79: export switch MDIO reference clock
authorFelix Fietkau <nbd@nbd.name>
Fri, 11 Jan 2019 14:22:35 +0000 (15:22 +0100)
committerPaul Burton <paul.burton@mips.com>
Tue, 22 Jan 2019 19:17:22 +0000 (11:17 -0800)
On AR934x, the MDIO reference clock can be configured to a fixed 100 MHz
clock. If that feature is not used, it defaults to the main reference
clock, like on all other SoC.

Signed-off-by: Felix Fietkau <nbd@nbd.name>
Signed-off-by: John Crispin <john@phrozen.org>
Acked-by: Rob Herring <robh@kernel.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
arch/mips/ath79/clock.c
include/dt-bindings/clock/ath79-clk.h

index c234818b30e16191733470e692c31607a9069a17..699f00f096cb9edddcc00607b4496a86982fc971 100644 (file)
@@ -42,6 +42,7 @@ static const char * const clk_names[ATH79_CLK_END] = {
        [ATH79_CLK_DDR] = "ddr",
        [ATH79_CLK_AHB] = "ahb",
        [ATH79_CLK_REF] = "ref",
+       [ATH79_CLK_MDIO] = "mdio",
 };
 
 static const char * __init ath79_clk_name(int type)
@@ -342,6 +343,10 @@ static void __init ar934x_clocks_init(void __iomem *pll_base)
        ath79_set_clk(ATH79_CLK_DDR, ddr_rate);
        ath79_set_clk(ATH79_CLK_AHB, ahb_rate);
 
+       clk_ctrl = __raw_readl(pll_base + AR934X_PLL_SWITCH_CLOCK_CONTROL_REG);
+       if (clk_ctrl & AR934X_PLL_SWITCH_CLOCK_CONTROL_MDIO_CLK_SEL)
+               ath79_set_clk(ATH79_CLK_MDIO, 100 * 1000 * 1000);
+
        iounmap(dpll_base);
 }
 
@@ -698,6 +703,9 @@ static void __init ath79_clocks_init_dt(struct device_node *np)
        else if (of_device_is_compatible(np, "qca,qca9560-pll"))
                qca956x_clocks_init(pll_base);
 
+       if (!clks[ATH79_CLK_MDIO])
+               clks[ATH79_CLK_MDIO] = clks[ATH79_CLK_REF];
+
        if (of_clk_add_provider(np, of_clk_src_onecell_get, &clk_data)) {
                pr_err("%pOF: could not register clk provider\n", np);
                goto err_iounmap;
index 262d7c5eb2485f59cc702e58afe52e93dec962eb..dcc679a7ad85ceba7f2f5e9295d1777012bfa368 100644 (file)
@@ -14,7 +14,8 @@
 #define ATH79_CLK_DDR          1
 #define ATH79_CLK_AHB          2
 #define ATH79_CLK_REF          3
+#define ATH79_CLK_MDIO         4
 
-#define ATH79_CLK_END          4
+#define ATH79_CLK_END          5
 
 #endif /* __DT_BINDINGS_ATH79_CLK_H */