Merge branch 'for-linus' of git://git.infradead.org/users/vkoul/slave-dma

[sfrench/cifs-2.6.git] / sound / soc / sh / fsi.c

diff --git a/sound/soc/sh/fsi.c b/sound/soc/sh/fsi.c
index 0c2af21b0b82513176ac841ae8e394cd6711eead..142c066eaee2ecb13dcfbee6ac01b076ce52894c 100644 (file)
--- a/sound/soc/sh/fsi.c
+++ b/sound/soc/sh/fsi.c
@@ -250,6 +250,7 @@ struct fsi_clk {
 
 struct fsi_priv {
        void __iomem *base;
 
 struct fsi_priv {
        void __iomem *base;

+       phys_addr_t phys;

        struct fsi_master *master;
 
        struct fsi_stream playback;
        struct fsi_master *master;
 
        struct fsi_stream playback;


@@ -1371,13 +1372,18 @@ static int fsi_dma_probe(struct fsi_priv *fsi, struct fsi_stream *io, struct dev
                                shdma_chan_filter, (void *)io->dma_id,
                                dev, is_play ? "tx" : "rx");
        if (io->chan) {
                                shdma_chan_filter, (void *)io->dma_id,
                                dev, is_play ? "tx" : "rx");
        if (io->chan) {

-               struct dma_slave_config cfg;
+               struct dma_slave_config cfg = {};

                int ret;
 
                int ret;
 

-               cfg.slave_id    = io->dma_id;
-               cfg.dst_addr    = 0; /* use default addr */
-               cfg.src_addr    = 0; /* use default addr */
-               cfg.direction   = is_play ? DMA_MEM_TO_DEV : DMA_DEV_TO_MEM;
+               if (is_play) {
+                       cfg.dst_addr            = fsi->phys + REG_DODT;
+                       cfg.dst_addr_width      = DMA_SLAVE_BUSWIDTH_4_BYTES;
+                       cfg.direction           = DMA_MEM_TO_DEV;
+               } else {
+                       cfg.src_addr            = fsi->phys + REG_DIDT;
+                       cfg.src_addr_width      = DMA_SLAVE_BUSWIDTH_4_BYTES;
+                       cfg.direction           = DMA_DEV_TO_MEM;
+               }

 
                ret = dmaengine_slave_config(io->chan, &cfg);
                if (ret < 0) {
 
                ret = dmaengine_slave_config(io->chan, &cfg);
                if (ret < 0) {


@@ -1974,6 +1980,7 @@ static int fsi_probe(struct platform_device *pdev)
        /* FSI A setting */
        fsi             = &master->fsia;
        fsi->base       = master->base;
        /* FSI A setting */
        fsi             = &master->fsia;
        fsi->base       = master->base;

+       fsi->phys       = res->start;

        fsi->master     = master;
        fsi_port_info_init(fsi, &info.port_a);
        fsi_handler_init(fsi, &info.port_a);
        fsi->master     = master;
        fsi_port_info_init(fsi, &info.port_a);
        fsi_handler_init(fsi, &info.port_a);


@@ -1986,6 +1993,7 @@ static int fsi_probe(struct platform_device *pdev)
        /* FSI B setting */
        fsi             = &master->fsib;
        fsi->base       = master->base + 0x40;
        /* FSI B setting */
        fsi             = &master->fsib;
        fsi->base       = master->base + 0x40;

+       fsi->phys       = res->start + 0x40;

        fsi->master     = master;
        fsi_port_info_init(fsi, &info.port_b);
        fsi_handler_init(fsi, &info.port_b);
        fsi->master     = master;
        fsi_port_info_init(fsi, &info.port_b);
        fsi_handler_init(fsi, &info.port_b);