Bläddra i källkod

Merge "msm: camera: sensor: Update the flash init structure" into camera-kernel.lnx.1.0

Jong-Guk Im 5 år sedan
förälder
incheckning
1500c7dad5

+ 2 - 2
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;
 };
 
 /**

+ 3 - 2
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));
 
 /**