Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a55ede16 authored by Mark Brown's avatar Mark Brown
Browse files

Merge remote-tracking branch 'asoc/fix/intel' into asoc-linus

parents dad0e523 6212755e

sound/soc/intel/sst-acpi.c

+1 −0
Original line number Diff line number Diff line
@@ -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;

sound/soc/intel/sst-dsp.h

+1 −0
Original line number Diff line number Diff line
@@ -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;

sound/soc/intel/sst-firmware.c

+4 −0
Original line number Diff line number Diff line
@@ -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) {

sound/soc/intel/sst/sst_acpi.c

+1 −1
Original line number Diff line number Diff line
@@ -309,7 +309,7 @@ static int sst_acpi_probe(struct platform_device *pdev) 
	ctx->shim_regs64 = devm_kzalloc(ctx->dev, sizeof(*ctx->shim_regs64),

					GFP_KERNEL);

	if (!ctx->shim_regs64) {

		return -ENOMEM;

		ret = -ENOMEM;

		goto do_sst_cleanup;

	}