samsung-sm8650/android_kernel_samsung_sm8650-modules
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "msm: camera: cpas: Add support for Cape Camera" into camera-kernel.lnx.5.0

Browse Source
This commit is contained in:
Savita Patted
2021-11-03 18:02:59 -07:00
committed by Gerrit - the friendly Code Review server
parent c43ac5bd74 ca7336742c
commit 370aeb1448
6 changed files with 1330 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Kbuild
View File

@@ -38,6 +38,10 @@ ifeq ($(CONFIG_ARCH_DIWALI), y)
include $(CAMERA_KERNEL_ROOT)/config/diwali.mk
endif
ifeq ($(CONFIG_ARCH_CAPE), y)
include $(CAMERA_KERNEL_ROOT)/config/cape.mk
endif
# List of all camera-kernel headers
cam_include_dirs := $(shell dirname `find $(CAMERA_KERNEL_ROOT) -name '*.h'` | uniq)

22
config/cape.mk Normal file
View File

@@ -0,0 +1,22 @@
# SPDX-License-Identifier: GPL-2.0-only
# Settings for compiling cape camera architecture
# Localized KCONFIG settings
CONFIG_SPECTRA_ISP := y
CONFIG_SPECTRA_ICP := y
CONFIG_SPECTRA_JPEG := y
CONFIG_SPECTRA_CUSTOM := y
CONFIG_SPECTRA_SENSOR := y
# Flags to pass into C preprocessor
ccflags-y += -DCONFIG_SPECTRA_ISP=1
ccflags-y += -DCONFIG_SPECTRA_ICP=1
ccflags-y += -DCONFIG_SPECTRA_JPEG=1
ccflags-y += -DCONFIG_SPECTRA_CUSTOM=1
ccflags-y += -DCONFIG_SPECTRA_SENSOR=1
# External Dependencies
KBUILD_CPPFLAGS += -DCONFIG_MSM_MMRM=1
ifeq ($(CONFIG_QCOM_VA_MINIDUMP), y)
KBUILD_CPPFLAGS += -DCONFIG_QCOM_VA_MINIDUMP=1
endif

7
drivers/cam_cpas/cpas_top/cam_cpastop_hw.c
View File

@@ -31,6 +31,7 @@
#include "cpastop_v570_100.h"
#include "cpastop_v570_200.h"
#include "cpastop_v680_100.h"
#include "cpastop_v680_110.h"
#include "cpastop_v165_100.h"
#include "cpastop_v780_100.h"
#include "cam_req_mgr_workq.h"
@@ -140,7 +141,7 @@ static const uint32_t cam_cpas_hw_version_map
{
CAM_CPAS_TITAN_680_V100,
0,
0,
CAM_CPAS_TITAN_680_V110,
0,
0,
0,
@@ -955,6 +956,10 @@ static int cam_cpastop_init_hw_version(struct cam_hw_info *cpas_hw,
camnoc_info = &cam680_cpas100_camnoc_info;
qchannel_info = &cam680_cpas100_qchannel_info;
break;
case CAM_CPAS_TITAN_680_V110:
camnoc_info = &cam680_cpas110_camnoc_info;
qchannel_info = &cam680_cpas110_qchannel_info;
break;
case CAM_CPAS_TITAN_165_V100:
camnoc_info = &cam165_cpas100_camnoc_info;
break;

1296
drivers/cam_cpas/cpas_top/cpastop_v680_110.h Normal file
View File

File diff suppressed because it is too large Load Diff

1
drivers/cam_cpas/include/cam_cpas_api.h
View File

@@ -147,6 +147,7 @@ enum cam_cpas_hw_version {
CAM_CPAS_TITAN_570_V100 = 0x570100,
CAM_CPAS_TITAN_570_V200 = 0x570200,
CAM_CPAS_TITAN_680_V100 = 0x680100,
CAM_CPAS_TITAN_680_V110 = 0x680110,
CAM_CPAS_TITAN_780_V100 = 0x780100,
CAM_CPAS_TITAN_MAX
};

1
drivers/cam_icp/icp_hw/icp_hw_mgr/cam_icp_hw_mgr.c
View File

@@ -6553,6 +6553,7 @@ int cam_icp_hw_mgr_init(struct device_node *of_node, uint64_t *hw_mgr_hdl,
(camera_hw_version == CAM_CPAS_TITAN_570_V100) ||
(camera_hw_version == CAM_CPAS_TITAN_570_V200) ||
(camera_hw_version == CAM_CPAS_TITAN_680_V100) ||
(camera_hw_version == CAM_CPAS_TITAN_680_V110) ||
(camera_hw_version == CAM_CPAS_TITAN_780_V100)) {
if (cam_caps & CPAS_TITAN_IPE0_CAP_BIT)
icp_hw_mgr.ipe0_enable = true;