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

Commit b5cf43c4 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'for-linus' of git://git.alsa-project.org/alsa-kernel 

* 'for-linus' of git://git.alsa-project.org/alsa-kernel: (179 commits)
  ALSA: Release v1.0.17
  ALSA: correct kcalloc usage
  ALSA: ALSA driver for SGI O2 audio board
  ALSA: asoc: kbuild - only show menus for the current ASoC CPU platform.
  ALSA: ALSA driver for SGI HAL2 audio device
  ALSA: hda - Fix FSC V5505 model
  ALSA: hda - Fix missing init for unsol events on micsense model
  ALSA: hda - Fix internal mic vref pin setup
  ALSA: hda: 92hd71bxx PC Beep
  ALSA: HDA - HP dc7600 with pci sub IDs 0x103c/0x3011 belongs to hp-3013 model
  ALSA: usb-audio: add some Yamaha USB MIDI quirks
  ALSA: usb-audio: fix Yamaha KX quirk
  ALSA: ASoC: Au12x0/Au1550 PSC Audio support
  ALSA: Add Yamaha KX49 (USB MIDI controller) to usbquirks.h
  ALSA: ASoC: pxa2xx-ac97: fix warning due to missing argument in fuction declaration
  ALSA: tosa: fix compilation with new DAPM API
  ALSA: wavefront - add const
  ALSA: remove CONFIG_KMOD from sound
  ALSA: Fix a const to non-const assignment in the Digigram VXpocket sound driver
  ALSA: Fix a const pointer usage warning in the Digigram VX soundcard driver
  ...
parents b7f80afa fe0a3fe3

Documentation/sound/alsa/ALSA-Configuration.txt

+14 −3
Original line number Original line Diff line number Diff line
@@ -753,8 +753,11 @@ Prior to version 0.9.0rc4 options had a 'snd_' prefix. This was removed. 




    [Multiple options for each card instance]

    [Multiple options for each card instance]

    model	- force the model name

    model	- force the model name

    position_fix - Fix DMA pointer (0 = auto, 1 = none, 2 = POSBUF, 3 = FIFO size)

    position_fix - Fix DMA pointer (0 = auto, 1 = use LPIB, 2 = POSBUF)

    probe_mask  - Bitmask to probe codecs (default = -1, meaning all slots)

    probe_mask  - Bitmask to probe codecs (default = -1, meaning all slots)

    bdl_pos_adj	- Specifies the DMA IRQ timing delay in samples.

		Passing -1 will make the driver to choose the appropriate

		value based on the controller chip.

    

    

    [Single (global) options]

    [Single (global) options]

    single_cmd  - Use single immediate commands to communicate with

    single_cmd  - Use single immediate commands to communicate with
@@ -845,7 +848,7 @@ Prior to version 0.9.0rc4 options had a 'snd_' prefix. This was removed. 
	ALC269

	ALC269

	  basic		Basic preset

	  basic		Basic preset





	ALC662

	ALC662/663

	  3stack-dig	3-stack (2-channel) with SPDIF

	  3stack-dig	3-stack (2-channel) with SPDIF

	  3stack-6ch	 3-stack (6-channel)

	  3stack-6ch	 3-stack (6-channel)

	  3stack-6ch-dig 3-stack (6-channel) with SPDIF

	  3stack-6ch-dig 3-stack (6-channel) with SPDIF
@@ -853,6 +856,10 @@ Prior to version 0.9.0rc4 options had a 'snd_' prefix. This was removed. 
	  lenovo-101e	 Lenovo laptop

	  lenovo-101e	 Lenovo laptop

	  eeepc-p701	ASUS Eeepc P701

	  eeepc-p701	ASUS Eeepc P701

	  eeepc-ep20	ASUS Eeepc EP20

	  eeepc-ep20	ASUS Eeepc EP20

	  m51va		ASUS M51VA

	  g71v		ASUS G71V

	  h13		ASUS H13

	  g50v		ASUS G50V

	  auto		auto-config reading BIOS (default)

	  auto		auto-config reading BIOS (default)





	ALC882/885

	ALC882/885
@@ -1091,7 +1098,7 @@ Prior to version 0.9.0rc4 options had a 'snd_' prefix. This was removed. 
    This occurs when the access to non-existing or non-working codec slot

    This occurs when the access to non-existing or non-working codec slot

    (likely a modem one) causes a stall of the communication via HD-audio

    (likely a modem one) causes a stall of the communication via HD-audio

    bus.  You can see which codec slots are probed by enabling

    bus.  You can see which codec slots are probed by enabling

    CONFIG_SND_DEBUG_DETECT, or simply from the file name of the codec

    CONFIG_SND_DEBUG_VERBOSE, or simply from the file name of the codec

    proc files.  Then limit the slots to probe by probe_mask option.

    proc files.  Then limit the slots to probe by probe_mask option.

    For example, probe_mask=1 means to probe only the first slot, and

    For example, probe_mask=1 means to probe only the first slot, and

    probe_mask=4 means only the third slot.

    probe_mask=4 means only the third slot.
@@ -2267,6 +2274,10 @@ case above again, the first two slots are already reserved. If any 
other driver (e.g. snd-usb-audio) is loaded before snd-interwave or

other driver (e.g. snd-usb-audio) is loaded before snd-interwave or

snd-ens1371, it will be assigned to the third or later slot.

snd-ens1371, it will be assigned to the third or later slot.





When a module name is given with '!', the slot will be given for any

