Merge branch 'topic/misc' of... (b8f1f598) · Commits · e / devices / android_kernel_teracube_2e

Documentation/sound/alsa/ALSA-Configuration.txt

+25 −0

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

		reference_rate - reference sample rate, 44100 or 48000 (default)
		multiple - multiple to ref. sample rate, 1 or 2 (default)
		subsystem - override the PCI SSID for probing; the value
		consists of SSVID << 16 \| SSDID. The default is
		zero, which means no override.

		This module supports multiple cards.

		@@ -1123,6 +1126,21 @@ Prior to version 0.9.0rc4 options had a 'snd_' prefix. This was removed.

		This module supports multiple cards, autoprobe and ISA PnP.

		Module snd-jazz16
		-------------------

		Module for Media Vision Jazz16 chipset. The chipset consists of 3 chips:
		MVD1216 + MVA416 + MVA514.

		port - port # for SB DSP chip (0x210,0x220,0x230,0x240,0x250,0x260)
		irq - IRQ # for SB DSP chip (3,5,7,9,10,15)
		dma8 - DMA # for SB DSP chip (1,3)
		dma16 - DMA # for SB DSP chip (5,7)
		mpu_port - MPU-401 port # (0x300,0x310,0x320,0x330)
		mpu_irq - MPU-401 irq # (2,3,5,7)

		This module supports multiple cards.

		Module snd-korg1212
		-------------------

		@@ -1791,6 +1809,13 @@ Prior to version 0.9.0rc4 options had a 'snd_' prefix. This was removed.

		The power-management is supported.

		Module snd-ua101
		----------------

		Module for the Edirol UA-101 audio/MIDI interface.

		This module supports multiple devices, autoprobe and hotplugging.

		Module snd-usb-audio
		--------------------

include/sound/core.h

+3 −0

Original line number	Diff line number	Diff line
		@@ -458,5 +458,8 @@ struct snd_pci_quirk {
		const struct snd_pci_quirk *
		snd_pci_quirk_lookup(struct pci_dev pci, const struct snd_pci_quirk list);

		const struct snd_pci_quirk *
		snd_pci_quirk_lookup_id(u16 vendor, u16 device,
		const struct snd_pci_quirk *list);

		#endif /* __SOUND_CORE_H */

include/sound/cs46xx_dsp_spos.h

+4 −2

Original line number	Diff line number	Diff line
		@@ -118,9 +118,11 @@ struct dsp_scb_descriptor {

		struct snd_info_entry *proc_info;
		int ref_count;
		spinlock_t lock;

		int deleted;
		u16 volume[2];
		unsigned int deleted :1;
		unsigned int updated :1;
		unsigned int volume_set :1;
		};

		struct dsp_task_descriptor {

include/sound/pcm.h

+42 −0

Original line number	Diff line number	Diff line
		@@ -915,6 +915,44 @@ int snd_pcm_lib_preallocate_pages_for_all(struct snd_pcm *pcm,
		int snd_pcm_lib_malloc_pages(struct snd_pcm_substream *substream, size_t size);
		int snd_pcm_lib_free_pages(struct snd_pcm_substream *substream);

		int _snd_pcm_lib_alloc_vmalloc_buffer(struct snd_pcm_substream *substream,
		size_t size, gfp_t gfp_flags);
		int snd_pcm_lib_free_vmalloc_buffer(struct snd_pcm_substream *substream);
		struct page snd_pcm_lib_get_vmalloc_page(struct snd_pcm_substream substream,
		unsigned long offset);
		#if 0 /* for kernel-doc */
		/**
		* snd_pcm_lib_alloc_vmalloc_buffer - allocate virtual DMA buffer
		* @substream: the substream to allocate the buffer to
		* @size: the requested buffer size, in bytes
		*
		* Allocates the PCM substream buffer using vmalloc(), i.e., the memory is
		* contiguous in kernel virtual space, but not in physical memory. Use this
		* if the buffer is accessed by kernel code but not by device DMA.
		*
		* Returns 1 if the buffer was changed, 0 if not changed, or a negative error
		* code.
		*/
		static int snd_pcm_lib_alloc_vmalloc_buffer
		(struct snd_pcm_substream *substream, size_t size);
		/**
		* snd_pcm_lib_alloc_vmalloc_32_buffer - allocate 32-bit-addressable buffer
		* @substream: the substream to allocate the buffer to
		* @size: the requested buffer size, in bytes
		*
		* This function works like snd_pcm_lib_alloc_vmalloc_buffer(), but uses
		* vmalloc_32(), i.e., the pages are allocated from 32-bit-addressable memory.
		*/
		static int snd_pcm_lib_alloc_vmalloc_32_buffer
		(struct snd_pcm_substream *substream, size_t size);
		#endif
		#define snd_pcm_lib_alloc_vmalloc_buffer(subs, size) \
		_snd_pcm_lib_alloc_vmalloc_buffer \
		(subs, size, GFP_KERNEL \| __GFP_HIGHMEM \| __GFP_ZERO)
		#define snd_pcm_lib_alloc_vmalloc_32_buffer(subs, size) \
		_snd_pcm_lib_alloc_vmalloc_buffer \
		(subs, size, GFP_KERNEL \| GFP_DMA32 \| __GFP_ZERO)

		#ifdef CONFIG_SND_DMA_SGBUF
		/*
		* SG-buffer handling
		@@ -985,6 +1023,10 @@ int snd_pcm_lib_mmap_iomem(struct snd_pcm_substream *substream, struct vm_area_s
		#define snd_pcm_lib_mmap_iomem NULL
		#endif

		int snd_pcm_lib_mmap_noncached(struct snd_pcm_substream *substream,
		struct vm_area_struct *area);
		#define snd_pcm_lib_mmap_vmalloc snd_pcm_lib_mmap_noncached

		static inline void snd_pcm_limit_isa_dma_size(int dma, size_t *max)
		{
		max = dma < 4 ? 64 1024 : 128 * 1024;

include/sound/sb.h

+1 −0

Original line number	Diff line number	Diff line
		@@ -33,6 +33,7 @@ enum sb_hw_type {
		SB_HW_20,
		SB_HW_201,
		SB_HW_PRO,
		SB_HW_JAZZ16, /* Media Vision Jazz16 */
		SB_HW_16,
		SB_HW_16CSP, /* SB16 with CSP chip */
		SB_HW_ALS100, /* Avance Logic ALS100 chip */