diff options
| author | Stephen Boyd <sboyd@kernel.org> | 2021-08-28 21:15:35 -0700 |
|---|---|---|
| committer | Stephen Boyd <sboyd@kernel.org> | 2021-08-28 21:15:35 -0700 |
| commit | 3e061910b2a2ea2bc25861068a11df011fd3a0f8 (patch) | |
| tree | 050ccf4b23b239b4d532bfb821888d462017d7a9 /include | |
| parent | e73f0f0ee7541171d89f2e2491130c7771ba58d3 (diff) | |
| parent | 86842d255b45fc2103da1cd202f5064397ed41f8 (diff) | |
| download | cachepc-linux-3e061910b2a2ea2bc25861068a11df011fd3a0f8.tar.gz cachepc-linux-3e061910b2a2ea2bc25861068a11df011fd3a0f8.zip | |
Merge tag 'clk-imx-5.15' of git://git.kernel.org/pub/scm/linux/kernel/git/abelvesa/linux into clk-imx
Pull i.MX clock driver updates from Abel Vesa
- Fix CLKOUT clocks on i.MX8MM and i.MX8MN by using imx_clk_hw_mux2
- Switch from .round_rate to .determine_rate in clk-divider-gate
- Fix clock tree update for TF-A controlled clocks for all i.MX8M
- Add missing M7 core clock for i.MX8MN
* tag 'clk-imx-5.15' of git://git.kernel.org/pub/scm/linux/kernel/git/abelvesa/linux:
clk: imx8mn: Add M7 core clock
clk: imx8m: fix clock tree update of TF-A managed clocks
clk: imx: clk-divider-gate: Switch to clk_divider.determine_rate
clk: imx8mn: use correct mux type for clkout path
clk: imx8mm: use correct mux type for clkout path
Diffstat (limited to 'include')
| -rw-r--r-- | include/dt-bindings/clock/imx8mn-clock.h | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/include/dt-bindings/clock/imx8mn-clock.h b/include/dt-bindings/clock/imx8mn-clock.h index d24b627cb2e7..01e8bab1d767 100644 --- a/include/dt-bindings/clock/imx8mn-clock.h +++ b/include/dt-bindings/clock/imx8mn-clock.h @@ -241,6 +241,8 @@ #define IMX8MN_CLK_CLKOUT2_DIV 219 #define IMX8MN_CLK_CLKOUT2 220 -#define IMX8MN_CLK_END 221 +#define IMX8MN_CLK_M7_CORE 221 + +#define IMX8MN_CLK_END 222 #endif |