Merge tag 'sound-4.18-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound
Pull sound updates from Takashi Iwai: "We've got many code additions at this cycle as a result of quite a few new drivers. Below are highlights: Core stuff: - Fix the long-standing issue with the device registration order; the control device is now registered at last - PCM locking code cleanups for RT kernels - Fixes for possible races in ALSA timer resolution accesses - TLV offset definitions in uapi ASoC: - Many fixes for the topology stuff, including fixes for v4 ABI compatibility - Lots of cleanups / quirks for Intel platforms based on Realtek CODECs - Continued componentization works, removing legacy CODEC stuff - Conversion of OMAP DMA to the new, more standard SDMA-PCM driver - Fixes and updates to Cirrus Logic SoC drivers - New Qualcomm DSP support - New drivers for Analog SSM2305, Atmel I2S controllers, Mediatek MT6351, MT6797 and MT7622, Qualcomm DSPs, Realtek RT1305, RT1306 and RT5668 and TI TSCS454 HD-audio: - Finally better support for some CA0132 boards, allowing Windows firmware - HP Spectre x360 support along with a bulk of COEF stuff - Blacklisting power save default some known boards reported on Fedora USB-audio: - Continued improvements on UAC3 support; now BADD is supported - Fixes / improvements for Dell WD15 dock - Allow DMA coherent pages for PCM buffers for ARCH, MIPS & co Others: - New Xen sound frontend driver support - Cache implementation and other improvements for FireWire DICE - Conversions to octal permissions in allover places" * tag 'sound-4.18-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound: (386 commits) ASoC: dapm: delete dapm_kcontrol_data paths list before freeing it ALSA: usb-audio: remove redundant check on err ASoC: topology: Move skl-tplg-interface.h to uapi ASoC: topology: Move v4 manifest header data structures to uapi ASoC: topology: Improve backwards compatibility with v4 topology files ALSA: pci/hda: Remove unused, broken, header file ASoC: TSCS454: Add Support ASoC: Intel: kbl: Move codec sysclk config to codec_init function ASoC: simple-card: set cpu dai clk in hw_params ALSA: hda - Handle kzalloc() failure in snd_hda_attach_pcm_stream() ALSA: oxygen: use match_string() helper ASoC: dapm: use match_string() helper ASoC: max98095: use match_string() helper ASoC: max98088: use match_string() helper ASoC: Intel: bytcr_rt5651: Set card long_name based on quirks ASoC: mt6797-mt6351: add hostless phone call path ASoC: mt6797: add Hostless DAI ASoC: mt6797: add PCM interface ASoC: mediatek: export mtk-afe symbols as needed ASoC: codecs: PCM1789: include gpio/consumer.h ...
This commit is contained in:
@@ -189,6 +189,13 @@ struct uac2_iso_endpoint_descriptor {
|
||||
#define UAC2_CONTROL_DATA_OVERRUN (3 << 2)
|
||||
#define UAC2_CONTROL_DATA_UNDERRUN (3 << 4)
|
||||
|
||||
/* 5.2.5.4.2 Connector Control Parameter Block */
|
||||
struct uac2_connectors_ctl_blk {
|
||||
__u8 bNrChannels;
|
||||
__le32 bmChannelConfig;
|
||||
__u8 iChannelNames;
|
||||
} __attribute__((packed));
|
||||
|
||||
/* 6.1 Interrupt Data Message */
|
||||
|
||||
#define UAC2_INTERRUPT_DATA_MSG_VENDOR (1 << 0)
|
||||
|
@@ -221,6 +221,12 @@ struct uac3_iso_endpoint_descriptor {
|
||||
__le16 wLockDelay;
|
||||
} __attribute__((packed));
|
||||
|
||||
/* 5.2.1.6.1 INSERTION CONTROL PARAMETER BLOCK */
|
||||
struct uac3_insertion_ctl_blk {
|
||||
__u8 bSize;
|
||||
__u8 bmConInserted;
|
||||
} __attribute__ ((packed));
|
||||
|
||||
/* 6.1 INTERRUPT DATA MESSAGE */
|
||||
struct uac3_interrupt_data_msg {
|
||||
__u8 bInfo;
|
||||
@@ -392,4 +398,38 @@ struct uac3_interrupt_data_msg {
|
||||
#define UAC3_AC_ACTIVE_INTERFACE_CONTROL 0x01
|
||||
#define UAC3_AC_POWER_DOMAIN_CONTROL 0x02
|
||||
|
||||
/* A.23.5 TERMINAL CONTROL SELECTORS */
|
||||
#define UAC3_TE_UNDEFINED 0x00
|
||||
#define UAC3_TE_INSERTION 0x01
|
||||
#define UAC3_TE_OVERLOAD 0x02
|
||||
#define UAC3_TE_UNDERFLOW 0x03
|
||||
#define UAC3_TE_OVERFLOW 0x04
|
||||
#define UAC3_TE_LATENCY 0x05
|
||||
|
||||
/* BADD predefined Unit/Terminal values */
|
||||
#define UAC3_BADD_IT_ID1 1 /* Input Terminal ID1: bTerminalID = 1 */
|
||||
#define UAC3_BADD_FU_ID2 2 /* Feature Unit ID2: bUnitID = 2 */
|
||||
#define UAC3_BADD_OT_ID3 3 /* Output Terminal ID3: bTerminalID = 3 */
|
||||
#define UAC3_BADD_IT_ID4 4 /* Input Terminal ID4: bTerminalID = 4 */
|
||||
#define UAC3_BADD_FU_ID5 5 /* Feature Unit ID5: bUnitID = 5 */
|
||||
#define UAC3_BADD_OT_ID6 6 /* Output Terminal ID6: bTerminalID = 6 */
|
||||
#define UAC3_BADD_FU_ID7 7 /* Feature Unit ID7: bUnitID = 7 */
|
||||
#define UAC3_BADD_MU_ID8 8 /* Mixer Unit ID8: bUnitID = 8 */
|
||||
#define UAC3_BADD_CS_ID9 9 /* Clock Source Entity ID9: bClockID = 9 */
|
||||
#define UAC3_BADD_PD_ID10 10 /* Power Domain ID10: bPowerDomainID = 10 */
|
||||
#define UAC3_BADD_PD_ID11 11 /* Power Domain ID11: bPowerDomainID = 11 */
|
||||
|
||||
/* BADD wMaxPacketSize of AS endpoints */
|
||||
#define UAC3_BADD_EP_MAXPSIZE_SYNC_MONO_16 0x0060
|
||||
#define UAC3_BADD_EP_MAXPSIZE_ASYNC_MONO_16 0x0062
|
||||
#define UAC3_BADD_EP_MAXPSIZE_SYNC_MONO_24 0x0090
|
||||
#define UAC3_BADD_EP_MAXPSIZE_ASYNC_MONO_24 0x0093
|
||||
#define UAC3_BADD_EP_MAXPSIZE_SYNC_STEREO_16 0x00C0
|
||||
#define UAC3_BADD_EP_MAXPSIZE_ASYNC_STEREO_16 0x00C4
|
||||
#define UAC3_BADD_EP_MAXPSIZE_SYNC_STEREO_24 0x0120
|
||||
#define UAC3_BADD_EP_MAXPSIZE_ASYNC_STEREO_24 0x0126
|
||||
|
||||
/* BADD sample rate is always fixed to 48kHz */
|
||||
#define UAC3_BADD_SAMPLING_RATE 48000
|
||||
|
||||
#endif /* __LINUX_USB_AUDIO_V3_H */
|
||||
|
Reference in New Issue
Block a user