kernel: bump 5.10 to 5.10.173
[openwrt/staging/hauke.git] / target / linux / bcm27xx / patches-5.10 / 950-0315-drm-vc4-move-setup-from-hw_params-to-prepare.patch
index 25792b28fdbe8e077c787ab766355abade6c3e13..0d2a3984514d9dd06a2d17766b776434c3cbb997 100644 (file)
@@ -14,7 +14,7 @@ Signed-off-by: Matthias Reichl <hias@horus.com>
 
 --- a/drivers/gpu/drm/vc4/vc4_hdmi.c
 +++ b/drivers/gpu/drm/vc4/vc4_hdmi.c
-@@ -1035,9 +1035,8 @@ static int sample_rate_to_mai_fmt(int sa
+@@ -1036,9 +1036,8 @@ static int sample_rate_to_mai_fmt(int sa
  }
  
  /* HDMI audio codec callbacks */
@@ -26,7 +26,7 @@ Signed-off-by: Matthias Reichl <hias@horus.com>
  {
        struct vc4_hdmi *vc4_hdmi = dai_to_hdmi(dai);
        struct drm_encoder *encoder = &vc4_hdmi->encoder.base.base;
-@@ -1050,12 +1049,15 @@ static int vc4_hdmi_audio_hw_params(stru
+@@ -1051,12 +1050,15 @@ static int vc4_hdmi_audio_hw_params(stru
        if (substream != vc4_hdmi->audio.substream)
                return -EINVAL;
  
@@ -47,7 +47,7 @@ Signed-off-by: Matthias Reichl <hias@horus.com>
  
        HDMI_WRITE(HDMI_MAI_CTL,
                   VC4_HD_MAI_CTL_RESET |
-@@ -1267,7 +1269,7 @@ static const struct snd_soc_component_dr
+@@ -1268,7 +1270,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,