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

Commit 444bd6fc authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge HEAD from master.kernel.org:/pub/scm/linux/kernel/git/perex/alsa

parents 3cb904ca c8846970

Documentation/sound/alsa/ALSA-Configuration.txt

+1 −0
Original line number Diff line number Diff line
@@ -132,6 +132,7 @@ Prior to version 0.9.0rc4 options had a 'snd_' prefix. This was removed. 
    mpu_irq	- IRQ # for MPU-401 UART (PnP setup)

    dma1	- first DMA # for AD1816A chip (PnP setup)

    dma2	- second DMA # for AD1816A chip (PnP setup)

    clockfreq   - Clock frequency for AD1816A chip (default = 0, 33000Hz)

    

    Module supports up to 8 cards, autoprobe and PnP.

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

+11 −4
Original line number Diff line number Diff line
@@ -3422,10 +3422,17 @@ struct _snd_pcm_runtime { 


      <para>

        The <structfield>iface</structfield> field specifies the type of

      the control,

      <constant>SNDRV_CTL_ELEM_IFACE_XXX</constant>. There are

      <constant>MIXER</constant>, <constant>PCM</constant>,

      <constant>CARD</constant>, etc.

      the control, <constant>SNDRV_CTL_ELEM_IFACE_XXX</constant>, which

      is usually <constant>MIXER</constant>.

      Use <constant>CARD</constant> for global controls that are not

      logically part of the mixer.

      If the control is closely associated with some specific device on

      the sound card, use <constant>HWDEP</constant>,

      <constant>PCM</constant>, <constant>RAWMIDI</constant>,

      <constant>TIMER</constant>, or <constant>SEQUENCER</constant>, and

      specify the device number with the

      <structfield>device</structfield> and

      <structfield>subdevice</structfield> fields.

      </para>



      <para>

include/linux/sound.h

+2 −0
Original line number Diff line number Diff line
@@ -29,7 +29,9 @@ 
 *	Sound core interface functions

 */

 

struct device;

extern int register_sound_special(struct file_operations *fops, int unit);

extern int register_sound_special_device(struct file_operations *fops, int unit, struct device *dev);

extern int register_sound_mixer(struct file_operations *fops, int dev);

extern int register_sound_midi(struct file_operations *fops, int dev);

extern int register_sound_dsp(struct file_operations *fops, int dev);

include/sound/ac97_codec.h

+9 −0
Original line number Diff line number Diff line
@@ -26,6 +26,7 @@ 
 */



#include <linux/bitops.h>

#include <linux/device.h>

#include "pcm.h"

#include "control.h"

#include "info.h"
@@ -374,6 +375,9 @@ 
#define AC97_HAS_NO_PC_BEEP	(1<<12) /* no PC Beep volume */

#define AC97_HAS_NO_VIDEO	(1<<13) /* no Video volume */

#define AC97_HAS_NO_CD		(1<<14) /* no CD volume */

#define AC97_HAS_NO_MIC	(1<<15) /* no MIC volume */

#define AC97_HAS_NO_TONE	(1<<16) /* no Tone volume */

#define AC97_HAS_NO_STD_PCM	(1<<17)	/* no standard AC97 PCM volume and mute */



/* rates indexes */

#define AC97_RATES_FRONT_DAC	0
@@ -520,6 +524,7 @@ struct _snd_ac97 { 
	/* jack-sharing info */

	unsigned char indep_surround;

	unsigned char channel_mode;

	struct device dev;

};



/* conditions */
@@ -599,4 +604,8 @@ struct ac97_enum { 
	unsigned short mask;

	const char **texts;

};



/* ad hoc AC97 device driver access */

extern struct bus_type ac97_bus_type;



#endif /* __SOUND_AC97_CODEC_H */

include/sound/ad1816a.h

+1 −0
Original line number Diff line number Diff line
@@ -138,6 +138,7 @@ struct _snd_ad1816a { 
	spinlock_t lock;



	unsigned short mode;

	unsigned int clock_freq;



	snd_card_t *card;

	snd_pcm_t *pcm;