hollalinux
/
linux-sg2042
mirror of https://github.com/sophgo/linux-riscv.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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: Lars-Peter Clausen <lars@metafoo.de>
Acked-by: Peter Ujfalusi <peter.ujfalusi@ti.com>
Acked-by: Jarkko Nikula <jarkko.nikula@bitmer.com>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
This commit is contained in:
Lars-Peter Clausen 2013-04-03 11:06:05 +02:00 committed by Mark Brown
parent 2735e6cd2b
commit 09ae3aaf3c
16 changed files with 54 additions and 139 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
sound/soc/omap/am3517evm.c
View File

@ -28,7 +28,6 @@
#include <linux/platform_data/asoc-ti-mcbsp.h> #include <linux/platform_data/asoc-ti-mcbsp.h>
#include "omap-mcbsp.h" #include "omap-mcbsp.h"
#include "omap-pcm.h"
#include "../codecs/tlv320aic23.h" #include "../codecs/tlv320aic23.h"

1
sound/soc/omap/ams-delta.c
View File

@ -36,7 +36,6 @@
#include <linux/platform_data/asoc-ti-mcbsp.h> #include <linux/platform_data/asoc-ti-mcbsp.h>
#include "omap-mcbsp.h" #include "omap-mcbsp.h"
#include "omap-pcm.h"
#include "../codecs/cx20442.h" #include "../codecs/cx20442.h"

14
sound/soc/omap/mcbsp.c
View File

