From 3aac10c09fcf9cb7e4530e0db6cb42a026e30768 Mon Sep 17 00:00:00 2001 From: Jigarkumar Zala Date: Fri, 20 Sep 2019 16:58:11 -0700 Subject: [PATCH] msm: camera: sensor: Update the flash init structure Currently there is mismatch of the cmd type byte position for the flash init structure, which casue the cmd type parsing failure for early PCR. This change move to cmd type to sixth byte to support the unificaiton with other flash uapi structures. Also, update respective header change with respect to uapi change. CRs-Fixed: 2432102 Change-Id: Ic4899b483b35013c5ad77a8894eb3bb4831de811 Signed-off-by: Jigarkumar Zala --- drivers/cam_sensor_module/cam_flash/cam_flash_dev.h | 4 ++-- include/uapi/media/cam_sensor.h | 5 +++-- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/drivers/cam_sensor_module/cam_flash/cam_flash_dev.h b/drivers/cam_sensor_module/cam_flash/cam_flash_dev.h index 43ed13406e3d..29e352e47ce9 100644 --- a/drivers/cam_sensor_module/cam_flash/cam_flash_dev.h +++ b/drivers/cam_sensor_module/cam_flash/cam_flash_dev.h @@ -86,7 +86,7 @@ struct cam_flash_intf_params { struct cam_flash_common_attr { bool is_settings_valid; uint64_t request_id; - uint16_t count; + uint32_t count; uint8_t cmd_type; }; @@ -97,7 +97,7 @@ struct cam_flash_common_attr { */ struct cam_flash_init_packet { struct cam_flash_common_attr cmn_attr; - uint8_t flash_type; + uint32_t flash_type; }; /** diff --git a/include/uapi/media/cam_sensor.h b/include/uapi/media/cam_sensor.h index 514e8bd946cd..cc86f2706c63 100644 --- a/include/uapi/media/cam_sensor.h +++ b/include/uapi/media/cam_sensor.h @@ -401,9 +401,10 @@ struct cam_sensor_streamon_dev { * @cmd_type : command buffer type */ struct cam_flash_init { - uint8_t flash_type; - uint16_t reserved; + uint32_t flash_type; + uint8_t reserved; uint8_t cmd_type; + uint16_t reserved1; } __attribute__((packed)); /**