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

Commit bc885682 authored by Gaurav Jindal's avatar Gaurav Jindal Committed by Gerrit - the friendly Code Review server
Browse files

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: default avatarGaurav Jindal <gjindal@codeaurora.org>
parent e8a3b36b
Loading
Loading
Loading
Loading
+10 −0
Original line number Diff line number Diff line
@@ -1470,6 +1470,16 @@ static int cam_convert_hw_idx_to_ife_hw_num(int hw_idx)
			else if (hw_idx == 4)
				return CAM_ISP_IFE2_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);
+15 −0
Original line number Diff line number Diff line
@@ -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:
+2 −1
Original line number Diff line number Diff line
/* 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,
};

+1 −0
Original line number Diff line number Diff line
@@ -111,6 +111,7 @@
#define CAM_ISP_IFE0_LITE_HW     0x4
#define CAM_ISP_IFE1_LITE_HW     0x8
#define CAM_ISP_IFE2_LITE_HW     0x10
#define CAM_ISP_IFE2_HW          0x100

#define CAM_ISP_PXL_PATH          0x1
#define CAM_ISP_PPP_PATH          0x2