Merge "msm: camera: isp: Add support for VFE Bus Lite version 170" into dev/msm-4.9-camx (e458b44c) · Commits · e / devices / android_kernel_fairphone_FP3

drivers/media/platform/msm/camera/cam_isp/isp_hw_mgr/isp_hw/vfe_hw/vfe170/Makefile

+1 −1

Original line number	Diff line number	Diff line
		@@ -11,4 +11,4 @@ ccflags-y += -Idrivers/media/platform/msm/camera/cam_isp/isp_hw_mgr/isp_hw/vfe_h
		ccflags-y += -Idrivers/media/platform/msm/camera/cam_isp/isp_hw_mgr/isp_hw/vfe_hw/vfe_bus
		ccflags-y += -Idrivers/media/platform/msm/camera/cam_isp/isp_hw_mgr/isp_hw/vfe_hw

		obj-$(CONFIG_SPECTRA_CAMERA) += cam_vfe170.o
		obj-$(CONFIG_SPECTRA_CAMERA) += cam_vfe170.o cam_vfe_lite170.o

drivers/media/platform/msm/camera/cam_isp/isp_hw_mgr/isp_hw/vfe_hw/vfe170/cam_vfe170.h

+18 −16

Original line number	Diff line number	Diff line
		@@ -222,11 +222,12 @@ static struct cam_vfe_bus_ver2_hw_info vfe170_bus_hw_info = {
		.comp_error_status = 0x0000206C,
		.comp_ovrwr_status = 0x00002070,
		.dual_comp_error_status = 0x00002074,
		.dual_comp_error_status = 0x00002078,
		.dual_comp_ovrwr_status = 0x00002078,
		.addr_sync_cfg = 0x0000207C,
		.addr_sync_frame_hdr = 0x00002080,
		.addr_sync_no_sync = 0x00002084,
		},
		.num_client = 20,
		.bus_client_reg = {
		/* BUS Client 0 */
		{
		@@ -707,7 +708,23 @@ static struct cam_vfe_bus_ver2_hw_info vfe170_bus_hw_info = {
		.addr_sync_mask = 0x0000209C,
		},
		},
		.num_out = 18,
		.vfe_out_hw_info = {
		{
		.vfe_out_type = CAM_VFE_BUS_VER2_VFE_OUT_RDI0,
		.max_width = -1,
		.max_height = -1,
		},
		{
		.vfe_out_type = CAM_VFE_BUS_VER2_VFE_OUT_RDI1,
		.max_width = -1,
		.max_height = -1,
		},
		{
		.vfe_out_type = CAM_VFE_BUS_VER2_VFE_OUT_RDI2,
		.max_width = -1,
		.max_height = -1,
		},
		{
		.vfe_out_type = CAM_VFE_BUS_VER2_VFE_OUT_FULL,
		.max_width = 4096,
		@@ -738,21 +755,6 @@ static struct cam_vfe_bus_ver2_hw_info vfe170_bus_hw_info = {
		.max_width = -1,
		.max_height = -1,
		},
		{
		.vfe_out_type = CAM_VFE_BUS_VER2_VFE_OUT_RDI0,
		.max_width = -1,
		.max_height = -1,
		},
		{
		.vfe_out_type = CAM_VFE_BUS_VER2_VFE_OUT_RDI1,
		.max_width = -1,
		.max_height = -1,
		},
		{
		.vfe_out_type = CAM_VFE_BUS_VER2_VFE_OUT_RDI2,
		.max_width = -1,
		.max_height = -1,
		},
		{
		.vfe_out_type =
		CAM_VFE_BUS_VER2_VFE_OUT_STATS_HDR_BE,

drivers/media/platform/msm/camera/cam_isp/isp_hw_mgr/isp_hw/vfe_hw/vfe170/cam_vfe_lite170.c

0 → 100644

+51 −0

Original line number	Diff line number	Diff line
		/* Copyright (c) 2017, The Linux Foundation. All rights reserved.
		*
		* This program is free software; you can redistribute it and/or modify
		* it under the terms of the GNU General Public License version 2 and
		* only version 2 as published by the Free Software Foundation.
		*
		* This program is distributed in the hope that it will be useful,
		* but WITHOUT ANY WARRANTY; without even the implied warranty of
		* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
		* GNU General Public License for more details.
		*/

		#include <linux/module.h>
		#include "cam_vfe_lite170.h"
		#include "cam_vfe_hw_intf.h"
		#include "cam_vfe_core.h"
		#include "cam_vfe_dev.h"

		static const struct of_device_id cam_vfe170_dt_match[] = {
		{
		.compatible = "qcom,vfe-lite170",
		.data = &cam_vfe_lite170_hw_info,
		},
		{}
		};
		MODULE_DEVICE_TABLE(of, cam_vfe170_dt_match);

		static struct platform_driver cam_vfe170_driver = {
		.probe = cam_vfe_probe,
		.remove = cam_vfe_remove,
		.driver = {
		.name = "cam_vfe_lite170",
		.owner = THIS_MODULE,
		.of_match_table = cam_vfe170_dt_match,
		},
		};

		static int __init cam_vfe170_init_module(void)
		{
		return platform_driver_register(&cam_vfe170_driver);
		}

		static void __exit cam_vfe170_exit_module(void)
		{
		platform_driver_unregister(&cam_vfe170_driver);
		}

		module_init(cam_vfe170_init_module);
		module_exit(cam_vfe170_exit_module);
		MODULE_DESCRIPTION("CAM VFE170 driver");
		MODULE_LICENSE("GPL v2");

drivers/media/platform/msm/camera/cam_isp/isp_hw_mgr/isp_hw/vfe_hw/vfe170/cam_vfe_lite170.h

0 → 100644

+336 −0

Original line number	Diff line number	Diff line
		/* Copyright (c) 2017, The Linux Foundation. All rights reserved.
		*
		* This program is free software; you can redistribute it and/or modify
		* it under the terms of the GNU General Public License version 2 and
		* only version 2 as published by the Free Software Foundation.
		*
		* This program is distributed in the hope that it will be useful,
		* but WITHOUT ANY WARRANTY; without even the implied warranty of
		* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
		* GNU General Public License for more details.
		*/

		#ifndef _CAM_VFE_LITE170_H_
		#define _CAM_VFE_LITE170_H_

		#include "cam_vfe_bus_ver2.h"
		#include "cam_irq_controller.h"
		#include "cam_vfe_top_ver2.h"
		#include "cam_vfe_core.h"

		static struct cam_irq_register_set vfe170_top_irq_reg_set[2] = {
		{
		.mask_reg_offset = 0x0000005C,
		.clear_reg_offset = 0x00000064,
		.status_reg_offset = 0x0000006C,
		},
		{
		.mask_reg_offset = 0x00000060,
		.clear_reg_offset = 0x00000068,
		.status_reg_offset = 0x00000070,
		},
		};

		static struct cam_irq_controller_reg_info vfe170_top_irq_reg_info = {
		.num_registers = 2,
		.irq_reg_set = vfe170_top_irq_reg_set,
		.global_clear_offset = 0x00000058,
		.global_clear_bitmask = 0x00000001,
		};

		static struct cam_vfe_top_ver2_reg_offset_common vfe170_top_common_reg = {
		.hw_version = 0x00000000,
		.hw_capability = 0x00000004,
		.lens_feature = 0x00000008,
		.stats_feature = 0x0000000C,
		.color_feature = 0x00000010,
		.zoom_feature = 0x00000014,
		.global_reset_cmd = 0x00000018,
		.module_ctrl = {
		NULL,
		NULL,
		NULL,
		NULL,
		},
		.bus_cgc_ovd = 0x0000003C,
		.core_cfg = 0x00000000,
		.three_D_cfg = 0x00000000,
		.violation_status = 0x0000007C,
		.reg_update_cmd = 0x000004AC,
		};

		static struct cam_vfe_rdi_ver2_reg vfe170_rdi_reg = {
		.reg_update_cmd = 0x000004AC,
		};

		static struct cam_vfe_rdi_reg_data vfe170_rdi_0_data = {
		.reg_update_cmd_data = 0x2,
		.sof_irq_mask = 0x8000000,
		.reg_update_irq_mask = 0x20,
		};

		static struct cam_vfe_rdi_reg_data vfe170_rdi_1_data = {
		.reg_update_cmd_data = 0x4,
		.sof_irq_mask = 0x10000000,
		.reg_update_irq_mask = 0x40,
		};

		static struct cam_vfe_rdi_reg_data vfe170_rdi_2_data = {
		.reg_update_cmd_data = 0x8,
		.sof_irq_mask = 0x20000000,
		.reg_update_irq_mask = 0x80,
		};

		static struct cam_vfe_rdi_reg_data vfe170_rdi_3_data = {
		.reg_update_cmd_data = 0x10,
		.sof_irq_mask = 0x40000000,
		.reg_update_irq_mask = 0x100,
		};

		static struct cam_vfe_top_ver2_hw_info vfe170_top_hw_info = {
		.common_reg = &vfe170_top_common_reg,
		.camif_hw_info = {
		.common_reg = NULL,
		.camif_reg = NULL,
		.reg_data = NULL,
		},
		.rdi_hw_info = {
		.common_reg = &vfe170_top_common_reg,
		.rdi_reg = &vfe170_rdi_reg,
		.reg_data = {
		&vfe170_rdi_0_data,
		&vfe170_rdi_1_data,
		&vfe170_rdi_2_data,
		&vfe170_rdi_3_data,
		},
		},
		.mux_type = {
		CAM_VFE_RDI_VER_1_0,
		CAM_VFE_RDI_VER_1_0,
		CAM_VFE_RDI_VER_1_0,
		CAM_VFE_RDI_VER_1_0,
		},
		};

		static struct cam_irq_register_set vfe170_bus_irq_reg[3] = {
		{
		.mask_reg_offset = 0x00002044,
		.clear_reg_offset = 0x00002050,
		.status_reg_offset = 0x0000205C,
		},
		{
		.mask_reg_offset = 0x00002048,
		.clear_reg_offset = 0x00002054,
		.status_reg_offset = 0x00002060,
		},
		{
		.mask_reg_offset = 0x0000204C,
		.clear_reg_offset = 0x00002058,
		.status_reg_offset = 0x00002064,
		},
		};

		static struct cam_vfe_bus_ver2_hw_info vfe170_bus_hw_info = {
		.common_reg = {
		.hw_version = 0x00002000,
		.hw_capability = 0x00002004,
		.sw_reset = 0x00002008,
		.cgc_ovd = 0x0000200C,
		.pwr_iso_cfg = 0x000020CC,
		.dual_master_comp_cfg = 0x00002028,
		.irq_reg_info = {
		.num_registers = 3,
		.irq_reg_set = vfe170_bus_irq_reg,
		.global_clear_offset = 0x00002068,
		.global_clear_bitmask = 0x00000001,
		},
		.comp_error_status = 0x0000206C,
		.comp_ovrwr_status = 0x00002070,
		.dual_comp_error_status = 0x00002074,
		.dual_comp_ovrwr_status = 0x00002078,
		.addr_sync_cfg = 0x0000207C,
		.addr_sync_frame_hdr = 0x00002080,
		.addr_sync_no_sync = 0x00002084,
		},
		.num_client = 4,
		.bus_client_reg = {
		/* BUS Client 0 */
		{
		.status0 = 0x00002200,
		.status1 = 0x00002204,
		.cfg = 0x00002208,
		.header_addr = 0x0000220C,
		.header_cfg = 0x00002210,
		.image_addr = 0x00002214,
		.image_addr_offset = 0x00002218,
		.buffer_width_cfg = 0x0000221C,
		.buffer_height_cfg = 0x00002220,
		.packer_cfg = 0x00002224,
		.stride = 0x00002228,
		.irq_subsample_period = 0x00002248,
		.irq_subsample_pattern = 0x0000224C,
		.framedrop_period = 0x00002250,
		.framedrop_pattern = 0x00002254,
		.frame_inc = 0x00002258,
		.burst_limit = 0x0000225C,
		.ubwc_regs = NULL,
		},
		/* BUS Client 1 */
		{
		.status0 = 0x00002300,
		.status1 = 0x00002304,
		.cfg = 0x00002308,
		.header_addr = 0x0000230C,
		.header_cfg = 0x00002310,
		.image_addr = 0x00002314,
		.image_addr_offset = 0x00002318,
		.buffer_width_cfg = 0x0000231C,
		.buffer_height_cfg = 0x00002320,
		.packer_cfg = 0x00002324,
		.stride = 0x00002328,
		.irq_subsample_period = 0x00002348,
		.irq_subsample_pattern = 0x0000234C,
		.framedrop_period = 0x00002350,
		.framedrop_pattern = 0x00002354,
		.frame_inc = 0x00002358,
		.burst_limit = 0x0000235C,
		.ubwc_regs = NULL,
		},
		/* BUS Client 2 */
		{
		.status0 = 0x00002400,
		.status1 = 0x00002404,
		.cfg = 0x00002408,
		.header_addr = 0x0000240C,
		.header_cfg = 0x00002410,
		.image_addr = 0x00002414,
		.image_addr_offset = 0x00002418,
		.buffer_width_cfg = 0x0000241C,
		.buffer_height_cfg = 0x00002420,
		.packer_cfg = 0x00002424,
		.stride = 0x00002428,
		.irq_subsample_period = 0x00002448,
		.irq_subsample_pattern = 0x0000244C,
		.framedrop_period = 0x00002450,
		.framedrop_pattern = 0x00002454,
		.frame_inc = 0x00002458,
		.burst_limit = 0x0000245C,
		.ubwc_regs = NULL,
		},
		/* BUS Client 3 */
		{
		.status0 = 0x00002500,
		.status1 = 0x00002504,
		.cfg = 0x00002508,
		.header_addr = 0x0000250C,
		.header_cfg = 0x00002510,
		.image_addr = 0x00002514,
		.image_addr_offset = 0x00002518,
		.buffer_width_cfg = 0x0000251C,
		.buffer_height_cfg = 0x00002520,
		.packer_cfg = 0x00002524,
		.stride = 0x00002528,
		.irq_subsample_period = 0x00002548,
		.irq_subsample_pattern = 0x0000254C,
		.framedrop_period = 0x00002550,
		.framedrop_pattern = 0x00002554,
		.frame_inc = 0x00002558,
		.burst_limit = 0x0000255C,
		.ubwc_regs = NULL,
		},
		},
		.comp_grp_reg = {
		/* CAM_VFE_BUS_VER2_COMP_GRP_0 */
		{
		.comp_mask = 0x00002010,
		},
		/* CAM_VFE_BUS_VER2_COMP_GRP_1 */
		{
		.comp_mask = 0x00002014,
		},
		/* CAM_VFE_BUS_VER2_COMP_GRP_2 */
		{
		.comp_mask = 0x00002018,
		},
		/* CAM_VFE_BUS_VER2_COMP_GRP_3 */
		{
		.comp_mask = 0x0000201C,
		},
		/* CAM_VFE_BUS_VER2_COMP_GRP_4 */
		{
		.comp_mask = 0x00002020,
		},
		/* CAM_VFE_BUS_VER2_COMP_GRP_5 */
		{
		.comp_mask = 0x00002024,
		},
		/* CAM_VFE_BUS_VER2_COMP_GRP_DUAL_0 */
		{
		.comp_mask = 0x0000202C,
		.addr_sync_mask = 0x00002088,
		},
		/* CAM_VFE_BUS_VER2_COMP_GRP_DUAL_1 */
		{
		.comp_mask = 0x00002030,
		.addr_sync_mask = 0x0000208C,

		},
		/* CAM_VFE_BUS_VER2_COMP_GRP_DUAL_2 */
		{
		.comp_mask = 0x00002034,
		.addr_sync_mask = 0x00002090,

		},
		/* CAM_VFE_BUS_VER2_COMP_GRP_DUAL_3 */
		{
		.comp_mask = 0x00002038,
		.addr_sync_mask = 0x00002094,
		},
		/* CAM_VFE_BUS_VER2_COMP_GRP_DUAL_4 */
		{
		.comp_mask = 0x0000203C,
		.addr_sync_mask = 0x00002098,
		},
		/* CAM_VFE_BUS_VER2_COMP_GRP_DUAL_5 */
		{
		.comp_mask = 0x00002040,
		.addr_sync_mask = 0x0000209C,
		},
		},
		.num_out = 4,
		.vfe_out_hw_info = {
		{
		.vfe_out_type = CAM_VFE_BUS_VER2_VFE_OUT_RDI0,
		.max_width = -1,
		.max_height = -1,
		},
		{
		.vfe_out_type = CAM_VFE_BUS_VER2_VFE_OUT_RDI1,
		.max_width = -1,
		.max_height = -1,
		},
		{
		.vfe_out_type = CAM_VFE_BUS_VER2_VFE_OUT_RDI2,
		.max_width = -1,
		.max_height = -1,
		},
		{
		.vfe_out_type = CAM_VFE_BUS_VER2_VFE_OUT_RDI3,
		.max_width = -1,
		.max_height = -1,
		},
		},
		};

		static struct cam_vfe_hw_info cam_vfe_lite170_hw_info = {
		.irq_reg_info = &vfe170_top_irq_reg_info,

		.bus_version = CAM_VFE_BUS_VER_2_0,
		.bus_hw_info = &vfe170_bus_hw_info,

		.top_version = CAM_VFE_TOP_VER_2_0,
		.top_hw_info = &vfe170_top_hw_info,

		};

		#endif /* _CAM_VFE_LITE170_H_ */

drivers/media/platform/msm/camera/cam_isp/isp_hw_mgr/isp_hw/vfe_hw/vfe_bus/cam_vfe_bus_ver2.c

+46 −29

Original line number	Diff line number	Diff line
		@@ -184,6 +184,8 @@ struct cam_vfe_bus_ver2_vfe_out_data {

		struct cam_vfe_bus_ver2_priv {
		struct cam_vfe_bus_ver2_common_data common_data;
		uint32_t num_client;
		uint32_t num_out;

		struct cam_isp_resource_node bus_client[CAM_VFE_BUS_VER2_MAX_CLIENTS];
		struct cam_isp_resource_node comp_grp[CAM_VFE_BUS_VER2_COMP_GRP_MAX];
		@@ -394,6 +396,8 @@ static enum cam_vfe_bus_ver2_vfe_out_type
		return CAM_VFE_BUS_VER2_VFE_OUT_RDI1;
		case CAM_ISP_IFE_OUT_RES_RDI_2:
		return CAM_VFE_BUS_VER2_VFE_OUT_RDI2;
		case CAM_ISP_IFE_OUT_RES_RDI_3:
		return CAM_VFE_BUS_VER2_VFE_OUT_RDI3;
		case CAM_ISP_IFE_OUT_RES_STATS_HDR_BE:
		return CAM_VFE_BUS_VER2_VFE_OUT_STATS_HDR_BE;
		case CAM_ISP_IFE_OUT_RES_STATS_HDR_BHIST:
		@@ -425,6 +429,7 @@ static int cam_vfe_bus_get_num_wm(
		case CAM_VFE_BUS_VER2_VFE_OUT_RDI0:
		case CAM_VFE_BUS_VER2_VFE_OUT_RDI1:
		case CAM_VFE_BUS_VER2_VFE_OUT_RDI2:
		case CAM_VFE_BUS_VER2_VFE_OUT_RDI3:
		switch (format) {
		case CAM_FORMAT_MIPI_RAW_8:
		case CAM_FORMAT_MIPI_RAW_10:
		@@ -551,88 +556,97 @@ static int cam_vfe_bus_get_wm_idx(
		int wm_idx = -1;

		switch (vfe_out_res_id) {
		case CAM_VFE_BUS_VER2_VFE_OUT_FULL:
		case CAM_VFE_BUS_VER2_VFE_OUT_RDI0:
		switch (plane) {
		case PLANE_Y:
		wm_idx = 3;
		wm_idx = 0;
		break;
		case PLANE_C:
		wm_idx = 4;
		default:
		break;
		}
		break;
		case CAM_VFE_BUS_VER2_VFE_OUT_RDI1:
		switch (plane) {
		case PLANE_Y:
		wm_idx = 1;
		break;
		default:
		break;
		}
		break;
		case CAM_VFE_BUS_VER2_VFE_OUT_DS4:
		case CAM_VFE_BUS_VER2_VFE_OUT_RDI2:
		switch (plane) {
		case PLANE_Y:
		wm_idx = 5;
		wm_idx = 2;
		break;
		default:
		break;
		}
		break;
		case CAM_VFE_BUS_VER2_VFE_OUT_DS16:
		case CAM_VFE_BUS_VER2_VFE_OUT_RDI3:
		switch (plane) {
		case PLANE_Y:
		wm_idx = 6;
		wm_idx = 3;
		break;
		default:
		break;
		}
		break;
		case CAM_VFE_BUS_VER2_VFE_OUT_FD:
		case CAM_VFE_BUS_VER2_VFE_OUT_FULL:
		switch (plane) {
		case PLANE_Y:
		wm_idx = 7;
		wm_idx = 3;
		break;
		case PLANE_C:
		wm_idx = 8;
		wm_idx = 4;
		break;
		default:
		break;
		}
		break;
		case CAM_VFE_BUS_VER2_VFE_OUT_RAW_DUMP:
		case CAM_VFE_BUS_VER2_VFE_OUT_DS4:
		switch (plane) {
		case PLANE_Y:
		wm_idx = 9;
		wm_idx = 5;
		break;
		default:
		break;
		}
		break;
		case CAM_VFE_BUS_VER2_VFE_OUT_PDAF:
		case CAM_VFE_BUS_VER2_VFE_OUT_DS16:
		switch (plane) {
		case PLANE_Y:
		wm_idx = 10;
		wm_idx = 6;
		break;
		default:
		break;
		}
		break;
		case CAM_VFE_BUS_VER2_VFE_OUT_RDI0:
		case CAM_VFE_BUS_VER2_VFE_OUT_FD:
		switch (plane) {
		case PLANE_Y:
		wm_idx = 0;
		wm_idx = 7;
		break;
		case PLANE_C:
		wm_idx = 8;
		break;
		default:
		break;
		}
		break;
		case CAM_VFE_BUS_VER2_VFE_OUT_RDI1:
		case CAM_VFE_BUS_VER2_VFE_OUT_RAW_DUMP:
		switch (plane) {
		case PLANE_Y:
		wm_idx = 1;
		wm_idx = 9;
		break;
		default:
		break;
		}
		break;
		case CAM_VFE_BUS_VER2_VFE_OUT_RDI2:
		case CAM_VFE_BUS_VER2_VFE_OUT_PDAF:
		switch (plane) {
		case PLANE_Y:
		wm_idx = 2;
		wm_idx = 10;
		break;
		default:
		break;
		@@ -792,7 +806,7 @@ static int cam_vfe_bus_acquire_wm(

		/* No need to allocate for BUS VER2. VFE OUT to WM is fixed. */
		wm_idx = cam_vfe_bus_get_wm_idx(vfe_out_res_id, plane);
		if (wm_idx < 0 \|\| wm_idx >= CAM_VFE_BUS_VER2_MAX_CLIENTS) {
		if (wm_idx < 0 \|\| wm_idx >= ver2_bus_priv->num_client) {
		CAM_ERR(CAM_ISP, "Unsupported VFE out %d plane %d",
		vfe_out_res_id, plane);
		return -EINVAL;
		@@ -2168,7 +2182,8 @@ static int cam_vfe_bus_init_vfe_out_resource(uint32_t index,
		vfe_out->res_state = CAM_ISP_RESOURCE_STATE_AVAILABLE;
		INIT_LIST_HEAD(&vfe_out->list);

		rsrc_data->out_type = index;
		rsrc_data->out_type =
		ver2_hw_info->vfe_out_hw_info[index].vfe_out_type;
		rsrc_data->common_data = &ver2_bus_priv->common_data;
		rsrc_data->max_width =
		ver2_hw_info->vfe_out_hw_info[index].max_width;
		@@ -2783,6 +2798,8 @@ int cam_vfe_bus_ver2_init(
		}
		vfe_bus_local->bus_priv = bus_priv;

		bus_priv->num_client = ver2_hw_info->num_client;
		bus_priv->num_out = ver2_hw_info->num_out;
		bus_priv->common_data.num_sec_out = 0;
		bus_priv->common_data.secure_mode = CAM_SECURE_MODE_NON_SECURE;
		bus_priv->common_data.core_index = soc_info->index;
		@@ -2808,7 +2825,7 @@ int cam_vfe_bus_ver2_init(
		INIT_LIST_HEAD(&bus_priv->free_dual_comp_grp);
		INIT_LIST_HEAD(&bus_priv->used_comp_grp);

		for (i = 0; i < CAM_VFE_BUS_VER2_MAX_CLIENTS; i++) {
		for (i = 0; i < bus_priv->num_client; i++) {
		rc = cam_vfe_bus_init_wm_resource(i, bus_priv, bus_hw_info,
		&bus_priv->bus_client[i]);
		if (rc < 0) {
		@@ -2826,7 +2843,7 @@ int cam_vfe_bus_ver2_init(
		}
		}

		for (i = 0; i < CAM_VFE_BUS_VER2_VFE_OUT_MAX; i++) {
		for (i = 0; i < bus_priv->num_out; i++) {
		rc = cam_vfe_bus_init_vfe_out_resource(i, bus_priv, bus_hw_info,
		&bus_priv->vfe_out[i]);
		if (rc < 0) {
		@@ -2859,7 +2876,7 @@ int cam_vfe_bus_ver2_init(

		deinit_vfe_out:
		if (i < 0)
		i = CAM_VFE_BUS_VER2_VFE_OUT_MAX;
		i = bus_priv->num_out;
		for (--i; i >= 0; i--)
		cam_vfe_bus_deinit_vfe_out_resource(&bus_priv->vfe_out[i]);

		@@ -2871,7 +2888,7 @@ int cam_vfe_bus_ver2_init(

		deinit_wm:
		if (i < 0)
		i = CAM_VFE_BUS_VER2_MAX_CLIENTS;
		i = bus_priv->num_client;
		for (--i; i >= 0; i--)
		cam_vfe_bus_deinit_wm_resource(&bus_priv->bus_client[i]);

		@@ -2909,7 +2926,7 @@ int cam_vfe_bus_ver2_deinit(
		for (i = 0; i < CAM_VFE_BUS_VER2_PAYLOAD_MAX; i++)
		INIT_LIST_HEAD(&bus_priv->common_data.evt_payload[i].list);

		for (i = 0; i < CAM_VFE_BUS_VER2_MAX_CLIENTS; i++) {
		for (i = 0; i < bus_priv->num_client; i++) {
		rc = cam_vfe_bus_deinit_wm_resource(&bus_priv->bus_client[i]);
		if (rc < 0)
		CAM_ERR(CAM_ISP,
		@@ -2923,7 +2940,7 @@ int cam_vfe_bus_ver2_deinit(
		"Deinit Comp Grp failed rc=%d", rc);
		}

		for (i = 0; i < CAM_VFE_BUS_VER2_VFE_OUT_MAX; i++) {
		for (i = 0; i < bus_priv->num_out; i++) {
		rc = cam_vfe_bus_deinit_vfe_out_resource(&bus_priv->vfe_out[i]);
		if (rc < 0)
		CAM_ERR(CAM_ISP,