Merge branch 'topic/misc' into for-linus (e38302f7) · Commits · e / devices / android_kernel_fairphone_FP5

Documentation/sound/alsa/ALSA-Configuration.txt

+9 −11

Original line number	Original line	Diff line number	Diff line
	@@ -974,13 +974,6 @@ Prior to version 0.9.0rc4 options had a 'snd_' prefix. This was removed.

	See hdspm.txt for details.		See hdspm.txt for details.

	Module snd-hifier
	-----------------

	Module for the MediaTek/TempoTec HiFier Fantasia sound card.

	This module supports autoprobe and multiple cards.

	Module snd-ice1712		Module snd-ice1712
	------------------		------------------

	@@ -1531,15 +1524,20 @@ Prior to version 0.9.0rc4 options had a 'snd_' prefix. This was removed.
	Module snd-oxygen		Module snd-oxygen
	-----------------		-----------------

	Module for sound cards based on the C-Media CMI8788 chip:		Module for sound cards based on the C-Media CMI8786/8787/8788 chip:
	* Asound A-8788		* Asound A-8788
			* Asus Xonar DG
	* AuzenTech X-Meridian		* AuzenTech X-Meridian
			* AuzenTech X-Meridian 2G
	* Bgears b-Enspirer		* Bgears b-Enspirer
	* Club3D Theatron DTS		* Club3D Theatron DTS
	* HT-Omega Claro (plus)		* HT-Omega Claro (plus)
	* HT-Omega Claro halo (XT)		* HT-Omega Claro halo (XT)
			* Kuroutoshikou CMI8787-HG2PCI
	* Razer Barracuda AC-1		* Razer Barracuda AC-1
	* Sondigo Inferno		* Sondigo Inferno
			* TempoTec HiFier Fantasia
			* TempoTec HiFier Serenade

	This module supports autoprobe and multiple cards.		This module supports autoprobe and multiple cards.

	@@ -2006,9 +2004,9 @@ Prior to version 0.9.0rc4 options had a 'snd_' prefix. This was removed.
	Module snd-virtuoso		Module snd-virtuoso
	-------------------		-------------------

	Module for sound cards based on the Asus AV100/AV200 chips,		Module for sound cards based on the Asus AV66/AV100/AV200 chips,
	i.e., Xonar D1, DX, D2, D2X, DS, HDAV1.3 (Deluxe), Essence ST		i.e., Xonar D1, DX, D2, D2X, DS, Essence ST (Deluxe), Essence STX,
	(Deluxe) and Essence STX.		HDAV1.3 (Deluxe), and HDAV1.3 Slim.

	This module supports autoprobe and multiple cards.		This module supports autoprobe and multiple cards.

MAINTAINERS

+43 −0

