ASoC: Intel: remove misleading DMA error messages on Baytrail platforms

During probe, the Baytrail audio driver reports errors such as:

[44.172040] baytrail-pcm-audio baytrail-pcm-audio: error: invalid DMA engine 0
[44.172137] baytrail-pcm-audio baytrail-pcm-audio: sst_dma_new failed

Those error messages are misleading, there is no error since the DMA
is explicitly not configured for Baytrail.
Add a test to remove DMA error checks when DMA is not configured
and return silently.

Acked-by: Liam Girdwood <liam.r.girdwood@linux.intel.com>
Signed-off-by: Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
Signed-off-by: Mark Brown <broonie@kernel.org>

diff --git a/sound/soc/intel/sst-acpi.c b/sound/soc/intel/sst-acpi.c
index b3d84560fbb5da2f6ce908eb1803b9031da71d78..42f293f9c6e2dcfbdf5da2f451a6cf196fc296dc 100644 (file)
--- a/sound/soc/intel/sst-acpi.c
+++ b/sound/soc/intel/sst-acpi.c
@@ -142,6 +142,7 @@ static int sst_acpi_probe(struct platform_device *pdev)
        sst_acpi->desc = desc;
        sst_acpi->mach = mach;
 
+       sst_pdata->resindex_dma_base = desc->resindex_dma_base;
        if (desc->resindex_dma_base >= 0) {
                sst_pdata->dma_engine = desc->dma_engine;
                sst_pdata->dma_base = desc->resindex_dma_base;

diff --git a/sound/soc/intel/sst-dsp.h b/sound/soc/intel/sst-dsp.h
index f291e32f00777a626b64299e8725cdb5fb3bf42b..148d8c589a43f6b03ad87c6af43adb0fd58c016e 100644 (file)
--- a/sound/soc/intel/sst-dsp.h
+++ b/sound/soc/intel/sst-dsp.h
@@ -206,6 +206,7 @@ struct sst_pdata {
        const struct firmware *fw;
 
        /* DMA */
+       int resindex_dma_base; /* other fields invalid if equals to -1 */
        u32 dma_base;
        u32 dma_size;
        int dma_engine;

diff --git a/sound/soc/intel/sst-firmware.c b/sound/soc/intel/sst-firmware.c
index b3f9489794a6acad776fc2cf7670b6e12ab06bf6..28beceb3f252dda955e13ac827b81041e8785032 100644 (file)
--- a/sound/soc/intel/sst-firmware.c
+++ b/sound/soc/intel/sst-firmware.c
@@ -271,6 +271,10 @@ int sst_dma_new(struct sst_dsp *sst)
        const char *dma_dev_name;
        int ret = 0;
 
+       if (sst->pdata->resindex_dma_base == -1)
+               /* DMA is not used, return and squelsh error messages */
+               return 0;
+
        /* configure the correct platform data for whatever DMA engine
        * is attached to the ADSP IP. */
        switch (sst->pdata->dma_engine) {