HDA-Intel: present all 4 HDMI outputs instead of just the first one

Commit 92608badc519a8c1f65d93743396517aaa582b53 in linux kernel added
the possibility of 3 additional HDMI devices on indexes 7-9.

Present all those additional devices using the "hdmi" alias as well.

Signed-off-by: Anssi Hannula <anssi.hannula@iki.fi>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
This commit is contained in:
Anssi Hannula 2010-08-03 20:27:49 +03:00 committed by Takashi Iwai
parent eb3768563a
commit e6d5dcf1f6

View file

@ -142,11 +142,17 @@ HDA-Intel.pcm.iec958.0 {
<confdir:pcm/hdmi.conf> <confdir:pcm/hdmi.conf>
HDA-Intel.pcm.hdmi.0 { HDA-Intel.pcm.hdmi.common {
@args [ CARD AES0 AES1 AES2 AES3 ] @args [ CARD DEVICE CTLINDEX AES0 AES1 AES2 AES3 ]
@args.CARD { @args.CARD {
type string type string
} }
@args.DEVICE {
type integer
}
@args.CTLINDEX {
type integer
}
@args.AES0 { @args.AES0 {
type integer type integer
} }
@ -163,26 +169,120 @@ HDA-Intel.pcm.hdmi.0 {
slave.pcm { slave.pcm {
type hw type hw
card $CARD card $CARD
device 3 device $DEVICE
} }
hooks.0 { hooks.0 {
type ctl_elems type ctl_elems
hook_args [ hook_args [
{ {
name "IEC958 Playback Default" name "IEC958 Playback Default"
index $CTLINDEX
lock true lock true
preserve true preserve true
value [ $AES0 $AES1 $AES2 $AES3 ] value [ $AES0 $AES1 $AES2 $AES3 ]
} }
{ {
name "IEC958 Playback Switch" name "IEC958 Playback Switch"
index $CTLINDEX
lock true lock true
preserve true preserve true
value true value true
} }
] ]
} }
hint.device 3 hint.device $DEVICE
}
HDA-Intel.pcm.hdmi.0 {
@args [ CARD AES0 AES1 AES2 AES3 ]
@args.CARD { type string }
@args.AES0 { type integer }
@args.AES1 { type integer }
@args.AES2 { type integer }
@args.AES3 { type integer }
@func refer
name {
@func concat
strings [
"cards.HDA-Intel.pcm.hdmi.common:"
"CARD=" $CARD ","
"DEVICE=3,"
"CTLINDEX=0,"
"AES0=" $AES0 ","
"AES1=" $AES1 ","
"AES2=" $AES2 ","
"AES3=" $AES3
]
}
}
HDA-Intel.pcm.hdmi.1 {
@args [ CARD AES0 AES1 AES2 AES3 ]
@args.CARD { type string }
@args.AES0 { type integer }
@args.AES1 { type integer }
@args.AES2 { type integer }
@args.AES3 { type integer }
@func refer
name {
@func concat
strings [
"cards.HDA-Intel.pcm.hdmi.common:"
"CARD=" $CARD ","
"DEVICE=7,"
"CTLINDEX=1,"
"AES0=" $AES0 ","
"AES1=" $AES1 ","
"AES2=" $AES2 ","
"AES3=" $AES3
]
}
}
HDA-Intel.pcm.hdmi.2 {
@args [ CARD AES0 AES1 AES2 AES3 ]
@args.CARD { type string }
@args.AES0 { type integer }
@args.AES1 { type integer }
@args.AES2 { type integer }
@args.AES3 { type integer }
@func refer
name {
@func concat
strings [
"cards.HDA-Intel.pcm.hdmi.common:"
"CARD=" $CARD ","
"DEVICE=8,"
"CTLINDEX=2,"
"AES0=" $AES0 ","
"AES1=" $AES1 ","
"AES2=" $AES2 ","
"AES3=" $AES3
]
}
}
HDA-Intel.pcm.hdmi.3 {
@args [ CARD AES0 AES1 AES2 AES3 ]
@args.CARD { type string }
@args.AES0 { type integer }
@args.AES1 { type integer }
@args.AES2 { type integer }
@args.AES3 { type integer }
@func refer
name {
@func concat
strings [
"cards.HDA-Intel.pcm.hdmi.common:"
"CARD=" $CARD ","
"DEVICE=9,"
"CTLINDEX=3,"
"AES0=" $AES0 ","
"AES1=" $AES1 ","
"AES2=" $AES2 ","
"AES3=" $AES3
]
}
} }
<confdir:pcm/modem.conf> <confdir:pcm/modem.conf>