Commit 5f592bb9 authored by Takashi Iwai's avatar Takashi Iwai
Browse files

Merge branch 'for-2.6.31' of... 

Merge branch 'for-2.6.31' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound-2.6 into topic/asoc
parents dd4a4164 81a4275b

MAINTAINERS

+1 −1
Original line number Diff line number Diff line
@@ -5286,7 +5286,7 @@ P: Liam Girdwood 
M:	lrg@slimlogic.co.uk

P:	Mark Brown

M:	broonie@opensource.wolfsonmicro.com

T:	git git://opensource.wolfsonmicro.com/linux-2.6-asoc

T:	git git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound-2.6.git

L:	alsa-devel@alsa-project.org (subscribers-only)

W:	http://alsa-project.org/main/index.php/ASoC

S:	Supported

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 */

include/sound/soc-dai.h

+2 −1
Original line number Diff line number Diff line
@@ -79,7 +79,8 @@ struct snd_pcm_substream; 
#define SND_SOC_CLOCK_OUT		1



#define SND_SOC_STD_AC97_FMTS (SNDRV_PCM_FMTBIT_S16_LE |\

                               SNDRV_PCM_FMTBIT_S32_LE)

                               SNDRV_PCM_FMTBIT_S32_LE |\

                               SNDRV_PCM_FMTBIT_S32_BE)



struct snd_soc_dai_ops;

struct snd_soc_dai;

sound/soc/codecs/wm9712.c

+2 −0
Original line number Diff line number Diff line
@@ -585,6 +585,8 @@ static int wm9712_reset(struct snd_soc_codec *codec, int try_warm) 
	}



	soc_ac97_ops.reset(codec->ac97);

	if (soc_ac97_ops.warm_reset)

		soc_ac97_ops.warm_reset(codec->ac97);

	if (ac97_read(codec, 0) != wm9712_reg[0])

		goto err;

	return 0;

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"