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

Commit c60aa7da authored by Linux Build Service Account's avatar Linux Build Service Account
Browse files

Merge a50c3608 on remote branch 

Change-Id: I567e607fa24fb592e6d1a602dcf9db91cf467f90
parents 93d71001 a50c3608

Makefile

+9 −0
Original line number Diff line number Diff line
@@ -13,6 +13,10 @@ ifeq ($(CONFIG_ARCH_BENGAL), y) 
include $(srctree)/techpack/camera/config/bengalcamera.conf

endif



ifeq ($(CONFIG_ARCH_KHAJE), y)

include $(srctree)/techpack/camera/config/khajecamera.conf

endif



ifeq ($(CONFIG_ARCH_KONA), y)

LINUXINCLUDE    += \

		-include $(srctree)/techpack/camera/config/konacameraconf.h
@@ -28,6 +32,11 @@ LINUXINCLUDE += \ 
		-include $(srctree)/techpack/camera/config/bengalcameraconf.h

endif



ifeq ($(CONFIG_ARCH_KHAJE), y)

LINUXINCLUDE    += \

		-include $(srctree)/techpack/camera/config/khajecameraconf.h

endif



ifdef CONFIG_SPECTRA_CAMERA

# Use USERINCLUDE when you must reference the UAPI directories only.

USERINCLUDE     += \

config/khajecamera.conf

0 → 100644
+6 −0
Original line number Diff line number Diff line 
# SPDX-License-Identifier: GPL-2.0-only

# Copyright (c) 2021, The Linux Foundation. All rights reserved.



export CONFIG_SPECTRA_CAMERA_OPE=y

export CONFIG_SPECTRA_CAMERA_TFE=y

export CONFIG_SPECTRA_CAMERA_SENSOR=y

config/khajecameraconf.h

0 → 100644
+8 −0
Original line number Diff line number Diff line 
/* SPDX-License-Identifier: GPL-2.0-only */

/*

 * Copyright (c) 2021, The Linux Foundation. All rights reserved.

 */



#define CONFIG_SPECTRA_CAMERA      1

#define CONFIG_SPECTRA_CAMERA_OPE  1

#define CONFIG_SPECTRA_CAMERA_TFE  1

drivers/cam_cdm/cam_cdm.h

+4 −1
Original line number Diff line number Diff line 
/* SPDX-License-Identifier: GPL-2.0-only */

/*

 * Copyright (c) 2017-2020, The Linux Foundation. All rights reserved.

 * Copyright (c) 2017-2021, The Linux Foundation. All rights reserved.

 */



#ifndef _CAM_CDM_H_
@@ -276,6 +276,7 @@ struct cam_cdm_common_reg_data { 
 *                       wait, etc.

 * @core_en:             offset to pause/enable CDM

 * @fe_cfg:              offset to configure CDM fetch engine

 * @irq_context_status   offset to read back irq context status

 * @bl_fifo_rb:          offset to set BL_FIFO read back

 * @bl_fifo_base_rb:     offset to read back base address on offset set by

 *                       bl_fifo_rb
@@ -319,6 +320,7 @@ struct cam_cdm_common_regs { 
	uint32_t core_cfg;

	uint32_t core_en;

	uint32_t fe_cfg;

	uint32_t irq_context_status;

	uint32_t bl_fifo_rb;

	uint32_t bl_fifo_base_rb;

	uint32_t bl_fifo_len_rb;
@@ -415,6 +417,7 @@ enum cam_cdm_hw_version { 
	CAM_CDM_VERSION_1_1 = 0x10010000,

	CAM_CDM_VERSION_1_2 = 0x10020000,

	CAM_CDM_VERSION_2_0 = 0x20000000,

	CAM_CDM_VERSION_2_1 = 0x20010000,

	CAM_CDM_VERSION_MAX,

};

drivers/cam_cdm/cam_cdm_core_common.c

+3 −1
Original line number Diff line number Diff line 
// SPDX-License-Identifier: GPL-2.0-only

/*

 * Copyright (c) 2017-2020, The Linux Foundation. All rights reserved.

 * Copyright (c) 2017-2021, The Linux Foundation. All rights reserved.

 */



#include <linux/delay.h>
@@ -49,6 +49,7 @@ bool cam_cdm_set_cam_hw_version( 
	case CAM_CDM110_VERSION:

	case CAM_CDM120_VERSION:

	case CAM_CDM200_VERSION:

	case CAM_CDM210_VERSION:

		cam_version->major    = (ver & 0xF0000000);

		cam_version->minor    = (ver & 0xFFF0000);

		cam_version->incr     = (ver & 0xFFFF);
@@ -81,6 +82,7 @@ struct cam_cdm_utils_ops *cam_cdm_get_ops( 
		case CAM_CDM110_VERSION:

		case CAM_CDM120_VERSION:

		case CAM_CDM200_VERSION:

		case CAM_CDM210_VERSION:

			return &CDM170_ops;

		default:

			CAM_ERR(CAM_CDM, "CDM Version=%x not supported in util",