Skip to content

Commit

Permalink
ALSA: hda/tegra: compatible string as shortname
Browse files Browse the repository at this point in the history
By default HDA sound card is registered with shortname "tegra-hda".
Same driver is used across tegra platforms and it is necessary to
distinguish between platforms to use platform specific settings from
userspace. One such example is, hdmi port on different platforms use
different alsa pcm device ID. For hdmi playback to work it should
open correct pcm device depending on the platform.

This patch applies shortname from first compatible string provided
in root node of device tree. Userspace then can use this card name
to apply specific settings.

Signed-off-by: Sameer Pujar <spujar@nvidia.com>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
  • Loading branch information
Sameer Pujar authored and Takashi Iwai committed Nov 29, 2018
1 parent 3103c08 commit c94800a
Showing 1 changed file with 19 additions and 1 deletion.
20 changes: 19 additions & 1 deletion sound/pci/hda/hda_tegra.c
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,7 @@
#include <linux/of_device.h>
#include <linux/slab.h>
#include <linux/time.h>
#include <linux/string.h>

#include <sound/core.h>
#include <sound/initval.h>
Expand Down Expand Up @@ -344,6 +345,8 @@ static int hda_tegra_first_init(struct azx *chip, struct platform_device *pdev)
int err;
unsigned short gcap;
int irq_id = platform_get_irq(pdev, 0);
const char *sname;
struct device_node *root;

err = hda_tegra_init_chip(chip, pdev);
if (err)
Expand Down Expand Up @@ -401,8 +404,23 @@ static int hda_tegra_first_init(struct azx *chip, struct platform_device *pdev)
return -ENODEV;
}

/* driver name */
strcpy(card->driver, "tegra-hda");
strcpy(card->shortname, "tegra-hda");

root = of_find_node_by_path("/");
sname = of_get_property(root, "compatible", NULL);
of_node_put(root);
if (!sname) {
dev_err(card->dev,
"failed to get compatible property from root node\n");
return -ENODEV;
}
/* shortname for card */
if (strlen(sname) > sizeof(card->shortname))
dev_info(card->dev, "truncating shortname for card\n");
strncpy(card->shortname, sname, sizeof(card->shortname));

/* longname for card */
snprintf(card->longname, sizeof(card->longname),
"%s at 0x%lx irq %i",
card->shortname, bus->addr, bus->irq);
Expand Down

0 comments on commit c94800a

Please sign in to comment.