Merge branch 'topic/cs423x-merge' into for-linus (a3c6048d) · Commits · e / devices / android_kernel_teracube_2e

Documentation/sound/alsa/ALSA-Configuration.txt

+9 −25

Original line number	Original line	Diff line number	Diff line
	@@ -346,6 +346,9 @@ Prior to version 0.9.0rc4 options had a 'snd_' prefix. This was removed.
	sbirq - IRQ # for CMI8330 chip (SB16)		sbirq - IRQ # for CMI8330 chip (SB16)
	sbdma8 - 8bit DMA # for CMI8330 chip (SB16)		sbdma8 - 8bit DMA # for CMI8330 chip (SB16)
	sbdma16 - 16bit DMA # for CMI8330 chip (SB16)		sbdma16 - 16bit DMA # for CMI8330 chip (SB16)
			fmport - (optional) OPL3 I/O port
			mpuport - (optional) MPU401 I/O port
			mpuirq - (optional) MPU401 irq #

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

	@@ -388,34 +391,11 @@ Prior to version 0.9.0rc4 options had a 'snd_' prefix. This was removed.

	The power-management is supported.		The power-management is supported.

	Module snd-cs4232
	-----------------

	Module for sound cards based on CS4232/CS4232A ISA chips.

	isapnp - ISA PnP detection - 0 = disable, 1 = enable (default)

	with isapnp=0, the following options are available:

	port - port # for CS4232 chip (PnP setup - 0x534)
	cport - control port # for CS4232 chip (PnP setup - 0x120,0x210,0xf00)
	mpu_port - port # for MPU-401 UART (PnP setup - 0x300), -1 = disable
	fm_port - FM port # for CS4232 chip (PnP setup - 0x388), -1 = disable
	irq - IRQ # for CS4232 chip (5,7,9,11,12,15)
	mpu_irq - IRQ # for MPU-401 UART (9,11,12,15)
	dma1 - first DMA # for CS4232 chip (0,1,3)
	dma2 - second DMA # for Yamaha CS4232 chip (0,1,3), -1 = disable

	This module supports multiple cards. This module does not support autoprobe
	(if ISA PnP is not used) thus main port must be specified!!! Other ports are
	optional.

	The power-management is supported.

	Module snd-cs4236		Module snd-cs4236
	-----------------		-----------------

	Module for sound cards based on CS4235/CS4236/CS4236B/CS4237B/		Module for sound cards based on CS4232/CS4232A,
			CS4235/CS4236/CS4236B/CS4237B/
	CS4238B/CS4239 ISA chips.		CS4238B/CS4239 ISA chips.

	isapnp - ISA PnP detection - 0 = disable, 1 = enable (default)		isapnp - ISA PnP detection - 0 = disable, 1 = enable (default)
	@@ -437,6 +417,9 @@ Prior to version 0.9.0rc4 options had a 'snd_' prefix. This was removed.

	The power-management is supported.		The power-management is supported.

			This module is aliased as snd-cs4232 since it provides the old
			snd-cs4232 functionality, too.

	Module snd-cs4281		Module snd-cs4281
	-----------------		-----------------

	@@ -606,6 +589,7 @@ Prior to version 0.9.0rc4 options had a 'snd_' prefix. This was removed.
	Module for ESS AudioDrive ES-1688 and ES-688 sound cards.		Module for ESS AudioDrive ES-1688 and ES-688 sound cards.

	port - port # for ES-1688 chip (0x220,0x240,0x260)		port - port # for ES-1688 chip (0x220,0x240,0x260)
			fm_port - port # for OPL3 (option; share the same port as default)
	mpu_port - port # for MPU-401 port (0x300,0x310,0x320,0x330), -1 = disable (default)		mpu_port - port # for MPU-401 port (0x300,0x310,0x320,0x330), -1 = disable (default)
	irq - IRQ # for ES-1688 chip (5,7,9,10)		irq - IRQ # for ES-1688 chip (5,7,9,10)
	mpu_irq - IRQ # for MPU-401 port (5,7,9,10)		mpu_irq - IRQ # for MPU-401 port (5,7,9,10)

include/sound/ad1816a.h

+2 −0

Original line number	Original line	Diff line number	Diff line
	@@ -169,5 +169,7 @@ extern int snd_ad1816a_create(struct snd_card *card, unsigned long port,

	extern int snd_ad1816a_pcm(struct snd_ad1816a chip, int device, struct snd_pcm *rpcm);		extern int snd_ad1816a_pcm(struct snd_ad1816a chip, int device, struct snd_pcm *rpcm);
	extern int snd_ad1816a_mixer(struct snd_ad1816a *chip);		extern int snd_ad1816a_mixer(struct snd_ad1816a *chip);
			extern int snd_ad1816a_timer(struct snd_ad1816a *chip, int device,
			struct snd_timer **rtimer);

	#endif /* __SOUND_AD1816A_H */		#endif /* __SOUND_AD1816A_H */

include/sound/wss.h

+1 −0

Original line number	Original line	Diff line number	Diff line
	@@ -154,6 +154,7 @@ int snd_wss_create(struct snd_card *card,
	unsigned short hardware,		unsigned short hardware,
	unsigned short hwshare,		unsigned short hwshare,
	struct snd_wss **rchip);		struct snd_wss **rchip);
			int snd_wss_free(struct snd_wss *chip);
	int snd_wss_pcm(struct snd_wss chip, int device, struct snd_pcm *rpcm);		int snd_wss_pcm(struct snd_wss chip, int device, struct snd_pcm *rpcm);
	int snd_wss_timer(struct snd_wss chip, int device, struct snd_timer *rtimer);		int snd_wss_timer(struct snd_wss chip, int device, struct snd_timer *rtimer);
	int snd_wss_mixer(struct snd_wss *chip);		int snd_wss_mixer(struct snd_wss *chip);

