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

Commit 79fc84c7 authored by Takashi Iwai's avatar Takashi Iwai
Browse files

Merge branch 'topic/misc' into for-linus

parents f6f94e2a 97c44b2d

Documentation/sound/alsa/ALSA-Configuration.txt

+68 −14
Original line number Original line Diff line number Diff line
@@ -300,6 +300,74 @@ Prior to version 0.9.0rc4 options had a 'snd_' prefix. This was removed. 
           control correctly. If you have problems regarding this, try

           control correctly. If you have problems regarding this, try

           another ALSA compliant mixer (alsamixer works).

           another ALSA compliant mixer (alsamixer works).





  Module snd-azt1605

  ------------------



    Module for Aztech Sound Galaxy soundcards based on the Aztech AZT1605

    chipset.



    port	- port # for BASE (0x220,0x240,0x260,0x280)

    wss_port	- port # for WSS (0x530,0x604,0xe80,0xf40)

    irq		- IRQ # for WSS (7,9,10,11)

    dma1	- DMA # for WSS playback (0,1,3)

    dma2	- DMA # for WSS capture (0,1), -1 = disabled (default)

    mpu_port	- port # for MPU-401 UART (0x300,0x330), -1 = disabled (default)

    mpu_irq	- IRQ # for MPU-401 UART (3,5,7,9), -1 = disabled (default)

    fm_port	- port # for OPL3 (0x388), -1 = disabled (default)



    This module supports multiple cards. It does not support autoprobe: port,

    wss_port, irq and dma1 have to be specified. The other values are

    optional.



    "port" needs to match the BASE ADDRESS jumper on the card (0x220 or 0x240)

    or the value stored in the card's EEPROM for cards that have an EEPROM and

    their "CONFIG MODE" jumper set to "EEPROM SETTING". The other values can

    be choosen freely from the options enumerated above.



    If dma2 is specified and different from dma1, the card will operate in

    full-duplex mode. When dma1=3, only dma2=0 is valid and the only way to

    enable capture since only channels 0 and 1 are available for capture.



    Generic settings are "port=0x220 wss_port=0x530 irq=10 dma1=1 dma2=0

    mpu_port=0x330 mpu_irq=9 fm_port=0x388".



    Whatever IRQ and DMA channels you pick, be sure to reserve them for

    legacy ISA in your BIOS.



  Module snd-azt2316

  ------------------



    Module for Aztech Sound Galaxy soundcards based on the Aztech AZT2316

    chipset.



    port	- port # for BASE (0x220,0x240,0x260,0x280)

    wss_port	- port # for WSS (0x530,0x604,0xe80,0xf40)

    irq		- IRQ # for WSS (7,9,10,11)

    dma1	- DMA # for WSS playback (0,1,3)

    dma2	- DMA # for WSS capture (0,1), -1 = disabled (default)

    mpu_port	- port # for MPU-401 UART (0x300,0x330), -1 = disabled (default)

    mpu_irq	- IRQ # for MPU-401 UART (5,7,9,10), -1 = disabled (default)

    fm_port	- port # for OPL3 (0x388), -1 = disabled (default)



    This module supports multiple cards. It does not support autoprobe: port,

    wss_port, irq and dma1 have to be specified. The other values are

    optional.



    "port" needs to match the BASE ADDRESS jumper on the card (0x220 or 0x240)

    or the value stored in the card's EEPROM for cards that have an EEPROM and

    their "CONFIG MODE" jumper set to "EEPROM SETTING". The other values can

    be choosen freely from the options enumerated above.



    If dma2 is specified and different from dma1, the card will operate in

    full-duplex mode. When dma1=3, only dma2=0 is valid and the only way to

    enable capture since only channels 0 and 1 are available for capture.



    Generic settings are "port=0x220 wss_port=0x530 irq=10 dma1=1 dma2=0

    mpu_port=0x330 mpu_irq=9 fm_port=0x388".



    Whatever IRQ and DMA channels you pick, be sure to reserve them for

    legacy ISA in your BIOS.



  Module snd-aw2

  Module snd-aw2

  --------------

  --------------
@@ -1641,20 +1709,6 @@ Prior to version 0.9.0rc4 options had a 'snd_' prefix. This was removed. 




    This card is also known as Audio Excel DSP 16 or Zoltrix AV302.

    This card is also known as Audio Excel DSP 16 or Zoltrix AV302.





  Module snd-sgalaxy

  ------------------



    Module for Aztech Sound Galaxy sound card.



    sbport	- Port # for SB16 interface (0x220,0x240)

    wssport	- Port # for WSS interface (0x530,0xe80,0xf40,0x604)

    irq		- IRQ # (7,9,10,11)

    dma1	- DMA #



    This module supports multiple cards.



    The power-management is supported.



  Module snd-sscape

  Module snd-sscape

  -----------------

  -----------------

