| Message ID | 20201115153843.1109200-1-kai.heng.feng@canonical.com |
|---|---|
| State | Accepted |
| Commit | e5633b95dce915c2ade5ce1c90d295d555396c60 |
| Headers | show |
| Series | ALSA: usb-audio: Use ALC1220-VB-DT mapping for ASUS ROG Strix TRX40 mobo | expand |
On Sun, 15 Nov 2020 16:38:42 +0100, Kai-Heng Feng wrote: > > ASUS ROG Strix also uses ALC1220-VB-DT, so adjust the mapping and add > profile name to let userspace pick correct UCM profile. > > BugLink: https://gitlab.freedesktop.org/pulseaudio/pulseaudio/-/issues/1031 > Signed-off-by: Kai-Heng Feng <kai.heng.feng@canonical.com> Thanks, applied now. Takashi
diff --git a/sound/usb/card.c b/sound/usb/card.c index fa764b61fe9c..4457214a3ae6 100644 --- a/sound/usb/card.c +++ b/sound/usb/card.c @@ -379,6 +379,10 @@ static const struct usb_audio_device_name usb_audio_names[] = { DEVICE_NAME(0x046d, 0x0990, "Logitech, Inc.", "QuickCam Pro 9000"), + /* ASUS ROG Strix */ + PROFILE_NAME(0x0b05, 0x1917, + "Realtek", "ALC1220-VB-DT", "Realtek-ALC1220-VB-Desktop"), + /* Dell WD15 Dock */ PROFILE_NAME(0x0bda, 0x4014, "Dell", "WD15 Dock", "Dell-WD15-Dock"), /* Dell WD19 Dock */ diff --git a/sound/usb/mixer_maps.c b/sound/usb/mixer_maps.c index c369c81e74c4..a7212f16660e 100644 --- a/sound/usb/mixer_maps.c +++ b/sound/usb/mixer_maps.c @@ -561,7 +561,8 @@ static const struct usbmix_ctl_map usbmix_ctl_maps[] = { }, { /* ASUS ROG Strix */ .id = USB_ID(0x0b05, 0x1917), - .map = asus_rog_map, + .map = trx40_mobo_map, + .connector_map = trx40_mobo_connector_map, }, { /* MSI TRX40 Creator */ .id = USB_ID(0x0db0, 0x0d64),
ASUS ROG Strix also uses ALC1220-VB-DT, so adjust the mapping and add profile name to let userspace pick correct UCM profile. BugLink: https://gitlab.freedesktop.org/pulseaudio/pulseaudio/-/issues/1031 Signed-off-by: Kai-Heng Feng <kai.heng.feng@canonical.com> --- sound/usb/card.c | 4 ++++ sound/usb/mixer_maps.c | 3 ++- 2 files changed, 6 insertions(+), 1 deletion(-)