[ALSA] soc - ASoC 0.13 pxa2xx DMA
This patch updates the pxa2xx I2S driver to the new API in ASoC 0.13. Changes:- o Added check in hw_params to detect buffer less pcms (i.e. BT <--> codec). o Updated structures to new API o Removed DAI's and ac97 ops from PCM header. o Integer hardware constraint added for periods. Signed-off-by: Andrew Johnson <ajohnson@intrinsyc.com> Signed-off-by: Liam Girdwood <lg@opensource.wolfsonmicro.com> Signed-off-by: Takashi Iwai <tiwai@suse.de> Signed-off-by: Jaroslav Kysela <perex@suse.cz>
This commit is contained in:
parent
596ce32b74
commit
a8f5d0a5d0
|
@ -76,13 +76,18 @@ static int pxa2xx_pcm_hw_params(struct snd_pcm_substream *substream,
|
|||
struct snd_pcm_runtime *runtime = substream->runtime;
|
||||
struct pxa2xx_runtime_data *prtd = runtime->private_data;
|
||||
struct snd_soc_pcm_runtime *rtd = substream->private_data;
|
||||
struct pxa2xx_pcm_dma_params *dma = rtd->cpu_dai->dma_data;
|
||||
struct pxa2xx_pcm_dma_params *dma = rtd->dai->cpu_dai->dma_data;
|
||||
size_t totsize = params_buffer_bytes(params);
|
||||
size_t period = params_period_bytes(params);
|
||||
pxa_dma_desc *dma_desc;
|
||||
dma_addr_t dma_buff_phys, next_desc_phys;
|
||||
int ret;
|
||||
|
||||
/* return if this is a bufferless transfer e.g.
|
||||
* codec <--> BT codec or GSM modem -- lg FIXME */
|
||||
if (!dma)
|
||||
return 0;
|
||||
|
||||
/* this may get called several times by oss emulation
|
||||
* with different params */
|
||||
if (prtd->params == NULL) {
|
||||
|
@ -227,6 +232,10 @@ static int pxa2xx_pcm_open(struct snd_pcm_substream *substream)
|
|||
if (ret)
|
||||
goto out;
|
||||
|
||||
ret = snd_pcm_hw_constraint_integer(runtime, SNDRV_PCM_HW_PARAM_PERIODS);
|
||||
if (ret < 0)
|
||||
goto out;
|
||||
|
||||
prtd = kzalloc(sizeof(struct pxa2xx_runtime_data), GFP_KERNEL);
|
||||
if (prtd == NULL) {
|
||||
ret = -ENOMEM;
|
||||
|
|
|
@ -28,21 +28,7 @@ struct pxa2xx_gpio {
|
|||
u32 frm;
|
||||
};
|
||||
|
||||
/* pxa2xx DAI ID's */
|
||||
#define PXA2XX_DAI_AC97_HIFI 0
|
||||
#define PXA2XX_DAI_AC97_AUX 1
|
||||
#define PXA2XX_DAI_AC97_MIC 2
|
||||
#define PXA2XX_DAI_I2S 0
|
||||
#define PXA2XX_DAI_SSP1 0
|
||||
#define PXA2XX_DAI_SSP2 1
|
||||
#define PXA2XX_DAI_SSP3 2
|
||||
|
||||
extern struct snd_soc_cpu_dai pxa_ac97_dai[3];
|
||||
extern struct snd_soc_cpu_dai pxa_i2s_dai;
|
||||
extern struct snd_soc_cpu_dai pxa_ssp_dai[3];
|
||||
|
||||
/* platform data */
|
||||
extern struct snd_soc_platform pxa2xx_soc_platform;
|
||||
extern struct snd_ac97_bus_ops pxa2xx_ac97_ops;
|
||||
|
||||
#endif
|
||||
|
|
Loading…
Reference in a new issue