Unverified Commit 85045a9e authored by Mark Brown's avatar Mark Brown
Browse files

ASoC: SOF: misc updates for 6.7 

Merge series from Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>:

New PCI ID, one fix for a delayed IRQ thread causing issues, one
update for debug and one follow-up cleanup for the .remove callback.
parents 93a83b76 e4d09de3

sound/soc/sof/amd/acp.c

+2 −2
Original line number Diff line number Diff line
@@ -575,7 +575,7 @@ int amd_sof_acp_probe(struct snd_sof_dev *sdev) 
}

EXPORT_SYMBOL_NS(amd_sof_acp_probe, SND_SOC_SOF_AMD_COMMON);



int amd_sof_acp_remove(struct snd_sof_dev *sdev)

void amd_sof_acp_remove(struct snd_sof_dev *sdev)

{

	struct acp_dev_data *adata = sdev->pdata->hw_pdata;
@@ -588,7 +588,7 @@ int amd_sof_acp_remove(struct snd_sof_dev *sdev) 
	if (adata->dmic_dev)

		platform_device_unregister(adata->dmic_dev);



	return acp_reset(sdev);

	acp_reset(sdev);

}

EXPORT_SYMBOL_NS(amd_sof_acp_remove, SND_SOC_SOF_AMD_COMMON);

sound/soc/sof/amd/acp.h

+1 −1
Original line number Diff line number Diff line
@@ -220,7 +220,7 @@ int configure_and_run_sha_dma(struct acp_dev_data *adata, void *image_addr, 


/* ACP device probe/remove */

int amd_sof_acp_probe(struct snd_sof_dev *sdev);

int amd_sof_acp_remove(struct snd_sof_dev *sdev);

void amd_sof_acp_remove(struct snd_sof_dev *sdev);



/* DSP Loader callbacks */

int acp_sof_dsp_run(struct snd_sof_dev *sdev);

sound/soc/sof/imx/imx8.c

+1 −3
Original line number Diff line number Diff line
@@ -338,7 +338,7 @@ static int imx8_probe(struct snd_sof_dev *sdev) 
	return ret;

}



static int imx8_remove(struct snd_sof_dev *sdev)

static void imx8_remove(struct snd_sof_dev *sdev)

{

	struct imx8_priv *priv = sdev->pdata->hw_pdata;

	int i;
@@ -350,8 +350,6 @@ static int imx8_remove(struct snd_sof_dev *sdev) 
		device_link_del(priv->link[i]);

		dev_pm_domain_detach(priv->pd_dev[i], false);

	}



	return 0;

}



/* on i.MX8 there is 1 to 1 match between type and BAR idx */

sound/soc/sof/imx/imx8m.c

+1 −3
Original line number Diff line number Diff line
@@ -269,14 +269,12 @@ static int imx8m_probe(struct snd_sof_dev *sdev) 
	return ret;

}



static int imx8m_remove(struct snd_sof_dev *sdev)

static void imx8m_remove(struct snd_sof_dev *sdev)

{

	struct imx8m_priv *priv = sdev->pdata->hw_pdata;



	imx8_disable_clocks(sdev, priv->clks);

	platform_device_unregister(priv->ipc_dev);



	return 0;

}



/* on i.MX8 there is 1 to 1 match between type and BAR idx */

sound/soc/sof/imx/imx8ulp.c

+1 −3
Original line number Diff line number Diff line
@@ -278,14 +278,12 @@ static int imx8ulp_probe(struct snd_sof_dev *sdev) 
	return ret;

}



static int imx8ulp_remove(struct snd_sof_dev *sdev)

static void imx8ulp_remove(struct snd_sof_dev *sdev)

{

	struct imx8ulp_priv *priv = sdev->pdata->hw_pdata;



	imx8_disable_clocks(sdev, priv->clks);

	platform_device_unregister(priv->ipc_dev);



	return 0;

}



/* on i.MX8 there is 1 to 1 match between type and BAR idx */