sound/isa/Kconfig

+8 −17

Original line number	Original line	Diff line number	Diff line
	@@ -56,8 +56,8 @@ config SND_AD1848
	Say Y here to include support for AD1848 (Analog Devices) or		Say Y here to include support for AD1848 (Analog Devices) or
	CS4248 (Cirrus Logic - Crystal Semiconductors) chips.		CS4248 (Cirrus Logic - Crystal Semiconductors) chips.

	For newer chips from Cirrus Logic, use the CS4231, CS4232 or		For newer chips from Cirrus Logic, use the CS4231 or CS4232+
	CS4236+ drivers.		drivers.

	To compile this driver as a module, choose M here: the module		To compile this driver as a module, choose M here: the module
	will be called snd-ad1848.		will be called snd-ad1848.
	@@ -94,6 +94,8 @@ config SND_CMI8330
	tristate "C-Media CMI8330"		tristate "C-Media CMI8330"
	select SND_WSS_LIB		select SND_WSS_LIB
	select SND_SB16_DSP		select SND_SB16_DSP
			select SND_OPL3_LIB
			select SND_MPU401_UART
	help		help
	Say Y here to include support for soundcards based on the		Say Y here to include support for soundcards based on the
	C-Media CMI8330 chip.		C-Media CMI8330 chip.
	@@ -112,26 +114,15 @@ config SND_CS4231
	To compile this driver as a module, choose M here: the module		To compile this driver as a module, choose M here: the module
	will be called snd-cs4231.		will be called snd-cs4231.

	config SND_CS4232
	tristate "Generic Cirrus Logic CS4232 driver"
	select SND_OPL3_LIB
	select SND_MPU401_UART
	select SND_WSS_LIB
	help
	Say Y here to include support for CS4232 chips from Cirrus
	Logic - Crystal Semiconductors.

	To compile this driver as a module, choose M here: the module
	will be called snd-cs4232.

	config SND_CS4236		config SND_CS4236
	tristate "Generic Cirrus Logic CS4236+ driver"		tristate "Generic Cirrus Logic CS4232/CS4236+ driver"
	select SND_OPL3_LIB		select SND_OPL3_LIB
	select SND_MPU401_UART		select SND_MPU401_UART
	select SND_WSS_LIB		select SND_WSS_LIB
	help		help
	Say Y to include support for CS4235,CS4236,CS4237B,CS4238B,		Say Y to include support for CS4232,CS4235,CS4236,CS4237B,
	CS4239 chips from Cirrus Logic - Crystal Semiconductors.		CS4238B,CS4239 chips from Cirrus Logic - Crystal
			Semiconductors.

	To compile this driver as a module, choose M here: the module		To compile this driver as a module, choose M here: the module
	will be called snd-cs4236.		will be called snd-cs4236.

sound/isa/ad1816a/ad1816a.c

+9 −5

Original line number	Original line	Diff line number	Diff line
	@@ -156,6 +156,7 @@ static int __devinit snd_card_ad1816a_probe(int dev, struct pnp_card_link *pcard
	struct snd_card_ad1816a *acard;		struct snd_card_ad1816a *acard;
	struct snd_ad1816a *chip;		struct snd_ad1816a *chip;
	struct snd_opl3 *opl3;		struct snd_opl3 *opl3;
			struct snd_timer *timer;

	error = snd_card_create(index[dev], id[dev], THIS_MODULE,		error = snd_card_create(index[dev], id[dev], THIS_MODULE,
	sizeof(struct snd_card_ad1816a), &card);		sizeof(struct snd_card_ad1816a), &card);
	@@ -195,6 +196,12 @@ static int __devinit snd_card_ad1816a_probe(int dev, struct pnp_card_link *pcard
	return error;		return error;
	}		}

			error = snd_ad1816a_timer(chip, 0, &timer);
			if (error < 0) {
			snd_card_free(card);
			return error;
			}

	if (mpu_port[dev] > 0) {		if (mpu_port[dev] > 0) {
	if (snd_mpu401_uart_new(card, 0, MPU401_HW_MPU401,		if (snd_mpu401_uart_new(card, 0, MPU401_HW_MPU401,
	mpu_port[dev], 0, mpu_irq[dev], IRQF_DISABLED,		mpu_port[dev], 0, mpu_irq[dev], IRQF_DISABLED,
	@@ -208,11 +215,8 @@ static int __devinit snd_card_ad1816a_probe(int dev, struct pnp_card_link *pcard
	OPL3_HW_AUTO, 0, &opl3) < 0) {		OPL3_HW_AUTO, 0, &opl3) < 0) {
	printk(KERN_ERR PFX "no OPL device at 0x%lx-0x%lx.\n", fm_port[dev], fm_port[dev] + 2);		printk(KERN_ERR PFX "no OPL device at 0x%lx-0x%lx.\n", fm_port[dev], fm_port[dev] + 2);
	} else {		} else {
	if ((error = snd_opl3_timer_new(opl3, 1, 2)) < 0) {		error = snd_opl3_hwdep_new(opl3, 0, 1, NULL);
	snd_card_free(card);		if (error < 0) {
	return error;
	}
	if ((error = snd_opl3_hwdep_new(opl3, 0, 1, NULL)) < 0) {
	snd_card_free(card);		snd_card_free(card);
	return error;		return error;
	}		}