msm: camera: port khaje camera driver on 5.15 kernel

Changes to enable khaje camera driver on msm-5.15.
This includes makefile changes, dma-buf, ICC and
other compilation fixes.

Change-Id: Ief9b192aecd77858d9d5d5d76416711e1a14678c
Signed-off-by: Nirmal Abraham <[email protected]>

Android.mk

@@ -0,0 +1,41 @@
+ifeq ($(call is-board-platform-in-list, $(TARGET_BOARD_PLATFORM)),true)
+
+# Make target to specify building the camera.ko from within Android build system.
+LOCAL_PATH := $(call my-dir)
+# Path to DLKM make scripts
+DLKM_DIR := $(TOP)/device/qcom/common/dlkm
+
+# Kbuild options
+KBUILD_OPTIONS := CAMERA_KERNEL_ROOT=$(shell pwd)/$(LOCAL_PATH)
+KBUILD_OPTIONS += KERNEL_ROOT=$(shell pwd)/kernel/msm-$(TARGET_KERNEL_VERSION)/
+KBUILD_OPTIONS += MODNAME=camera
+KBUILD_OPTIONS += BOARD_PLATFORM=$(TARGET_BOARD_PLATFORM)
+
+# Clear shell environment variables from previous android module during build
+include $(CLEAR_VARS)
+# For incremental compilation support.
+LOCAL_SRC_FILES             :=  \
+                                $(shell find $(LOCAL_PATH)/config -L -type f)      \
+                                $(shell find $(LOCAL_PATH)/drivers -L -type f)     \
+                                $(shell find $(LOCAL_PATH)/dt-bindings -L -type f) \
+                                $(shell find $(LOCAL_PATH)/include -L -type f)     \
+                                $(LOCAL_PATH)/Android.mk \
+                                $(LOCAL_PATH)/board.mk   \
+                                $(LOCAL_PATH)/product.mk \
+                                $(LOCAL_PATH)/Kbuild
+LOCAL_MODULE_PATH           := $(KERNEL_MODULES_OUT)
+LOCAL_MODULE                := camera.ko
+LOCAL_MODULE_TAGS           := optional
+#LOCAL_MODULE_KBUILD_NAME   := camera.ko
+#LOCAL_MODULE_DEBUG_ENABLE  := true
+
+ifeq ($(TARGET_BOARD_PLATFORM), lahaina)
+# Include Kernel DLKM Android.mk target to place generated .ko file in image
+include $(DLKM_DIR)/AndroidKernelModule.mk
+# Include Camera UAPI Android.mk target to copy headers
+include $(LOCAL_PATH)/include/uapi/Android.mk
+else
+include $(DLKM_DIR)/Build_external_kernelmodule.mk
+endif
+
+endif # End of check for board platform

Kbuild

