Merge tag 'u-boot-imx-20200825' of https://gitlab.denx.de/u-boot/custodians/u-boot-imx

[platform/kernel/u-boot.git] / drivers / clk / imx / clk-imx6q.c

diff --git a/drivers/clk/imx/clk-imx6q.c b/drivers/clk/imx/clk-imx6q.c
index 5ae4781..5343036 100644 (file)
--- a/drivers/clk/imx/clk-imx6q.c
+++ b/drivers/clk/imx/clk-imx6q.c
@@ -7,6 +7,7 @@
 #include <common.h>
 #include <clk-uclass.h>
 #include <dm.h>
+#include <log.h>
 #include <asm/arch/clock.h>
 #include <asm/arch/imx-regs.h>
 #include <dt-bindings/clock/imx6qdl-clock.h>
@@ -112,10 +113,14 @@ static int imx6q_clk_probe(struct udevice *dev)
               imx_clk_pfd("pll2_pfd0_352m", "pll2_bus", base + 0x100, 0));
        clk_dm(IMX6QDL_CLK_PLL2_PFD2_396M,
               imx_clk_pfd("pll2_pfd2_396m", "pll2_bus", base + 0x100, 2));
+       clk_dm(IMX6QDL_CLK_PLL6,
+              imx_clk_pllv3(IMX_PLLV3_ENET, "pll6", "osc", base + 0xe0, 0x3));
+       clk_dm(IMX6QDL_CLK_PLL6_ENET,
+              imx_clk_gate("pll6_enet", "pll6", base + 0xe0, 13));
 
        /* CCM clocks */
        base = dev_read_addr_ptr(dev);
-       if (base == (void *)FDT_ADDR_T_NONE)
+       if (!base)
                return -EINVAL;
 
        clk_dm(IMX6QDL_CLK_USDHC1_SEL,
@@ -182,6 +187,10 @@ static int imx6q_clk_probe(struct udevice *dev)
        clk_dm(IMX6QDL_CLK_I2C2,
               imx_clk_gate2("i2c2", "ipg_per", base + 0x70, 8));
 
+       clk_dm(IMX6QDL_CLK_ENET, imx_clk_gate2("enet", "ipg", base + 0x6c, 10));
+       clk_dm(IMX6QDL_CLK_ENET_REF,
+              imx_clk_fixed_factor("enet_ref", "pll6_enet", 1, 1));
+
        return 0;
 }