Commit 48073935 authored by Bjorn Andersson's avatar Bjorn Andersson
Browse files

remoteproc: qcom: wcnss: Allow specifying firmware-name 



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: default avatarMathieu Poirier <mathieu.poirier@linaro.org>
Signed-off-by: default avatarBjorn Andersson <bjorn.andersson@linaro.org>
Link: https://lore.kernel.org/r/20210312002441.3273183-1-bjorn.andersson@linaro.org


Signed-off-by: default avatarBjorn Andersson <bjorn.andersson@linaro.org>
parent bb91c9ee

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

+6 −0
Original line number Diff line number Diff line
@@ -34,6 +34,12 @@ on the Qualcomm WCNSS core. 
	Definition: should be "wdog", "fatal", optionally followed by "ready",

		    "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)

- vddcx-supply: (deprecated for qcom,pronto-v1/2-pil)

- vddpx-supply:

drivers/remoteproc/qcom_wcnss.c

+7 −1
Original line number Diff line number Diff line
@@ -530,6 +530,7 @@ static int wcnss_alloc_memory_region(struct qcom_wcnss *wcnss) 


static int wcnss_probe(struct platform_device *pdev)

{

	const char *fw_name = WCNSS_FIRMWARE_NAME;

	const struct wcnss_data *data;

	struct qcom_wcnss *wcnss;

	struct resource *res;
@@ -547,8 +548,13 @@ static int wcnss_probe(struct platform_device *pdev) 
		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,

			    WCNSS_FIRMWARE_NAME, sizeof(*wcnss));

			    fw_name, sizeof(*wcnss));

	if (!rproc) {

		dev_err(&pdev->dev, "unable to allocate remoteproc\n");

		return -ENOMEM;