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-vf610.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-vf610.c')
| -rw-r--r-- | drivers/clk/imx/clk-vf610.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/clk/imx/clk-vf610.c b/drivers/clk/imx/clk-vf610.c index cd04e7dc1878..5129ef8e1d6e 100644 --- a/drivers/clk/imx/clk-vf610.c +++ b/drivers/clk/imx/clk-vf610.c @@ -438,6 +438,7 @@ static void __init vf610_clocks_init(struct device_node *ccm_node) clk[VF610_CLK_SNVS] = imx_clk_gate2("snvs-rtc", "ipg_bus", CCM_CCGR6, CCM_CCGRx_CGn(7)); clk[VF610_CLK_DAP] = imx_clk_gate("dap", "platform_bus", CCM_CCSR, 24); clk[VF610_CLK_OCOTP] = imx_clk_gate("ocotp", "ipg_bus", CCM_CCGR6, CCM_CCGRx_CGn(5)); + clk[VF610_CLK_CAAM] = imx_clk_gate2("caam", "ipg_bus", CCM_CCGR11, CCM_CCGRx_CGn(0)); imx_check_clocks(clk, ARRAY_SIZE(clk)); |