Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c41567ea authored by Camera Software Integration's avatar Camera Software Integration Committed by Gerrit - the friendly Code Review server
Browse files

Merge "msm: camera: isp: change variables declaration to static" into camera-kernel.lnx.4.0

parents ccdab9da 54bddb9d

drivers/cam_isp/isp_hw_mgr/isp_hw/vfe_hw/vfe17x/cam_vfe170.h

+6 −6
Original line number Diff line number Diff line
@@ -77,25 +77,25 @@ static struct cam_vfe_camif_reg_data vfe_170_camif_reg_data = { 
	.enable_diagnostic_hw            = 0x1,

};



struct cam_vfe_top_ver2_reg_offset_module_ctrl lens_170_reg = {

static struct cam_vfe_top_ver2_reg_offset_module_ctrl lens_170_reg = {

	.reset    = 0x0000001C,

	.cgc_ovd  = 0x0000002C,

	.enable   = 0x00000040,

};



struct cam_vfe_top_ver2_reg_offset_module_ctrl stats_170_reg = {

static struct cam_vfe_top_ver2_reg_offset_module_ctrl stats_170_reg = {

	.reset    = 0x00000020,

	.cgc_ovd  = 0x00000030,

	.enable   = 0x00000044,

};



struct cam_vfe_top_ver2_reg_offset_module_ctrl color_170_reg = {

static struct cam_vfe_top_ver2_reg_offset_module_ctrl color_170_reg = {

	.reset    = 0x00000024,

	.cgc_ovd  = 0x00000034,

	.enable   = 0x00000048,

};



struct cam_vfe_top_ver2_reg_offset_module_ctrl zoom_170_reg = {

static struct cam_vfe_top_ver2_reg_offset_module_ctrl zoom_170_reg = {

	.reset    = 0x00000028,

	.cgc_ovd  = 0x00000038,

	.enable   = 0x0000004C,
@@ -853,7 +853,7 @@ static struct cam_vfe_bus_ver2_hw_info vfe170_bus_hw_info = { 
	.top_irq_shift = 9,

};



struct cam_vfe_hw_info cam_vfe170_hw_info = {

static struct cam_vfe_hw_info cam_vfe170_hw_info = {

	.irq_reg_info                  = &vfe170_top_irq_reg_info,



	.bus_version                   = CAM_VFE_BUS_VER_2_0,
@@ -866,7 +866,7 @@ struct cam_vfe_hw_info cam_vfe170_hw_info = { 
	.camif_reg                     = &vfe170_camif_reg,



	.camif_lite_version            = 0,

	.camif_reg                     = NULL,

	.camif_lite_reg                = NULL,



};

drivers/cam_isp/isp_hw_mgr/isp_hw/vfe_hw/vfe17x/cam_vfe170_150.h

+5 −5
Original line number Diff line number Diff line
@@ -79,25 +79,25 @@ static struct cam_vfe_camif_reg_data vfe_170_150_camif_reg_data = { 
	.dual_vfe_sync_mask              = 0x3,

};



struct cam_vfe_top_ver2_reg_offset_module_ctrl lens_170_150_reg = {

static struct cam_vfe_top_ver2_reg_offset_module_ctrl lens_170_150_reg = {

	.reset    = 0x0000001C,

	.cgc_ovd  = 0x0000002C,

	.enable   = 0x00000040,

};



struct cam_vfe_top_ver2_reg_offset_module_ctrl stats_170_150_reg = {

static struct cam_vfe_top_ver2_reg_offset_module_ctrl stats_170_150_reg = {

	.reset    = 0x00000020,

	.cgc_ovd  = 0x00000030,

	.enable   = 0x00000044,

};



struct cam_vfe_top_ver2_reg_offset_module_ctrl color_170_150_reg = {

static struct cam_vfe_top_ver2_reg_offset_module_ctrl color_170_150_reg = {

	.reset    = 0x00000024,

	.cgc_ovd  = 0x00000034,

	.enable   = 0x00000048,

};



struct cam_vfe_top_ver2_reg_offset_module_ctrl zoom_170_150_reg = {

static struct cam_vfe_top_ver2_reg_offset_module_ctrl zoom_170_150_reg = {

	.reset    = 0x00000028,

	.cgc_ovd  = 0x00000038,

	.enable   = 0x0000004C,
@@ -830,7 +830,7 @@ static struct cam_vfe_bus_ver2_hw_info vfe170_150_bus_hw_info = { 
	},

};



struct cam_vfe_hw_info cam_vfe170_150_hw_info = {

static struct cam_vfe_hw_info cam_vfe170_150_hw_info = {

	.irq_reg_info                  = &vfe170_150_top_irq_reg_info,



