aboutsummaryrefslogtreecommitdiffstats
path: root/sound/pci/hda/patch_intelhdmi.c
diff options
context:
space:
mode:
Diffstat (limited to 'sound/pci/hda/patch_intelhdmi.c')
-rw-r--r--sound/pci/hda/patch_intelhdmi.c18
1 files changed, 9 insertions, 9 deletions
diff --git a/sound/pci/hda/patch_intelhdmi.c b/sound/pci/hda/patch_intelhdmi.c
index 747aa84d0ecd..459b04576de1 100644
--- a/sound/pci/hda/patch_intelhdmi.c
+++ b/sound/pci/hda/patch_intelhdmi.c
@@ -85,7 +85,7 @@ struct hdmi_audio_infoframe {
85 u8 CXT04; 85 u8 CXT04;
86 u8 CA; 86 u8 CA;
87 u8 LFEPBL01_LSV36_DM_INH7; 87 u8 LFEPBL01_LSV36_DM_INH7;
88 u8 reserved[5]; /* PB6 - PB10 */ 88 u8 reserved[5]; /* PB6 - PB10 */
89}; 89};
90 90
91/* 91/*
@@ -160,7 +160,7 @@ static struct cea_channel_speaker_allocation channel_allocations[] = {
160{ .ca_index = 0x00, .speakers = { 0, 0, 0, 0, 0, 0, FR, FL } }, 160{ .ca_index = 0x00, .speakers = { 0, 0, 0, 0, 0, 0, FR, FL } },
161 /* 2.1 */ 161 /* 2.1 */
162{ .ca_index = 0x01, .speakers = { 0, 0, 0, 0, 0, LFE, FR, FL } }, 162{ .ca_index = 0x01, .speakers = { 0, 0, 0, 0, 0, LFE, FR, FL } },
163 /* dolby surround */ 163 /* Dolby Surround */
164{ .ca_index = 0x02, .speakers = { 0, 0, 0, 0, FC, 0, FR, FL } }, 164{ .ca_index = 0x02, .speakers = { 0, 0, 0, 0, FC, 0, FR, FL } },
165{ .ca_index = 0x03, .speakers = { 0, 0, 0, 0, FC, LFE, FR, FL } }, 165{ .ca_index = 0x03, .speakers = { 0, 0, 0, 0, FC, LFE, FR, FL } },
166{ .ca_index = 0x04, .speakers = { 0, 0, 0, RC, 0, 0, FR, FL } }, 166{ .ca_index = 0x04, .speakers = { 0, 0, 0, RC, 0, 0, FR, FL } },
@@ -287,7 +287,7 @@ static void hdmi_set_channel_count(struct hda_codec *codec, int chs)
287 287
288 if (chs != hdmi_get_channel_count(codec)) 288 if (chs != hdmi_get_channel_count(codec))
289 snd_printd(KERN_INFO "Channel count expect=%d, real=%d\n", 289 snd_printd(KERN_INFO "Channel count expect=%d, real=%d\n",
290 chs, hdmi_get_channel_count(codec)); 290 chs, hdmi_get_channel_count(codec));
291} 291}
292 292
293static void hdmi_debug_channel_mapping(struct hda_codec *codec) 293static void hdmi_debug_channel_mapping(struct hda_codec *codec)
@@ -300,7 +300,7 @@ static void hdmi_debug_channel_mapping(struct hda_codec *codec)
300 slot = snd_hda_codec_read(codec, CVT_NID, 0, 300 slot = snd_hda_codec_read(codec, CVT_NID, 0,
301 AC_VERB_GET_HDMI_CHAN_SLOT, i); 301 AC_VERB_GET_HDMI_CHAN_SLOT, i);
302 printk(KERN_DEBUG "ASP channel %d => slot %d\n", 302 printk(KERN_DEBUG "ASP channel %d => slot %d\n",
303 slot >> 4, slot & 0x7); 303 slot >> 4, slot & 0x7);
304 } 304 }
305#endif 305#endif
306} 306}
@@ -316,7 +316,7 @@ static void hdmi_parse_eld(struct hda_codec *codec)
316 316
317 317
318/* 318/*
319 * Audio Infoframe routines 319 * Audio InfoFrame routines
320 */ 320 */
321 321
322static void hdmi_debug_dip_size(struct hda_codec *codec) 322static void hdmi_debug_dip_size(struct hda_codec *codec)
@@ -547,8 +547,8 @@ static void intel_hdmi_unsol_event(struct hda_codec *codec, unsigned int res)
547 */ 547 */
548 548
549static int intel_hdmi_playback_pcm_open(struct hda_pcm_stream *hinfo, 549static int intel_hdmi_playback_pcm_open(struct hda_pcm_stream *hinfo,
550 struct hda_codec *codec, 550 struct hda_codec *codec,
551 struct snd_pcm_substream *substream) 551 struct snd_pcm_substream *substream)
552{ 552{
553 struct intel_hdmi_spec *spec = codec->spec; 553 struct intel_hdmi_spec *spec = codec->spec;
554 554
@@ -556,8 +556,8 @@ static int intel_hdmi_playback_pcm_open(struct hda_pcm_stream *hinfo,
556} 556}
557 557
558static int intel_hdmi_playback_pcm_close(struct hda_pcm_stream *hinfo, 558static int intel_hdmi_playback_pcm_close(struct hda_pcm_stream *hinfo,
559 struct hda_codec *codec, 559 struct hda_codec *codec,
560 struct snd_pcm_substream *substream) 560 struct snd_pcm_substream *substream)
561{ 561{
562 struct intel_hdmi_spec *spec = codec->spec; 562 struct intel_hdmi_spec *spec = codec->spec;
563 563