diff options
| -rw-r--r-- | sound/soc/intel/sst-acpi.c | 1 | ||||
| -rw-r--r-- | sound/soc/intel/sst-dsp.h | 1 | ||||
| -rw-r--r-- | sound/soc/intel/sst-firmware.c | 4 | 
3 files changed, 6 insertions, 0 deletions
diff --git a/sound/soc/intel/sst-acpi.c b/sound/soc/intel/sst-acpi.c index b3d84560fbb5..42f293f9c6e2 100644 --- 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) | |||
| 142 | sst_acpi->desc = desc; | 142 | sst_acpi->desc = desc; | 
| 143 | sst_acpi->mach = mach; | 143 | sst_acpi->mach = mach; | 
| 144 | 144 | ||
| 145 | sst_pdata->resindex_dma_base = desc->resindex_dma_base; | ||
| 145 | if (desc->resindex_dma_base >= 0) { | 146 | if (desc->resindex_dma_base >= 0) { | 
| 146 | sst_pdata->dma_engine = desc->dma_engine; | 147 | sst_pdata->dma_engine = desc->dma_engine; | 
| 147 | sst_pdata->dma_base = desc->resindex_dma_base; | 148 | 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 f291e32f0077..148d8c589a43 100644 --- a/sound/soc/intel/sst-dsp.h +++ b/sound/soc/intel/sst-dsp.h  | |||
| @@ -206,6 +206,7 @@ struct sst_pdata { | |||
| 206 | const struct firmware *fw; | 206 | const struct firmware *fw; | 
| 207 | 207 | ||
| 208 | /* DMA */ | 208 | /* DMA */ | 
| 209 | int resindex_dma_base; /* other fields invalid if equals to -1 */ | ||
| 209 | u32 dma_base; | 210 | u32 dma_base; | 
| 210 | u32 dma_size; | 211 | u32 dma_size; | 
| 211 | int dma_engine; | 212 | int dma_engine; | 
diff --git a/sound/soc/intel/sst-firmware.c b/sound/soc/intel/sst-firmware.c index b3f9489794a6..28beceb3f252 100644 --- 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) | |||
| 271 | const char *dma_dev_name; | 271 | const char *dma_dev_name; | 
| 272 | int ret = 0; | 272 | int ret = 0; | 
| 273 | 273 | ||
| 274 | if (sst->pdata->resindex_dma_base == -1) | ||
| 275 | /* DMA is not used, return and squelsh error messages */ | ||
| 276 | return 0; | ||
| 277 | |||
| 274 | /* configure the correct platform data for whatever DMA engine | 278 | /* configure the correct platform data for whatever DMA engine | 
| 275 | * is attached to the ADSP IP. */ | 279 | * is attached to the ADSP IP. */ | 
| 276 | switch (sst->pdata->dma_engine) { | 280 | switch (sst->pdata->dma_engine) { | 
