diff options
| author | Stanimir Varbanov <stanimir.varbanov@linaro.org> | 2017-06-15 19:31:59 +0300 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@s-opensource.com> | 2017-06-20 14:53:41 +0300 |
| commit | 50058a9a589154121a798dd16ef9199bf607bdc5 (patch) | |
| tree | 29c2c279dc8a92335ccf2e10c22075131e7ba685 /drivers/media/platform/qcom/venus/firmware.c | |
| parent | ebebc5939e15e12b4a226552574408772cda5ced (diff) | |
| download | linux-50058a9a589154121a798dd16ef9199bf607bdc5.tar.xz | |
[media] media: venus: update firmware path with linux-firmware place
This makes firmware name and path part of venus_resources
structure and initialize it properly depending on the SoC and
firmware version.
Signed-off-by: Stanimir Varbanov <stanimir.varbanov@linaro.org>
Signed-off-by: Hans Verkuil <hans.verkuil@cisco.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@s-opensource.com>
Diffstat (limited to 'drivers/media/platform/qcom/venus/firmware.c')
| -rw-r--r-- | drivers/media/platform/qcom/venus/firmware.c | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/drivers/media/platform/qcom/venus/firmware.c b/drivers/media/platform/qcom/venus/firmware.c index 365e64010920..1b1a4f355918 100644 --- a/drivers/media/platform/qcom/venus/firmware.c +++ b/drivers/media/platform/qcom/venus/firmware.c @@ -23,7 +23,6 @@ #include "firmware.h" -#define VENUS_FIRMWARE_NAME "venus.mdt" #define VENUS_PAS_ID 9 #define VENUS_FW_MEM_SIZE SZ_8M @@ -32,7 +31,7 @@ static void device_release_dummy(struct device *dev) of_reserved_mem_device_release(dev); } -int venus_boot(struct device *parent, struct device *fw_dev) +int venus_boot(struct device *parent, struct device *fw_dev, const char *fwname) { const struct firmware *mdt; phys_addr_t mem_phys; @@ -67,7 +66,7 @@ int venus_boot(struct device *parent, struct device *fw_dev) goto err_unreg_device; } - ret = request_firmware(&mdt, VENUS_FIRMWARE_NAME, fw_dev); + ret = request_firmware(&mdt, fwname, fw_dev); if (ret < 0) goto err_unreg_device; @@ -78,8 +77,8 @@ int venus_boot(struct device *parent, struct device *fw_dev) goto err_unreg_device; } - ret = qcom_mdt_load(fw_dev, mdt, VENUS_FIRMWARE_NAME, VENUS_PAS_ID, - mem_va, mem_phys, mem_size); + ret = qcom_mdt_load(fw_dev, mdt, fwname, VENUS_PAS_ID, mem_va, mem_phys, + mem_size); release_firmware(mdt); |