modules but that name.  For example, "slots=!snd-pcsp" will reserve

the first slot for any modules but snd-pcsp. 







ALSA PCM devices to OSS devices mapping

ALSA PCM devices to OSS devices mapping

=======================================

=======================================

Documentation/sound/alsa/DocBook/writing-an-alsa-driver.tmpl

+2 −2
Original line number Original line Diff line number Diff line
@@ -6127,8 +6127,8 @@ struct _snd_pcm_runtime { 




      <para>

      <para>

        <function>snd_printdd()</function> is compiled in only when

        <function>snd_printdd()</function> is compiled in only when

      <constant>CONFIG_SND_DEBUG_DETECT</constant> is set. Please note

      <constant>CONFIG_SND_DEBUG_VERBOSE</constant> is set. Please note

      that <constant>DEBUG_DETECT</constant> is not set as default

      that <constant>CONFIG_SND_DEBUG_VERBOSE</constant> is not set as default

      even if you configure the alsa-driver with

      even if you configure the alsa-driver with

      <option>--with-debug=full</option> option. You need to give

      <option>--with-debug=full</option> option. You need to give

      explicitly <option>--with-debug=detect</option> option instead. 

      explicitly <option>--with-debug=detect</option> option instead.

include/asm-mips/mach-au1x00/au1xxx_psc.h

+8 −0
Original line number Original line Diff line number Diff line
@@ -204,6 +204,14 @@ typedef struct psc_i2s { 
	u32	psc_i2sudf;

	u32	psc_i2sudf;

} psc_i2s_t;

} psc_i2s_t;





#define PSC_I2SCFG_OFFSET	0x08

#define PSC_I2SMASK_OFFSET	0x0C

#define PSC_I2SPCR_OFFSET	0x10

#define PSC_I2SSTAT_OFFSET	0x14

#define PSC_I2SEVENT_OFFSET	0x18

#define PSC_I2SRXTX_OFFSET	0x1C

#define PSC_I2SUDF_OFFSET	0x20



/* I2S Config Register. */

/* I2S Config Register. */

#define PSC_I2SCFG_RT_MASK	(3 << 30)

#define PSC_I2SCFG_RT_MASK	(3 << 30)

#define PSC_I2SCFG_RT_FIFO1	(0 << 30)

#define PSC_I2SCFG_RT_FIFO1	(0 << 30)

include/sound/ad1843.h

0 → 100644
+46 −0
Original line number Original line Diff line number Diff line 
/*

 * This file is subject to the terms and conditions of the GNU General Public

 * License.  See the file "COPYING" in the main directory of this archive

 * for more details.

 *

 * Copyright 2003 Vivien Chappelier <vivien.chappelier@linux-mips.org>

 * Copyright 2008 Thomas Bogendoerfer <tsbogend@franken.de>

 */



#ifndef __SOUND_AD1843_H

#define __SOUND_AD1843_H



struct snd_ad1843 {

	void *chip;

	int (*read)(void *chip, int reg);

	int (*write)(void *chip, int reg, int val);

};



#define AD1843_GAIN_RECLEV 0

#define AD1843_GAIN_LINE   1

#define AD1843_GAIN_LINE_2 2

#define AD1843_GAIN_MIC    3

#define AD1843_GAIN_PCM_0  4

#define AD1843_GAIN_PCM_1  5

#define AD1843_GAIN_SIZE   (AD1843_GAIN_PCM_1+1)



int ad1843_get_gain_max(struct snd_ad1843 *ad1843, int id);

int ad1843_get_gain(struct snd_ad1843 *ad1843, int id);

int ad1843_set_gain(struct snd_ad1843 *ad1843, int id, int newval);

int ad1843_get_recsrc(struct snd_ad1843 *ad1843);

int ad1843_set_recsrc(struct snd_ad1843 *ad1843, int newsrc);

void ad1843_setup_dac(struct snd_ad1843 *ad1843,

		      unsigned int id,

		      unsigned int framerate,

		      snd_pcm_format_t fmt,

		      unsigned int channels);

void ad1843_shutdown_dac(struct snd_ad1843 *ad1843,

			 unsigned int id);

void ad1843_setup_adc(struct snd_ad1843 *ad1843,

		      unsigned int framerate,

		      snd_pcm_format_t fmt,

		      unsigned int channels);

void ad1843_shutdown_adc(struct snd_ad1843 *ad1843);

int ad1843_init(struct snd_ad1843 *ad1843);



#endif /* __SOUND_AD1843_H */

include/sound/control.h

+0 −3
Original line number Original line Diff line number Diff line
@@ -129,9 +129,6 @@ int snd_ctl_unregister_ioctl_compat(snd_kctl_ioctl_func_t fcn); 
#define snd_ctl_unregister_ioctl_compat(fcn)

#define snd_ctl_unregister_ioctl_compat(fcn)

#endif

#endif





int snd_ctl_elem_read(struct snd_card *card, struct snd_ctl_elem_value *control);

int snd_ctl_elem_write(struct snd_card *card, struct snd_ctl_file *file, struct snd_ctl_elem_value *control);



static inline unsigned int snd_ctl_get_ioffnum(struct snd_kcontrol *kctl, struct snd_ctl_elem_id *id)

static inline unsigned int snd_ctl_get_ioffnum(struct snd_kcontrol *kctl, struct snd_ctl_elem_id *id)

{

{

	return id->numid - kctl->id.numid;

	return id->numid - kctl->id.numid;