@@ -0,0 +1,234 @@
+# SPDX-License-Identifier: GPL-2.0-only
+
+ifeq ($(CONFIG_QCOM_CAMERA_DEBUG), y)
+$(info "CAMERA_KERNEL_ROOT is: $(CAMERA_KERNEL_ROOT)")
+$(info "KERNEL_ROOT is: $(KERNEL_ROOT)")
+endif
+
+# Include Architecture configurations
+ifeq ($(CONFIG_ARCH_WAIPIO), y)
+include $(CAMERA_KERNEL_ROOT)/config/waipio.mk
+endif
+
+ifeq ($(CONFIG_ARCH_LAHAINA), y)
+include $(CAMERA_KERNEL_ROOT)/config/lahaina.mk
+endif
+
+ifeq ($(CONFIG_ARCH_KONA), y)
+include $(CAMERA_KERNEL_ROOT)/config/kona.mk
+endif
+
+ifeq ($(CONFIG_ARCH_BENGAL), y)
+include $(CAMERA_KERNEL_ROOT)/config/holi.mk
+endif
+
+ifeq ($(CONFIG_ARCH_KHAJE), y)
+include $(CAMERA_KERNEL_ROOT)/config/holi.mk
+endif
+
+ifeq ($(CONFIG_ARCH_HOLI), y)
+include $(CAMERA_KERNEL_ROOT)/config/holi.mk
+endif
+
+ifeq ($(CONFIG_ARCH_LITO), y)
+include $(CAMERA_KERNEL_ROOT)/config/lito.mk
+endif
+
+ifeq ($(CONFIG_ARCH_SHIMA), y)
+include $(CAMERA_KERNEL_ROOT)/config/shima.mk
+endif
+
+# List of all camera-kernel headers
+cam_include_dirs := $(shell dirname `find $(CAMERA_KERNEL_ROOT) -name '*.h'` | uniq)
+
+# Include UAPI headers
+USERINCLUDE +=                              \
+	-I$(CAMERA_KERNEL_ROOT)/include/uapi/
+# Include Kernel headers
+LINUXINCLUDE +=                                 \
+	-I$(KERNEL_ROOT)                            \
+	$(addprefix -I,$(cam_include_dirs))         \
+	-I$(CAMERA_KERNEL_ROOT)/include/uapi/camera \
+	-I$(CAMERA_KERNEL_ROOT)/
+# Optional include directories
+ccflags-$(CONFIG_MSM_GLOBAL_SYNX) += -I$(KERNEL_ROOT)/drivers/media/platform/msm/synx
+
+# After creating lists, add content of 'ccflags-m' variable to 'ccflags-y' one.
+ccflags-y += ${ccflags-m}
+
+camera-y := \
+	drivers/cam_req_mgr/cam_req_mgr_core.o \
+	drivers/cam_req_mgr/cam_req_mgr_dev.o \
+	drivers/cam_req_mgr/cam_req_mgr_util.o \
+	drivers/cam_req_mgr/cam_mem_mgr.o \
+	drivers/cam_req_mgr/cam_req_mgr_workq.o \
+	drivers/cam_req_mgr/cam_req_mgr_timer.o \
+	drivers/cam_req_mgr/cam_req_mgr_debug.o \
+	drivers/cam_utils/cam_soc_util.o \
+	drivers/cam_utils/cam_io_util.o \
+	drivers/cam_utils/cam_packet_util.o \
+	drivers/cam_utils/cam_debug_util.o \
+	drivers/cam_utils/cam_trace.o \
+	drivers/cam_utils/cam_common_util.o \
+	drivers/cam_utils/cam_compat.o \
+	drivers/cam_core/cam_context.o \
+	drivers/cam_core/cam_context_utils.o \
+	drivers/cam_core/cam_node.o \
+	drivers/cam_core/cam_subdev.o \
+	drivers/cam_smmu/cam_smmu_api.o \
+	drivers/cam_sync/cam_sync.o \
+	drivers/cam_sync/cam_sync_util.o \
+	drivers/cam_cpas/cpas_top/cam_cpastop_hw.o \
+	drivers/cam_cpas/camss_top/cam_camsstop_hw.o \
+	drivers/cam_cpas/cam_cpas_soc.o \
+	drivers/cam_cpas/cam_cpas_intf.o \
+	drivers/cam_cpas/cam_cpas_hw.o \
+	drivers/cam_cdm/cam_cdm_soc.o \
+	drivers/cam_cdm/cam_cdm_util.o \
+	drivers/cam_cdm/cam_cdm_intf.o \
+	drivers/cam_cdm/cam_cdm_core_common.o \
+	drivers/cam_cdm/cam_cdm_virtual_core.o \
+	drivers/cam_cdm/cam_cdm_hw_core.o
+
+camera-$(CONFIG_QCOM_CX_IPEAK) += drivers/cam_utils/cam_cx_ipeak.o
+camera-$(CONFIG_QCOM_BUS_SCALING) += drivers/cam_utils/cam_soc_bus.o
+camera-$(CONFIG_INTERCONNECT_QCOM) += drivers/cam_utils/cam_soc_icc.o
+
+camera-$(CONFIG_SPECTRA_ISP) += \
+	drivers/cam_isp/isp_hw_mgr/hw_utils/cam_tasklet_util.o \
+	drivers/cam_isp/isp_hw_mgr/hw_utils/cam_isp_packet_parser.o \
+	drivers/cam_isp/isp_hw_mgr/hw_utils/irq_controller/cam_irq_controller.o \
+	drivers/cam_isp/isp_hw_mgr/isp_hw/top_tpg/cam_top_tpg_dev.o \
+	drivers/cam_isp/isp_hw_mgr/isp_hw/top_tpg/cam_top_tpg_soc.o \
+	drivers/cam_isp/isp_hw_mgr/isp_hw/top_tpg/cam_top_tpg_core.o \
+	drivers/cam_isp/isp_hw_mgr/isp_hw/top_tpg/cam_top_tpg_v1.o \
+	drivers/cam_isp/isp_hw_mgr/cam_isp_hw_mgr.o \
+	drivers/cam_isp/cam_isp_dev.o \
+	drivers/cam_isp/cam_isp_context.o
+
+camera-$(CONFIG_SPECTRA_SFE) += \
+	drivers/cam_isp/isp_hw_mgr/isp_hw/sfe_hw/cam_sfe_soc.o \
+	drivers/cam_isp/isp_hw_mgr/isp_hw/sfe_hw/cam_sfe_dev.o \
+	drivers/cam_isp/isp_hw_mgr/isp_hw/sfe_hw/cam_sfe_core.o \
+	drivers/cam_isp/isp_hw_mgr/isp_hw/sfe_hw/sfe_top/cam_sfe_top.o \
+	drivers/cam_isp/isp_hw_mgr/isp_hw/sfe_hw/sfe_bus/cam_sfe_bus.o \
+	drivers/cam_isp/isp_hw_mgr/isp_hw/sfe_hw/sfe_bus/cam_sfe_bus_rd.o \
+	drivers/cam_isp/isp_hw_mgr/isp_hw/sfe_hw/sfe_bus/cam_sfe_bus_wr.o \
+
+camera-$(CONFIG_SPECTRA_ICP) += \
+	drivers/cam_icp/icp_hw/icp_hw_mgr/cam_icp_hw_mgr.o \
+	drivers/cam_icp/icp_hw/ipe_hw/ipe_dev.o \
+	drivers/cam_icp/icp_hw/ipe_hw/ipe_core.o \
+	drivers/cam_icp/icp_hw/ipe_hw/ipe_soc.o \
+	drivers/cam_icp/icp_hw/a5_hw/a5_dev.o \
+	drivers/cam_icp/icp_hw/a5_hw/a5_core.o \
+	drivers/cam_icp/icp_hw/a5_hw/a5_soc.o \
+	drivers/cam_icp/icp_hw/bps_hw/bps_dev.o \
+	drivers/cam_icp/icp_hw/bps_hw/bps_core.o \
+	drivers/cam_icp/icp_hw/bps_hw/bps_soc.o \
+	drivers/cam_icp/cam_icp_subdev.o \
+	drivers/cam_icp/cam_icp_context.o \
+	drivers/cam_icp/hfi.o
+
+camera-$(CONFIG_SPECTRA_JPEG) += \
+	drivers/cam_jpeg/jpeg_hw/jpeg_enc_hw/jpeg_enc_dev.o \
+	drivers/cam_jpeg/jpeg_hw/jpeg_enc_hw/jpeg_enc_core.o \
+	drivers/cam_jpeg/jpeg_hw/jpeg_enc_hw/jpeg_enc_soc.o \
+	drivers/cam_jpeg/jpeg_hw/jpeg_dma_hw/jpeg_dma_dev.o \
+	drivers/cam_jpeg/jpeg_hw/jpeg_dma_hw/jpeg_dma_core.o \
+	drivers/cam_jpeg/jpeg_hw/jpeg_dma_hw/jpeg_dma_soc.o \
+	drivers/cam_jpeg/jpeg_hw/cam_jpeg_hw_mgr.o \
+	drivers/cam_jpeg/cam_jpeg_dev.o \
+	drivers/cam_jpeg/cam_jpeg_context.o
+
+camera-$(CONFIG_SPECTRA_FD) += \
+	drivers/cam_fd/fd_hw_mgr/fd_hw/cam_fd_hw_dev.o \
+	drivers/cam_fd/fd_hw_mgr/fd_hw/cam_fd_hw_core.o \
+	drivers/cam_fd/fd_hw_mgr/fd_hw/cam_fd_hw_soc.o \
+	drivers/cam_fd/fd_hw_mgr/cam_fd_hw_mgr.o \
+	drivers/cam_fd/cam_fd_dev.o \
+	drivers/cam_fd/cam_fd_context.o
+
+camera-$(CONFIG_SPECTRA_LRME) += \
+	drivers/cam_lrme/lrme_hw_mgr/lrme_hw/cam_lrme_hw_dev.o \
+	drivers/cam_lrme/lrme_hw_mgr/lrme_hw/cam_lrme_hw_core.o \
+	drivers/cam_lrme/lrme_hw_mgr/lrme_hw/cam_lrme_hw_soc.o \
+	drivers/cam_lrme/lrme_hw_mgr/cam_lrme_hw_mgr.o \
+	drivers/cam_lrme/cam_lrme_dev.o \
+	drivers/cam_lrme/cam_lrme_context.o
+
+camera-$(CONFIG_SPECTRA_SENSOR) += \
+	drivers/cam_sensor_module/cam_actuator/cam_actuator_dev.o \
+	drivers/cam_sensor_module/cam_actuator/cam_actuator_core.o \
+	drivers/cam_sensor_module/cam_actuator/cam_actuator_soc.o \
+	drivers/cam_sensor_module/cam_cci/cam_cci_dev.o \
+	drivers/cam_sensor_module/cam_cci/cam_cci_core.o \
+	drivers/cam_sensor_module/cam_cci/cam_cci_soc.o \
+	drivers/cam_sensor_module/cam_csiphy/cam_csiphy_soc.o \
+	drivers/cam_sensor_module/cam_csiphy/cam_csiphy_dev.o \
+	drivers/cam_sensor_module/cam_csiphy/cam_csiphy_core.o \
+	drivers/cam_sensor_module/cam_eeprom/cam_eeprom_dev.o \
+	drivers/cam_sensor_module/cam_eeprom/cam_eeprom_core.o  \
+	drivers/cam_sensor_module/cam_eeprom/cam_eeprom_soc.o \
+	drivers/cam_sensor_module/cam_ois/cam_ois_dev.o \
+	drivers/cam_sensor_module/cam_ois/cam_ois_core.o \
+	drivers/cam_sensor_module/cam_ois/cam_ois_soc.o \
+	drivers/cam_sensor_module/cam_sensor/cam_sensor_dev.o \
+	drivers/cam_sensor_module/cam_sensor/cam_sensor_core.o \
+	drivers/cam_sensor_module/cam_sensor/cam_sensor_soc.o \
+	drivers/cam_sensor_module/cam_sensor_io/cam_sensor_io.o \
+	drivers/cam_sensor_module/cam_sensor_io/cam_sensor_cci_i2c.o \
+	drivers/cam_sensor_module/cam_sensor_io/cam_sensor_qup_i2c.o \
+	drivers/cam_sensor_module/cam_sensor_io/cam_sensor_spi.o \
+	drivers/cam_sensor_module/cam_sensor_utils/cam_sensor_util.o \
+	drivers/cam_sensor_module/cam_res_mgr/cam_res_mgr.o
+
+camera-$(CONFIG_LEDS_QPNP_FLASH_V2) += \
+	drivers/cam_sensor_module/cam_flash/cam_flash_dev.o \
+	drivers/cam_sensor_module/cam_flash/cam_flash_core.o \
+	drivers/cam_sensor_module/cam_flash/cam_flash_soc.o
+
+camera-$(CONFIG_LEDS_QTI_FLASH) += \
+	drivers/cam_sensor_module/cam_flash/cam_flash_dev.o \
+	drivers/cam_sensor_module/cam_flash/cam_flash_core.o \
+	drivers/cam_sensor_module/cam_flash/cam_flash_soc.o
+
+camera-$(CONFIG_SPECTRA_CUSTOM) += \
+	drivers/cam_cust/cam_custom_hw_mgr/cam_custom_hw1/cam_custom_sub_mod_soc.o \
+	drivers/cam_cust/cam_custom_hw_mgr/cam_custom_hw1/cam_custom_sub_mod_dev.o \
+	drivers/cam_cust/cam_custom_hw_mgr/cam_custom_hw1/cam_custom_sub_mod_core.o \
+	drivers/cam_cust/cam_custom_hw_mgr/cam_custom_csid/cam_custom_csid_dev.o \
+	drivers/cam_cust/cam_custom_hw_mgr/cam_custom_hw_mgr.o \
+	drivers/cam_cust/cam_custom_dev.o \
+	drivers/cam_cust/cam_custom_context.o
+
+camera-$(CONFIG_SPECTRA_OPE) += \
+	drivers/cam_ope/cam_ope_subdev.o \
+	drivers/cam_ope/cam_ope_context.o \
+	drivers/cam_ope/ope_hw_mgr/cam_ope_hw_mgr.o \
+	drivers/cam_ope/ope_hw_mgr/ope_hw/ope_dev.o \
+	drivers/cam_ope/ope_hw_mgr/ope_hw/ope_soc.o \
+	drivers/cam_ope/ope_hw_mgr/ope_hw/ope_core.o \
+	drivers/cam_ope/ope_hw_mgr/ope_hw/top/ope_top.o \
+	drivers/cam_ope/ope_hw_mgr/ope_hw/bus_rd/ope_bus_rd.o\
+	drivers/cam_ope/ope_hw_mgr/ope_hw/bus_wr/ope_bus_wr.o
+
+camera-$(CONFIG_SPECTRA_TFE) += \
+	drivers/cam_isp/isp_hw_mgr/isp_hw/ppi_hw/cam_csid_ppi_core.o \
+	drivers/cam_isp/isp_hw_mgr/isp_hw/ppi_hw/cam_csid_ppi_dev.o \
+	drivers/cam_isp/isp_hw_mgr/isp_hw/ppi_hw/cam_csid_ppi100.o \
+	drivers/cam_isp/isp_hw_mgr/isp_hw/tfe_hw/cam_tfe_soc.o \
+	drivers/cam_isp/isp_hw_mgr/isp_hw/tfe_hw/cam_tfe_dev.o \
+	drivers/cam_isp/isp_hw_mgr/isp_hw/tfe_hw/cam_tfe_core.o \
+	drivers/cam_isp/isp_hw_mgr/isp_hw/tfe_hw/cam_tfe_bus.o \
+	drivers/cam_isp/isp_hw_mgr/isp_hw/tfe_hw/cam_tfe.o \
+	drivers/cam_isp/isp_hw_mgr/isp_hw/tfe_csid_hw/cam_tfe_csid_dev.o \
+	drivers/cam_isp/isp_hw_mgr/isp_hw/tfe_csid_hw/cam_tfe_csid_soc.o \
+	drivers/cam_isp/isp_hw_mgr/isp_hw/tfe_csid_hw/cam_tfe_csid_core.o \
+	drivers/cam_isp/isp_hw_mgr/isp_hw/tfe_csid_hw/cam_tfe_csid530.o \
+	drivers/cam_isp/isp_hw_mgr/cam_tfe_hw_mgr.o
+
+camera-y += drivers/camera_main.o
+
+obj-m += camera.o
+BOARD_VENDOR_KERNEL_MODULES += $(KERNEL_MODULES_OUT)/camera.ko

