From 4aad75a2f964fddc2c22c445d9bfc0d9493f78b6 Mon Sep 17 00:00:00 2001 From: Trishansh Bhardwaj Date: Thu, 3 Oct 2019 16:13:47 +0530 Subject: [PATCH] msm: camera: ope: Support 32 bit arch Update datatypes to work with 32 bit kernel. CRs-Fixed: 2594541 Change-Id: I72d628152134770d7e09c3684443e25c47d9d1dc Signed-off-by: Trishansh Bhardwaj --- drivers/cam_ope/ope_hw_mgr/cam_ope_hw_mgr.c | 6 +++--- drivers/cam_ope/ope_hw_mgr/ope_hw/ope_core.c | 8 ++++---- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/drivers/cam_ope/ope_hw_mgr/cam_ope_hw_mgr.c b/drivers/cam_ope/ope_hw_mgr/cam_ope_hw_mgr.c index 13cc29e46b5d..d2b4f7d081e5 100644 --- a/drivers/cam_ope/ope_hw_mgr/cam_ope_hw_mgr.c +++ b/drivers/cam_ope/ope_hw_mgr/cam_ope_hw_mgr.c @@ -1363,7 +1363,7 @@ static int cam_ope_mgr_process_cmd_io_buf_req(struct cam_ope_hw_mgr *hw_mgr, { int rc = 0; int i, j, k, l; - uint64_t iova_addr; + dma_addr_t iova_addr; size_t len; struct ope_frame_process *in_frame_process; struct ope_frame_set *in_frame_set; @@ -1522,8 +1522,8 @@ static int cam_ope_mgr_process_cmd_buf_req(struct cam_ope_hw_mgr *hw_mgr, { int rc = 0; int i, j; - uint64_t iova_addr; - uint64_t iova_cdm_addr; + dma_addr_t iova_addr; + dma_addr_t iova_cdm_addr; uintptr_t cpu_addr; size_t len; struct ope_frame_process *frame_process; diff --git a/drivers/cam_ope/ope_hw_mgr/ope_hw/ope_core.c b/drivers/cam_ope/ope_hw_mgr/ope_hw/ope_core.c index 25f03f640111..cd5be9ec833a 100644 --- a/drivers/cam_ope/ope_hw_mgr/ope_hw/ope_core.c +++ b/drivers/cam_ope/ope_hw_mgr/ope_hw/ope_core.c @@ -462,7 +462,7 @@ static uint32_t *ope_create_frame_cmd_prefetch_dis( struct ope_bus_wr_io_port_cdm_info *wr_cdm_info; struct ope_bus_rd_io_port_cdm_info *rd_cdm_info; struct ope_frame_process *frm_proc; - uint64_t iova_addr; + dma_addr_t iova_addr; uintptr_t cpu_addr; size_t buf_len; uint32_t print_idx; @@ -574,7 +574,7 @@ static uint32_t *ope_create_frame_cmd_batch(struct cam_ope_hw_mgr *hw_mgr, struct ope_bus_wr_io_port_cdm_info *wr_cdm_info; struct ope_bus_rd_io_port_cdm_info *rd_cdm_info; struct ope_frame_process *frm_proc; - uint64_t iova_addr; + dma_addr_t iova_addr; uintptr_t cpu_addr; size_t buf_len; uint32_t print_idx; @@ -729,7 +729,7 @@ static uint32_t *ope_create_frame_cmd(struct cam_ope_hw_mgr *hw_mgr, struct ope_bus_wr_io_port_cdm_info *wr_cdm_info; struct ope_bus_rd_io_port_cdm_info *rd_cdm_info; struct ope_frame_process *frm_proc; - uint64_t iova_addr; + dma_addr_t iova_addr; uintptr_t cpu_addr; size_t buf_len; uint32_t print_idx; @@ -833,7 +833,7 @@ static uint32_t *ope_create_stripe_cmd(struct cam_ope_hw_mgr *hw_mgr, int rc = 0, i, j, k; uint32_t temp[3]; struct cdm_dmi_cmd *dmi_cmd; - uint64_t iova_addr; + dma_addr_t iova_addr; uintptr_t cpu_addr; size_t buf_len; uint32_t print_idx;