include/sound/core.h

+1 −1
Original line number Original line Diff line number Diff line
@@ -179,7 +179,7 @@ int snd_power_wait(struct snd_card *card, unsigned int power_state); 
#define snd_power_lock(card)		do { (void)(card); } while (0)

#define snd_power_lock(card)		do { (void)(card); } while (0)

#define snd_power_unlock(card)		do { (void)(card); } while (0)

#define snd_power_unlock(card)		do { (void)(card); } while (0)

static inline int snd_power_wait(struct snd_card *card, unsigned int state) { return 0; }

static inline int snd_power_wait(struct snd_card *card, unsigned int state) { return 0; }

#define snd_power_get_state(card)	SNDRV_CTL_POWER_D0

#define snd_power_get_state(card)	({ (void)(card); SNDRV_CTL_POWER_D0; })

#define snd_power_change_state(card, state)	do { (void)(card); } while (0)

#define snd_power_change_state(card, state)	do { (void)(card); } while (0)





#endif /* CONFIG_PM */

#endif /* CONFIG_PM */

include/sound/emu10k1.h

+2 −0
Original line number Original line Diff line number Diff line
@@ -438,6 +438,8 @@ 
#define CCCA_CURRADDR_MASK	0x00ffffff	/* Current address of the selected channel		*/

#define CCCA_CURRADDR_MASK	0x00ffffff	/* Current address of the selected channel		*/

#define CCCA_CURRADDR		0x18000008

#define CCCA_CURRADDR		0x18000008





/* undefine CCR to avoid conflict with the definition for SH */

#undef CCR

#define CCR			0x09		/* Cache control register				*/

#define CCR			0x09		/* Cache control register				*/

#define CCR_CACHEINVALIDSIZE	0x07190009

#define CCR_CACHEINVALIDSIZE	0x07190009

#define CCR_CACHEINVALIDSIZE_MASK	0xfe000000	/* Number of invalid samples cache for this channel    	*/

#define CCR_CACHEINVALIDSIZE_MASK	0xfe000000	/* Number of invalid samples cache for this channel    	*/

include/sound/jack.h

+4 −1
Original line number Original line Diff line number Diff line
@@ -47,6 +47,9 @@ enum snd_jack_types { 
	SND_JACK_BTN_0		= 0x4000,

	SND_JACK_BTN_0		= 0x4000,

	SND_JACK_BTN_1		= 0x2000,

	SND_JACK_BTN_1		= 0x2000,

	SND_JACK_BTN_2		= 0x1000,

	SND_JACK_BTN_2		= 0x1000,

	SND_JACK_BTN_3		= 0x0800,

	SND_JACK_BTN_4		= 0x0400,

	SND_JACK_BTN_5		= 0x0200,

};

};





struct snd_jack {

struct snd_jack {
@@ -55,7 +58,7 @@ struct snd_jack { 
	int type;

	int type;

	const char *id;

	const char *id;

	char name[100];

	char name[100];

	unsigned int key[3];   /* Keep in sync with definitions above */

	unsigned int key[6];   /* Keep in sync with definitions above */

	void *private_data;

	void *private_data;

	void (*private_free)(struct snd_jack *);

	void (*private_free)(struct snd_jack *);

};

};

include/sound/pcm.h

+1 −0
Original line number Original line Diff line number Diff line
@@ -278,6 +278,7 @@ struct snd_pcm_runtime { 
	snd_pcm_uframes_t hw_ptr_base;	/* Position at buffer restart */

	snd_pcm_uframes_t hw_ptr_base;	/* Position at buffer restart */

	snd_pcm_uframes_t hw_ptr_interrupt; /* Position at interrupt time */

	snd_pcm_uframes_t hw_ptr_interrupt; /* Position at interrupt time */

	unsigned long hw_ptr_jiffies;	/* Time when hw_ptr is updated */

	unsigned long hw_ptr_jiffies;	/* Time when hw_ptr is updated */

	unsigned long hw_ptr_buffer_jiffies; /* buffer time in jiffies */

	snd_pcm_sframes_t delay;	/* extra delay; typically FIFO size */

	snd_pcm_sframes_t delay;	/* extra delay; typically FIFO size */





	/* -- HW params -- */

	/* -- HW params -- */