Original line number	Original line	Diff line number	Diff line
	@@ -1434,6 +1434,14 @@ S: Supported
	F: block/bsg.c		F: block/bsg.c
	F: include/linux/bsg.h		F: include/linux/bsg.h

			BT87X AUDIO DRIVER
			M: Clemens Ladisch <clemens@ladisch.de>
			L: alsa-devel@alsa-project.org (moderated for non-subscribers)
			T: git git://git.alsa-project.org/alsa-kernel.git
			S: Maintained
			F: Documentation/sound/alsa/Bt87x.txt
			F: sound/pci/bt87x.c

	BT8XXGPIO DRIVER		BT8XXGPIO DRIVER
	M: Michael Buesch <mb@bu3sch.de>		M: Michael Buesch <mb@bu3sch.de>
	W: http://bu3sch.de/btgpio.php		W: http://bu3sch.de/btgpio.php
	@@ -1459,6 +1467,13 @@ S: Maintained
	F: Documentation/video4linux/bttv/		F: Documentation/video4linux/bttv/
	F: drivers/media/video/bt8xx/bttv*		F: drivers/media/video/bt8xx/bttv*

			C-MEDIA CMI8788 DRIVER
			M: Clemens Ladisch <clemens@ladisch.de>
			L: alsa-devel@alsa-project.org (moderated for non-subscribers)
			T: git git://git.alsa-project.org/alsa-kernel.git
			S: Maintained
			F: sound/pci/oxygen/

	CACHEFILES: FS-CACHE BACKEND FOR CACHING ON MOUNTED FILESYSTEMS		CACHEFILES: FS-CACHE BACKEND FOR CACHING ON MOUNTED FILESYSTEMS
	M: David Howells <dhowells@redhat.com>		M: David Howells <dhowells@redhat.com>
	L: linux-cachefs@redhat.com		L: linux-cachefs@redhat.com
	@@ -2249,6 +2264,13 @@ W: bluesmoke.sourceforge.net
	S: Maintained		S: Maintained
	F: drivers/edac/r82600_edac.c		F: drivers/edac/r82600_edac.c

			EDIROL UA-101/UA-1000 DRIVER
			M: Clemens Ladisch <clemens@ladisch.de>
			L: alsa-devel@alsa-project.org (moderated for non-subscribers)
			T: git git://git.alsa-project.org/alsa-kernel.git
			S: Maintained
			F: sound/usb/misc/ua101.c

	EEEPC LAPTOP EXTRAS DRIVER		EEEPC LAPTOP EXTRAS DRIVER
	M: Corentin Chary <corentincj@iksaif.net>		M: Corentin Chary <corentincj@iksaif.net>
	L: acpi4asus-user@lists.sourceforge.net		L: acpi4asus-user@lists.sourceforge.net
	@@ -3393,6 +3415,13 @@ L: linux-serial@vger.kernel.org
	S: Maintained		S: Maintained
	F: drivers/serial/jsm/		F: drivers/serial/jsm/

			K10TEMP HARDWARE MONITORING DRIVER
			M: Clemens Ladisch <clemens@ladisch.de>
			L: lm-sensors@lm-sensors.org
			S: Maintained
			F: Documentation/hwmon/k10temp
			F: drivers/hwmon/k10temp.c

	K8TEMP HARDWARE MONITORING DRIVER		K8TEMP HARDWARE MONITORING DRIVER
	M: Rudolf Marek <r.marek@assembler.cz>		M: Rudolf Marek <r.marek@assembler.cz>
	L: lm-sensors@lm-sensors.org		L: lm-sensors@lm-sensors.org
	@@ -4409,6 +4438,13 @@ F: drivers/of
	F: include/linux/of*.h		F: include/linux/of*.h
	K: of_get_property		K: of_get_property

			OPL4 DRIVER
			M: Clemens Ladisch <clemens@ladisch.de>
			L: alsa-devel@alsa-project.org (moderated for non-subscribers)
			T: git git://git.alsa-project.org/alsa-kernel.git
			S: Maintained
			F: sound/drivers/opl4/

	OPROFILE		OPROFILE
	M: Robert Richter <robert.richter@amd.com>		M: Robert Richter <robert.richter@amd.com>
	L: oprofile-list@lists.sf.net		L: oprofile-list@lists.sf.net
	@@ -6141,6 +6177,13 @@ S: Maintained
	W: http://www.one-eyed-alien.net/~mdharm/linux-usb/		W: http://www.one-eyed-alien.net/~mdharm/linux-usb/
	F: drivers/usb/storage/		F: drivers/usb/storage/

			USB MIDI DRIVER
			M: Clemens Ladisch <clemens@ladisch.de>
			L: alsa-devel@alsa-project.org (moderated for non-subscribers)
			T: git git://git.alsa-project.org/alsa-kernel.git
			S: Maintained
			F: sound/usb/midi.*

	USB OHCI DRIVER		USB OHCI DRIVER
	M: David Brownell <dbrownell@users.sourceforge.net>		M: David Brownell <dbrownell@users.sourceforge.net>
	L: linux-usb@vger.kernel.org		L: linux-usb@vger.kernel.org

