t19x: hda: parse card name from device tree

Galen requires a unique sound card to be registered for android audio.
This is to avoid conflicts with previous platform, since we maintain
an unified audio XML.

Bug 200375020

Change-Id: Ife37f72d2c179c8480cfaf059c334dcc6673906e
Signed-off-by: Sameer Pujar <spujar@nvidia.com>
Reviewed-on: https://git-master.nvidia.com/r/1626537
Reviewed-by: Mohan Kumar D <mkumard@nvidia.com>
Reviewed-by: Automatic_Commit_Validation_User
GVS: Gerrit_Virtual_Submit
Reviewed-by: Sharad Gupta <sharadg@nvidia.com>
Reviewed-by: mobile promotions <svcmobile_promotions@nvidia.com>
Tested-by: mobile promotions <svcmobile_promotions@nvidia.com>

1 files changed, 13 insertions, 2 deletions

diff --git a/sound/pci/hda/hda_tegra.c b/sound/pci/hda/hda_tegra.c
index 883e27c92..1a8262d1d 100644
--- a/sound/pci/hda/hda_tegra.c
+++ b/sound/pci/hda/hda_tegra.c
@@ -465,6 +465,7 @@ 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 *card_name;
 
         err = hda_tegra_init_chip(chip, pdev);
         if (err)
@@ -524,8 +525,18 @@ static int hda_tegra_first_init(struct azx *chip, struct platform_device *pdev)
                 return -ENODEV;
         }
 
-        strcpy(card->driver, "tegra-hda");
-        strcpy(card->shortname, "tegra-hda");
+
+        /* xavier onwards, passing card name from DT */
+        if (!of_property_read_string(pdev->dev.of_node, "hda,card-name",
+                &card_name)) {
+                strcpy(card->driver, card_name);
+                strcpy(card->shortname, card_name);
+        } else {
+                /* for platforms < xavier */
+                strcpy(card->driver, "tegra-hda");
+                strcpy(card->shortname, "tegra-hda");
+        }
+
         snprintf(card->longname, sizeof(card->longname),
                  "%s at 0x%lx irq %i",
                  card->shortname, bus->addr, bus->irq);