diff options
author | Stephen Boyd <sboyd@kernel.org> | 2020-07-21 01:03:16 -0700 |
---|---|---|
committer | Stephen Boyd <sboyd@kernel.org> | 2020-07-21 01:03:16 -0700 |
commit | 63e95849a774140ea0825f99be35765758bb7341 (patch) | |
tree | 29f36b5fdce2e1c7bc0c57fc80e3057a34614dad /drivers/clk/imx/clk-imx8mp.c | |
parent | b396b3d206cdc7942e8c4f008f994066b4cb3c71 (diff) | |
parent | 22b1408b0d282c1cd09846f8e3fe3a1e9b962eb4 (diff) | |
download | linux-63e95849a774140ea0825f99be35765758bb7341.tar.bz2 |
Merge branch 'clk-imx' into clk-next
* clk-imx:
clk: imx: vf610: add CAAM clock
clk: imx8mp: add mu root clk
Diffstat (limited to 'drivers/clk/imx/clk-imx8mp.c')
-rw-r--r-- | drivers/clk/imx/clk-imx8mp.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/clk/imx/clk-imx8mp.c b/drivers/clk/imx/clk-imx8mp.c index b4d9db9d5bf1..ca747712400f 100644 --- a/drivers/clk/imx/clk-imx8mp.c +++ b/drivers/clk/imx/clk-imx8mp.c @@ -680,6 +680,7 @@ static int imx8mp_clocks_probe(struct platform_device *pdev) hws[IMX8MP_CLK_I2C2_ROOT] = imx_clk_hw_gate4("i2c2_root_clk", "i2c2", ccm_base + 0x4180, 0); hws[IMX8MP_CLK_I2C3_ROOT] = imx_clk_hw_gate4("i2c3_root_clk", "i2c3", ccm_base + 0x4190, 0); hws[IMX8MP_CLK_I2C4_ROOT] = imx_clk_hw_gate4("i2c4_root_clk", "i2c4", ccm_base + 0x41a0, 0); + hws[IMX8MP_CLK_MU_ROOT] = imx_clk_hw_gate4("mu_root_clk", "ipg_root", ccm_base + 0x4210, 0); hws[IMX8MP_CLK_OCOTP_ROOT] = imx_clk_hw_gate4("ocotp_root_clk", "ipg_root", ccm_base + 0x4220, 0); hws[IMX8MP_CLK_PCIE_ROOT] = imx_clk_hw_gate4("pcie_root_clk", "pcie_aux", ccm_base + 0x4250, 0); hws[IMX8MP_CLK_PWM1_ROOT] = imx_clk_hw_gate4("pwm1_root_clk", "pwm1", ccm_base + 0x4280, 0); |