Merge remote-tracking branch 'remoteproc/for-next'

diff --git a/drivers/remoteproc/remoteproc_core.c b/drivers/remoteproc/remoteproc_core.c
index 9e03d158f4119133f09b0979d8b5b70e1ae63c06..3d7d58a109d8ebb0b602e17b9a6ff4ed211423ef 100644 (file)
--- a/drivers/remoteproc/remoteproc_core.c
+++ b/drivers/remoteproc/remoteproc_core.c
@@ -823,8 +823,10 @@ static int rproc_fw_boot(struct rproc *rproc, const struct firmware *fw)
 
        /* look for the resource table */
        table = rproc_find_rsc_table(rproc, fw, &tablesz);
-       if (!table)
+       if (!table) {
+               dev_err(dev, "Failed to find resource table\n");
                goto clean_up;
+       }
 
        /* Verify that resource table in loaded fw is unchanged */
        if (rproc->table_csum != crc32(0, table, tablesz)) {

diff --git a/drivers/remoteproc/wkup_m3_rproc.c b/drivers/remoteproc/wkup_m3_rproc.c
index edf81819cce179bb338ff615ac09a12b3266e2c8..02d271d101b45a0c6585d7dfe24f1e22259f88ed 100644 (file)
--- a/drivers/remoteproc/wkup_m3_rproc.c
+++ b/drivers/remoteproc/wkup_m3_rproc.c
@@ -122,6 +122,7 @@ static const struct of_device_id wkup_m3_rproc_of_match[] = {
        { .compatible = "ti,am4372-wkup-m3", },
        {},
 };
+MODULE_DEVICE_TABLE(of, wkup_m3_rproc_of_match);
 
 static int wkup_m3_rproc_probe(struct platform_device *pdev)
 {