diff options
| author | Marcel Ziswiler <marcel.ziswiler@toradex.com> | 2020-09-18 15:17:33 +0200 |
|---|---|---|
| committer | Marcel Ziswiler <marcel.ziswiler@toradex.com> | 2020-09-18 15:17:33 +0200 |
| commit | 843b84fd822ffdd9b4b058b0f2bcd8faf5a850b9 (patch) | |
| tree | dd02d08a2833641aae6120c2883fa1a727e4fa69 /drivers/clk/imx/clk-imx8mm.c | |
| parent | bea227e90a607d5df50f1c0aa929b855a54ed664 (diff) | |
| parent | dc4ba17dfdb745646ef7688aa1ef4782a475299d (diff) | |
Merge remote-tracking branch 'remotes/codeaurora/imx_4.14.98_2.3.0' into toradex_4.14-2.3.x-imx
Diffstat (limited to 'drivers/clk/imx/clk-imx8mm.c')
| -rw-r--r-- | drivers/clk/imx/clk-imx8mm.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/clk/imx/clk-imx8mm.c b/drivers/clk/imx/clk-imx8mm.c index 517fa488d4f7..56f35978cc54 100644 --- a/drivers/clk/imx/clk-imx8mm.c +++ b/drivers/clk/imx/clk-imx8mm.c @@ -543,7 +543,7 @@ static void __init imx8mm_clocks_init(struct device_node *ccm_node) /* BUS */ clks[IMX8MM_CLK_MAIN_AXI] = imx8m_clk_composite_critical("main_axi", imx8mm_main_axi_sels, base + 0x8800); clks[IMX8MM_CLK_ENET_AXI] = imx8m_clk_composite("enet_axi", imx8mm_enet_axi_sels, base + 0x8880); - clks[IMX8MM_CLK_NAND_USDHC_BUS] = imx8m_clk_composite_critical("nand_usdhc_bus", imx8mm_nand_usdhc_sels, base + 0x8900); + clks[IMX8MM_CLK_NAND_USDHC_BUS] = imx8m_clk_composite("nand_usdhc_bus", imx8mm_nand_usdhc_sels, base + 0x8900); clks[IMX8MM_CLK_VPU_BUS] = imx8m_clk_composite("vpu_bus", imx8mm_vpu_bus_sels, base + 0x8980); clks[IMX8MM_CLK_DISP_AXI] = imx8m_clk_composite("disp_axi", imx8mm_disp_axi_sels, base + 0x8a00); clks[IMX8MM_CLK_DISP_APB] = imx8m_clk_composite("disp_apb", imx8mm_disp_apb_sels, base + 0x8a80); |