ENGR00179628-1 SSI: enable dual-fifo feature as default

enable SSI dual-fifo feature as default setting

Signed-off-by: Gary Zhang <b13634@freescale.com>

diff --git a/drivers/dma/imx-sdma.c b/drivers/dma/imx-sdma.c
index 6f168fe568a8b3cbb0cabf1551905248a2604239..1b98d7306d255a43f236901d55cc6073579a34c4 100644 (file)
--- a/drivers/dma/imx-sdma.c
+++ b/drivers/dma/imx-sdma.c
@@ -576,6 +576,9 @@ static void sdma_get_pc(struct sdma_channel *sdmac,
                emi_2_per = sdma->script_addrs->mcu_2_app_addr;
                break;
        case IMX_DMATYPE_SSI_SP:
+               per_2_emi = sdma->script_addrs->ssish_2_mcu_addr;
+               emi_2_per = sdma->script_addrs->mcu_2_ssish_addr;
+               break;
        case IMX_DMATYPE_MMC:
        case IMX_DMATYPE_SDHC:
        case IMX_DMATYPE_CSPI_SP:
@@ -1155,7 +1158,7 @@ static void sdma_issue_pending(struct dma_chan *chan)
         */
 }
 
-#define SDMA_SCRIPT_ADDRS_ARRAY_SIZE_V1        34
+#define SDMA_SCRIPT_ADDRS_ARRAY_SIZE_V1        37
 
 static void sdma_add_scripts(struct sdma_engine *sdma,
                const struct sdma_script_start_addrs *addr)

diff --git a/sound/soc/imx/imx-ssi.c b/sound/soc/imx/imx-ssi.c
index 4d6319c8dcbe8f9b8468d9d6f0c4c5a83a71cbda..aff891aebb0576d9f429d5a0485140edabffa463 100644 (file)
--- a/sound/soc/imx/imx-ssi.c
+++ b/sound/soc/imx/imx-ssi.c
@@ -157,6 +157,10 @@ static int imx_ssi_set_dai_fmt(struct snd_soc_dai *cpu_dai, unsigned int fmt)
        if (ssi->flags & IMX_SSI_SYN)
                scr |= SSI_SCR_SYN;
 
+       /* Dual-FIFO support */
+       strcr |= SSI_STCR_TFEN1;
+       scr |= SSI_SCR_TCH_EN;
+
        writel(strcr, ssi->base + SSI_STCR);
        if ((fmt & SND_SOC_DAIFMT_MASTER_MASK) == SND_SOC_DAIFMT_CBS_CFS)
                strcr &= ~(SSI_STCR_TFDIR | SSI_STCR_TXDIR);