Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit cdbc653a authored by Takashi Iwai's avatar Takashi Iwai
Browse files

Merge branch 'for-next' into for-linus 



4.18-rc1 merge material.

Signed-off-by: default avatarTakashi Iwai <tiwai@suse.de>
parents 009f8c90 ceec4684

Documentation/sound/alsa-configuration.rst

+7 −0
Original line number Diff line number Diff line
@@ -2224,6 +2224,13 @@ quirk_alias 
    Quirk alias list, pass strings like ``0123abcd:5678beef``, which

    applies the existing quirk for the device 5678:beef to a new

    device 0123:abcd.

use_vmalloc

    Use vmalloc() for allocations of the PCM buffers (default: yes).

    For architectures with non-coherent memory like ARM or MIPS, the

    mmap access may give inconsistent results with vmalloc'ed

    buffers.  If mmap is used on such architectures, turn off this

    option, so that the DMA-coherent buffers are allocated and used

    instead.



This module supports multiple devices, autoprobe and hotplugging.

Documentation/sound/hd-audio/models.rst

+2 −0
Original line number Diff line number Diff line
@@ -263,6 +263,8 @@ hp-dock 
    HP dock support

mute-led-gpio

    Mute LED control via GPIO

hp-mic-fix

    Fix for headset mic pin on HP boxes



STAC9200

========

MAINTAINERS

+7 −0
Original line number Diff line number Diff line
@@ -15494,6 +15494,13 @@ S: Supported 
F:	arch/x86/xen/*swiotlb*

F:	drivers/xen/*swiotlb*



XEN SOUND FRONTEND DRIVER

M:	Oleksandr Andrushchenko <oleksandr_andrushchenko@epam.com>

L:	xen-devel@lists.xenproject.org (moderated for non-subscribers)

L:	alsa-devel@alsa-project.org (moderated for non-subscribers)

S:	Supported

F:	sound/xen/*



XFS FILESYSTEM

M:	Darrick J. Wong <darrick.wong@oracle.com>

M:	linux-xfs@vger.kernel.org

include/linux/usb/audio-v2.h

+7 −0
Original line number Diff line number Diff line
@@ -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)

include/linux/usb/audio-v3.h

+40 −0
Original line number Diff line number Diff line
@@ -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 */