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

Commit af3afa6b authored by Camera Software Integration's avatar Camera Software Integration Committed by Gerrit - the friendly Code Review server
Browse files

Merge "msm: camera: cpas: Add support for Khaje Camera" into camera-kernel.lnx.3.1

parents b06743ea d86bddbd

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_cpas/cam_cpas_soc.c

+5 −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/device.h>
@@ -529,6 +529,10 @@ int cam_cpas_get_custom_dt_info(struct cam_hw_info *cpas_hw, 
			(u32 *)&soc_private->camnoc_axi_min_ib_bw);

	}



	soc_private->custom_id = 0;

	rc = of_property_read_u32(of_node,

				"custom-id",

				&soc_private->custom_id);

	if (rc) {

		CAM_DBG(CAM_CPAS,

			"failed to read camnoc-axi-min-ib-bw rc:%d", rc);

drivers/cam_cpas/cam_cpas_soc.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_CPAS_SOC_H_
@@ -109,6 +109,8 @@ struct cam_cpas_feature_info { 
 * @feature_info: fuse based feature info for hw supported features

 * @cx_ipeak_gpu_limit: Flag for Cx Ipeak GPU mitigation

 * @gpu_pwr_limit: Handle for Cx Ipeak GPU Mitigation

 * @custom_id: Custom id to differentiate between target if

 *      cpas version is same

 *

 */

struct cam_cpas_private_soc {
@@ -129,6 +131,7 @@ struct cam_cpas_private_soc { 
	struct cam_cpas_feature_info  feature_info[CAM_CPAS_MAX_FUSE_FEATURE];

	uint32_t cx_ipeak_gpu_limit;

	struct kgsl_pwr_limit *gpu_pwr_limit;

	uint32_t custom_id;

};



void cam_cpas_util_debug_parse_data(struct cam_cpas_private_soc *soc_private);