--- Begin Message ---
Send Davinci-linux-open-source mailing list submissions to
[email protected]
To subscribe or unsubscribe via the World Wide Web, visit
http://linux.davincidsp.com/mailman/listinfo/davinci-linux-open-source
or, via email, send a message with subject or body 'help' to
[email protected]
You can reach the person managing the list at
[email protected]
When replying, please edit your Subject line so it is more specific
than "Re: Contents of Davinci-linux-open-source digest..."
Today's Topics:
1. [PATCH] davinci: da8xx: clean up magic numbers in
devices-da8xx.c (Michael Williamson)
2. Re: [PATCH v2] asoc: davinci: da830/omap-l137: correct
cpu_dai_name (Mark Brown)
3. RE: Error While Running Demos (Tivy, Robert)
4. [PATCH 0/3] spi: davinci: move eventq parameter to platform
data (Michael Williamson)
5. [PATCH 1/3] davinci: spi: move event_q parameter to platform
data (Michael Williamson)
6. [PATCH 2/3] davinci: dm355: move spi0 eventq assignment from
resources to platform data (Michael Williamson)
----------------------------------------------------------------------
Message: 1
Date: Thu, 3 Feb 2011 15:12:00 -0500
From: Michael Williamson <[email protected]>
To: [email protected]
Cc: [email protected], [email protected]
Subject: [PATCH] davinci: da8xx: clean up magic numbers in
devices-da8xx.c
Message-ID:
<1296763920-4165-2-git-send-email-michael.william...@criticallink.com>
Extract magic numbers from DMA resource initializers to #defines.
Signed-off-by: Michael Williamson <[email protected]>
---
arch/arm/mach-davinci/devices-da8xx.c | 21 +++++++++++++--------
1 files changed, 13 insertions(+), 8 deletions(-)
diff --git a/arch/arm/mach-davinci/devices-da8xx.c
b/arch/arm/mach-davinci/devices-da8xx.c
index beda8a4..119d46e 100644
--- a/arch/arm/mach-davinci/devices-da8xx.c
+++ b/arch/arm/mach-davinci/devices-da8xx.c
@@ -44,6 +44,11 @@
#define DA8XX_EMAC_RAM_OFFSET 0x0000
#define DA8XX_EMAC_CTRL_RAM_SIZE SZ_8K
+#define DA8XX_DMA_MMCSD0_RX EDMA_CTLR_CHAN(0, 16)
+#define DA8XX_DMA_MMCSD0_TX EDMA_CTLR_CHAN(0, 17)
+#define DA850_DMA_MMCSD1_RX EDMA_CTLR_CHAN(1, 28)
+#define DA850_DMA_MMCSD1_TX EDMA_CTLR_CHAN(1, 29)
+
void __iomem *da8xx_syscfg0_base;
void __iomem *da8xx_syscfg1_base;
@@ -573,13 +578,13 @@ static struct resource da8xx_mmcsd0_resources[] = {
.flags = IORESOURCE_IRQ,
},
{ /* DMA RX */
- .start = EDMA_CTLR_CHAN(0, 16),
- .end = EDMA_CTLR_CHAN(0, 16),
+ .start = DA8XX_DMA_MMCSD0_RX,
+ .end = DA8XX_DMA_MMCSD0_RX,
.flags = IORESOURCE_DMA,
},
{ /* DMA TX */
- .start = EDMA_CTLR_CHAN(0, 17),
- .end = EDMA_CTLR_CHAN(0, 17),
+ .start = DA8XX_DMA_MMCSD0_TX,
+ .end = DA8XX_DMA_MMCSD0_TX,
.flags = IORESOURCE_DMA,
},
};
@@ -610,13 +615,13 @@ static struct resource da850_mmcsd1_resources[] = {
.flags = IORESOURCE_IRQ,
},
{ /* DMA RX */
- .start = EDMA_CTLR_CHAN(1, 28),
- .end = EDMA_CTLR_CHAN(1, 28),
+ .start = DA850_DMA_MMCSD1_RX,
+ .end = DA850_DMA_MMCSD1_RX,
.flags = IORESOURCE_DMA,
},
{ /* DMA TX */
- .start = EDMA_CTLR_CHAN(1, 29),
- .end = EDMA_CTLR_CHAN(1, 29),
+ .start = DA850_DMA_MMCSD1_TX,
+ .end = DA850_DMA_MMCSD1_TX,
.flags = IORESOURCE_DMA,
},
};
--
1.7.0.4
------------------------------
Message: 2
Date: Thu, 3 Feb 2011 20:22:53 +0000
From: Mark Brown <[email protected]>
To: Vaibhav Bedia <[email protected]>
Cc: [email protected], [email protected],
[email protected], [email protected],
[email protected]
Subject: Re: [PATCH v2] asoc: davinci: da830/omap-l137: correct
cpu_dai_name
Message-ID: <[email protected]>
Content-Type: text/plain; charset=us-ascii
On Thu, Feb 03, 2011 at 04:42:25PM +0530, Vaibhav Bedia wrote:
> McASP1 is used on the DA830/OMAP-L137 platform for the codec.
> This is different from the DA850/OMAP-L138 platform which uses McASP0.
>
> This is fixed by adding a new snd_soc_dai_link struct.
Applied, thanks.
------------------------------
Message: 3
Date: Thu, 3 Feb 2011 15:31:48 -0600
From: "Tivy, Robert" <[email protected]>
To: Aditya Barawkar <[email protected]>,
"[email protected]"
<[email protected]>
Subject: RE: Error While Running Demos
Message-ID:
<[email protected]>
Content-Type: text/plain; charset="us-ascii"
More details about the failure to open the codec engine are needed. You can
generate more info by setting the environment variable CE_DEBUG=3 and
re-running your app:
% export CE_DEBUG=3
% ./decode ...
Regards,
- Rob
________________________________
From: davinci-linux-open-source-bounces+rtivy=ti....@linux.davincidsp.com
[mailto:davinci-linux-open-source-bounces+rtivy=ti....@linux.davincidsp.com] On
Behalf Of Aditya Barawkar
Sent: Thursday, February 03, 2011 11:56 AM
To: [email protected]
Subject: Error While Running Demos
I'm trying to run demos for encode decode which came with DVSDK v1.30.01 for
DM6446 EVM
When i boot the board then I'm not seeing any demos which should run
automatically as per the TI doc.
So i opted to run the demos using command line.
First i loaded all the modules which are required to run the demos
Modules loaded :: cmemk.ko and dsplinkk.ko
[email protected]:/opt/demos/dm6446/decode/release# lsmod
Module Size Used by
cmemk 17368 0
dsplinkk 96360 0
But when i excute command to run the demo ::: ./decode -v
/opt/demos/dm6446/data/videos/davincieffect_ntsc.m2v -k
i get following error::
Decode demo started.
TraceUtil> Error: Failed to open codec engine "decode"
TraceUtil> Error: Aborting TraceUtil_start
Decode Error: Failed to open codec engine decode
Decode Error: Failed to open codec engine decode
[email protected]:/opt/demos/dm6446/decode/release#
Please help me out on how to make the sample demos run.
Thanks in advance.!
-------------- next part --------------
An HTML attachment was scrubbed...
URL:
<http://linux.davincidsp.com/pipermail/davinci-linux-open-source/attachments/20110203/6f8c5766/attachment-0001.html>
------------------------------
Message: 4
Date: Thu, 3 Feb 2011 19:34:47 -0500
From: Michael Williamson <[email protected]>
To: [email protected],
[email protected],
[email protected]
Cc: [email protected], [email protected]
Subject: [PATCH 0/3] spi: davinci: move eventq parameter to platform
data
Message-ID:
<1296779690-9723-1-git-send-email-michael.william...@criticallink.com>
For DMA operation, the davinci spi driver needs an eventq number.
Currently, this number is passed as a IORESOURCE_DMA. This is not
correct, as the eventq is not a DMA channel. Pass the eventq
via the platform data structure instead as is done with davinci
devices such as the McASP.
Two platforms (dm355 and dm365) are using the davinci spi driver
with DMA's enabled, move the eventq parameter out of the resources
and into the platform data.
I have tested this patch with an OMAP-L138 (patch submission for this
platform is in progress). I do not have a dm355 or dm365, so these
platforms have not been tested.
Michael Williamson (3):
davinci: spi: move event_q parameter to platform data
davinci: dm355: move spi0 eventq assignment from resources to
platform data
davinci: dm365: move spi0 eventq assignment from resources to
platform data
arch/arm/mach-davinci/dm355.c | 5 +----
arch/arm/mach-davinci/dm365.c | 5 +----
arch/arm/mach-davinci/include/mach/spi.h | 15 ++++++++++-----
drivers/spi/davinci_spi.c | 11 +++--------
4 files changed, 15 insertions(+), 21 deletions(-)
------------------------------
Message: 5
Date: Thu, 3 Feb 2011 19:34:48 -0500
From: Michael Williamson <[email protected]>
To: [email protected],
[email protected],
[email protected]
Cc: [email protected], [email protected]
Subject: [PATCH 1/3] davinci: spi: move event_q parameter to platform
data
Message-ID:
<1296779690-9723-2-git-send-email-michael.william...@criticallink.com>
For DMA operation, the davinci spi driver needs an eventq number.
Currently, this number is passed as a IORESOURCE_DMA. This is not
correct, as the eventq is not a DMA channel. Pass the eventq
via the platform data structure instead.
Signed-off-by: Michael Williamson <[email protected]>
---
arch/arm/mach-davinci/include/mach/spi.h | 15 ++++++++++-----
drivers/spi/davinci_spi.c | 11 +++--------
2 files changed, 13 insertions(+), 13 deletions(-)
diff --git a/arch/arm/mach-davinci/include/mach/spi.h
b/arch/arm/mach-davinci/include/mach/spi.h
index 38f4da5..0853a5f 100644
--- a/arch/arm/mach-davinci/include/mach/spi.h
+++ b/arch/arm/mach-davinci/include/mach/spi.h
@@ -19,6 +19,8 @@
#ifndef __ARCH_ARM_DAVINCI_SPI_H
#define __ARCH_ARM_DAVINCI_SPI_H
+#include <mach/edma.h>
+
#define SPI_INTERN_CS 0xFF
enum {
@@ -39,13 +41,16 @@ enum {
* to populate if all chip-selects are internal.
* @cshold_bug: set this to true if the SPI controller on your chip
requires
* a write to CSHOLD bit in between transfers (like in DM355).
+ * @dma_event_q: DMA event_q to use if SPI_IO_TYPE_DMA is used for any device
+ * on the bus.
*/
struct davinci_spi_platform_data {
- u8 version;
- u8 num_chipselect;
- u8 intr_line;
- u8 *chip_sel;
- bool cshold_bug;
+ u8 version;
+ u8 num_chipselect;
+ u8 intr_line;
+ u8 *chip_sel;
+ bool cshold_bug;
+ enum dma_event_q dma_event_q;
};
/**
diff --git a/drivers/spi/davinci_spi.c b/drivers/spi/davinci_spi.c
index 6beab99..166a879 100644
--- a/drivers/spi/davinci_spi.c
+++ b/drivers/spi/davinci_spi.c
@@ -790,7 +790,6 @@ static int davinci_spi_probe(struct platform_device *pdev)
struct resource *r, *mem;
resource_size_t dma_rx_chan = SPI_NO_RESOURCE;
resource_size_t dma_tx_chan = SPI_NO_RESOURCE;
- resource_size_t dma_eventq = SPI_NO_RESOURCE;
int i = 0, ret = 0;
u32 spipc0;
@@ -878,17 +877,13 @@ static int davinci_spi_probe(struct platform_device *pdev)
r = platform_get_resource(pdev, IORESOURCE_DMA, 1);
if (r)
dma_tx_chan = r->start;
- r = platform_get_resource(pdev, IORESOURCE_DMA, 2);
- if (r)
- dma_eventq = r->start;
dspi->bitbang.txrx_bufs = davinci_spi_bufs;
if (dma_rx_chan != SPI_NO_RESOURCE &&
- dma_tx_chan != SPI_NO_RESOURCE &&
- dma_eventq != SPI_NO_RESOURCE) {
+ dma_tx_chan != SPI_NO_RESOURCE) {
dspi->dma.rx_channel = dma_rx_chan;
dspi->dma.tx_channel = dma_tx_chan;
- dspi->dma.eventq = dma_eventq;
+ dspi->dma.eventq = pdata->dma_event_q;
ret = davinci_spi_request_dma(dspi);
if (ret)
@@ -897,7 +892,7 @@ static int davinci_spi_probe(struct platform_device *pdev)
dev_info(&pdev->dev, "DMA: supported\n");
dev_info(&pdev->dev, "DMA: RX channel: %d, TX channel: %d, "
"event queue: %d\n", dma_rx_chan, dma_tx_chan,
- dma_eventq);
+ pdata->dma_event_q);
}
dspi->get_rx = davinci_spi_rx_buf_u8;
--
1.7.0.4
------------------------------
Message: 6
Date: Thu, 3 Feb 2011 19:34:49 -0500
From: Michael Williamson <[email protected]>
To: [email protected],
[email protected],
[email protected]
Cc: [email protected], [email protected]
Subject: [PATCH 2/3] davinci: dm355: move spi0 eventq assignment from
resources to platform data
Message-ID:
<1296779690-9723-3-git-send-email-michael.william...@criticallink.com>
Move the eventq assignment for spi0 out of resources and into platform data.
Signed-off-by: Michael Williamson <[email protected]>
---
arch/arm/mach-davinci/dm355.c | 5 +----
1 files changed, 1 insertions(+), 4 deletions(-)
diff --git a/arch/arm/mach-davinci/dm355.c b/arch/arm/mach-davinci/dm355.c
index a5f8a80..76364d1 100644
--- a/arch/arm/mach-davinci/dm355.c
+++ b/arch/arm/mach-davinci/dm355.c
@@ -403,16 +403,13 @@ static struct resource dm355_spi0_resources[] = {
.start = 16,
.flags = IORESOURCE_DMA,
},
- {
- .start = EVENTQ_1,
- .flags = IORESOURCE_DMA,
- },
};
static struct davinci_spi_platform_data dm355_spi0_pdata = {
.version = SPI_VERSION_1,
.num_chipselect = 2,
.cshold_bug = true,
+ .dma_event_q = EVENTQ_1,
};
static struct platform_device dm355_spi0_device = {
.name = "spi_davinci",
--
1.7.0.4
------------------------------
_______________________________________________
Davinci-linux-open-source mailing list
[email protected]
http://linux.davincidsp.com/mailman/listinfo/davinci-linux-open-source
End of Davinci-linux-open-source Digest, Vol 62, Issue 18
*********************************************************
--- End Message ---