	.bus_version                   = CAM_VFE_BUS_VER_2_0,

drivers/cam_isp/isp_hw_mgr/isp_hw/vfe_hw/vfe17x/cam_vfe175.h

+5 −5
Original line number Diff line number Diff line
@@ -104,25 +104,25 @@ static struct cam_vfe_camif_lite_ver2_reg_data vfe175_camif_lite_reg_data = { 
	.dual_pd_path_sel_shift          = 24,

};



struct cam_vfe_top_ver2_reg_offset_module_ctrl lens_175_reg = {

static struct cam_vfe_top_ver2_reg_offset_module_ctrl lens_175_reg = {

	.reset    = 0x0000001C,

	.cgc_ovd  = 0x0000002C,

	.enable   = 0x00000040,

};



struct cam_vfe_top_ver2_reg_offset_module_ctrl stats_175_reg = {

static struct cam_vfe_top_ver2_reg_offset_module_ctrl stats_175_reg = {

	.reset    = 0x00000020,

	.cgc_ovd  = 0x00000030,

	.enable   = 0x00000044,

};



struct cam_vfe_top_ver2_reg_offset_module_ctrl color_175_reg = {

static struct cam_vfe_top_ver2_reg_offset_module_ctrl color_175_reg = {

	.reset    = 0x00000024,

	.cgc_ovd  = 0x00000034,

	.enable   = 0x00000048,

};



struct cam_vfe_top_ver2_reg_offset_module_ctrl zoom_175_reg = {

static struct cam_vfe_top_ver2_reg_offset_module_ctrl zoom_175_reg = {

	.reset    = 0x00000028,

	.cgc_ovd  = 0x00000038,

	.enable   = 0x0000004C,
@@ -1023,7 +1023,7 @@ static struct cam_vfe_bus_ver2_hw_info vfe175_bus_hw_info = { 
	.top_irq_shift = 9,

};



struct cam_vfe_hw_info cam_vfe175_hw_info = {

static struct cam_vfe_hw_info cam_vfe175_hw_info = {

	.irq_reg_info                  = &vfe175_top_irq_reg_info,



	.bus_version                   = CAM_VFE_BUS_VER_2_0,

drivers/cam_isp/isp_hw_mgr/isp_hw/vfe_hw/vfe17x/cam_vfe175_130.h

+5 −5
Original line number Diff line number Diff line
@@ -152,25 +152,25 @@ static struct cam_vfe_camif_lite_ver2_reg_data 
	.dual_pd_path_sel_shift          = 24,

};



struct cam_vfe_top_ver2_reg_offset_module_ctrl lens_175_130_reg = {

static struct cam_vfe_top_ver2_reg_offset_module_ctrl lens_175_130_reg = {

	.reset    = 0x0000001C,

	.cgc_ovd  = 0x0000002C,

	.enable   = 0x00000040,

};



struct cam_vfe_top_ver2_reg_offset_module_ctrl stats_175_130_reg = {

static struct cam_vfe_top_ver2_reg_offset_module_ctrl stats_175_130_reg = {

	.reset    = 0x00000020,

	.cgc_ovd  = 0x00000030,

	.enable   = 0x00000044,

};



struct cam_vfe_top_ver2_reg_offset_module_ctrl color_175_130_reg = {

static struct cam_vfe_top_ver2_reg_offset_module_ctrl color_175_130_reg = {

	.reset    = 0x00000024,

	.cgc_ovd  = 0x00000034,

	.enable   = 0x00000048,

};



struct cam_vfe_top_ver2_reg_offset_module_ctrl zoom_175_130_reg = {

static struct cam_vfe_top_ver2_reg_offset_module_ctrl zoom_175_130_reg = {

	.reset    = 0x00000028,

	.cgc_ovd  = 0x00000038,

	.enable   = 0x0000004C,
@@ -1129,7 +1129,7 @@ static struct cam_vfe_bus_ver2_hw_info vfe175_130_bus_hw_info = { 
	.top_irq_shift = 9,

};



struct cam_vfe_hw_info cam_vfe175_130_hw_info = {

static struct cam_vfe_hw_info cam_vfe175_130_hw_info = {

	.irq_reg_info                  = &vfe175_130_top_irq_reg_info,



	.bus_version                   = CAM_VFE_BUS_VER_2_0,

drivers/cam_isp/isp_hw_mgr/isp_hw/vfe_hw/vfe17x/cam_vfe480.h

+1 −1
Original line number Diff line number Diff line
@@ -1364,7 +1364,7 @@ static struct cam_vfe_bus_rd_ver1_hw_info vfe480_bus_rd_hw_info = { 
	.top_irq_shift = 8,

};



struct cam_vfe_hw_info cam_vfe480_hw_info = {

static struct cam_vfe_hw_info cam_vfe480_hw_info = {

	.irq_reg_info                  = &vfe480_top_irq_reg_info,



	.bus_version                   = CAM_VFE_BUS_VER_3_0,