Merge tag 'rproc-v6.4' of git://git.kernel.org/pub/scm/linux/kernel/git/remoteproc...

[linux-2.6-block.git] / drivers / remoteproc / qcom_q6v5_mss.c

diff --git a/drivers/remoteproc/qcom_q6v5_mss.c b/drivers/remoteproc/qcom_q6v5_mss.c
index e7a67c8c16a001c7c7295895a9501f383ca0e261..8e15e4f85de13a781bf6672d9bc560c6460b3dce 100644 (file)
--- a/drivers/remoteproc/qcom_q6v5_mss.c
+++ b/drivers/remoteproc/qcom_q6v5_mss.c
@@ -235,8 +235,8 @@ struct q6v5 {
        bool has_qaccept_regs;
        bool has_ext_cntl_regs;
        bool has_vq6;
-       int mpss_perm;
-       int mba_perm;
+       u64 mpss_perm;
+       u64 mba_perm;
        const char *hexagon_mdt_image;
        int version;
 };
@@ -414,7 +414,7 @@ static void q6v5_pds_disable(struct q6v5 *qproc, struct device **pds,
        }
 }
 
-static int q6v5_xfer_mem_ownership(struct q6v5 *qproc, int *current_perm,
+static int q6v5_xfer_mem_ownership(struct q6v5 *qproc, u64 *current_perm,
                                   bool local, bool remote, phys_addr_t addr,
                                   size_t size)
 {
@@ -967,7 +967,7 @@ static int q6v5_mpss_init_image(struct q6v5 *qproc, const struct firmware *fw,
        unsigned long dma_attrs = DMA_ATTR_FORCE_CONTIGUOUS;
        dma_addr_t phys;
        void *metadata;
-       int mdata_perm;
+       u64 mdata_perm;
        int xferop_ret;
        size_t size;
        void *ptr;