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

Commit aecf6fd8 authored by Vinod Koul's avatar Vinod Koul Committed by Mark Brown
Browse files

ASoC: Intel: Skylake: Use the fw name from ACPI mach table 



The firmware name is hard coded which doesnt allow to load
different platforms for various platforms so get this name from
available machine table and pass it to dsp context for loading

Signed-off-by: default avatarVinod Koul <vinod.koul@intel.com>
Signed-off-by: default avatarMark Brown <broonie@kernel.org>
parent 40c3ac46

sound/soc/intel/skylake/skl-messages.c

+1 −1
Original line number Diff line number Diff line
@@ -96,7 +96,7 @@ int skl_init_dsp(struct skl *skl) 
	}



	ret = skl_sst_dsp_init(bus->dev, mmio_base, irq,

			loader_ops, &skl->skl_sst);

			skl->fw_name, loader_ops, &skl->skl_sst);

	if (ret < 0)

		return ret;

sound/soc/intel/skylake/skl-sst-dsp.h

+2 −1
Original line number Diff line number Diff line
@@ -139,7 +139,8 @@ void skl_dsp_free(struct sst_dsp *dsp); 


int skl_dsp_boot(struct sst_dsp *ctx);

int skl_sst_dsp_init(struct device *dev, void __iomem *mmio_base, int irq,

		struct skl_dsp_loader_ops dsp_ops, struct skl_sst **dsp);

		const char *fw_name, struct skl_dsp_loader_ops dsp_ops,

		struct skl_sst **dsp);

void skl_sst_dsp_cleanup(struct device *dev, struct skl_sst *ctx);



#endif /*__SKL_SST_DSP_H__*/

sound/soc/intel/skylake/skl-sst.c

+3 −2
Original line number Diff line number Diff line
@@ -77,7 +77,7 @@ static int skl_load_base_firmware(struct sst_dsp *ctx) 
	init_waitqueue_head(&skl->boot_wait);



	if (ctx->fw == NULL) {

		ret = request_firmware(&ctx->fw, "dsp_fw_release.bin", ctx->dev);

		ret = request_firmware(&ctx->fw, ctx->fw_name, ctx->dev);

		if (ret < 0) {

			dev_err(ctx->dev, "Request firmware failed %d\n", ret);

			skl_dsp_disable_core(ctx);
@@ -223,7 +223,7 @@ static struct sst_dsp_device skl_dev = { 
};



int skl_sst_dsp_init(struct device *dev, void __iomem *mmio_base, int irq,

		struct skl_dsp_loader_ops dsp_ops, struct skl_sst **dsp)

		const char *fw_name, struct skl_dsp_loader_ops dsp_ops, struct skl_sst **dsp)

{

	struct skl_sst *skl;

	struct sst_dsp *sst;
@@ -244,6 +244,7 @@ int skl_sst_dsp_init(struct device *dev, void __iomem *mmio_base, int irq, 


	sst = skl->dsp;



	sst->fw_name = fw_name;

	sst->addr.lpe = mmio_base;

	sst->addr.shim = mmio_base;

	sst_dsp_mailbox_init(sst, (SKL_ADSP_SRAM0_BASE + SKL_ADSP_W0_STAT_SZ),

sound/soc/intel/skylake/skl.c

+1 −0
Original line number Diff line number Diff line
@@ -264,6 +264,7 @@ static int skl_machine_device_register(struct skl *skl, void *driver_data) 
		dev_err(bus->dev, "No matching machine driver found\n");

		return -ENODEV;

	}

	skl->fw_name = mach->fw_filename;



	pdev = platform_device_alloc(mach->drv_name, -1);

	if (pdev == NULL) {

sound/soc/intel/skylake/skl.h

+2 −0
Original line number Diff line number Diff line
@@ -68,6 +68,8 @@ struct skl { 


	struct skl_dsp_resource resource;

	struct list_head ppl_list;



	const char *fw_name;

};



#define skl_to_ebus(s)	(&(s)->ebus)