include/sound/asound.h

+3 −0

Original line number	Original line	Diff line number	Diff line
	@@ -259,6 +259,7 @@ typedef int __bitwise snd_pcm_subformat_t;
	#define SNDRV_PCM_INFO_HALF_DUPLEX 0x00100000 /* only half duplex */		#define SNDRV_PCM_INFO_HALF_DUPLEX 0x00100000 /* only half duplex */
	#define SNDRV_PCM_INFO_JOINT_DUPLEX 0x00200000 /* playback and capture stream are somewhat correlated */		#define SNDRV_PCM_INFO_JOINT_DUPLEX 0x00200000 /* playback and capture stream are somewhat correlated */
	#define SNDRV_PCM_INFO_SYNC_START 0x00400000 /* pcm support some kind of sync go */		#define SNDRV_PCM_INFO_SYNC_START 0x00400000 /* pcm support some kind of sync go */
			#define SNDRV_PCM_INFO_NO_PERIOD_WAKEUP 0x00800000 /* period wakeup can be disabled */
	#define SNDRV_PCM_INFO_FIFO_IN_FRAMES 0x80000000 /* internal kernel flag - FIFO size is in frames */		#define SNDRV_PCM_INFO_FIFO_IN_FRAMES 0x80000000 /* internal kernel flag - FIFO size is in frames */

	typedef int __bitwise snd_pcm_state_t;		typedef int __bitwise snd_pcm_state_t;
	@@ -334,6 +335,8 @@ typedef int snd_pcm_hw_param_t;
	#define SNDRV_PCM_HW_PARAM_LAST_INTERVAL SNDRV_PCM_HW_PARAM_TICK_TIME		#define SNDRV_PCM_HW_PARAM_LAST_INTERVAL SNDRV_PCM_HW_PARAM_TICK_TIME

	#define SNDRV_PCM_HW_PARAMS_NORESAMPLE (1<<0) /* avoid rate resampling */		#define SNDRV_PCM_HW_PARAMS_NORESAMPLE (1<<0) /* avoid rate resampling */
			#define SNDRV_PCM_HW_PARAMS_EXPORT_BUFFER (1<<1) /* export buffer */
			#define SNDRV_PCM_HW_PARAMS_NO_PERIOD_WAKEUP (1<<2) /* disable period wakeups */

	struct snd_interval {		struct snd_interval {
	unsigned int min, max;		unsigned int min, max;

include/sound/control.h

+3 −1

Original line number	Original line	Diff line number	Diff line
	@@ -160,12 +160,14 @@ static inline struct snd_ctl_elem_id *snd_ctl_build_ioff(struct snd_ctl_elem_id
	}		}

	/*		/*
	* Frequently used control callbacks		* Frequently used control callbacks/helpers
	*/		*/
	int snd_ctl_boolean_mono_info(struct snd_kcontrol *kcontrol,		int snd_ctl_boolean_mono_info(struct snd_kcontrol *kcontrol,
	struct snd_ctl_elem_info *uinfo);		struct snd_ctl_elem_info *uinfo);
	int snd_ctl_boolean_stereo_info(struct snd_kcontrol *kcontrol,		int snd_ctl_boolean_stereo_info(struct snd_kcontrol *kcontrol,
	struct snd_ctl_elem_info *uinfo);		struct snd_ctl_elem_info *uinfo);
			int snd_ctl_enum_info(struct snd_ctl_elem_info *info, unsigned int channels,
			unsigned int items, const char *const names[]);

	/*		/*
	* virtual master control		* virtual master control

include/sound/hdsp.h

+1 −0

Original line number	Original line	Diff line number	Diff line
	@@ -28,6 +28,7 @@ enum HDSP_IO_Type {
	Multiface,		Multiface,
	H9652,		H9652,
	H9632,		H9632,
			RPM,
	Undefined,		Undefined,
	};		};