From: Ville Syrjälä ville.syrjala@linux.intel.com
Now that the kernel driver exposes several pcm devices, update the hdmi pcm definitions to match.
Cc: Takashi Iwai tiwai@suse.de Cc: Pierre-Louis Bossart pierre-louis.bossart@linux.intel.com Signed-off-by: Ville Syrjälä ville.syrjala@linux.intel.com --- src/conf/cards/HdmiLpeAudio.conf | 74 ++++++++++++++++++++++++++++++++++++++-- 1 file changed, 72 insertions(+), 2 deletions(-)
diff --git a/src/conf/cards/HdmiLpeAudio.conf b/src/conf/cards/HdmiLpeAudio.conf index 61bdfeae2917..ad174b8ac450 100644 --- a/src/conf/cards/HdmiLpeAudio.conf +++ b/src/conf/cards/HdmiLpeAudio.conf @@ -51,11 +51,14 @@ HdmiLpeAudio.pcm.default {
-HdmiLpeAudio.pcm.hdmi.0 { - @args [ CARD AES0 AES1 AES2 AES3 ] +HdmiLpeAudio.pcm.hdmi.common { + @args [ CARD DEVICE AES0 AES1 AES2 AES3 ] @args.CARD { type string } + @args.DEVICE { + type integer + } @args.AES0 { type integer } @@ -72,6 +75,7 @@ HdmiLpeAudio.pcm.hdmi.0 { slave.pcm { type hw card $CARD + device $DEVICE } hooks.0 { type ctl_elems @@ -86,3 +90,69 @@ HdmiLpeAudio.pcm.hdmi.0 { ] } } + +HdmiLpeAudio.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.HdmiLpeAudio.pcm.hdmi.common:" + "CARD=" $CARD "," + "DEVICE=0," + "AES0=" $AES0 "," + "AES1=" $AES1 "," + "AES2=" $AES2 "," + "AES3=" $AES3 + ] + } +} + +HdmiLpeAudio.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.HdmiLpeAudio.pcm.hdmi.common:" + "CARD=" $CARD "," + "DEVICE=1," + "AES0=" $AES0 "," + "AES1=" $AES1 "," + "AES2=" $AES2 "," + "AES3=" $AES3 + ] + } +} + +HdmiLpeAudio.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.HdmiLpeAudio.pcm.hdmi.common:" + "CARD=" $CARD "," + "DEVICE=2," + "AES0=" $AES0 "," + "AES1=" $AES1 "," + "AES2=" $AES2 "," + "AES3=" $AES3 + ] + } +}