From: Naresh Medisetty <[EMAIL PROTECTED]>
Fixes compilation errors for alsa driver
Signed-off-by: Naresh Medisetty <[EMAIL PROTECTED]>
---
arch/arm/mach-davinci/dma.c | 20 ++++++++++++++++++++
arch/arm/mach-davinci/include/mach/edma.h | 10 ++++++++++
sound/soc/davinci/davinci-evm.c | 5 +++--
sound/soc/davinci/davinci-pcm.c | 5 +++--
4 files changed, 36 insertions(+), 4 deletions(-)
diff --git a/arch/arm/mach-davinci/dma.c b/arch/arm/mach-davinci/dma.c
index 7ed4604..5fc74a9 100644
--- a/arch/arm/mach-davinci/dma.c
+++ b/arch/arm/mach-davinci/dma.c
@@ -482,6 +482,26 @@ static void free_dma_interrupt(int intr_no)
}
}
+/**
+ * davinci_dma_getposition - returns the current transfer points
+ * @lch: logical channel number
+ * @src: source port position
+ * @dst: destination port position
+ *
+ * Returns current source and destination address of a paticular
+ * DMA channel
+ **/
+void davinci_dma_getposition(int lch, dma_addr_t *src, dma_addr_t *dst)
+{
+ edmacc_paramentry_regs temp;
+
+ davinci_get_dma_params(lch, &temp);
+ if (src != NULL)
+ *src = temp.src;
+ if (dst != NULL)
+ *dst = temp.dst;
+}
+EXPORT_SYMBOL(davinci_dma_getposition);
/******************************************************************************
*
* DMA interrupt handler
diff --git a/arch/arm/mach-davinci/include/mach/edma.h
b/arch/arm/mach-davinci/include/mach/edma.h
index a692684..df58b74 100644
--- a/arch/arm/mach-davinci/include/mach/edma.h
+++ b/arch/arm/mach-davinci/include/mach/edma.h
@@ -550,4 +550,14 @@ void davinci_dma_unchain_lch(int lch_head, int lch_queue);
*****************************************************************************/
void davinci_free_dma(int lch);
+/**
+ * davinci_dma_getposition - returns the current transfer points
+ * @lch: logical channel number
+ * @src: source port position
+ * @dst: destination port position
+ *
+ * Returns current source and destination address of a paticular
+ * DMA channel
+ **/
+void davinci_dma_getposition(int lch, dma_addr_t *src, dma_addr_t *dst);
#endif
diff --git a/sound/soc/davinci/davinci-evm.c b/sound/soc/davinci/davinci-evm.c
index 65fdbd8..63f535d 100644
--- a/sound/soc/davinci/davinci-evm.c
+++ b/sound/soc/davinci/davinci-evm.c
@@ -21,6 +21,7 @@
#include <asm/dma.h>
#include <mach/hardware.h>
+#include <mach/edma.h>
#include "../codecs/tlv320aic3x.h"
#include "davinci-pcm.h"
@@ -156,8 +157,8 @@ static struct resource evm_snd_resources[] = {
};
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_MCBSP_TX,
+ .rx_dma_ch = DAVINCI_DMA_MCBSP_RX,
};
static struct platform_device *evm_snd_device;
diff --git a/sound/soc/davinci/davinci-pcm.c b/sound/soc/davinci/davinci-pcm.c
index 6a5e56a..606847b 100644
--- a/sound/soc/davinci/davinci-pcm.c
+++ b/sound/soc/davinci/davinci-pcm.c
@@ -21,6 +21,7 @@
#include <sound/soc.h>
#include <asm/dma.h>
+#include <mach/edma.h>
#include "davinci-pcm.h"
@@ -147,7 +148,7 @@ static int davinci_pcm_dma_request(struct snd_pcm_substream
*substream)
return ret;
/* Request slave DMA channel */
- ret = davinci_request_dma(PARAM_ANY, "Link",
+ ret = davinci_request_dma(DAVINCI_EDMA_PARAM_ANY, "Link",
NULL, NULL, &prtd->slave_lch, &tcc, EVENTQ_0);
if (ret) {
davinci_free_dma(prtd->master_lch);
@@ -191,7 +192,7 @@ static int davinci_pcm_trigger(struct snd_pcm_substream
*substream, int cmd)
static int davinci_pcm_prepare(struct snd_pcm_substream *substream)
{
struct davinci_runtime_data *prtd = substream->runtime->private_data;
- struct paramentry_descriptor temp;
+ edmacc_paramentry_regs temp;
prtd->period = 0;
davinci_pcm_enqueue_dma(substream);
--
1.5.4.1
_______________________________________________
Davinci-linux-open-source mailing list
[email protected]
http://linux.davincidsp.com/mailman/listinfo/davinci-linux-open-source
