Merge a838b9ec2105f3cef4f307ce0d71a11e04290ed9 on remote branch (cdf624e2) · Commits · e / devices / android_kernel_fairphone_FP4

Makefile

+9 −0

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

		ifeq ($(CONFIG_ARCH_BENGAL), y)
		include $(srctree)/techpack/camera/config/bengalcamera.conf
		endif

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

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

		ifdef CONFIG_SPECTRA_CAMERA
		# Use USERINCLUDE when you must reference the UAPI directories only.
		USERINCLUDE += \

0 → 100644

+4 −0

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

		export CONFIG_SPECTRA_CAMERA=y

0 → 100644

+7 −0

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

		#define CONFIG_SPECTRA_CAMERA 1

+1 −0

Original line number	Diff line number	Diff line
		@@ -11,3 +11,4 @@ obj-$(CONFIG_SPECTRA_CAMERA) += cam_icp/
		obj-$(CONFIG_SPECTRA_CAMERA) += cam_jpeg/
		obj-$(CONFIG_SPECTRA_CAMERA) += cam_fd/
		obj-$(CONFIG_SPECTRA_CAMERA) += cam_lrme/
		obj-$(CONFIG_SPECTRA_CAMERA) += cam_cust/

+1 −1

Original line number	Diff line number	Diff line
		@@ -274,7 +274,7 @@ int cam_cdm_stream_ops_internal(void *hw_priv,
		struct cam_axi_vote axi_vote = {0};

		ahb_vote.type = CAM_VOTE_ABSOLUTE;
		ahb_vote.vote.level = CAM_SVS_VOTE;
		ahb_vote.vote.level = CAM_LOWSVS_VOTE;
		axi_vote.num_paths = 1;
		axi_vote.axi_path[0].path_data_type =
		CAM_AXI_PATH_DATA_ALL;