Commit 9be43a5a authored by Maxime Ripard's avatar Maxime Ripard

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: default avatarMaxime Ripard <maxime@cerno.tech>
Tested-by: default avatarChanwoo Choi <cw00.choi@samsung.com>
Tested-by: default avatarHoegeun Kwon <hoegeun.kwon@samsung.com>
Tested-by: default avatarStefan Wahren <stefan.wahren@i2se.com>
Reviewed-by: default avatarDave Stevenson <dave.stevenson@raspberrypi.com>
Link: https://patchwork.freedesktop.org/patch/msgid/e60a37444e848a384a45707a21d6df8883115f86.1599120059.git-series.maxime@cerno.tech
parent 632ee3aa
...@@ -1043,7 +1043,7 @@ static int vc4_hdmi_audio_init(struct vc4_hdmi *vc4_hdmi) ...@@ -1043,7 +1043,7 @@ static int vc4_hdmi_audio_init(struct vc4_hdmi *vc4_hdmi)
card->dai_link = dai_link; card->dai_link = dai_link;
card->num_links = 1; card->num_links = 1;
card->name = "vc4-hdmi"; card->name = vc4_hdmi->variant->card_name;
card->dev = dev; card->dev = dev;
/* /*
...@@ -1502,6 +1502,7 @@ static int vc4_hdmi_dev_remove(struct platform_device *pdev) ...@@ -1502,6 +1502,7 @@ static int vc4_hdmi_dev_remove(struct platform_device *pdev)
static const struct vc4_hdmi_variant bcm2835_variant = { static const struct vc4_hdmi_variant bcm2835_variant = {
.encoder_type = VC4_ENCODER_TYPE_HDMI0, .encoder_type = VC4_ENCODER_TYPE_HDMI0,
.debugfs_name = "hdmi_regs", .debugfs_name = "hdmi_regs",
.card_name = "vc4-hdmi",
.max_pixel_clock = 162000000, .max_pixel_clock = 162000000,
.cec_available = true, .cec_available = true,
.registers = vc4_hdmi_fields, .registers = vc4_hdmi_fields,
......
...@@ -30,6 +30,9 @@ struct vc4_hdmi_variant { ...@@ -30,6 +30,9 @@ struct vc4_hdmi_variant {
/* Encoder Type for that controller */ /* Encoder Type for that controller */
enum vc4_encoder_type encoder_type; enum vc4_encoder_type encoder_type;
/* ALSA card name */
const char *card_name;
/* Filename to expose the registers in debugfs */ /* Filename to expose the registers in debugfs */
const char *debugfs_name; const char *debugfs_name;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment