Merge "msm: camera: cpas: Add support for Yupik camnoc" into camera-kernel.lnx.4.0 (0626661e) · Commits · e / devices / android_kernel_fairphone_FP5

Makefile

+9 −0

Original line number	Original line	Diff line number	Diff line
	@@ -26,6 +26,10 @@ ifeq ($(CONFIG_ARCH_SHIMA), y)
	include $(srctree)/techpack/camera/config/shimacamera.conf		include $(srctree)/techpack/camera/config/shimacamera.conf
	endif		endif

			ifeq ($(CONFIG_ARCH_YUPIK), y)
			include $(srctree)/techpack/camera/config/yupikcamera.conf
			endif

	ifeq ($(CONFIG_ARCH_KONA), y)		ifeq ($(CONFIG_ARCH_KONA), y)
	LINUXINCLUDE += \		LINUXINCLUDE += \
	-include $(srctree)/techpack/camera/config/konacameraconf.h		-include $(srctree)/techpack/camera/config/konacameraconf.h
	@@ -56,6 +60,11 @@ LINUXINCLUDE += \
	-include $(srctree)/techpack/camera/config/shimacameraconf.h		-include $(srctree)/techpack/camera/config/shimacameraconf.h
	endif		endif

			ifeq ($(CONFIG_ARCH_YUPIK), y)
			LINUXINCLUDE += \
			-include $(srctree)/techpack/camera/config/yupikcameraconf.h
			endif

	endif		endif

	ifneq (,$(filter $(CONFIG_SPECTRA_CAMERA), y m))		ifneq (,$(filter $(CONFIG_SPECTRA_CAMERA), y m))

config/yupikcamera.conf

0 → 100644

+18 −0

Original line number	Original line	Diff line number	Diff line
			# SPDX-License-Identifier: GPL-2.0-only
			# Copyright (c) 2020, The Linux Foundation. All rights reserved.

			ifeq ($(CONFIG_QGKI),y)
			export CONFIG_SPECTRA_CAMERA=m
			$(info "SPECTRA_CAMERA IS MODULAR")
			else
			$(info "SPECTRA_CAMERA IS MODULAR")
			export CONFIG_SPECTRA_CAMERA=m
			endif

			ifneq (,$(filter $(CONFIG_SPECTRA_CAMERA), y m))
			export CONFIG_SPECTRA_ISP=y
			export CONFIG_SPECTRA_SENSOR=y
			export CONFIG_SPECTRA_ICP=y
			export CONFIG_SPECTRA_JPEG=y
			export CONFIG_SPECTRA_LRME=y
			endif

config/yupikcameraconf.h

0 → 100644

+11 −0

Original line number	Original line	Diff line number	Diff line
			/* SPDX-License-Identifier: GPL-2.0-only */
			/*
			* Copyright (c) 2020, The Linux Foundation. All rights reserved.
			*/

			#define CONFIG_SPECTRA_CAMERA 1
			#define CONFIG_SPECTRA_ISP 1
			#define CONFIG_SPECTRA_SENSOR 1
			#define CONFIG_SPECTRA_ICP 1
			#define CONFIG_SPECTRA_JPEG 1
			#define CONFIG_SPECTRA_LRME 1

drivers/cam_cpas/cpas_top/cam_cpastop_hw.c

+17 −0

Original line number	Original line	Diff line number	Diff line
	@@ -30,6 +30,7 @@
	#include "cpastop_v545_100.h"		#include "cpastop_v545_100.h"
	#include "cpastop_v570_200.h"		#include "cpastop_v570_200.h"
	#include "cpastop_v680_100.h"		#include "cpastop_v680_100.h"
			#include "cpastop_v165_100.h"
	#include "cam_req_mgr_workq.h"		#include "cam_req_mgr_workq.h"

	struct cam_camnoc_info *camnoc_info;		struct cam_camnoc_info *camnoc_info;
	@@ -130,6 +131,15 @@ static const uint32_t cam_cpas_hw_version_map
	0,		0,
	CAM_CPAS_TITAN_570_V200,		CAM_CPAS_TITAN_570_V200,
	},		},
			/* for camera_165 */
			{
			CAM_CPAS_TITAN_165_V100,
			0,
			0,
			0,
			0,
			0,
			},
	};		};

	static int cam_cpas_translate_camera_cpas_version_id(		static int cam_cpas_translate_camera_cpas_version_id(
	@@ -181,6 +191,10 @@ static int cam_cpas_translate_camera_cpas_version_id(
	*cam_version_id = CAM_CPAS_CAMERA_VERSION_ID_680;		*cam_version_id = CAM_CPAS_CAMERA_VERSION_ID_680;
	break;		break;

			case CAM_CPAS_CAMERA_VERSION_165:
			*cam_version_id = CAM_CPAS_CAMERA_VERSION_ID_165;
			break;

	default:		default:
	CAM_ERR(CAM_CPAS, "Invalid cam version %u",		CAM_ERR(CAM_CPAS, "Invalid cam version %u",
	cam_version);		cam_version);
	@@ -857,6 +871,9 @@ static int cam_cpastop_init_hw_version(struct cam_hw_info *cpas_hw,
	case CAM_CPAS_TITAN_680_V100:		case CAM_CPAS_TITAN_680_V100:
	camnoc_info = &cam680_cpas100_camnoc_info;		camnoc_info = &cam680_cpas100_camnoc_info;
	break;		break;
			case CAM_CPAS_TITAN_165_V100:
			camnoc_info = &cam165_cpas100_camnoc_info;
			break;
	default:		default:
	CAM_ERR(CAM_CPAS, "Camera Version not supported %d.%d.%d",		CAM_ERR(CAM_CPAS, "Camera Version not supported %d.%d.%d",
	hw_caps->camera_version.major,		hw_caps->camera_version.major,

drivers/cam_cpas/cpas_top/cam_cpastop_hw.h

+3 −0

Original line number	Original line	Diff line number	Diff line
	@@ -191,6 +191,9 @@ enum cam_camnoc_port_type {
	CAM_CAMNOC_TFE_1,		CAM_CAMNOC_TFE_1,
	CAM_CAMNOC_TFE_2,		CAM_CAMNOC_TFE_2,
	CAM_CAMNOC_OPE,		CAM_CAMNOC_OPE,
			CAM_CAMNOC_IFE01234_RDI_WRITE,
			CAM_CAMNOC_IFE01_NRDI_WRITE,
			CAM_CAMNOC_IFE2_NRDI_WRITE,
	};		};

	/**		/**