Sound-open-firmware

Download

sound-open-firmware@alsa-project.org

1572 discussions

[Sound-open-firmware] [PATCH] ipc: dma: Correct typo for DMA timeout time and units.
by Liam Girdwood 20 Oct '16

20 Oct '16

100 usecs not 1 msec Signed-off-by: Liam Girdwood <liam.r.girdwood(a)linux.intel.com> --- src/ipc/dma-copy.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/ipc/dma-copy.c b/src/ipc/dma-copy.c index c7523fa..0e92ebe 100644 --- a/src/ipc/dma-copy.c +++ b/src/ipc/dma-copy.c @@ -89,7 +89,7 @@ int dma_copy_to_host(struct dma_sg_config *host_sg, int32_t host_offset, return -EINVAL; /* set up DMA configuration */ - complete.timeout = 100; /* wait 1 msecs for DMA to finish */ + complete.timeout = 100; /* wait 100 usecs for DMA to finish */ config.direction = DMA_DIR_LMEM_TO_HMEM; config.src_width = sizeof(uint32_t); config.dest_width = sizeof(uint32_t); @@ -166,7 +166,7 @@ int dma_copy_from_host(struct dma_sg_config *host_sg, int32_t host_offset, return -EINVAL; /* set up DMA configuration */ - complete.timeout = 100; /* wait 1 msecs for DMA to finish */ + complete.timeout = 100; /* wait 100 usecs for DMA to finish */ config.direction = DMA_DIR_HMEM_TO_LMEM; config.src_width = sizeof(uint32_t); config.dest_width = sizeof(uint32_t); -- 2.7.4

1 0

[Sound-open-firmware] [PATCH] dai: add support for CHT SSP ports
by Liam Girdwood 20 Oct '16

20 Oct '16

CHT has 6 SSP ports compared to 3 on BYT Signed-off-by: Liam Girdwood <liam.r.girdwood(a)linux.intel.com> --- src/platform/baytrail/dai.c | 58 +++++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 56 insertions(+), 2 deletions(-) diff --git a/src/platform/baytrail/dai.c b/src/platform/baytrail/dai.c index 4db91e5..8df13ed 100644 --- a/src/platform/baytrail/dai.c +++ b/src/platform/baytrail/dai.c @@ -39,7 +39,7 @@ #include <stdint.h> #include <string.h> -static struct dai ssp[3] = { +static struct dai ssp[] = { { .type = COMP_TYPE_DAI_SSP, .index = 0, @@ -90,7 +90,61 @@ static struct dai ssp[3] = { } }, .ops = &ssp_ops, -},}; +}, +#if defined CONFIG_CHERRYTRAIL +{ + .type = COMP_TYPE_DAI_SSP, + .index = 3, + .plat_data = { + .base = SSP3_BASE, + .irq = IRQ_NUM_EXT_SSP0, + .fifo[STREAM_DIRECTION_PLAYBACK] = { + .offset = SSP3_BASE + SSDR, + .handshake = DMA_HANDSHAKE_SSP3_TX, + }, + .fifo[STREAM_DIRECTION_CAPTURE] = { + .offset = SSP0_BASE + SSDR, + .handshake = DMA_HANDSHAKE_SSP3_RX, + } + }, + .ops = &ssp_ops, +}, +{ + .type = COMP_TYPE_DAI_SSP, + .index = 4, + .plat_data = { + .base = SSP4_BASE, + .irq = IRQ_NUM_EXT_SSP1, + .fifo[STREAM_DIRECTION_PLAYBACK] = { + .offset = SSP4_BASE + SSDR, + .handshake = DMA_HANDSHAKE_SSP4_TX, + }, + .fifo[STREAM_DIRECTION_CAPTURE] = { + .offset = SSP4_BASE + SSDR, + .handshake = DMA_HANDSHAKE_SSP4_RX, + } + }, + .ops = &ssp_ops, +}, +{ + .type = COMP_TYPE_DAI_SSP, + .index = 5, + .plat_data = { + .base = SSP5_BASE, + .irq = IRQ_NUM_EXT_SSP2, + .fifo[STREAM_DIRECTION_PLAYBACK] = { + .offset = SSP5_BASE + SSDR, + .handshake = DMA_HANDSHAKE_SSP5_TX, + }, + .fifo[STREAM_DIRECTION_CAPTURE] = { + .offset = SSP5_BASE + SSDR, + .handshake = DMA_HANDSHAKE_SSP5_RX, + } + }, + .ops = &ssp_ops, +}, +#endif +}; struct dai *dai_get(uint32_t type, uint32_t index) { -- 2.7.4

1 3

Jump to page: