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

Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6 

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6:
  ASoC: DaVinci EVM board support buildfixes
  ASoC: DaVinci I2S updates
  ASoC: davinci-pcm buildfixes
  ALSA: pcsp: fix printk format warning
  ALSA: riptide: postfix increment and off by one
  pxa2xx-ac97: fix reset gpio mode setting
  ASoC: soc-core: fix crash when removing not instantiated card
parents ade385e4 60befb97

arch/arm/mach-davinci/include/mach/asp.h

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

 * <mach/asp.h> - DaVinci Audio Serial Port support

 */

#ifndef __ASM_ARCH_DAVINCI_ASP_H

#define __ASM_ARCH_DAVINCI_ASP_H



#include <mach/irqs.h>



/* Bases of register banks */

#define DAVINCI_ASP0_BASE	0x01E02000

#define DAVINCI_ASP1_BASE	0x01E04000



/* EDMA channels */

#define DAVINCI_DMA_ASP0_TX	2

#define DAVINCI_DMA_ASP0_RX	3

#define DAVINCI_DMA_ASP1_TX	8

#define DAVINCI_DMA_ASP1_RX	9



/* Interrupts */

#define DAVINCI_ASP0_RX_INT	IRQ_MBRINT

#define DAVINCI_ASP0_TX_INT	IRQ_MBXINT

#define DAVINCI_ASP1_RX_INT	IRQ_MBRINT

#define DAVINCI_ASP1_TX_INT	IRQ_MBXINT



#endif /* __ASM_ARCH_DAVINCI_ASP_H */

sound/arm/pxa2xx-ac97-lib.c

+1 −1
Original line number Diff line number Diff line
@@ -65,7 +65,7 @@ static void set_resetgpio_mode(int resetgpio_action) 
		switch (resetgpio_action) {

		case RESETGPIO_NORMAL_ALTFUNC:

			if (reset_gpio == 113)

				mode = 113 | GPIO_OUT | GPIO_DFLT_LOW;

				mode = 113 | GPIO_ALT_FN_2_OUT;

			if (reset_gpio == 95)

				mode = 95 | GPIO_ALT_FN_1_OUT;

			break;

sound/drivers/pcsp/pcsp_mixer.c

+1 −1
Original line number Diff line number Diff line
@@ -50,7 +50,7 @@ static int pcsp_treble_info(struct snd_kcontrol *kcontrol, 
	uinfo->value.enumerated.items = chip->max_treble + 1;

	if (uinfo->value.enumerated.item > chip->max_treble)

		uinfo->value.enumerated.item = chip->max_treble;

	sprintf(uinfo->value.enumerated.name, "%d",

	sprintf(uinfo->value.enumerated.name, "%lu",

			PCSP_CALC_RATE(uinfo->value.enumerated.item));

	return 0;

}

sound/pci/riptide/riptide.c

+6 −4
Original line number Diff line number Diff line
@@ -889,7 +889,7 @@ static int sendcmd(struct cmdif *cif, u32 flags, u32 cmd, u32 parm, 
	spin_lock_irqsave(&cif->lock, irqflags);

	while (i++ < CMDIF_TIMEOUT && !IS_READY(cif->hwport))

		udelay(10);

	if (i >= CMDIF_TIMEOUT) {

	if (i > CMDIF_TIMEOUT) {

		err = -EBUSY;

		goto errout;

	}
@@ -907,8 +907,10 @@ static int sendcmd(struct cmdif *cif, u32 flags, u32 cmd, u32 parm, 
			WRITE_PORT_ULONG(cmdport->data1, cmd);	/* write cmd */

			if ((flags & RESP) && ret) {

				while (!IS_DATF(cmdport) &&

				       time++ < CMDIF_TIMEOUT)

				       time < CMDIF_TIMEOUT) {

					udelay(10);

					time++;

				}

				if (time < CMDIF_TIMEOUT) {	/* read response */

					ret->retlongs[0] =

					    READ_PORT_ULONG(cmdport->data1);
@@ -1454,7 +1456,7 @@ static int snd_riptide_trigger(struct snd_pcm_substream *substream, int cmd) 
			SEND_GPOS(cif, 0, data->id, &rptr);

			udelay(1);

		} while (i != rptr.retlongs[1] && j++ < MAX_WRITE_RETRY);

		if (j >= MAX_WRITE_RETRY)

		if (j > MAX_WRITE_RETRY)

			snd_printk(KERN_ERR "Riptide: Could not stop stream!");

		break;

	case SNDRV_PCM_TRIGGER_PAUSE_PUSH:
@@ -1783,7 +1785,7 @@ snd_riptide_codec_write(struct snd_ac97 *ac97, unsigned short reg, 
		SEND_SACR(cif, val, reg);

		SEND_RACR(cif, reg, &rptr);

	} while (rptr.retwords[1] != val && i++ < MAX_WRITE_RETRY);

	if (i == MAX_WRITE_RETRY)

	if (i > MAX_WRITE_RETRY)

		snd_printdd("Write AC97 reg failed\n");

}

sound/soc/davinci/Kconfig

+4 −3
Original line number Diff line number Diff line
@@ -10,13 +10,14 @@ config SND_DAVINCI_SOC_I2S 
	tristate



config SND_DAVINCI_SOC_EVM

	tristate "SoC Audio support for DaVinci EVM"

	depends on SND_DAVINCI_SOC && MACH_DAVINCI_EVM

	tristate "SoC Audio support for DaVinci DM6446 or DM355 EVM"

	depends on SND_DAVINCI_SOC

	depends on MACH_DAVINCI_EVM || MACH_DAVINCI_DM355_EVM

	select SND_DAVINCI_SOC_I2S

	select SND_SOC_TLV320AIC3X

	help

	  Say Y if you want to add support for SoC audio on TI

	  DaVinci EVM platform.

	  DaVinci DM6446 or DM355 EVM platforms.



config SND_DAVINCI_SOC_SFFSDR

	tristate "SoC Audio support for SFFSDR"

CRA Git | Maintained and supported by SUSTech CRA and CCSE