Commit 09ae3aaf authored by Lars-Peter Clausen's avatar Lars-Peter Clausen Committed by Mark Brown
Browse files

ASoC: omap: Use common DAI DMA data 



Use the common DAI DMA data struct for omap, this allows us to use the common
helper function to configure the DMA slave config based on the DAI DMA data.

For omap-dmic and omap-mcpdm also move the DMA data from a global variable to
the driver state struct.

Signed-off-by: default avatarLars-Peter Clausen <lars@metafoo.de>
Acked-by: default avatarPeter Ujfalusi <peter.ujfalusi@ti.com>
Acked-by: default avatarJarkko Nikula <jarkko.nikula@bitmer.com>
Signed-off-by: default avatarMark Brown <broonie@opensource.wolfsonmicro.com>
parent 2735e6cd

sound/soc/omap/am3517evm.c

+0 −1
Original line number Diff line number Diff line
@@ -28,7 +28,6 @@ 
#include <linux/platform_data/asoc-ti-mcbsp.h>



#include "omap-mcbsp.h"

#include "omap-pcm.h"



#include "../codecs/tlv320aic23.h"

sound/soc/omap/ams-delta.c

+0 −1
Original line number Diff line number Diff line
@@ -36,7 +36,6 @@ 
#include <linux/platform_data/asoc-ti-mcbsp.h>



#include "omap-mcbsp.h"

#include "omap-pcm.h"

#include "../codecs/cx20442.h"

sound/soc/omap/mcbsp.c

+8 −6
Original line number Diff line number Diff line
@@ -1018,9 +1018,10 @@ int omap_mcbsp_init(struct platform_device *pdev) 
		return -ENODEV;

	}

	/* RX DMA request number, and port address configuration */

	mcbsp->dma_data[1].name = "Audio Capture";

	mcbsp->dma_data[1].dma_req = res->start;

	mcbsp->dma_data[1].port_addr = omap_mcbsp_dma_reg_params(mcbsp, 1);

	mcbsp->dma_req[1] = res->start;

	mcbsp->dma_data[1].filter_data = &mcbsp->dma_req[1];

	mcbsp->dma_data[1].addr = omap_mcbsp_dma_reg_params(mcbsp, 1);

	mcbsp->dma_data[1].maxburst = 4;



	res = platform_get_resource_byname(pdev, IORESOURCE_DMA, "tx");

	if (!res) {
@@ -1028,9 +1029,10 @@ int omap_mcbsp_init(struct platform_device *pdev) 
		return -ENODEV;

	}

	/* TX DMA request number, and port address configuration */

	mcbsp->dma_data[0].name = "Audio Playback";

	mcbsp->dma_data[0].dma_req = res->start;

	mcbsp->dma_data[0].port_addr = omap_mcbsp_dma_reg_params(mcbsp, 0);

	mcbsp->dma_req[0] = res->start;

	mcbsp->dma_data[0].filter_data = &mcbsp->dma_req[0];

	mcbsp->dma_data[0].addr = omap_mcbsp_dma_reg_params(mcbsp, 0);

	mcbsp->dma_data[0].maxburst = 4;



	mcbsp->fclk = clk_get(&pdev->dev, "fck");

	if (IS_ERR(mcbsp->fclk)) {

sound/soc/omap/mcbsp.h

+4 −3
Original line number Diff line number Diff line
@@ -24,14 +24,14 @@ 
#ifndef __ASOC_MCBSP_H

#define __ASOC_MCBSP_H



#include "omap-pcm.h"



#ifdef CONFIG_ARCH_OMAP1

#define mcbsp_omap1()	1

#else

#define mcbsp_omap1()	0

#endif



#include <sound/dmaengine_pcm.h>



/* McBSP register numbers. Register address offset = num * reg_step */

enum {

	/* Common registers */
@@ -312,7 +312,8 @@ struct omap_mcbsp { 
	struct omap_mcbsp_platform_data *pdata;

	struct omap_mcbsp_st_data *st_data;

	struct omap_mcbsp_reg_cfg cfg_regs;

	struct omap_pcm_dma_data dma_data[2];

	struct snd_dmaengine_dai_dma_data dma_data[2];

	unsigned int dma_req[2];

	int dma_op_mode;

	u16 max_tx_thres;

	u16 max_rx_thres;

sound/soc/omap/n810.c

+0 −1
Original line number Diff line number Diff line
@@ -34,7 +34,6 @@ 
#include <linux/platform_data/asoc-ti-mcbsp.h>



#include "omap-mcbsp.h"

#include "omap-pcm.h"



#define N810_HEADSET_AMP_GPIO	10

#define N810_SPEAKER_AMP_GPIO	101

CRA Git | Maintained and supported by SUSTech CRA and CCSE