msm: camera: isp: Update register offset for VFELITE-880

Update register offset for VFE-Lite 880.
Discarding csid secure register offset which is beginning
of reg space and not accesable from HLOS.

CRs-Fixed: 3263421
Change-Id: Ib10a9b54057f262a92612e3a53bc29dd8afb5fe3
Signed-off-by: zhuo <[email protected]>

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

@@ -16,51 +16,53 @@
 
 #define CAM_VFE_88X_NUM_DBG_REG 5
 
+/* Offsets might not match due to csid secure regs at beginning of reg space */
+
 static struct cam_irq_register_set vfe_lite88x_top_irq_reg_set[2] = {
 	{
-		.mask_reg_offset   = 0x00002024,
-		.clear_reg_offset  = 0x0000202C,
-		.status_reg_offset = 0x0000201C,
-		.set_reg_offset    = 0x00002034,
+		.mask_reg_offset   = 0x00001024,
+		.clear_reg_offset  = 0x0000102C,
+		.status_reg_offset = 0x0000101C,
+		.set_reg_offset    = 0x00001034,
 		.test_set_val      = BIT(0),
 		.test_sub_val      = BIT(0),
 	},
 	{
-		.mask_reg_offset   = 0x00002028,
-		.clear_reg_offset  = 0x00002030,
-		.status_reg_offset = 0x00002020,
+		.mask_reg_offset   = 0x00001028,
+		.clear_reg_offset  = 0x00001030,
+		.status_reg_offset = 0x00001020,
 	},
 };
 
 static struct cam_irq_controller_reg_info vfe_lite88x_top_irq_reg_info = {
 	.num_registers = 2,
 	.irq_reg_set = vfe_lite88x_top_irq_reg_set,
-	.global_irq_cmd_offset = 0x00002038,
+	.global_irq_cmd_offset = 0x00001038,
 	.global_clear_bitmask  = 0x00000001,
 	.global_set_bitmask    = 0x00000010,
 	.clear_all_bitmask     = 0xFFFFFFFF,
 };
 
 static struct cam_vfe_top_ver4_reg_offset_common vfe_lite88x_top_common_reg = {
-	.hw_version               = 0x00002000,
-	.hw_capability            = 0x00002004,
-	.core_cgc_ovd_0           = 0x00002014,
-	.ahb_cgc_ovd              = 0x00002018,
-	.core_cfg_0               = 0x0000203C,
-	.diag_config              = 0x00002040,
-	.diag_sensor_status_0     = 0x00002044,
-	.diag_sensor_status_1     = 0x00002048,
-	.ipp_violation_status     = 0x00002054,
-	.bus_violation_status     = 0x00002264,
-	.bus_overflow_status      = 0x00002268,
-	.top_debug_cfg            = 0x00002074,
+	.hw_version               = 0x00001000,
+	.hw_capability            = 0x00001004,
+	.core_cgc_ovd_0           = 0x00001014,
+	.ahb_cgc_ovd              = 0x00001018,
+	.core_cfg_0               = 0x0000103C,
+	.diag_config              = 0x00001040,
+	.diag_sensor_status_0     = 0x00001044,
+	.diag_sensor_status_1     = 0x00001048,
+	.ipp_violation_status     = 0x00001054,
+	.bus_violation_status     = 0x00001264,
+	.bus_overflow_status      = 0x00001268,
+	.top_debug_cfg            = 0x00001074,
 	.num_top_debug_reg        = CAM_VFE_88X_NUM_DBG_REG,
 	.top_debug                = {
-		0x0000205C,
-		0x00002060,
-		0x00002064,
-		0x00002068,
-		0x0000206C,
+		0x0000105C,
+		0x00001060,
+		0x00001064,
+		0x00001068,
+		0x0000106C,
 	},
 };
 
