diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2019-10-18 09:21:13 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2019-10-18 09:21:13 -0700 |
| commit | 5f93393a15f0f19e7fef35fcf1e6b6ffc351108d (patch) | |
| tree | 71456c274f39a980070e1ce421de3bfd09086ab1 /include | |
| parent | adca4ce32f4aebe65d817901cf27ede58fa2d143 (diff) | |
| parent | 94989e318b2f11e217e86bee058088064fa9a2e9 (diff) | |
| download | linux-5f93393a15f0f19e7fef35fcf1e6b6ffc351108d.tar.bz2 | |
Merge tag 'sound-5.4-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound
Pull sound fixes from Takashi Iwai:
"Just a few small fixes for the usual suspect, HD- and USB-audio:
enablement of runtime PM for Nvidia due to the recent PCI changes, a
fix for potential hangs with recent HD-audio platforms, and the rest
device-specific quirks"
* tag 'sound-5.4-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound:
ALSA: hda - Force runtime PM on Nvidia HDMI codecs
ALSA: hda/realtek - Enable headset mic on Asus MJ401TA
ALSA: usb-audio: Disable quirks for BOSS Katana amplifiers
ALSA: hdac: clear link output stream mapping
ALSA: hda/realtek: Reduce the Headphone static noise on XPS 9350/9360
Diffstat (limited to 'include')
| -rw-r--r-- | include/sound/hda_register.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/include/sound/hda_register.h b/include/sound/hda_register.h index 0fd39295b426..057d2a2d0bd0 100644 --- a/include/sound/hda_register.h +++ b/include/sound/hda_register.h @@ -264,6 +264,9 @@ enum { SDI0, SDI1, SDI2, SDI3, SDO0, SDO1, SDO2, SDO3 }; #define AZX_REG_ML_LOUTPAY 0x20 #define AZX_REG_ML_LINPAY 0x30 +/* bit0 is reserved, with BIT(1) mapping to stream1 */ +#define ML_LOSIDV_STREAM_MASK 0xFFFE + #define ML_LCTL_SCF_MASK 0xF #define AZX_MLCTL_SPA (0x1 << 16) #define AZX_MLCTL_CPA (0x1 << 23) |