diff options
author | Bjorn Andersson <bjorn.andersson@sonymobile.com> | 2016-03-28 23:36:58 -0400 |
---|---|---|
committer | Bjorn Andersson <bjorn.andersson@linaro.org> | 2016-05-12 18:50:04 -0400 |
commit | e395f9ce49eb5a9fa69c3fd74b6de59a5cb5a300 (patch) | |
tree | 4c7d4e9f0714cf60e03558ebfc1f0b8b58b056f4 /drivers/remoteproc | |
parent | 3d87fa1d47c10c71684e1eca15cb051746ab1d56 (diff) |
remoteproc: core: Make the loaded resource table optional
Remote processors like the ones found in the Qualcomm SoCs does not have
a resource table passed to them, so make it optional by only populating
it if it does exist.
Signed-off-by: Bjorn Andersson <bjorn.andersson@sonymobile.com>
Signed-off-by: Bjorn Andersson <bjorn.andersson@linaro.org>
Diffstat (limited to 'drivers/remoteproc')
-rw-r--r-- | drivers/remoteproc/remoteproc_core.c | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/drivers/remoteproc/remoteproc_core.c b/drivers/remoteproc/remoteproc_core.c index 1210d6db40b1..31dfc9996389 100644 --- a/drivers/remoteproc/remoteproc_core.c +++ b/drivers/remoteproc/remoteproc_core.c | |||
@@ -856,12 +856,8 @@ static int rproc_fw_boot(struct rproc *rproc, const struct firmware *fw) | |||
856 | * copy this information to device memory. | 856 | * copy this information to device memory. |
857 | */ | 857 | */ |
858 | loaded_table = rproc_find_loaded_rsc_table(rproc, fw); | 858 | loaded_table = rproc_find_loaded_rsc_table(rproc, fw); |
859 | if (!loaded_table) { | 859 | if (loaded_table) |
860 | ret = -EINVAL; | 860 | memcpy(loaded_table, rproc->cached_table, tablesz); |
861 | goto clean_up; | ||
862 | } | ||
863 | |||
864 | memcpy(loaded_table, rproc->cached_table, tablesz); | ||
865 | 861 | ||
866 | /* power up the remote processor */ | 862 | /* power up the remote processor */ |
867 | ret = rproc->ops->start(rproc); | 863 | ret = rproc->ops->start(rproc); |