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

Commit cdd53d2d authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "usb: gadget: f_uac1: Add support for UAC1 function"

parents c2161416 7b33db7c

Documentation/usb/gadget-testing.txt

+2 −0
Original line number Diff line number Diff line
@@ -632,6 +632,8 @@ The uac2 function provides these attributes in its function directory: 
	p_chmask - playback channel mask

	p_srate - playback sampling rate

	p_ssize - playback sample size (bytes)

	req_number - the number of pre-allocated request for both capture

		     and playback



The attributes have sane default values.

arch/arm64/configs/msm-auto-perf_defconfig

+0 −1
Original line number Diff line number Diff line
@@ -459,7 +459,6 @@ CONFIG_USB_CONFIGFS_F_PTP=y 
CONFIG_USB_CONFIGFS_F_ACC=y

CONFIG_USB_CONFIGFS_F_AUDIO_SRC=y

CONFIG_USB_CONFIGFS_UEVENT=y

CONFIG_USB_CONFIGFS_F_UAC1=y

CONFIG_USB_CONFIGFS_F_MIDI=y

CONFIG_USB_CONFIGFS_F_DIAG=y

CONFIG_USB_CONFIGFS_F_CDEV=y

arch/arm64/configs/msm-auto_defconfig

+0 −1
Original line number Diff line number Diff line
@@ -463,7 +463,6 @@ CONFIG_USB_CONFIGFS_F_PTP=y 
CONFIG_USB_CONFIGFS_F_ACC=y

CONFIG_USB_CONFIGFS_F_AUDIO_SRC=y

CONFIG_USB_CONFIGFS_UEVENT=y

CONFIG_USB_CONFIGFS_F_UAC1=y

CONFIG_USB_CONFIGFS_F_MIDI=y

CONFIG_USB_CONFIGFS_F_DIAG=y

CONFIG_USB_CONFIGFS_F_CDEV=y

drivers/usb/gadget/Kconfig

+1 −0
Original line number Diff line number Diff line
@@ -499,6 +499,7 @@ config USB_CONFIGFS_F_UAC2 
	depends on SND

	select USB_LIBCOMPOSITE

	select SND_PCM

	select USB_U_AUDIO

	select USB_F_UAC2

	help

	  This Audio function is compatible with USB Audio Class

drivers/usb/gadget/function/f_uac2.c

+105 −701

File changed.

Preview size limit exceeded, changes collapsed.