diff options
Diffstat (limited to 'sound/soc/imx/imx-ssi.h')
-rw-r--r-- | sound/soc/imx/imx-ssi.h | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/sound/soc/imx/imx-ssi.h b/sound/soc/imx/imx-ssi.h index 55f26ebcd8c2..dc8a87530e3e 100644 --- a/sound/soc/imx/imx-ssi.h +++ b/sound/soc/imx/imx-ssi.h | |||
@@ -183,11 +183,11 @@ | |||
183 | #define IMX_SSI_RX_DIV_PSR 4 | 183 | #define IMX_SSI_RX_DIV_PSR 4 |
184 | #define IMX_SSI_RX_DIV_PM 5 | 184 | #define IMX_SSI_RX_DIV_PM 5 |
185 | 185 | ||
186 | extern struct snd_soc_dai imx_ssi_pcm_dai[2]; | ||
187 | extern struct snd_soc_platform imx_soc_platform; | ||
188 | |||
189 | #define DRV_NAME "imx-ssi" | 186 | #define DRV_NAME "imx-ssi" |
190 | 187 | ||
188 | #include <linux/dmaengine.h> | ||
189 | #include <mach/dma.h> | ||
190 | |||
191 | struct imx_pcm_dma_params { | 191 | struct imx_pcm_dma_params { |
192 | int dma; | 192 | int dma; |
193 | unsigned long dma_addr; | 193 | unsigned long dma_addr; |
@@ -197,7 +197,7 @@ struct imx_pcm_dma_params { | |||
197 | struct imx_ssi { | 197 | struct imx_ssi { |
198 | struct platform_device *ac97_dev; | 198 | struct platform_device *ac97_dev; |
199 | 199 | ||
200 | struct snd_soc_device imx_ac97; | 200 | struct snd_soc_dai *imx_ac97; |
201 | struct clk *clk; | 201 | struct clk *clk; |
202 | void __iomem *base; | 202 | void __iomem *base; |
203 | int irq; | 203 | int irq; |
@@ -213,6 +213,9 @@ struct imx_ssi { | |||
213 | struct imx_pcm_dma_params dma_params_tx; | 213 | struct imx_pcm_dma_params dma_params_tx; |
214 | 214 | ||
215 | int enabled; | 215 | int enabled; |
216 | |||
217 | struct platform_device *soc_platform_pdev; | ||
218 | struct platform_device *soc_platform_pdev_fiq; | ||
216 | }; | 219 | }; |
217 | 220 | ||
218 | struct snd_soc_platform *imx_ssi_fiq_init(struct platform_device *pdev, | 221 | struct snd_soc_platform *imx_ssi_fiq_init(struct platform_device *pdev, |
@@ -231,7 +234,4 @@ void imx_pcm_free(struct snd_pcm *pcm); | |||
231 | */ | 234 | */ |
232 | #define IMX_SSI_DMABUF_SIZE (64 * 1024) | 235 | #define IMX_SSI_DMABUF_SIZE (64 * 1024) |
233 | 236 | ||
234 | #define DMA_RXFIFO_BURST 0x4 | ||
235 | #define DMA_TXFIFO_BURST 0x6 | ||
236 | |||
237 | #endif /* _IMX_SSI_H */ | 237 | #endif /* _IMX_SSI_H */ |