Makefile

@@ -1,53 +1,16 @@
-# SPDX-License-Identifier: GPL-2.0-only
+# Makefile for use with Android's kernel/build system
 
-# auto-detect subdirs
-ifeq ($(CONFIG_ARCH_KONA), y)
-include $(srctree)/techpack/camera/config/konacamera.conf
-endif
+KBUILD_OPTIONS += CAMERA_KERNEL_ROOT=$(shell pwd)
+KBUILD_OPTIONS += KERNEL_ROOT=$(ROOT_DIR)/$(KERNEL_DIR)
+KBUILD_OPTIONS += MODNAME=camera
 
-ifeq ($(CONFIG_ARCH_LITO), y)
-include $(srctree)/techpack/camera/config/litocamera.conf
-endif
+all: modules
 
-ifeq ($(CONFIG_ARCH_BENGAL), y)
-include $(srctree)/techpack/camera/config/bengalcamera.conf
-endif
+modules dtbs:
+	$(MAKE) -C $(KERNEL_SRC) M=$(M) modules $(KBUILD_OPTIONS)
 
-ifeq ($(CONFIG_ARCH_KHAJE), y)
-include $(srctree)/techpack/camera/config/khajecamera.conf
-endif
+modules_install:
+	$(MAKE) M=$(M) -C $(KERNEL_SRC) modules_install
 
