clk: imx8mm/8mn: Add USB clocks

Add USB relevant clocks to support usb clock settings for both
DM USB host and gadget drivers

Signed-off-by: Ye Li <ye.li@nxp.com>
Signed-off-by: Peng Fan <peng.fan@nxp.com>

diff --git a/drivers/clk/imx/clk-imx8mm.c b/drivers/clk/imx/clk-imx8mm.c
index 4743394..85d1757 100644 (file)
--- a/drivers/clk/imx/clk-imx8mm.c
+++ b/drivers/clk/imx/clk-imx8mm.c
@@ -95,6 +95,9 @@ static const char *imx8mm_enet_phy_sels[] = {"clock-osc-24m", "sys_pll2_50m", "s
 static const char *imx8mm_nand_usdhc_sels[] = {"clock-osc-24m", "sys_pll1_266m", "sys_pll1_800m", "sys_pll2_200m",
                                               "sys_pll1_133m", "sys_pll3_out", "sys_pll2_250m", "audio_pll1_out", };
 
+static const char *imx8mm_usb_bus_sels[] = {"clock-osc-24m", "sys_pll2_500m", "sys_pll1_800m", "sys_pll2_100m",
+                                           "sys_pll2_200m", "clk_ext2", "clk_ext4", "audio_pll2_out", };
+
 static const char *imx8mm_usdhc1_sels[] = {"clock-osc-24m", "sys_pll1_400m", "sys_pll1_800m", "sys_pll2_500m",
                                           "sys_pll3_out", "sys_pll1_266m", "audio_pll2_out", "sys_pll1_100m", };
 
@@ -122,6 +125,12 @@ static const char *imx8mm_usdhc3_sels[] = {"clock-osc-24m", "sys_pll1_400m", "sy
 static const char *imx8mm_qspi_sels[] = {"clock-osc-24m", "sys_pll1_400m", "sys_pll2_333m", "sys_pll2_500m",
                                           "audio_pll2_out", "sys_pll1_266m", "sys_pll3_out", "sys_pll1_100m", };
 
+static const char *imx8mm_usb_core_sels[] = {"clock-osc-24m", "sys_pll1_100m", "sys_pll1_40m", "sys_pll2_100m",
+                                            "sys_pll2_200m", "clk_ext2", "clk_ext3", "audio_pll2_out", };
+
+static const char *imx8mm_usb_phy_sels[] = {"clock-osc-24m", "sys_pll1_100m", "sys_pll1_40m", "sys_pll2_100m",
+                                            "sys_pll2_200m", "clk_ext2", "clk_ext3", "audio_pll2_out", };
+
 static ulong imx8mm_clk_get_rate(struct clk *clk)
 {
        struct clk *c;
@@ -355,6 +364,8 @@ static int imx8mm_clk_probe(struct udevice *dev)
               imx8m_clk_composite_critical("nand_usdhc_bus",
                                            imx8mm_nand_usdhc_sels,
                                            base + 0x8900));
+       clk_dm(IMX8MM_CLK_USB_BUS,
+               imx8m_clk_composite("usb_bus", imx8mm_usb_bus_sels, base + 0x8b80));
 
        /* IP */
        clk_dm(IMX8MM_CLK_USDHC1,
@@ -378,6 +389,10 @@ static int imx8mm_clk_probe(struct udevice *dev)
                                   base + 0xbc80));
        clk_dm(IMX8MM_CLK_QSPI,
               imx8m_clk_composite("qspi", imx8mm_qspi_sels, base + 0xab80));
+       clk_dm(IMX8MM_CLK_USB_CORE_REF,
+               imx8m_clk_composite("usb_core_ref", imx8mm_usb_core_sels, base + 0xb100));
+       clk_dm(IMX8MM_CLK_USB_PHY_REF,
+               imx8m_clk_composite("usb_phy_ref", imx8mm_usb_phy_sels, base + 0xb180));
 
        clk_dm(IMX8MM_CLK_I2C1_ROOT,
               imx_clk_gate4("i2c1_root_clk", "i2c1", base + 0x4170, 0));
@@ -403,6 +418,8 @@ static int imx8mm_clk_probe(struct udevice *dev)
               imx_clk_gate4("usdhc3_root_clk", "usdhc3", base + 0x45e0, 0));
        clk_dm(IMX8MM_CLK_QSPI_ROOT,
               imx_clk_gate4("qspi_root_clk", "qspi", base + 0x42f0, 0));
+       clk_dm(IMX8MM_CLK_USB1_CTRL_ROOT,
+               imx_clk_gate4("usb1_ctrl_root_clk", "usb_bus", base + 0x44d0, 0));
 
        /* clks not needed in SPL stage */
 #ifndef CONFIG_SPL_BUILD

