diff options
| author | Linaro CI <ci_notify@linaro.org> | 2021-09-15 04:00:47 +0000 |
|---|---|---|
| committer | Linaro CI <ci_notify@linaro.org> | 2021-09-15 04:00:47 +0000 |
| commit | 07c7a01939cad4fae38df06f1ddc1f78402a33f5 (patch) | |
| tree | a8c30da86e123c4715f850a1a93d65974a257b68 | |
| parent | 820f6d04c4ccc3f7a6f1de8787bbf42b1fc693c8 (diff) | |
| parent | b5adefb4d30c1d56a49441a74add0ebb724af006 (diff) | |
Merge remote-tracking branch 'remoteproc/tracking-qcomlt-remoteproc' into integration-linux-qcomlt
# Conflicts:
# drivers/remoteproc/qcom_wcnss.c
| -rw-r--r-- | arch/arm64/boot/dts/qcom/apq8016-sbc.dtsi | 6 | ||||
| -rw-r--r-- | drivers/remoteproc/qcom_wcnss.c | 3 |
2 files changed, 9 insertions, 0 deletions
diff --git a/arch/arm64/boot/dts/qcom/apq8016-sbc.dtsi b/arch/arm64/boot/dts/qcom/apq8016-sbc.dtsi index f8d8f3e3664e..2cc0e9118ed4 100644 --- a/arch/arm64/boot/dts/qcom/apq8016-sbc.dtsi +++ b/arch/arm64/boot/dts/qcom/apq8016-sbc.dtsi @@ -305,6 +305,11 @@ status = "okay"; }; +&mpss { + status = "okay"; + firmware-name = "qcom/msm8916/mba.mbn", "qcom/msm8916/modem.mdt"; +}; + &pm8916_resin { status = "okay"; linux,code = <KEY_VOLUMEDOWN>; @@ -312,6 +317,7 @@ &pronto { status = "okay"; + firmware-name = "qcom/msm8916/wcnss.mdt"; }; &sdhc_1 { diff --git a/drivers/remoteproc/qcom_wcnss.c b/drivers/remoteproc/qcom_wcnss.c index ebadc6c08e11..65968b24ae41 100644 --- a/drivers/remoteproc/qcom_wcnss.c +++ b/drivers/remoteproc/qcom_wcnss.c @@ -655,6 +655,9 @@ static int wcnss_remove(struct platform_device *pdev) qcom_iris_remove(wcnss->iris); + if (wcnss->state) + qcom_smem_state_put(wcnss->state); + rproc_del(wcnss->rproc); qcom_remove_sysmon_subdev(wcnss->sysmon); |