diff options
| author | Stephen Boyd <sboyd@kernel.org> | 2023-10-23 15:09:18 -0700 |
|---|---|---|
| committer | Stephen Boyd <sboyd@kernel.org> | 2023-10-23 15:09:18 -0700 |
| commit | 701d1057654f99c374fde56f34fccc1853d1bf45 (patch) | |
| tree | 8d07234b92430f4aa17f744b856f6a4a7a4d894b /include/dt-bindings | |
| parent | 0bb80ecc33a8fb5a682236443c1e740d5c917d1d (diff) | |
| parent | 2838820800dcaa60f32bef715c7e2e87e049aebc (diff) | |
Merge tag 'clk-imx-6.7' of git://git.kernel.org/pub/scm/linux/kernel/git/abelvesa/linux into clk-imx
Pull i.MX clk driver updates from Abel Vesa:
- Select MXC_CLK when building in the CLK_IMX8QXP
- Fixes for error handling paths in i.MX8 ACM driver
- Move the clocks check in i.MX8 ACM driver in order to log any error
- Drop the unused return value of clk_imx_acm_detach_pm_domains
- Drop non-existant IMX8MP_CLK_AUDIOMIX_PDM_ROOT clock
- Fix error handling in i.MX8MQ clock driver
- Allow a different LCDIF1 clock parent if DT describes it for i.MX6SX
- Keep the SCU resource table sorted in the i.MX8DXL rsrc driver
- Move the elcdif PLL clock registration above lcd_clk, as it is its parent
- Correct some ENET specific clocks for i.MX8DXL platform
- Drop the VPU_UART and VPUCORE from i.MX8QM as latest HW revision doesn't have them
- Remove "de-featured" MLB support from i.MX8QM/QXP/DXL platforms
- Skip registering clocks owned by Cortex-A partition SCU-based platforms
- Add CAN_1/2 to i.MX8QM and M4_0, PI_0_PWM_0 and PI_0_I2C_0 to i.MX8QXP resources
* tag 'clk-imx-6.7' of git://git.kernel.org/pub/scm/linux/kernel/git/abelvesa/linux:
clk: imx: imx8qm/qxp: add more resources to whitelist
clk: imx: scu: ignore clks not owned by Cortex-A partition
clk: imx8: remove MLB support
clk: imx: imx8qm-rsrc: drop VPU_UART/VPUCORE
clk: imx: imx8qxp: correct the enet clocks for i.MX8DXL
clk: imx: imx8qxp: Fix elcdif_pll clock
clk: imx: imx8dxl-rsrc: keep sorted in the ascending order
clk: imx: imx6sx: Allow a different LCDIF1 clock parent
clk: imx: imx8mq: correct error handling path
clk: imx8mp: Remove non-existent IMX8MP_CLK_AUDIOMIX_PDM_ROOT
clk: imx: imx8: Simplify clk_imx_acm_detach_pm_domains()
clk: imx: imx8: Add a message in case of devm_clk_hw_register_mux_parent_data_table() error
clk: imx: imx8: Fix an error handling path in imx8_acm_clk_probe()
clk: imx: imx8: Fix an error handling path if devm_clk_hw_register_mux_parent_data_table() fails
clk: imx: imx8: Fix an error handling path in clk_imx_acm_attach_pm_domains()
clk: imx: Select MXC_CLK for CLK_IMX8QXP
Diffstat (limited to 'include/dt-bindings')
| -rw-r--r-- | include/dt-bindings/clock/imx8mp-clock.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/include/dt-bindings/clock/imx8mp-clock.h b/include/dt-bindings/clock/imx8mp-clock.h index 11cb0a4fe999..7da4243984b2 100644 --- a/include/dt-bindings/clock/imx8mp-clock.h +++ b/include/dt-bindings/clock/imx8mp-clock.h @@ -376,7 +376,6 @@ #define IMX8MP_CLK_AUDIOMIX_MU2_ROOT 36 #define IMX8MP_CLK_AUDIOMIX_MU3_ROOT 37 #define IMX8MP_CLK_AUDIOMIX_EARC_PHY 38 -#define IMX8MP_CLK_AUDIOMIX_PDM_ROOT 39 #define IMX8MP_CLK_AUDIOMIX_SAI1_MCLK1_SEL 40 #define IMX8MP_CLK_AUDIOMIX_SAI1_MCLK2_SEL 41 #define IMX8MP_CLK_AUDIOMIX_SAI2_MCLK1_SEL 42 |