@ -1018,9 +1018,10 @@ int omap_mcbsp_init(struct platform_device *pdev)
return -ENODEV; return -ENODEV;
} }
/* RX DMA request number, and port address configuration */ /* RX DMA request number, and port address configuration */
mcbsp->dma_data[1].name = "Audio Capture"; mcbsp->dma_req[1] = res->start;
mcbsp->dma_data[1].dma_req = res->start; mcbsp->dma_data[1].filter_data = &mcbsp->dma_req[1];
mcbsp->dma_data[1].port_addr = omap_mcbsp_dma_reg_params(mcbsp, 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"); res = platform_get_resource_byname(pdev, IORESOURCE_DMA, "tx");
if (!res) { if (!res) {
@ -1028,9 +1029,10 @@ int omap_mcbsp_init(struct platform_device *pdev)
return -ENODEV; return -ENODEV;
} }
/* TX DMA request number, and port address configuration */ /* TX DMA request number, and port address configuration */
mcbsp->dma_data[0].name = "Audio Playback"; mcbsp->dma_req[0] = res->start;
mcbsp->dma_data[0].dma_req = res->start; mcbsp->dma_data[0].filter_data = &mcbsp->dma_req[0];
mcbsp->dma_data[0].port_addr = omap_mcbsp_dma_reg_params(mcbsp, 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"); mcbsp->fclk = clk_get(&pdev->dev, "fck");
if (IS_ERR(mcbsp->fclk)) { if (IS_ERR(mcbsp->fclk)) {

7
sound/soc/omap/mcbsp.h
View File

@ -24,14 +24,14 @@
#ifndef __ASOC_MCBSP_H #ifndef __ASOC_MCBSP_H
#define __ASOC_MCBSP_H #define __ASOC_MCBSP_H
#include "omap-pcm.h"
#ifdef CONFIG_ARCH_OMAP1 #ifdef CONFIG_ARCH_OMAP1
#define mcbsp_omap1() 1 #define mcbsp_omap1() 1
#else #else
#define mcbsp_omap1() 0 #define mcbsp_omap1() 0
#endif #endif
#include <sound/dmaengine_pcm.h>
/* McBSP register numbers. Register address offset = num * reg_step */ /* McBSP register numbers. Register address offset = num * reg_step */
enum { enum {
/* Common registers */ /* Common registers */
@ -312,7 +312,8 @@ struct omap_mcbsp {
struct omap_mcbsp_platform_data *pdata; struct omap_mcbsp_platform_data *pdata;
struct omap_mcbsp_st_data *st_data; struct omap_mcbsp_st_data *st_data;
struct omap_mcbsp_reg_cfg cfg_regs; 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; int dma_op_mode;
u16 max_tx_thres; u16 max_tx_thres;
u16 max_rx_thres; u16 max_rx_thres;

1
sound/soc/omap/n810.c
View File

@ -34,7 +34,6 @@
#include <linux/platform_data/asoc-ti-mcbsp.h> #include <linux/platform_data/asoc-ti-mcbsp.h>
#include "omap-mcbsp.h" #include "omap-mcbsp.h"
#include "omap-pcm.h"
#define N810_HEADSET_AMP_GPIO 10 #define N810_HEADSET_AMP_GPIO 10
#define N810_SPEAKER_AMP_GPIO 101 #define N810_SPEAKER_AMP_GPIO 101

1
sound/soc/omap/omap-abe-twl6040.c
View File

@ -34,7 +34,6 @@
#include "omap-dmic.h" #include "omap-dmic.h"
#include "omap-mcpdm.h" #include "omap-mcpdm.h"
#include "omap-pcm.h"
#include "../codecs/twl6040.h" #include "../codecs/twl6040.h"
struct abe_twl6040 { struct abe_twl6040 {

22
sound/soc/omap/omap-dmic.c
View File

@ -39,8 +39,8 @@
#include <sound/pcm_params.h> #include <sound/pcm_params.h>
#include <sound/initval.h> #include <sound/initval.h>
#include <sound/soc.h> #include <sound/soc.h>
#include <sound/dmaengine_pcm.h>
#include "omap-pcm.h"
#include "omap-dmic.h" #include "omap-dmic.h"
struct omap_dmic { struct omap_dmic {
@ -55,13 +55,9 @@ struct omap_dmic {
u32 ch_enabled; u32 ch_enabled;
bool active; bool active;
struct mutex mutex; struct mutex mutex;
};
/* struct snd_dmaengine_dai_dma_data dma_data;
* Stream DMA parameters unsigned int dma_req;
*/
static struct omap_pcm_dma_data omap_dmic_dai_dma_params = {
.name = "DMIC capture",
}; };
static inline void omap_dmic_write(struct omap_dmic *dmic, u16 reg, u32 val) static inline void omap_dmic_write(struct omap_dmic *dmic, u16 reg, u32 val)
@ -118,7 +114,7 @@ static int omap_dmic_dai_startup(struct snd_pcm_substream *substream,
mutex_unlock(&dmic->mutex); mutex_unlock(&dmic->mutex);
snd_soc_dai_set_dma_data(dai, substream, &omap_dmic_dai_dma_params); snd_soc_dai_set_dma_data(dai, substream, &dmic->dma_data);
return ret; return ret;
} }
@ -203,7 +199,7 @@ static int omap_dmic_dai_hw_params(struct snd_pcm_substream *substream,
struct snd_soc_dai *dai) struct snd_soc_dai *dai)
{ {
struct omap_dmic *dmic = snd_soc_dai_get_drvdata(dai); struct omap_dmic *dmic = snd_soc_dai_get_drvdata(dai);
struct omap_pcm_dma_data *dma_data; struct snd_dmaengine_dai_dma_data *dma_data;
int channels; int channels;
dmic->clk_div = omap_dmic_select_divider(dmic, params_rate(params)); dmic->clk_div = omap_dmic_select_divider(dmic, params_rate(params));
@ -230,7 +226,7 @@ static int omap_dmic_dai_hw_params(struct snd_pcm_substream *substream,
/* packet size is threshold * channels */ /* packet size is threshold * channels */
dma_data = snd_soc_dai_get_dma_data(dai, substream); dma_data = snd_soc_dai_get_dma_data(dai, substream);
dma_data->packet_size = dmic->threshold * channels; dma_data->maxburst = dmic->threshold * channels;
return 0; return 0;
} }
@ -476,7 +472,7 @@ static int asoc_dmic_probe(struct platform_device *pdev)
ret = -ENODEV; ret = -ENODEV;
goto err_put_clk; goto err_put_clk;
} }
omap_dmic_dai_dma_params.port_addr = res->start + OMAP_DMIC_DATA_REG; dmic->dma_data.addr = res->start + OMAP_DMIC_DATA_REG;
res = platform_get_resource(pdev, IORESOURCE_DMA, 0); res = platform_get_resource(pdev, IORESOURCE_DMA, 0);
if (!res) { if (!res) {
@ -484,7 +480,9 @@ static int asoc_dmic_probe(struct platform_device *pdev)
ret = -ENODEV; ret = -ENODEV;
goto err_put_clk; goto err_put_clk;
} }
omap_dmic_dai_dma_params.dma_req = res->start;
dmic->dma_req = res->start;
dmic->dma_data.filter_data = &dmic->dma_req;
res = platform_get_resource_byname(pdev, IORESOURCE_MEM, "mpu"); res = platform_get_resource_byname(pdev, IORESOURCE_MEM, "mpu");
if (!res) { if (!res) {

24
sound/soc/omap/omap-hdmi.c
View File

@ -32,15 +32,16 @@
#include <sound/soc.h> #include <sound/soc.h>
#include <sound/asound.h> #include <sound/asound.h>
#include <sound/asoundef.h> #include <sound/asoundef.h>
#include <sound/dmaengine_pcm.h>
#include <video/omapdss.h> #include <video/omapdss.h>
#include "omap-pcm.h"
#include "omap-hdmi.h" #include "omap-hdmi.h"
#define DRV_NAME "omap-hdmi-audio-dai" #define DRV_NAME "omap-hdmi-audio-dai"
struct hdmi_priv { struct hdmi_priv {
struct omap_pcm_dma_data dma_params; struct snd_dmaengine_dai_dma_data dma_data;
unsigned int dma_req;
struct omap_dss_audio dss_audio; struct omap_dss_audio dss_audio;
struct snd_aes_iec958 iec; struct snd_aes_iec958 iec;
struct snd_cea_861_aud_if cea; struct snd_cea_861_aud_if cea;
@ -68,7 +69,7 @@ static int omap_hdmi_dai_startup(struct snd_pcm_substream *substream,
return -ENODEV; return -ENODEV;
} }
snd_soc_dai_set_dma_data(dai, substream, &priv->dma_params); snd_soc_dai_set_dma_data(dai, substream, &priv->dma_data);
return 0; return 0;
} }
@ -88,25 +89,20 @@ static int omap_hdmi_dai_hw_params(struct snd_pcm_substream *substream,
struct hdmi_priv *priv = snd_soc_dai_get_drvdata(dai); struct hdmi_priv *priv = snd_soc_dai_get_drvdata(dai);
struct snd_aes_iec958 *iec = &priv->iec; struct snd_aes_iec958 *iec = &priv->iec;
struct snd_cea_861_aud_if *cea = &priv->cea; struct snd_cea_861_aud_if *cea = &priv->cea;
struct omap_pcm_dma_data *dma_data;
int err = 0; int err = 0;
dma_data = snd_soc_dai_get_dma_data(dai, substream);
switch (params_format(params)) { switch (params_format(params)) {
case SNDRV_PCM_FORMAT_S16_LE: case SNDRV_PCM_FORMAT_S16_LE:
dma_data->packet_size = 16; priv->dma_data.maxburst = 16;
break; break;
case SNDRV_PCM_FORMAT_S24_LE: case SNDRV_PCM_FORMAT_S24_LE:
dma_data->packet_size = 32; priv->dma_data.maxburst = 32;
break; break;
default: default:
dev_err(dai->dev, "format not supported!\n"); dev_err(dai->dev, "format not supported!\n");
return -EINVAL; return -EINVAL;
} }
dma_data->data_type = 32;
/* /*
* fill the IEC-60958 channel status word * fill the IEC-60958 channel status word
*/ */
@ -283,8 +279,7 @@ static int omap_hdmi_probe(struct platform_device *pdev)
return -ENODEV; return -ENODEV;
} }
hdmi_data->dma_params.port_addr = hdmi_rsrc->start hdmi_data->dma_data.addr = hdmi_rsrc->start + OMAP_HDMI_AUDIO_DMA_PORT;
+ OMAP_HDMI_AUDIO_DMA_PORT;
hdmi_rsrc = platform_get_resource(pdev, IORESOURCE_DMA, 0); hdmi_rsrc = platform_get_resource(pdev, IORESOURCE_DMA, 0);
if (!hdmi_rsrc) { if (!hdmi_rsrc) {
@ -292,8 +287,9 @@ static int omap_hdmi_probe(struct platform_device *pdev)
return -ENODEV; return -ENODEV;
} }
hdmi_data->dma_params.dma_req = hdmi_rsrc->start; hdmi_data->dma_req = hdmi_rsrc->start;
hdmi_data->dma_params.name = "HDMI playback"; hdmi_data->dma_data.filter_data = &hdmi_data->dma_req;
hdmi_data->dma_data.addr_width = DMA_SLAVE_BUSWIDTH_4_BYTES;
/* /*
* TODO: We assume that there is only one DSS HDMI device. Future * TODO: We assume that there is only one DSS HDMI device. Future

6
sound/soc/omap/omap-mcbsp.c
View File

@ -33,11 +33,11 @@
#include <sound/pcm_params.h> #include <sound/pcm_params.h>
#include <sound/initval.h> #include <sound/initval.h>
#include <sound/soc.h> #include <sound/soc.h>
#include <sound/dmaengine_pcm.h>
#include <linux/platform_data/asoc-ti-mcbsp.h> #include <linux/platform_data/asoc-ti-mcbsp.h>
#include "mcbsp.h" #include "mcbsp.h"
#include "omap-mcbsp.h" #include "omap-mcbsp.h"
#include "omap-pcm.h"
#define OMAP_MCBSP_RATES (SNDRV_PCM_RATE_8000_96000) #define OMAP_MCBSP_RATES (SNDRV_PCM_RATE_8000_96000)
@ -224,7 +224,7 @@ static int omap_mcbsp_dai_hw_params(struct snd_pcm_substream *substream,
{ {
struct omap_mcbsp *mcbsp = snd_soc_dai_get_drvdata(cpu_dai); struct omap_mcbsp *mcbsp = snd_soc_dai_get_drvdata(cpu_dai);
struct omap_mcbsp_reg_cfg *regs = &mcbsp->cfg_regs; struct omap_mcbsp_reg_cfg *regs = &mcbsp->cfg_regs;
struct omap_pcm_dma_data *dma_data; struct snd_dmaengine_dai_dma_data *dma_data;
int wlen, channels, wpf; int wlen, channels, wpf;
int pkt_size = 0; int pkt_size = 0;
unsigned int format, div, framesize, master; unsigned int format, div, framesize, master;
@ -276,7 +276,7 @@ static int omap_mcbsp_dai_hw_params(struct snd_pcm_substream *substream,
omap_mcbsp_set_threshold(substream, pkt_size); omap_mcbsp_set_threshold(substream, pkt_size);
} }
dma_data->packet_size = pkt_size; dma_data->maxburst = pkt_size;
if (mcbsp->configured) { if (mcbsp->configured) {
/* McBSP already configured by another stream */ /* McBSP already configured by another stream */

31
sound/soc/omap/omap-mcpdm.c
View File

@ -39,9 +39,9 @@
#include <sound/pcm.h> #include <sound/pcm.h>
#include <sound/pcm_params.h> #include <sound/pcm_params.h>
#include <sound/soc.h> #include <sound/soc.h>
#include <sound/dmaengine_pcm.h>
#include "omap-mcpdm.h" #include "omap-mcpdm.h"
#include "omap-pcm.h"
struct mcpdm_link_config { struct mcpdm_link_config {
u32 link_mask; /* channel mask for the direction */ u32 link_mask; /* channel mask for the direction */
@ -64,19 +64,14 @@ struct omap_mcpdm {
/* McPDM needs to be restarted due to runtime reconfiguration */ /* McPDM needs to be restarted due to runtime reconfiguration */
bool restart; bool restart;
struct snd_dmaengine_dai_dma_data dma_data[2];
unsigned int dma_req[2];
}; };
/* /*
* Stream DMA parameters * Stream DMA parameters
*/ */
static struct omap_pcm_dma_data omap_mcpdm_dai_dma_params[] = {
{
.name = "Audio playback",
},
{
.name = "Audio capture",
},
};
static inline void omap_mcpdm_write(struct omap_mcpdm *mcpdm, u16 reg, u32 val) static inline void omap_mcpdm_write(struct omap_mcpdm *mcpdm, u16 reg, u32 val)
{ {
@ -272,7 +267,7 @@ static int omap_mcpdm_dai_startup(struct snd_pcm_substream *substream,
mutex_unlock(&mcpdm->mutex); mutex_unlock(&mcpdm->mutex);
snd_soc_dai_set_dma_data(dai, substream, snd_soc_dai_set_dma_data(dai, substream,
&omap_mcpdm_dai_dma_params[substream->stream]); &mcpdm->dma_data[substream->stream]);
return 0; return 0;
} }
@ -302,7 +297,7 @@ static int omap_mcpdm_dai_hw_params(struct snd_pcm_substream *substream,
{ {
struct omap_mcpdm *mcpdm = snd_soc_dai_get_drvdata(dai); struct omap_mcpdm *mcpdm = snd_soc_dai_get_drvdata(dai);
int stream = substream->stream; int stream = substream->stream;
struct omap_pcm_dma_data *dma_data; struct snd_dmaengine_dai_dma_data *dma_data;
u32 threshold; u32 threshold;
int channels; int channels;
int link_mask = 0; int link_mask = 0;
@ -342,14 +337,14 @@ static int omap_mcpdm_dai_hw_params(struct snd_pcm_substream *substream,
if (!mcpdm->config[!stream].link_mask) if (!mcpdm->config[!stream].link_mask)
mcpdm->config[!stream].link_mask = 0x3; mcpdm->config[!stream].link_mask = 0x3;
dma_data->packet_size = dma_data->maxburst =
(MCPDM_DN_THRES_MAX - threshold) * channels; (MCPDM_DN_THRES_MAX - threshold) * channels;
} else { } else {
/* If playback is not running assume a stereo stream to come */ /* If playback is not running assume a stereo stream to come */
if (!mcpdm->config[!stream].link_mask) if (!mcpdm->config[!stream].link_mask)
mcpdm->config[!stream].link_mask = (0x3 << 3); mcpdm->config[!stream].link_mask = (0x3 << 3);
dma_data->packet_size = threshold * channels; dma_data->maxburst = threshold * channels;
} }
/* Check if we need to restart McPDM with this stream */ /* Check if we need to restart McPDM with this stream */
@ -475,20 +470,22 @@ static int asoc_mcpdm_probe(struct platform_device *pdev)
if (res == NULL) if (res == NULL)
return -ENOMEM; return -ENOMEM;
omap_mcpdm_dai_dma_params[0].port_addr = res->start + MCPDM_REG_DN_DATA; mcpdm->dma_data[0].addr = res->start + MCPDM_REG_DN_DATA;
omap_mcpdm_dai_dma_params[1].port_addr = res->start + MCPDM_REG_UP_DATA; mcpdm->dma_data[1].addr = res->start + MCPDM_REG_UP_DATA;
res = platform_get_resource_byname(pdev, IORESOURCE_DMA, "dn_link"); res = platform_get_resource_byname(pdev, IORESOURCE_DMA, "dn_link");
if (!res) if (!res)
return -ENODEV; return -ENODEV;
omap_mcpdm_dai_dma_params[0].dma_req = res->start; mcpdm->dma_req[0] = res->start;
mcpdm->dma_data[0].filter_data = &mcpdm->dma_req[0];
res = platform_get_resource_byname(pdev, IORESOURCE_DMA, "up_link"); res = platform_get_resource_byname(pdev, IORESOURCE_DMA, "up_link");
if (!res) if (!res)
return -ENODEV; return -ENODEV;
omap_mcpdm_dai_dma_params[1].dma_req = res->start; mcpdm->dma_req[1] = res->start;
mcpdm->dma_data[1].filter_data = &mcpdm->dma_req[1];
res = platform_get_resource_byname(pdev, IORESOURCE_MEM, "mpu"); res = platform_get_resource_byname(pdev, IORESOURCE_MEM, "mpu");
if (res == NULL) if (res == NULL)

42
sound/soc/omap/omap-pcm.c
View File

@ -32,8 +32,6 @@
#include <sound/dmaengine_pcm.h> #include <sound/dmaengine_pcm.h>
#include <sound/soc.h> #include <sound/soc.h>
#include "omap-pcm.h"
#ifdef CONFIG_ARCH_OMAP1 #ifdef CONFIG_ARCH_OMAP1
#define pcm_omap1510() cpu_is_omap1510() #define pcm_omap1510() cpu_is_omap1510()
#else #else
@ -56,25 +54,6 @@ static const struct snd_pcm_hardware omap_pcm_hardware = {
.buffer_bytes_max = 128 * 1024, .buffer_bytes_max = 128 * 1024,
}; };
static int omap_pcm_get_dma_buswidth(int num_bits)
{
int buswidth;
switch (num_bits) {
case 16:
buswidth = DMA_SLAVE_BUSWIDTH_2_BYTES;
break;
case 32:
buswidth = DMA_SLAVE_BUSWIDTH_4_BYTES;
break;
default:
buswidth = -EINVAL;
break;
}
return buswidth;
}
/* this may get called several times by oss emulation */ /* this may get called several times by oss emulation */
static int omap_pcm_hw_params(struct snd_pcm_substream *substream, static int omap_pcm_hw_params(struct snd_pcm_substream *substream,
struct snd_pcm_hw_params *params) struct snd_pcm_hw_params *params)
@ -105,20 +84,9 @@ static int omap_pcm_hw_params(struct snd_pcm_substream *substream,
if (err) if (err)
return err; return err;
/* Override the *_dma addr_width if requested by the DAI driver */ snd_dmaengine_pcm_set_config_from_dai_data(substream,
if (dma_data->data_type) { snd_soc_dai_get_dma_data(rtd->cpu_dai, substream),
int buswidth = omap_pcm_get_dma_buswidth(dma_data->data_type); &config);
if (substream->stream == SNDRV_PCM_STREAM_PLAYBACK)
config.dst_addr_width = buswidth;
else
config.src_addr_width = buswidth;
}
config.src_addr = dma_data->port_addr;
config.dst_addr = dma_data->port_addr;
config.src_maxburst = dma_data->packet_size;
config.dst_maxburst = dma_data->packet_size;
return dmaengine_slave_config(chan, &config); return dmaengine_slave_config(chan, &config);
} }
@ -144,14 +112,14 @@ static snd_pcm_uframes_t omap_pcm_pointer(struct snd_pcm_substream *substream)
static int omap_pcm_open(struct snd_pcm_substream *substream) static int omap_pcm_open(struct snd_pcm_substream *substream)
{ {
struct snd_soc_pcm_runtime *rtd = substream->private_data; struct snd_soc_pcm_runtime *rtd = substream->private_data;
struct omap_pcm_dma_data *dma_data; struct snd_dmaengine_dai_dma_data *dma_data;
snd_soc_set_runtime_hwparams(substream, &omap_pcm_hardware); snd_soc_set_runtime_hwparams(substream, &omap_pcm_hardware);
dma_data = snd_soc_dai_get_dma_data(rtd->cpu_dai, substream); dma_data = snd_soc_dai_get_dma_data(rtd->cpu_dai, substream);
return snd_dmaengine_pcm_open(substream, omap_dma_filter_fn, return snd_dmaengine_pcm_open(substream, omap_dma_filter_fn,
&dma_data->dma_req); dma_data->filter_data);
} }
static int omap_pcm_mmap(struct snd_pcm_substream *substream, static int omap_pcm_mmap(struct snd_pcm_substream *substream,

39
sound/soc/omap/omap-pcm.h
View File

@ -1,39 +0,0 @@
/*
* omap-pcm.h
*
* Copyright (C) 2008 Nokia Corporation
*
* Contact: Jarkko Nikula <jarkko.nikula@bitmer.com>
* Peter Ujfalusi <peter.ujfalusi@ti.com>
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License
* version 2 as published by the Free Software Foundation.
*
* This program is distributed in the hope that it will be useful, but
* WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
* 02110-1301 USA
*
*/
#ifndef __OMAP_PCM_H__
#define __OMAP_PCM_H__
struct snd_pcm_substream;
struct omap_pcm_dma_data {
char *name; /* stream identifier */
int dma_req; /* DMA request line */
unsigned long port_addr; /* transmit/receive register */
int data_type; /* 8, 16, 32 (bits) or 0 to let omap-pcm
* to decide the sDMA data type */
int packet_size; /* packet size only in PACKET mode */
};
#endif

1
sound/soc/omap/omap-twl4030.c
View File

@ -43,7 +43,6 @@
#include <sound/jack.h> #include <sound/jack.h>
#include "omap-mcbsp.h" #include "omap-mcbsp.h"
#include "omap-pcm.h"
struct omap_twl4030 { struct omap_twl4030 {
int jack_detect; /* board can detect jack events */ int jack_detect; /* board can detect jack events */

1
sound/soc/omap/omap3pandora.c
View File

@ -34,7 +34,6 @@
#include <linux/platform_data/asoc-ti-mcbsp.h> #include <linux/platform_data/asoc-ti-mcbsp.h>
#include "omap-mcbsp.h" #include "omap-mcbsp.h"
#include "omap-pcm.h"
#define OMAP3_PANDORA_DAC_POWER_GPIO 118 #define OMAP3_PANDORA_DAC_POWER_GPIO 118
#define OMAP3_PANDORA_AMP_POWER_GPIO 14 #define OMAP3_PANDORA_AMP_POWER_GPIO 14

1
sound/soc/omap/osk5912.c
View File

@ -33,7 +33,6 @@
#include <linux/platform_data/asoc-ti-mcbsp.h> #include <linux/platform_data/asoc-ti-mcbsp.h>
#include "omap-mcbsp.h" #include "omap-mcbsp.h"
#include "omap-pcm.h"
#include "../codecs/tlv320aic23.h" #include "../codecs/tlv320aic23.h"
#define CODEC_CLOCK 12000000 #define CODEC_CLOCK 12000000

1
sound/soc/omap/rx51.c
View File

@ -37,7 +37,6 @@
#include <asm/mach-types.h> #include <asm/mach-types.h>
#include "omap-mcbsp.h" #include "omap-mcbsp.h"
#include "omap-pcm.h"
#define RX51_TVOUT_SEL_GPIO 40 #define RX51_TVOUT_SEL_GPIO 40
#define RX51_JACK_DETECT_GPIO 177 #define RX51_JACK_DETECT_GPIO 177