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

Commit 60befb97 authored by Takashi Iwai's avatar Takashi Iwai
Browse files

Merge branch 'fix/asoc' into for-linus 

* fix/asoc:
  ASoC: DaVinci EVM board support buildfixes
  ASoC: DaVinci I2S updates
  ASoC: davinci-pcm buildfixes
  pxa2xx-ac97: fix reset gpio mode setting
  ASoC: soc-core: fix crash when removing not instantiated card
parents a3d2b755 f492ec9f

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

sound/soc/davinci/davinci-evm.c

+52 −11
Original line number Diff line number Diff line
@@ -20,7 +20,11 @@ 
#include <sound/soc-dapm.h>



#include <asm/dma.h>

#include <mach/hardware.h>

#include <asm/mach-types.h>



#include <mach/asp.h>

#include <mach/edma.h>

#include <mach/mux.h>



#include "../codecs/tlv320aic3x.h"

#include "davinci-pcm.h"
@@ -150,7 +154,7 @@ static struct snd_soc_card snd_soc_card_evm = { 


/* evm audio private data */

static struct aic3x_setup_data evm_aic3x_setup = {

	.i2c_bus = 0,

	.i2c_bus = 1,

	.i2c_address = 0x1b,

};
@@ -161,36 +165,73 @@ static struct snd_soc_device evm_snd_devdata = { 
	.codec_data = &evm_aic3x_setup,

};



/* DM6446 EVM uses ASP0; line-out is a pair of RCA jacks */

static struct resource evm_snd_resources[] = {

	{

		.start = DAVINCI_MCBSP_BASE,

		.end = DAVINCI_MCBSP_BASE + SZ_8K - 1,

		.start = DAVINCI_ASP0_BASE,

		.end = DAVINCI_ASP0_BASE + SZ_8K - 1,

		.flags = IORESOURCE_MEM,

	},

};



static struct evm_snd_platform_data evm_snd_data = {

	.tx_dma_ch	= DM644X_DMACH_MCBSP_TX,

	.rx_dma_ch	= DM644X_DMACH_MCBSP_RX,

	.tx_dma_ch	= DAVINCI_DMA_ASP0_TX,

	.rx_dma_ch	= DAVINCI_DMA_ASP0_RX,

};



/* DM335 EVM uses ASP1; line-out is a stereo mini-jack */

static struct resource dm335evm_snd_resources[] = {

	{

		.start = DAVINCI_ASP1_BASE,

		.end = DAVINCI_ASP1_BASE + SZ_8K - 1,

		.flags = IORESOURCE_MEM,

	},

};



static struct evm_snd_platform_data dm335evm_snd_data = {

	.tx_dma_ch	= DAVINCI_DMA_ASP1_TX,

	.rx_dma_ch	= DAVINCI_DMA_ASP1_RX,

};



static struct platform_device *evm_snd_device;



static int __init evm_init(void)

{

	struct resource *resources;

	unsigned num_resources;

	struct evm_snd_platform_data *data;

	int index;

	int ret;



	evm_snd_device = platform_device_alloc("soc-audio", 0);

	if (machine_is_davinci_evm()) {

		davinci_cfg_reg(DM644X_MCBSP);



		resources = evm_snd_resources;

		num_resources = ARRAY_SIZE(evm_snd_resources);

		data = &evm_snd_data;

		index = 0;

	} else if (machine_is_davinci_dm355_evm()) {

		/* we don't use ASP1 IRQs, or we'd need to mux them ... */

		davinci_cfg_reg(DM355_EVT8_ASP1_TX);

		davinci_cfg_reg(DM355_EVT9_ASP1_RX);



		resources = dm335evm_snd_resources;

		num_resources = ARRAY_SIZE(dm335evm_snd_resources);

		data = &dm335evm_snd_data;

		index = 1;

	} else

		return -EINVAL;



	evm_snd_device = platform_device_alloc("soc-audio", index);

	if (!evm_snd_device)

		return -ENOMEM;



	platform_set_drvdata(evm_snd_device, &evm_snd_devdata);

	evm_snd_devdata.dev = &evm_snd_device->dev;

	platform_device_add_data(evm_snd_device, &evm_snd_data,

				 sizeof(evm_snd_data));

	platform_device_add_data(evm_snd_device, data, sizeof(*data));



	ret = platform_device_add_resources(evm_snd_device, evm_snd_resources,

					    ARRAY_SIZE(evm_snd_resources));

	ret = platform_device_add_resources(evm_snd_device, resources,

			num_resources);

	if (ret) {

		platform_device_put(evm_snd_device);

		return ret;

sound/soc/davinci/davinci-i2s.c

+23 −3
Original line number Diff line number Diff line
@@ -24,6 +24,26 @@ 


#include "davinci-pcm.h"





/*

 * NOTE:  terminology here is confusing.

 *

 *  - This driver supports the "Audio Serial Port" (ASP),

 *    found on dm6446, dm355, and other DaVinci chips.

 *

 *  - But it labels it a "Multi-channel Buffered Serial Port"

 *    (McBSP) as on older chips like the dm642 ... which was

 *    backward-compatible, possibly explaining that confusion.

 *

 *  - OMAP chips have a controller called McBSP, which is

 *    incompatible with the DaVinci flavor of McBSP.

 *

 *  - Newer DaVinci chips have a controller called McASP,

 *    incompatible with ASP and with either McBSP.

 *

 * In short:  this uses ASP to implement I2S, not McBSP.

 * And it won't be the only DaVinci implemention of I2S.

 */

#define DAVINCI_MCBSP_DRR_REG	0x00

#define DAVINCI_MCBSP_DXR_REG	0x04

#define DAVINCI_MCBSP_SPCR_REG	0x08
@@ -421,7 +441,7 @@ static int davinci_i2s_probe(struct platform_device *pdev, 
{

	struct snd_soc_device *socdev = platform_get_drvdata(pdev);

	struct snd_soc_card *card = socdev->card;

	struct snd_soc_dai *cpu_dai = card->dai_link[pdev->id].cpu_dai;

	struct snd_soc_dai *cpu_dai = card->dai_link->cpu_dai;

	struct davinci_mcbsp_dev *dev;

	struct resource *mem, *ioarea;

	struct evm_snd_platform_data *pdata;
@@ -448,7 +468,7 @@ static int davinci_i2s_probe(struct platform_device *pdev, 


	cpu_dai->private_data = dev;



	dev->clk = clk_get(&pdev->dev, "McBSPCLK");

	dev->clk = clk_get(&pdev->dev, NULL);

	if (IS_ERR(dev->clk)) {

		ret = -ENODEV;

		goto err_free_mem;
@@ -483,7 +503,7 @@ static void davinci_i2s_remove(struct platform_device *pdev, 
{

	struct snd_soc_device *socdev = platform_get_drvdata(pdev);

	struct snd_soc_card *card = socdev->card;

	struct snd_soc_dai *cpu_dai = card->dai_link[pdev->id].cpu_dai;

	struct snd_soc_dai *cpu_dai = card->dai_link->cpu_dai;

	struct davinci_mcbsp_dev *dev = cpu_dai->private_data;

	struct resource *mem;