drm/vc4: hdmi: Deal with multiple ALSA cards

The HDMI driver was registering a single ALSA card so far with the name
vc4-hdmi.

Obviously, this is not going to work anymore when we will have multiple
HDMI controllers since we will end up trying to register two files with the
same name.

Let's use the variant to avoid that name conflict.

Signed-off-by: Maxime Ripard <maxime@cerno.tech>
Tested-by: Chanwoo Choi <cw00.choi@samsung.com>
Tested-by: Hoegeun Kwon <hoegeun.kwon@samsung.com>
Tested-by: Stefan Wahren <stefan.wahren@i2se.com>
Reviewed-by: Dave Stevenson <dave.stevenson@raspberrypi.com>
Link: https://patchwork.freedesktop.org/patch/msgid/e60a37444e848a384a45707a21d6df8883115f86.1599120059.git-series.maxime@cerno.tech

diff --git a/drivers/gpu/drm/vc4/vc4_hdmi.c b/drivers/gpu/drm/vc4/vc4_hdmi.c
index 20cfc85449ca953bcd1ab4c6dcd5ac50d1d8a078..5e479647559f4116c86f22f7f9ca326ddbe01d77 100644 (file)
--- a/drivers/gpu/drm/vc4/vc4_hdmi.c
+++ b/drivers/gpu/drm/vc4/vc4_hdmi.c
@@ -1043,7 +1043,7 @@ static int vc4_hdmi_audio_init(struct vc4_hdmi *vc4_hdmi)
 
        card->dai_link = dai_link;
        card->num_links = 1;
-       card->name = "vc4-hdmi";
+       card->name = vc4_hdmi->variant->card_name;
        card->dev = dev;
 
        /*
@@ -1502,6 +1502,7 @@ static int vc4_hdmi_dev_remove(struct platform_device *pdev)
 static const struct vc4_hdmi_variant bcm2835_variant = {
        .encoder_type           = VC4_ENCODER_TYPE_HDMI0,
        .debugfs_name           = "hdmi_regs",
+       .card_name              = "vc4-hdmi",
        .max_pixel_clock        = 162000000,
        .cec_available          = true,
        .registers              = vc4_hdmi_fields,

diff --git a/drivers/gpu/drm/vc4/vc4_hdmi.h b/drivers/gpu/drm/vc4/vc4_hdmi.h
index 4aea5ee8a91db4cfb89ef725319b366b60780e06..34138e0dd4a6ff6b3118272ba42ac2dddd923217 100644 (file)
--- a/drivers/gpu/drm/vc4/vc4_hdmi.h
+++ b/drivers/gpu/drm/vc4/vc4_hdmi.h
@@ -30,6 +30,9 @@ struct vc4_hdmi_variant {
        /* Encoder Type for that controller */
        enum vc4_encoder_type encoder_type;
 
+       /* ALSA card name */
+       const char *card_name;
+
        /* Filename to expose the registers in debugfs */
        const char *debugfs_name;