msm: camera: isp: Add support for IFE2

Add support for IFE2 hardware in ife hw manager, bus files.

CRs-Fixed: 2571273
Change-Id: I6193b70707b15282b8d819e8dda5eb2e5fc4c345
Signed-off-by: Gaurav Jindal <gjindal@codeaurora.org>
This commit is contained in:
Gaurav Jindal 2019-12-16 13:57:57 +05:30 • committed by Gerrit - the friendly Code Review server
commit 14b75bff2d
3 changed files with 27 additions and 1 deletions

View file

@ -1439,6 +1439,16 @@ static int cam_convert_hw_idx_to_ife_hw_num(int hw_idx)
else if (hw_idx == 4)
return CAM_ISP_IFE1_LITE_HW;
break;
case CAM_CPAS_TITAN_170_V200:
if (hw_idx == 0)
return CAM_ISP_IFE0_HW;
else if (hw_idx == 1)
return CAM_ISP_IFE1_HW;
else if (hw_idx == 2)
return CAM_ISP_IFE2_HW;
else if (hw_idx == 3)
return CAM_ISP_IFE0_LITE_HW;
break;
default:
CAM_ERR(CAM_ISP, "Invalid hw_version: 0x%X",
hw_version);

View file

@ -319,6 +319,7 @@ static int cam_vfe_bus_ver2_get_intra_client_mask(
case CAM_VFE_BUS_VER2_VFE_CORE_0:
switch (dual_slave_core) {
case CAM_VFE_BUS_VER2_VFE_CORE_1:
case CAM_VFE_BUS_VER2_VFE_CORE_2:
*intra_client_mask = version_based_intra_client_mask;
break;
default:
@ -331,6 +332,20 @@ static int cam_vfe_bus_ver2_get_intra_client_mask(
case CAM_VFE_BUS_VER2_VFE_CORE_1:
switch (dual_slave_core) {
case CAM_VFE_BUS_VER2_VFE_CORE_0:
case CAM_VFE_BUS_VER2_VFE_CORE_2:
*intra_client_mask = version_based_intra_client_mask;
break;
default:
CAM_ERR(CAM_ISP, "Invalid value for slave core %u",
dual_slave_core);
rc = -EINVAL;
break;
}
break;
case CAM_VFE_BUS_VER2_VFE_CORE_2:
switch (dual_slave_core) {
case CAM_VFE_BUS_VER2_VFE_CORE_0:
case CAM_VFE_BUS_VER2_VFE_CORE_1:
*intra_client_mask = version_based_intra_client_mask;
break;
default:

View file

@ -1,6 +1,6 @@
/* SPDX-License-Identifier: GPL-2.0-only */
/*
* Copyright (c) 2017-2018, The Linux Foundation. All rights reserved.
* Copyright (c) 2017-2019, The Linux Foundation. All rights reserved.
*/
#ifndef _CAM_VFE_BUS_VER2_H_
@ -14,6 +14,7 @@
enum cam_vfe_bus_ver2_vfe_core_id {
CAM_VFE_BUS_VER2_VFE_CORE_0,
CAM_VFE_BUS_VER2_VFE_CORE_1,
CAM_VFE_BUS_VER2_VFE_CORE_2,
CAM_VFE_BUS_VER2_VFE_CORE_MAX,
};