MIRRORS/linux-yocto
1
0
Fork 0
mirror of git://git.yoctoproject.org/linux-yocto.git synced 2025-10-23 07:23:12 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity

remoteproc: qcom: wcnss: Allow specifying firmware-name

Browse Source 
Introduce a firmware-name property, in order to be able to support
device/platform specific firmware for the wireless connectivity
subsystem; in line with other Qualcomm remoteproc drivers.

Acked-by: Mathieu Poirier <mathieu.poirier@linaro.org>
Signed-off-by: Bjorn Andersson <bjorn.andersson@linaro.org>
Link: https://lore.kernel.org/r/20210312002441.3273183-1-bjorn.andersson@linaro.org
Signed-off-by: Bjorn Andersson <bjorn.andersson@linaro.org>
This commit is contained in:
Bjorn Andersson 2021-03-11 16:24:41 -08:00
parent bb91c9ee51
commit 48073935b9
2 changed files with 13 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Documentation/devicetree/bindings/remoteproc/qcom,wcnss-pil.txt
View File

@ -34,6 +34,12 @@ on the Qualcomm WCNSS core.
Definition: should be "wdog", "fatal", optionally followed by "ready", Definition: should be "wdog", "fatal", optionally followed by "ready",
"handover", "stop-ack" "handover", "stop-ack"
- firmware-name:
Usage: optional
Value type: <string>
Definition: must list the relative firmware image path for the
WCNSS core. Defaults to "wcnss.mdt".
- vddmx-supply: (deprecated for qcom,pronto-v1/2-pil) - vddmx-supply: (deprecated for qcom,pronto-v1/2-pil)
- vddcx-supply: (deprecated for qcom,pronto-v1/2-pil) - vddcx-supply: (deprecated for qcom,pronto-v1/2-pil)
- vddpx-supply: - vddpx-supply:

8
drivers/remoteproc/qcom_wcnss.c
View File

@ -530,6 +530,7 @@ static int wcnss_alloc_memory_region(struct qcom_wcnss *wcnss)
static int wcnss_probe(struct platform_device *pdev) static int wcnss_probe(struct platform_device *pdev)
{ {
const char *fw_name = WCNSS_FIRMWARE_NAME;
const struct wcnss_data *data; const struct wcnss_data *data;
struct qcom_wcnss *wcnss; struct qcom_wcnss *wcnss;
struct resource *res; struct resource *res;
@ -547,8 +548,13 @@ static int wcnss_probe(struct platform_device *pdev)
return -ENXIO; return -ENXIO;
} }
ret = of_property_read_string(pdev->dev.of_node, "firmware-name",
&fw_name);
if (ret < 0 && ret != -EINVAL)
return ret;
rproc = rproc_alloc(&pdev->dev, pdev->name, &wcnss_ops, rproc = rproc_alloc(&pdev->dev, pdev->name, &wcnss_ops,
WCNSS_FIRMWARE_NAME, sizeof(*wcnss)); fw_name, sizeof(*wcnss));
if (!rproc) { if (!rproc) {
dev_err(&pdev->dev, "unable to allocate remoteproc\n"); dev_err(&pdev->dev, "unable to allocate remoteproc\n");
return -ENOMEM; return -ENOMEM;