Re: [GIT PULL] remoteproc updates for v6.9

[Bjorn Andersson <andersson@xxxxxxxxxx>]

On Thu, Mar 21, 2024 at 05:55:13AM -0700, Bjorn Andersson wrote:
> I'm sorry for the late pull request, I apparently had managed to get git
> send-email to only deliver my mail to /dev/null on the machine where I prepared
> this.
> 

I was further notified that this conflicts with your tree, Linus. Below
is the resolution for this conflict.

Please let me know if you'd like me to create some form of merge commit
for this.

Regards,
Bjorn

diff --cc drivers/remoteproc/imx_dsp_rproc.c
index d73727a5828a,56a799cb8b36..087506e21508
--- a/drivers/remoteproc/imx_dsp_rproc.c
+++ b/drivers/remoteproc/imx_dsp_rproc.c
@@@ -1090,9 -1154,7 +1090,7 @@@ static int imx_dsp_rproc_probe(struct p
  	return 0;
  
  err_detach_domains:
 -	imx_dsp_detach_pm_domains(priv);
 +	dev_pm_domain_detach_list(priv->pd_list);
- err_put_rproc:
- 	rproc_free(rproc);
  
  	return ret;
  }
@@@ -1104,8 -1166,7 +1102,7 @@@ static void imx_dsp_rproc_remove(struc
  
  	pm_runtime_disable(&pdev->dev);
  	rproc_del(rproc);
 -	imx_dsp_detach_pm_domains(priv);
 +	dev_pm_domain_detach_list(priv->pd_list);
- 	rproc_free(rproc);
  }
  
  /* pm runtime functions */
diff --cc drivers/remoteproc/qcom_q6v5_adsp.c
index 93f9a1537ec6,34ac996a93b2..1d24c9b656a8
--- a/drivers/remoteproc/qcom_q6v5_adsp.c
+++ b/drivers/remoteproc/qcom_q6v5_adsp.c
@@@ -704,13 -713,15 +704,13 @@@ static int adsp_probe(struct platform_d
  
  	ret = adsp_init_clock(adsp, desc->clk_ids);
  	if (ret)
- 		goto free_rproc;
+ 		return ret;
  
 -	ret = qcom_rproc_pds_attach(adsp->dev, adsp,
 -				    desc->proxy_pd_names);
 +	ret = qcom_rproc_pds_attach(adsp, desc->pd_names, desc->num_pds);
  	if (ret < 0) {
  		dev_err(&pdev->dev, "Failed to attach proxy power domains\n");
- 		goto free_rproc;
+ 		return ret;
  	}
 -	adsp->proxy_pd_count = ret;
  
  	ret = adsp_init_reset(adsp);
  	if (ret)
@@@ -742,11 -753,8 +742,8 @@@
  	return 0;
  
  disable_pm:
 -	qcom_rproc_pds_detach(adsp, adsp->proxy_pds, adsp->proxy_pd_count);
 +	qcom_rproc_pds_detach(adsp);
  
- free_rproc:
- 	rproc_free(rproc);
- 
  	return ret;
  }
  
@@@ -760,8 -768,7 +757,7 @@@ static void adsp_remove(struct platform
  	qcom_remove_glink_subdev(adsp->rproc, &adsp->glink_subdev);
  	qcom_remove_sysmon_subdev(adsp->sysmon);
  	qcom_remove_ssr_subdev(adsp->rproc, &adsp->ssr_subdev);
 -	qcom_rproc_pds_detach(adsp, adsp->proxy_pds, adsp->proxy_pd_count);
 +	qcom_rproc_pds_detach(adsp);
- 	rproc_free(adsp->rproc);
  }
  
  static const struct adsp_pil_data adsp_resource_init = {