git.openwrt.org Git - openwrt/staging/blocktrron.git/blob

   1 From 992513ac2ec9245cb8f0fdd9c0e2ce4add07beb2 Mon Sep 17 00:00:00 2001
   2 From: Dave Stevenson <dave.stevenson@raspberrypi.com>
   3 Date: Tue, 31 Mar 2020 16:21:45 +0100
   4 Subject: [PATCH] drm/vc4-hdmi: Give the HDMI audio instances different
   5  names
   6
   7 The debugfs usage within asoc gets confused if multiple interfaces
   8 have the same card name, therefore use unique names when
   9 initialising them.
  10
  11 Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.com>
  12 ---
  13  drivers/gpu/drm/vc4/vc4_hdmi.c | 2 +-
  14  1 file changed, 1 insertion(+), 1 deletion(-)
  15
  16 --- a/drivers/gpu/drm/vc4/vc4_hdmi.c
  17 +++ b/drivers/gpu/drm/vc4/vc4_hdmi.c
  18 @@ -1198,7 +1198,7 @@ static int vc4_hdmi_audio_init(struct vc
  19
  20         card->dai_link = dai_link;
  21         card->num_links = 1;
  22 -       card->name = "vc4-hdmi";
  23 +       card->name = vc4_hdmi->variant->id ? "vc4-hdmi1" : "vc4-hdmi";
  24         card->dev = dev;
  25         card->owner = THIS_MODULE;
  26