ALSA: hda - update hda vendor id

Vendor id changed for t12x.

Change-Id: I365f21f81db005bc14730a6f0b91893eb79a9fba
Signed-off-by: Manoj Gangwal <mgangwal@nvidia.com>
Reviewed-on: http://git-master/r/236763
Reviewed-by: Automatic_Commit_Validation_User
GVS: Gerrit_Virtual_Submit
Reviewed-by: Bharat Nihalani <bnihalani@nvidia.com>

1 files changed, 13 insertions, 5 deletions

diff --git a/sound/pci/hda/patch_hdmi.c b/sound/pci/hda/patch_hdmi.c
index 5ab5eeefe0ba..309cff50ef47 100644
--- a/sound/pci/hda/patch_hdmi.c
+++ b/sound/pci/hda/patch_hdmi.c
@@ -988,6 +988,7 @@ static void hdmi_intrinsic_event(struct hda_codec *codec, unsigned int res)
 #ifdef CONFIG_SND_HDA_PLATFORM_NVIDIA_TEGRA
 	if (((codec->preset->id == 0x10de0020) ||
 		(codec->preset->id == 0x10de0022) ||
+		(codec->preset->id == 0x10de0028) ||
 		(codec->preset->id == 0x10de002a))) {
 		/*
 		 * HDMI sink's ELD info cannot always be retrieved for now, e.g.
@@ -1147,7 +1148,8 @@ static int hdmi_pcm_open(struct hda_pcm_stream *hinfo,
 
 #ifdef CONFIG_SND_HDA_PLATFORM_NVIDIA_TEGRA
 	if ((((codec->preset->id == 0x10de0020) ||
-		(codec->preset->id == 0x10de0022)) ||
+		(codec->preset->id == 0x10de0022) ||
+		(codec->preset->id == 0x10de0028) ||
 		(codec->preset->id == 0x10de002a))) &&
 		(!eld->monitor_present || !eld->info.lpcm_sad_ready)) {
 		if (!eld->monitor_present) {
@@ -1338,6 +1340,7 @@ static void hdmi_repoll_eld(struct work_struct *work)
 #ifdef CONFIG_SND_HDA_PLATFORM_NVIDIA_TEGRA
 	if ((codec->preset->id == 0x10de0020) ||
 		(codec->preset->id == 0x10de0022) ||
+		(codec->preset->id == 0x10de0028) ||
 		(codec->preset->id == 0x10de002a)) {
 		/*
 		 * HDMI sink's ELD info cannot always be retrieved for now, e.g.
@@ -1467,10 +1470,11 @@ static int hdmi_parse_codec(struct hda_codec *codec)
 	 * HDA link is powered off at hot plug or hw initialization time.
 	 */
 	else if ((!(snd_hda_param_read(codec, codec->afg, AC_PAR_POWER_STATE) &
-	      AC_PWRST_EPSS)) && ((codec->preset->id != 0x10de0020) &&
-	      (codec->preset->id != 0x10de0022) &&
-	      (codec->preset->id != 0x10de002a)))
-		codec->bus->power_keep_link_on = 1;
+		    AC_PWRST_EPSS)) && ((codec->preset->id != 0x10de0020) &&
+					(codec->preset->id != 0x10de0022) &&
+					(codec->preset->id != 0x10de0028) &&
+					(codec->preset->id != 0x10de002a)))
+		 codec->bus->power_keep_link_on = 1;
 #endif
 
 	return 0;
@@ -1512,6 +1516,7 @@ static int generic_hdmi_playback_pcm_prepare(struct hda_pcm_stream *hinfo,
 #if defined(CONFIG_SND_HDA_PLATFORM_NVIDIA_TEGRA) && defined(CONFIG_TEGRA_DC)
 	if ((codec->preset->id == 0x10de0020) ||
 		(codec->preset->id == 0x10de0022) ||
+		(codec->preset->id == 0x10de0028) ||
 		(codec->preset->id == 0x10de002a)) {
 		int err = 0;
 
@@ -1825,6 +1830,7 @@ static int generic_hdmi_init_per_pins(struct hda_codec *codec)
 	switch (codec->preset->id) {
 	case 0x10de0020:
 	case 0x10de0022:
+	case 0x10de0028:
 	case 0x10de002a:
 		snd_hda_codec_write(codec, 4, 0,
 				    AC_VERB_SET_DIGI_CONVERT_1, 0x11);
@@ -2643,6 +2649,7 @@ static const struct hda_codec_preset snd_hda_preset_hdmi[] = {
 { .id = 0x10de0020, .name = "Tegra30 HDMI",	.patch = patch_generic_hdmi },
 { .id = 0x10de0022, .name = "Tegra35 HDMI",	.patch = patch_generic_hdmi },
 { .id = 0x10de002a, .name = "Tegra14x HDMI",	.patch = patch_generic_hdmi },
+{ .id = 0x10de0028, .name = "Tegra12x HDMI",	.patch = patch_generic_hdmi },
 { .id = 0x10de0040, .name = "GPU 40 HDMI/DP",	.patch = patch_generic_hdmi },
 { .id = 0x10de0041, .name = "GPU 41 HDMI/DP",	.patch = patch_generic_hdmi },
 { .id = 0x10de0042, .name = "GPU 42 HDMI/DP",	.patch = patch_generic_hdmi },
@@ -2698,6 +2705,7 @@ MODULE_ALIAS("snd-hda-codec-id:10de001b");
 MODULE_ALIAS("snd-hda-codec-id:10de001c");
 MODULE_ALIAS("snd-hda-codec-id:10de0020");
 MODULE_ALIAS("snd-hda-codec-id:10de0022");
+MODULE_ALIAS("snd-hda-codec-id:10de0028");
 MODULE_ALIAS("snd-hda-codec-id:10de002a");
 MODULE_ALIAS("snd-hda-codec-id:10de0040");
 MODULE_ALIAS("snd-hda-codec-id:10de0041");