diff --git a/drivers/clk/imx/clk-imx8mn.c b/drivers/clk/imx/clk-imx8mn.c
index a11b17f..8bf6061 100644 (file)
--- a/drivers/clk/imx/clk-imx8mn.c
+++ b/drivers/clk/imx/clk-imx8mn.c
@@ -95,6 +95,10 @@ static const char *imx8mn_enet_phy_sels[] = {"clock-osc-24m", "sys_pll2_50m", "s
 static const char *imx8mn_nand_usdhc_sels[] = {"clock-osc-24m", "sys_pll1_266m", "sys_pll1_800m", "sys_pll2_200m",
                                               "sys_pll1_133m", "sys_pll3_out", "sys_pll2_250m", "audio_pll1_out", };
 
+static const char * const imx8mn_usb_bus_sels[] = {"clock-osc-24m", "sys_pll2_500m", "sys_pll1_800m",
+                                               "sys_pll2_100m", "sys_pll2_200m", "clk_ext2",
+                                               "clk_ext4", "audio_pll2_out", };
+
 static const char *imx8mn_usdhc1_sels[] = {"clock-osc-24m", "sys_pll1_400m", "sys_pll1_800m", "sys_pll2_500m",
                                           "sys_pll3_out", "sys_pll1_266m", "audio_pll2_out", "sys_pll1_100m", };
 
@@ -122,6 +126,14 @@ static const char *imx8mn_usdhc3_sels[] = {"clock-osc-24m", "sys_pll1_400m", "sy
 static const char *imx8mn_qspi_sels[] = {"clock-osc-24m", "sys_pll1_400m", "sys_pll2_333m", "sys_pll2_500m",
                                           "audio_pll2_out", "sys_pll1_266m", "sys_pll3_out", "sys_pll1_100m", };
 
+static const char * const imx8mn_usb_core_sels[] = {"clock-osc-24m", "sys_pll1_100m", "sys_pll1_40m",
+                                               "sys_pll2_100m", "sys_pll2_200m", "clk_ext2",
+                                               "clk_ext3", "audio_pll2_out", };
+
+static const char * const imx8mn_usb_phy_sels[] = {"clock-osc-24m", "sys_pll1_100m", "sys_pll1_40m",
+                                               "sys_pll2_100m", "sys_pll2_200m", "clk_ext2",
+                                               "clk_ext3", "audio_pll2_out", };
+
 static ulong imx8mn_clk_get_rate(struct clk *clk)
 {
        struct clk *c;
@@ -355,6 +367,8 @@ static int imx8mn_clk_probe(struct udevice *dev)
               imx8m_clk_composite_critical("nand_usdhc_bus",
                                            imx8mn_nand_usdhc_sels,
                                            base + 0x8900));
+       clk_dm(IMX8MN_CLK_USB_BUS,
+               imx8m_clk_composite("usb_bus", imx8mn_usb_bus_sels, base + 0x8b80));
 
        /* IP */
        clk_dm(IMX8MN_CLK_USDHC1,
@@ -378,6 +392,10 @@ static int imx8mn_clk_probe(struct udevice *dev)
                                   base + 0xbc80));
        clk_dm(IMX8MN_CLK_QSPI,
               imx8m_clk_composite("qspi", imx8mn_qspi_sels, base + 0xab80));
+       clk_dm(IMX8MN_CLK_USB_CORE_REF,
+               imx8m_clk_composite("usb_core_ref", imx8mn_usb_core_sels, base + 0xb100));
+       clk_dm(IMX8MN_CLK_USB_PHY_REF,
+               imx8m_clk_composite("usb_phy_ref", imx8mn_usb_phy_sels, base + 0xb180));
 
        clk_dm(IMX8MN_CLK_I2C1_ROOT,
               imx_clk_gate4("i2c1_root_clk", "i2c1", base + 0x4170, 0));
@@ -403,6 +421,8 @@ static int imx8mn_clk_probe(struct udevice *dev)
               imx_clk_gate4("usdhc3_root_clk", "usdhc3", base + 0x45e0, 0));
        clk_dm(IMX8MN_CLK_QSPI_ROOT,
               imx_clk_gate4("qspi_root_clk", "qspi", base + 0x42f0, 0));
+       clk_dm(IMX8MN_CLK_USB1_CTRL_ROOT,
+               imx_clk_gate4("usb1_ctrl_root_clk", "usb_bus", base + 0x44d0, 0));
 
        /* clks not needed in SPL stage */
 #ifndef CONFIG_SPL_BUILD