USB-Audio/Realtek/ALC4080: conditional S/PDIF index, add back microphone (#1)

Fixes ASUS ROG Maximus XIII support.
C/Sub port is not tested.

Signed-off-by: Jaroslav Kysela <perex@perex.cz>

diff --git a/ucm2/USB-Audio/Realtek/ALC4080-HiFi.conf b/ucm2/USB-Audio/Realtek/ALC4080-HiFi.conf
index 9bbaf631d2b8cf996cc2a3640d141de0919a9490..52f6564b16e8d9888ca173595a7d966603c7644a 100644 (file)
--- a/ucm2/USB-Audio/Realtek/ALC4080-HiFi.conf
+++ b/ucm2/USB-Audio/Realtek/ALC4080-HiFi.conf
@@ -1,3 +1,14 @@
+Define.SPDIFIndex "3"
+
+If.asus-rog-usb {
+       Condition {
+               Type RegexMatch
+               String "${CardComponents}"
+               Regex "USB(0b05:1996)"
+       }
+       True.Define.SPDIFIndex "2"
+}
+
 SectionDevice."Speaker" {
        Comment "Speakers"
        Value {
@@ -23,7 +34,7 @@ SectionDevice."SPDIF" {
        Comment "S/PDIF Out"
        Value {
                PlaybackPriority 100
-               PlaybackPCM "hw:${CardId},3"
+               PlaybackPCM "hw:${CardId},${var:SPDIFIndex}"
                PlaybackMixerElem "IEC958"
        }
 }
@@ -47,11 +58,20 @@ SectionDevice."Mic" {
                cset "name='Mic Capture Switch' on"
        ]
 
-       Comment "Microphone"
+       Comment "Front Microphone"
        Value {
                CapturePriority 200
                CapturePCM "hw:${CardId},2"
                JackControl "Mic - Input Jack"
                CaptureMixerElem "Mic"
        }
+
+       # On ASUS ROG Maximus XIII and others, back microphone
+       Comment "Microphone"
+       Value {
+               CapturePriority 300
+               CapturePCM "hw:${CardId}"
+               JackControl "Mic - Input Jack"
+               CaptureMixerElem "Mic"
+       }
 }

diff --git a/ucm2/USB-Audio/Realtek/ALC4080.conf b/ucm2/USB-Audio/Realtek/ALC4080.conf
index a42dd68340bfadf3ce2a1a91bedb9b4f20433b22..3856d20c95fc9fd914c33306b4679040df161f41 100644 (file)
--- a/ucm2/USB-Audio/Realtek/ALC4080.conf
+++ b/ucm2/USB-Audio/Realtek/ALC4080.conf
@@ -1,5 +1,5 @@
 Comment "USB-audio on Realtek ALC4080"
 SectionUseCase."HiFi" {
        File "/USB-Audio/Realtek/ALC4080-HiFi.conf"
-       Comment "Default Alsa Profile"
+       Comment "Play HiFi quality Music"
 }