diff options
| author | Maxime Ripard <maxime@cerno.tech> | 2022-09-14 12:22:18 +0100 |
|---|---|---|
| committer | Maxime Ripard <maxime@cerno.tech> | 2022-09-14 12:22:18 +0100 |
| commit | a108772d03d8bdb43258218b00bfe43bbe1e8800 (patch) | |
| tree | 11b1f413ab384f2b5de0773f01b6886e2c601f8b /drivers/gpu/drm/vc4/vc4_hdmi.c | |
| parent | 75cebd664d57a78af3e46c14bd2659df0a08847b (diff) | |
| parent | 213cb76ddc8b875e772f9f4d173feefa122716af (diff) | |
| download | linux-rpi-a108772d03d8bdb43258218b00bfe43bbe1e8800.tar.gz linux-rpi-a108772d03d8bdb43258218b00bfe43bbe1e8800.tar.bz2 linux-rpi-a108772d03d8bdb43258218b00bfe43bbe1e8800.zip | |
Merge drm/drm-next into drm-misc-next
We need 6.0-rc1 to merge the backlight rework PR.
Signed-off-by: Maxime Ripard <maxime@cerno.tech>
Diffstat (limited to 'drivers/gpu/drm/vc4/vc4_hdmi.c')
| -rw-r--r-- | drivers/gpu/drm/vc4/vc4_hdmi.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/gpu/drm/vc4/vc4_hdmi.c b/drivers/gpu/drm/vc4/vc4_hdmi.c index b2d0a3c89fbb..64f9feabf43e 100644 --- a/drivers/gpu/drm/vc4/vc4_hdmi.c +++ b/drivers/gpu/drm/vc4/vc4_hdmi.c @@ -2345,6 +2345,7 @@ out: static const struct snd_soc_component_driver vc4_hdmi_audio_cpu_dai_comp = { .name = "vc4-hdmi-cpu-dai-component", + .legacy_dai_naming = 1, }; static int vc4_hdmi_audio_cpu_dai_probe(struct snd_soc_dai *dai) |