bcm27xx: remove linux 5.10 compatibility

[openwrt/staging/chunkeey.git] / target / linux / bcm27xx / patches-5.10 / 950-0315-drm-vc4-move-setup-from-hw_params-to-prepare.patch

diff --git a/target/linux/bcm27xx/patches-5.10/950-0315-drm-vc4-move-setup-from-hw_params-to-prepare.patch b/target/linux/bcm27xx/patches-5.10/950-0315-drm-vc4-move-setup-from-hw_params-to-prepare.patch
deleted file mode 100644 (file)
index 9b90426..0000000
--- a/target/linux/bcm27xx/patches-5.10/950-0315-drm-vc4-move-setup-from-hw_params-to-prepare.patch
+++ /dev/null
@@ -1,58 +0,0 @@
-From 7b6cfdfc74c7e9c00060a0c4146a6358b261f7db Mon Sep 17 00:00:00 2001
-From: Matthias Reichl <hias@horus.com>
-Date: Thu, 19 Mar 2020 20:00:35 +0100
-Subject: [PATCH] drm/vc4: move setup from hw_params to prepare
-
-Configuring HDMI audio registers in prepare allows us to take
-IEC958 bits into account which are set by the alsa hook after
-the hw_params call.
-
-Signed-off-by: Matthias Reichl <hias@horus.com>
----
- drivers/gpu/drm/vc4/vc4_hdmi.c | 20 +++++++++++---------
- 1 file changed, 11 insertions(+), 9 deletions(-)
-
---- a/drivers/gpu/drm/vc4/vc4_hdmi.c
-+++ b/drivers/gpu/drm/vc4/vc4_hdmi.c
-@@ -1031,9 +1031,8 @@ static int sample_rate_to_mai_fmt(int sa
- }
- 
- /* HDMI audio codec callbacks */
--static int vc4_hdmi_audio_hw_params(struct snd_pcm_substream *substream,
--                                  struct snd_pcm_hw_params *params,
--                                  struct snd_soc_dai *dai)
-+static int vc4_hdmi_audio_prepare(struct snd_pcm_substream *substream,
-+                                struct snd_soc_dai *dai)
- {
-       struct vc4_hdmi *vc4_hdmi = dai_to_hdmi(dai);
-       struct drm_encoder *encoder = &vc4_hdmi->encoder.base.base;
-@@ -1046,12 +1045,15 @@ static int vc4_hdmi_audio_hw_params(stru
-       if (substream != vc4_hdmi->audio.substream)
-               return -EINVAL;
- 
--      dev_dbg(dev, "%s: %u Hz, %d bit, %d channels\n", __func__,
--              params_rate(params), params_width(params),
--              params_channels(params));
-+      dev_dbg(dev, "%s: %u Hz, %d bit, %d channels AES0=%02x\n",
-+              __func__,
-+              substream->runtime->rate,
-+              snd_pcm_format_width(substream->runtime->format),
-+              substream->runtime->channels,
-+              vc4_hdmi->audio.iec_status[0]);
- 
--      vc4_hdmi->audio.channels = params_channels(params);
--      vc4_hdmi->audio.samplerate = params_rate(params);
-+      vc4_hdmi->audio.channels = substream->runtime->channels;
-+      vc4_hdmi->audio.samplerate = substream->runtime->rate;
- 
-       HDMI_WRITE(HDMI_MAI_CTL,
-                  VC4_HD_MAI_CTL_RESET |
-@@ -1273,7 +1275,7 @@ static const struct snd_soc_component_dr
- static const struct snd_soc_dai_ops vc4_hdmi_audio_dai_ops = {
-       .startup = vc4_hdmi_audio_startup,
-       .shutdown = vc4_hdmi_audio_shutdown,
--      .hw_params = vc4_hdmi_audio_hw_params,
-+      .prepare = vc4_hdmi_audio_prepare,
-       .set_fmt = vc4_hdmi_audio_set_fmt,
-       .trigger = vc4_hdmi_audio_trigger,
- };