-ifeq ($(CONFIG_ARCH_KONA), y)
-LINUXINCLUDE    += \
-		-include $(srctree)/techpack/camera/config/konacameraconf.h
-endif
-
-ifeq ($(CONFIG_ARCH_LITO), y)
-LINUXINCLUDE    += \
-		-include $(srctree)/techpack/camera/config/litocameraconf.h
-endif
-
-ifeq ($(CONFIG_ARCH_BENGAL), y)
-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     += \
-                -I$(srctree)/techpack/camera/include/uapi
-
-# Use LINUXINCLUDE when you must reference the include/ directory.
-# Needed to be compatible with the O= option
-LINUXINCLUDE    += \
-                -I$(srctree)/techpack/camera/include/uapi \
-                -I$(srctree)/techpack/camera/include
-obj-y += drivers/
-else
-$(info Target not found)
-endif
+clean:
+	$(MAKE) -C $(KERNEL_SRC) M=$(M) clean

board.mk

@@ -0,0 +1,6 @@
+# Build camera kernel driver
+ifneq ($(TARGET_BOARD_AUTO),true)
+ifeq ($(call is-board-platform-in-list,$(TARGET_BOARD_PLATFORM)),true)
+BOARD_VENDOR_KERNEL_MODULES += $(KERNEL_MODULES_OUT)/camera.ko
+endif
+endif

config/holi.mk

@@ -0,0 +1,13 @@
+# Settings for compiling holi camera architecture
+
+# Localized KCONFIG settings
+CONFIG_SPECTRA_ISP := y
+CONFIG_SPECTRA_OPE := y
+CONFIG_SPECTRA_TFE := y
+CONFIG_SPECTRA_SENSOR := y
+
+# Flags to pass into C preprocessor
+ccflags-y += -DCONFIG_SPECTRA_ISP=1
+ccflags-y += -DCONFIG_SPECTRA_OPE=1
+ccflags-y += -DCONFIG_SPECTRA_TFE=1
+ccflags-y += -DCONFIG_SPECTRA_SENSOR=1