diff options
author | Jani Nikula <jani.nikula@intel.com> | 2024-01-15 08:38:05 +0100 |
---|---|---|
committer | Jani Nikula <jani.nikula@intel.com> | 2024-01-15 08:38:05 +0100 |
commit | 0ea5c948cb64bab5bc7a5516774eb8536f05aa0d (patch) | |
tree | 8437ec451643a0fa3e7e8f3cab5c851dcb5a9c4b /include/dt-bindings/clock/imx8mp-clock.h | |
parent | drm/i915/psr: CAN_PSR and CAN_PANEL_REPLAY can be now local defines (diff) | |
parent | nouveau/gsp: handle engines in runl without nonstall interrupts. (diff) | |
download | linux-0ea5c948cb64bab5bc7a5516774eb8536f05aa0d.tar.xz linux-0ea5c948cb64bab5bc7a5516774eb8536f05aa0d.zip |
Merge drm/drm-next into drm-intel-next
Backmerge to bring Xe driver to drm-intel-next.
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
Diffstat (limited to 'include/dt-bindings/clock/imx8mp-clock.h')
-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 |