Commit 18a6262b authored by Stanimir Varbanov's avatar Stanimir Varbanov Committed by Mauro Carvalho Chehab
Browse files

media: venus: core: Parse firmware-name DT property 



On production devices the firmware could be located on different
places, this path could be provided by special firmware-name DT
property.

Here we check for existence of such DT property and if it exist
take the firmware path from there. Otherwise, if the property
is missing we fallback to the predefined path from driver resource
structure.

Signed-off-by: default avatarStanimir Varbanov <stanimir.varbanov@linaro.org>
Reviewed-by: default avatarAngeloGioacchino Del Regno <angelogioacchino.delregno@somainline.org>
Reviewed-by: default avatarBjorn Andersson <bjorn.andersson@linaro.org>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab+huawei@kernel.org>
parent f765f45f

drivers/media/platform/qcom/venus/firmware.c

+7 −1
Original line number Diff line number Diff line
@@ -187,6 +187,7 @@ int venus_boot(struct venus_core *core) 
{

	struct device *dev = core->dev;

	const struct venus_resources *res = core->res;

	const char *fwpath = NULL;

	phys_addr_t mem_phys;

	size_t mem_size;

	int ret;
@@ -195,7 +196,12 @@ int venus_boot(struct venus_core *core) 
	    (core->use_tz && !qcom_scm_is_available()))

		return -EPROBE_DEFER;



	ret = venus_load_fw(core, core->res->fwname, &mem_phys, &mem_size);

	ret = of_property_read_string_index(dev->of_node, "firmware-name", 0,

					    &fwpath);

	if (ret)

		fwpath = core->res->fwname;



	ret = venus_load_fw(core, fwpath, &mem_phys, &mem_size);

	if (ret) {

		dev_err(dev, "fail to load video firmware\n");

		return -EINVAL;