@@ -150,35 +152,35 @@ static struct cam_vfe_top_ver4_hw_info vfe_lite88x_top_hw_info = {
 
 static struct cam_irq_register_set vfe_lite88x_bus_irq_reg[1] = {
 	{
-		.mask_reg_offset   = 0x00002218,
-		.clear_reg_offset  = 0x00002220,
-		.status_reg_offset = 0x00002228,
+		.mask_reg_offset   = 0x00001218,
+		.clear_reg_offset  = 0x00001220,
+		.status_reg_offset = 0x00001228,
 	},
 };
 
 static struct cam_vfe_bus_ver3_hw_info vfe_lite88x_bus_hw_info = {
 	.common_reg = {
-		.hw_version                       = 0x00002200,
-		.cgc_ovd                          = 0x00002208,
+		.hw_version                       = 0x00001200,
+		.cgc_ovd                          = 0x00001208,
 		.if_frameheader_cfg               = {
-			0x00002234,
-			0x00002238,
-			0x0000223C,
-			0x00002240,
-			0x00002244,
+			0x00001234,
+			0x00001238,
+			0x0000123C,
+			0x00001240,
+			0x00001244,
 		},
-		.pwr_iso_cfg                      = 0x0000225C,
-		.overflow_status_clear            = 0x00002260,
-		.ccif_violation_status            = 0x00002264,
-		.overflow_status                  = 0x00002268,
-		.image_size_violation_status      = 0x00002270,
-		.debug_status_top_cfg             = 0x000022F0,
-		.debug_status_top                 = 0x000022F4,
-		.test_bus_ctrl                    = 0x00002394,
+		.pwr_iso_cfg                      = 0x0000125C,
+		.overflow_status_clear            = 0x00001260,
+		.ccif_violation_status            = 0x00001264,
+		.overflow_status                  = 0x00001268,
+		.image_size_violation_status      = 0x00001270,
+		.debug_status_top_cfg             = 0x000012F0,
+		.debug_status_top                 = 0x000012F4,
+		.test_bus_ctrl                    = 0x00001394,
 		.irq_reg_info = {
 			.num_registers            = 1,
 			.irq_reg_set              = vfe_lite88x_bus_irq_reg,
-			.global_irq_cmd_offset    = 0x00002230,
+			.global_irq_cmd_offset    = 0x00001230,
 			.global_clear_bitmask     = 0x00000001,
 		},
 	},
@@ -186,175 +188,175 @@ static struct cam_vfe_bus_ver3_hw_info vfe_lite88x_bus_hw_info = {
 	.bus_client_reg = {
 		/* BUS Client 0 RDI0 */
 		{
-			.cfg                      = 0x00002400,
-			.image_addr               = 0x00002404,
-			.frame_incr               = 0x00002408,
-			.image_cfg_0              = 0x0000240C,
-			.image_cfg_1              = 0x00002410,
-			.image_cfg_2              = 0x00002414,
-			.packer_cfg               = 0x00002418,
-			.frame_header_addr        = 0x00002420,
-			.frame_header_incr        = 0x00002424,
-			.frame_header_cfg         = 0x00002428,
-			.line_done_cfg            = 0x0000242C,
-			.irq_subsample_period     = 0x00002430,
-			.irq_subsample_pattern    = 0x00002434,
-			.mmu_prefetch_cfg         = 0x00002460,
-			.mmu_prefetch_max_offset  = 0x00002464,
-			.system_cache_cfg         = 0x00002468,
-			.addr_cfg                 = 0x00002470,
-			.addr_status_0            = 0x00002478,
-			.addr_status_1            = 0x0000247C,
-			.addr_status_2            = 0x00002480,
-			.addr_status_3            = 0x00002484,
-			.debug_status_cfg         = 0x00002488,
-			.debug_status_0           = 0x0000248C,
-			.debug_status_1           = 0x00002490,
+			.cfg                      = 0x00001400,
+			.image_addr               = 0x00001404,
+			.frame_incr               = 0x00001408,
+			.image_cfg_0              = 0x0000140C,
+			.image_cfg_1              = 0x00001410,
+			.image_cfg_2              = 0x00001414,
+			.packer_cfg               = 0x00001418,
+			.frame_header_addr        = 0x00001420,
+			.frame_header_incr        = 0x00001424,
+			.frame_header_cfg         = 0x00001428,
+			.line_done_cfg            = 0x0000142C,
+			.irq_subsample_period     = 0x00001430,
+			.irq_subsample_pattern    = 0x00001434,
+			.mmu_prefetch_cfg         = 0x00001460,
+			.mmu_prefetch_max_offset  = 0x00001464,
+			.system_cache_cfg         = 0x00001468,
+			.addr_cfg                 = 0x00001470,
+			.addr_status_0            = 0x00001478,
+			.addr_status_1            = 0x0000147C,
+			.addr_status_2            = 0x00001480,
+			.addr_status_3            = 0x00001484,
+			.debug_status_cfg         = 0x00001488,
+			.debug_status_0           = 0x0000148C,
+			.debug_status_1           = 0x00001490,
 			.comp_group               = CAM_VFE_BUS_VER3_COMP_GRP_1,
 			.ubwc_regs                = NULL,
 		},
 		/* BUS Client 1 RDI1 */
 		{
-			.cfg                      = 0x00002500,
-			.image_addr               = 0x00002504,
-			.frame_incr               = 0x00002508,
-			.image_cfg_0              = 0x0000250C,
-			.image_cfg_1              = 0x00002510,
-			.image_cfg_2              = 0x00002514,
-			.packer_cfg               = 0x00002518,
-			.frame_header_addr        = 0x00002520,
-			.frame_header_incr        = 0x00002524,
-			.frame_header_cfg         = 0x00002528,
-			.line_done_cfg            = 0x0000252C,
-			.irq_subsample_period     = 0x00002530,
-			.irq_subsample_pattern    = 0x00002534,
-			.mmu_prefetch_cfg         = 0x00002560,
-			.mmu_prefetch_max_offset  = 0x00002564,
-			.system_cache_cfg         = 0x00002568,
-			.addr_cfg                 = 0x00002570,
-			.addr_status_0            = 0x00002578,
-			.addr_status_1            = 0x0000257C,
-			.addr_status_2            = 0x00002580,
-			.addr_status_3            = 0x00002584,
-			.debug_status_cfg         = 0x00002588,
-			.debug_status_0           = 0x0000258C,
-			.debug_status_1           = 0x00002590,
+			.cfg                      = 0x00001500,
+			.image_addr               = 0x00001504,
+			.frame_incr               = 0x00001508,
+			.image_cfg_0              = 0x0000150C,
+			.image_cfg_1              = 0x00001510,
+			.image_cfg_2              = 0x00001514,
+			.packer_cfg               = 0x00001518,
+			.frame_header_addr        = 0x00001520,
+			.frame_header_incr        = 0x00001524,
+			.frame_header_cfg         = 0x00001528,
+			.line_done_cfg            = 0x0000152C,
+			.irq_subsample_period     = 0x00001530,
+			.irq_subsample_pattern    = 0x00001534,
+			.mmu_prefetch_cfg         = 0x00001560,
+			.mmu_prefetch_max_offset  = 0x00001564,
+			.system_cache_cfg         = 0x00001568,
+			.addr_cfg                 = 0x00001570,
+			.addr_status_0            = 0x00001578,
+			.addr_status_1            = 0x0000157C,
+			.addr_status_2            = 0x00001580,
+			.addr_status_3            = 0x00001584,
+			.debug_status_cfg         = 0x00001588,
+			.debug_status_0           = 0x0000158C,
+			.debug_status_1           = 0x00001590,
 			.comp_group               = CAM_VFE_BUS_VER3_COMP_GRP_2,
 			.ubwc_regs                = NULL,
 		},
 		/* BUS Client 2 RDI2 */
 		{
-			.cfg                      = 0x00002600,
-			.image_addr               = 0x00002604,
-			.frame_incr               = 0x00002608,
-			.image_cfg_0              = 0x0000260C,
-			.image_cfg_1              = 0x00002610,
-			.image_cfg_2              = 0x00002614,
-			.packer_cfg               = 0x00002618,
-			.frame_header_addr        = 0x00002620,
-			.frame_header_incr        = 0x00002624,
-			.frame_header_cfg         = 0x00002628,
-			.line_done_cfg            = 0x0000262C,
-			.irq_subsample_period     = 0x00002630,
-			.irq_subsample_pattern    = 0x00002634,
-			.mmu_prefetch_cfg         = 0x00002660,
-			.mmu_prefetch_max_offset  = 0x00002664,
-			.system_cache_cfg         = 0x00002668,
-			.addr_cfg                 = 0x00002670,
-			.addr_status_0            = 0x00002678,
-			.addr_status_1            = 0x0000267C,
-			.addr_status_2            = 0x00002680,
-			.addr_status_3            = 0x00002684,
-			.debug_status_cfg         = 0x00002688,
-			.debug_status_0           = 0x0000268C,
-			.debug_status_1           = 0x00002690,
+			.cfg                      = 0x00001600,
+			.image_addr               = 0x00001604,
+			.frame_incr               = 0x00001608,
+			.image_cfg_0              = 0x0000160C,
+			.image_cfg_1              = 0x00001610,
+			.image_cfg_2              = 0x00001614,
+			.packer_cfg               = 0x00001618,
+			.frame_header_addr        = 0x00001620,
+			.frame_header_incr        = 0x00001624,
+			.frame_header_cfg         = 0x00001628,
+			.line_done_cfg            = 0x0000162C,
+			.irq_subsample_period     = 0x00001630,
+			.irq_subsample_pattern    = 0x00001634,
+			.mmu_prefetch_cfg         = 0x00001660,
+			.mmu_prefetch_max_offset  = 0x00001664,
+			.system_cache_cfg         = 0x00001668,
+			.addr_cfg                 = 0x00001670,
+			.addr_status_0            = 0x00001678,
+			.addr_status_1            = 0x0000167C,
+			.addr_status_2            = 0x00001680,
+			.addr_status_3            = 0x00001684,
+			.debug_status_cfg         = 0x00001688,
+			.debug_status_0           = 0x0000168C,
+			.debug_status_1           = 0x00001690,
 			.comp_group               = CAM_VFE_BUS_VER3_COMP_GRP_3,
 			.ubwc_regs                = NULL,
 		},
 		/* BUS Client 3 RDI3 */
 		{
-			.cfg                      = 0x00002700,
-			.image_addr               = 0x00002704,
-			.frame_incr               = 0x00002708,
-			.image_cfg_0              = 0x0000270C,
-			.image_cfg_1              = 0x00002710,
-			.image_cfg_2              = 0x00002714,
-			.packer_cfg               = 0x00002718,
-			.frame_header_addr        = 0x00002720,
-			.frame_header_incr        = 0x00002724,
-			.frame_header_cfg         = 0x00002728,
-			.line_done_cfg            = 0x0000272C,
-			.irq_subsample_period     = 0x00002730,
-			.irq_subsample_pattern    = 0x00002734,
-			.mmu_prefetch_cfg         = 0x00002760,
-			.mmu_prefetch_max_offset  = 0x00002764,
-			.system_cache_cfg         = 0x00002768,
-			.addr_cfg                 = 0x00002770,
-			.addr_status_0            = 0x00002778,
-			.addr_status_1            = 0x0000277C,
-			.addr_status_2            = 0x00002780,
-			.addr_status_3            = 0x00002784,
-			.debug_status_cfg         = 0x00002788,
-			.debug_status_0           = 0x0000278C,
-			.debug_status_1           = 0x00002790,
+			.cfg                      = 0x00001700,
+			.image_addr               = 0x00001704,
+			.frame_incr               = 0x00001708,
+			.image_cfg_0              = 0x0000170C,
+			.image_cfg_1              = 0x00001710,
+			.image_cfg_2              = 0x00001714,
+			.packer_cfg               = 0x00001718,
+			.frame_header_addr        = 0x00001720,
+			.frame_header_incr        = 0x00001724,
+			.frame_header_cfg         = 0x00001728,
+			.line_done_cfg            = 0x0000172C,
+			.irq_subsample_period     = 0x00001730,
+			.irq_subsample_pattern    = 0x00001734,
+			.mmu_prefetch_cfg         = 0x00001760,
+			.mmu_prefetch_max_offset  = 0x00001764,
+			.system_cache_cfg         = 0x00001768,
+			.addr_cfg                 = 0x00001770,
+			.addr_status_0            = 0x00001778,
+			.addr_status_1            = 0x0000177C,
+			.addr_status_2            = 0x00001780,
+			.addr_status_3            = 0x00001784,
+			.debug_status_cfg         = 0x00001788,
+			.debug_status_0           = 0x0000178C,
+			.debug_status_1           = 0x00001790,
 			.comp_group               = CAM_VFE_BUS_VER3_COMP_GRP_4,
 			.ubwc_regs                = NULL,
 		},
 		/* BUS Client 4 Gamma */
 		{
-			.cfg                      = 0x00002800,
-			.image_addr               = 0x00002804,
-			.frame_incr               = 0x00002808,
-			.image_cfg_0              = 0x0000280C,
-			.image_cfg_1              = 0x00002810,
-			.image_cfg_2              = 0x00002814,
-			.packer_cfg               = 0x00002818,
-			.frame_header_addr        = 0x00002820,
-			.frame_header_incr        = 0x00002824,
-			.frame_header_cfg         = 0x00002828,
-			.line_done_cfg            = 0x0000282C,
-			.irq_subsample_period     = 0x00002830,
-			.irq_subsample_pattern    = 0x00002834,
-			.mmu_prefetch_cfg         = 0x00002860,
-			.mmu_prefetch_max_offset  = 0x00002864,
-			.system_cache_cfg         = 0x00002868,
-			.addr_cfg                 = 0x00002870,
-			.addr_status_0            = 0x00002878,
-			.addr_status_1            = 0x0000287C,
-			.addr_status_2            = 0x00002880,
-			.addr_status_3            = 0x00002884,
-			.debug_status_cfg         = 0x00002888,
-			.debug_status_0           = 0x0000288C,
-			.debug_status_1           = 0x00002890,
+			.cfg                      = 0x00001800,
+			.image_addr               = 0x00001804,
+			.frame_incr               = 0x00001808,
+			.image_cfg_0              = 0x0000180C,
+			.image_cfg_1              = 0x00001810,
+			.image_cfg_2              = 0x00001814,
+			.packer_cfg               = 0x00001818,
+			.frame_header_addr        = 0x00001820,
+			.frame_header_incr        = 0x00001824,
+			.frame_header_cfg         = 0x00001828,
+			.line_done_cfg            = 0x0000182C,
+			.irq_subsample_period     = 0x00001830,
+			.irq_subsample_pattern    = 0x00001834,
+			.mmu_prefetch_cfg         = 0x00001860,
+			.mmu_prefetch_max_offset  = 0x00001864,
+			.system_cache_cfg         = 0x00001868,
+			.addr_cfg                 = 0x00001870,
+			.addr_status_0            = 0x00001878,
+			.addr_status_1            = 0x0000187C,
+			.addr_status_2            = 0x00001880,
+			.addr_status_3            = 0x00001884,
+			.debug_status_cfg         = 0x00001888,
+			.debug_status_0           = 0x0000188C,
+			.debug_status_1           = 0x00001890,
 			.comp_group               = CAM_VFE_BUS_VER3_COMP_GRP_0,
 			.ubwc_regs                = NULL,
 		},
 		/* BUS Client 5 Stats BE */
 		{
-			.cfg                      = 0x00002900,
-			.image_addr               = 0x00002904,
-			.frame_incr               = 0x00002908,
-			.image_cfg_0              = 0x0000290C,
-			.image_cfg_1              = 0x00002910,
-			.image_cfg_2              = 0x00002914,
-			.packer_cfg               = 0x00002918,
-			.frame_header_addr        = 0x00002920,
-			.frame_header_incr        = 0x00002924,
-			.frame_header_cfg         = 0x00002928,
-			.line_done_cfg            = 0x0000292C,
-			.irq_subsample_period     = 0x00002930,
-			.irq_subsample_pattern    = 0x00002934,
-			.mmu_prefetch_cfg         = 0x00002960,
-			.mmu_prefetch_max_offset  = 0x00002964,
-			.system_cache_cfg         = 0x00002968,
-			.addr_cfg                 = 0x00002970,
-			.addr_status_0            = 0x00002978,
-			.addr_status_1            = 0x0000297C,
-			.addr_status_2            = 0x00002980,
-			.addr_status_3            = 0x00002984,
-			.debug_status_cfg         = 0x00002988,
-			.debug_status_0           = 0x0000298C,
-			.debug_status_1           = 0x00002990,
+			.cfg                      = 0x00001900,
+			.image_addr               = 0x00001904,
+			.frame_incr               = 0x00001908,
+			.image_cfg_0              = 0x0000190C,
+			.image_cfg_1              = 0x00001910,
+			.image_cfg_2              = 0x00001914,
+			.packer_cfg               = 0x00001918,
+			.frame_header_addr        = 0x00001920,
+			.frame_header_incr        = 0x00001924,
+			.frame_header_cfg         = 0x00001928,
+			.line_done_cfg            = 0x0000192C,
+			.irq_subsample_period     = 0x00001930,
+			.irq_subsample_pattern    = 0x00001934,
+			.mmu_prefetch_cfg         = 0x00001960,
+			.mmu_prefetch_max_offset  = 0x00001964,
+			.system_cache_cfg         = 0x00001968,
+			.addr_cfg                 = 0x00001970,
+			.addr_status_0            = 0x00001978,
+			.addr_status_1            = 0x0000197C,
+			.addr_status_2            = 0x00001980,
+			.addr_status_3            = 0x00001984,
+			.debug_status_cfg         = 0x00001988,
+			.debug_status_0           = 0x0000198C,
+			.debug_status_1           = 0x00001990,
 			.comp_group               = CAM_VFE_BUS_VER3_COMP_GRP_0,
 			.ubwc_regs                = NULL,
 		},