msm: camera: common: Migrate dt-bindings to techpack

To support external module compilation on Waipio, camera dt-bindings header
files need to be moved out of kernel SI and into the camera-kernel vendor SI.
This is to maintain seperation between the two SI's.

CRs-Fixed: 2835738
Change-Id: I8d63b48b6d406ed7b4a07f3bd4f1721ecd2dd0b0
Signed-off-by: Karthik Jayakumar <[email protected]>

Kbuild

@@ -41,11 +41,11 @@ cam_include_dirs := $(shell dirname `find $(CAMERA_KERNEL_ROOT) -name '*.h'` | u
 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
-
+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
 

Makefile

@@ -4,7 +4,9 @@ KBUILD_OPTIONS += CAMERA_KERNEL_ROOT=$(shell pwd)
 KBUILD_OPTIONS += KERNEL_ROOT=$(ROOT_DIR)/$(KERNEL_DIR)
 KBUILD_OPTIONS += MODNAME=camera
 
-modules:
+all: modules
+
+modules dtbs:
 	$(MAKE) -C $(KERNEL_SRC) M=$(M) modules $(KBUILD_OPTIONS)
 
 modules_install:

drivers/cam_cpas/cam_cpas_hw.h

@@ -6,7 +6,8 @@
 #ifndef _CAM_CPAS_HW_H_
 #define _CAM_CPAS_HW_H_
 
-#include <dt-bindings/msm/msm-camera.h>
+#include <dt-bindings/msm-camera.h>
+
 #include "cam_cpas_api.h"
 #include "cam_cpas_hw_intf.h"
 #include "cam_common_util.h"

drivers/cam_cpas/cam_cpas_intf.c

@@ -7,12 +7,14 @@
 #include <linux/module.h>
 #include <linux/kernel.h>
 #include <linux/platform_device.h>
+
 #include <media/v4l2-event.h>
 #include <media/v4l2-ioctl.h>
 #include <media/v4l2-subdev.h>
 #include <media/cam_cpas.h>
 #include <media/cam_req_mgr.h>
-#include <dt-bindings/msm/msm-camera.h>
+
+#include <dt-bindings/msm-camera.h>
 
 #include "cam_subdev.h"
 #include "cam_cpas_hw_intf.h"

drivers/cam_cpas/cam_cpas_soc.c

@@ -10,6 +10,8 @@
 #include <linux/platform_device.h>
 #include <linux/slab.h>
 
+#include <dt-bindings/msm-camera.h>
+
 #include "cam_cpas_api.h"
 #include "cam_cpas_hw_intf.h"
 #include "cam_cpas_hw.h"

drivers/cam_cpas/cpas_top/cam_cpastop_hw.c

@@ -131,6 +131,15 @@ static const uint32_t cam_cpas_hw_version_map
 		0,
 		CAM_CPAS_TITAN_570_V200,
 	},
+	/* for camera_680 */
+	{
+		CAM_CPAS_TITAN_680_V100,
+		0,
+		0,
+		0,
+		0,
+		0,
+	},
 	/* for camera_165 */
 	{
 		CAM_CPAS_TITAN_165_V100,

drivers/cam_isp/isp_hw_mgr/isp_hw/ife_csid_hw/cam_ife_csid_common.c

@@ -9,7 +9,8 @@
 #include <media/cam_isp.h>
 #include <media/cam_defs.h>
 
-#include <dt-bindings/msm/msm-camera.h>
+#include <dt-bindings/msm-camera.h>
+
 #include "cam_soc_util.h"
 #include "cam_io_util.h"
 #include "cam_debug_util.h"

drivers/cam_isp/isp_hw_mgr/isp_hw/ife_csid_hw/cam_ife_csid_hw_ver1.c

@@ -9,7 +9,7 @@
 #include <media/cam_isp.h>
 #include <media/cam_defs.h>
 
-#include <dt-bindings/msm/msm-camera.h>
+#include <dt-bindings/msm-camera.h>
 
 #include "cam_ife_csid_common.h"
 #include "cam_ife_csid_hw_ver1.h"

drivers/cam_isp/isp_hw_mgr/isp_hw/ife_csid_hw/cam_ife_csid_hw_ver2.c

@@ -9,7 +9,7 @@
 #include <media/cam_isp.h>
 #include <media/cam_defs.h>
 
-#include <dt-bindings/msm/msm-camera.h>
+#include <dt-bindings/msm-camera.h>
 
 #include "cam_ife_csid_common.h"
 #include "cam_ife_csid_hw_ver2.h"
@@ -3964,7 +3964,7 @@ static int cam_ife_csid_hw_init_irq(
 	return rc;
 }
 
-int cam_ife_csid_hw_ver2_init(struct cam_hw_intf  *hw_intf,
+int cam_ife_csid_hw_ver2_init(struct cam_hw_intf *hw_intf,
 	struct cam_ife_csid_core_info *core_info,
 	bool is_custom)
 {

drivers/cam_sensor_module/cam_csiphy/cam_csiphy_core.c

@@ -5,7 +5,7 @@
 
 #include <linux/module.h>
 
-#include <dt-bindings/msm/msm-camera.h>
+#include <dt-bindings/msm-camera.h>
 
 #include "cam_compat.h"
 #include "cam_csiphy_core.h"

dt-bindings/msm-camera.h

@@ -0,0 +1,93 @@
+/* SPDX-License-Identifier: GPL-2.0-only */
+/*
+ * Copyright (c) 2018-2020, The Linux Foundation. All rights reserved.
+ */
+
+#ifndef __MSM_CAMERA_H
+#define __MSM_CAMERA_H
+
+/* CPAS path data types */
+#define CAM_CPAS_PATH_DATA_IFE_START_OFFSET 0
+#define CAM_CPAS_PATH_DATA_IFE_LINEAR (CAM_CPAS_PATH_DATA_IFE_START_OFFSET + 0)
+#define CAM_CPAS_PATH_DATA_IFE_VID (CAM_CPAS_PATH_DATA_IFE_START_OFFSET + 1)
+#define CAM_CPAS_PATH_DATA_IFE_DISP (CAM_CPAS_PATH_DATA_IFE_START_OFFSET + 2)
+#define CAM_CPAS_PATH_DATA_IFE_STATS (CAM_CPAS_PATH_DATA_IFE_START_OFFSET + 3)
+#define CAM_CPAS_PATH_DATA_IFE_RDI0 (CAM_CPAS_PATH_DATA_IFE_START_OFFSET + 4)
+#define CAM_CPAS_PATH_DATA_IFE_RDI1 (CAM_CPAS_PATH_DATA_IFE_START_OFFSET + 5)
+#define CAM_CPAS_PATH_DATA_IFE_RDI2 (CAM_CPAS_PATH_DATA_IFE_START_OFFSET + 6)
+#define CAM_CPAS_PATH_DATA_IFE_RDI3 (CAM_CPAS_PATH_DATA_IFE_START_OFFSET + 7)
+#define CAM_CPAS_PATH_DATA_IFE_PDAF (CAM_CPAS_PATH_DATA_IFE_START_OFFSET + 8)
+#define CAM_CPAS_PATH_DATA_IFE_PIXEL_RAW \
+	(CAM_CPAS_PATH_DATA_IFE_START_OFFSET + 9)
+#define CAM_CPAS_PATH_DATA_IFE_MAX_OFFSET \
+	(CAM_CPAS_PATH_DATA_IFE_START_OFFSET + 31)
+
+#define CAM_CPAS_PATH_DATA_IPE_START_OFFSET 32
+#define CAM_CPAS_PATH_DATA_IPE_RD_IN (CAM_CPAS_PATH_DATA_IPE_START_OFFSET + 0)
+#define CAM_CPAS_PATH_DATA_IPE_RD_REF (CAM_CPAS_PATH_DATA_IPE_START_OFFSET + 1)
+#define CAM_CPAS_PATH_DATA_IPE_WR_VID (CAM_CPAS_PATH_DATA_IPE_START_OFFSET + 2)
+#define CAM_CPAS_PATH_DATA_IPE_WR_DISP (CAM_CPAS_PATH_DATA_IPE_START_OFFSET + 3)
+#define CAM_CPAS_PATH_DATA_IPE_WR_REF (CAM_CPAS_PATH_DATA_IPE_START_OFFSET + 4)
+#define CAM_CPAS_PATH_DATA_IPE_MAX_OFFSET \
+	(CAM_CPAS_PATH_DATA_IPE_START_OFFSET + 31)
+
+#define CAM_CPAS_PATH_DATA_OPE_START_OFFSET 64
+#define CAM_CPAS_PATH_DATA_OPE_RD_IN (CAM_CPAS_PATH_DATA_OPE_START_OFFSET + 0)
+#define CAM_CPAS_PATH_DATA_OPE_RD_REF (CAM_CPAS_PATH_DATA_OPE_START_OFFSET + 1)
+#define CAM_CPAS_PATH_DATA_OPE_WR_VID (CAM_CPAS_PATH_DATA_OPE_START_OFFSET + 2)
+#define CAM_CPAS_PATH_DATA_OPE_WR_DISP (CAM_CPAS_PATH_DATA_OPE_START_OFFSET + 3)
+#define CAM_CPAS_PATH_DATA_OPE_WR_REF (CAM_CPAS_PATH_DATA_OPE_START_OFFSET + 4)
+#define CAM_CPAS_PATH_DATA_OPE_MAX_OFFSET \
+	(CAM_CPAS_PATH_DATA_OPE_START_OFFSET + 31)
+
+#define CAM_CPAS_PATH_DATA_SFE_START_OFFSET 96
+#define CAM_CPAS_PATH_DATA_SFE_NRDI    (CAM_CPAS_PATH_DATA_SFE_START_OFFSET + 0)
+#define CAM_CPAS_PATH_DATA_SFE_RDI0    (CAM_CPAS_PATH_DATA_SFE_START_OFFSET + 1)
+#define CAM_CPAS_PATH_DATA_SFE_RDI1    (CAM_CPAS_PATH_DATA_SFE_START_OFFSET + 2)
+#define CAM_CPAS_PATH_DATA_SFE_RDI2    (CAM_CPAS_PATH_DATA_SFE_START_OFFSET + 3)
+#define CAM_CPAS_PATH_DATA_SFE_RDI3    (CAM_CPAS_PATH_DATA_SFE_START_OFFSET + 4)
+#define CAM_CPAS_PATH_DATA_SFE_RDI4    (CAM_CPAS_PATH_DATA_SFE_START_OFFSET + 5)
+#define CAM_CPAS_PATH_DATA_SFE_STATS   (CAM_CPAS_PATH_DATA_SFE_START_OFFSET + 6)
+#define CAM_CPAS_PATH_DATA_SFE_MAX_OFFSET \
+	(CAM_CPAS_PATH_DATA_SFE_START_OFFSET + 31)
+
+#define CAM_CPAS_PATH_DATA_CONSO_OFFSET 256
+#define CAM_CPAS_PATH_DATA_ALL (CAM_CPAS_PATH_DATA_CONSO_OFFSET + 0)
+
+/* IFE consolidated paths */
+#define CAM_CPAS_PATH_DATA_IFE_LINEAR_PDAF (CAM_CPAS_PATH_DATA_CONSO_OFFSET + 1)
+#define CAM_CPAS_PATH_DATA_IFE_UBWC_STATS (CAM_CPAS_PATH_DATA_CONSO_OFFSET + 2)
+#define CAM_CPAS_PATH_DATA_IFE_PIXEL_ALL (CAM_CPAS_PATH_DATA_CONSO_OFFSET + 3)
+#define CAM_CPAS_PATH_DATA_IFE_RDI_PIXEL_RAW \
+	(CAM_CPAS_PATH_DATA_CONSO_OFFSET + 4)
+#define CAM_CPAS_PATH_DATA_IFE_RDI_ALL (CAM_CPAS_PATH_DATA_CONSO_OFFSET + 5)
+#define CAM_CPAS_PATH_DATA_IFE_UBWC (CAM_CPAS_PATH_DATA_CONSO_OFFSET + 6)
+#define CAM_CPAS_PATH_DATA_IFE_LINEAR_STATS \
+	(CAM_CPAS_PATH_DATA_CONSO_OFFSET + 7)
+
+/* IPE Consolidated paths */
+#define CAM_CPAS_PATH_DATA_IPE_WR_VID_DISP (CAM_CPAS_PATH_DATA_CONSO_OFFSET + 1)
+
+/* CPAS transaction types */
+#define CAM_CPAS_TRANSACTION_READ 0
+#define CAM_CPAS_TRANSACTION_WRITE 1
+
+/* CPAS traffic merge types */
+#define CAM_CPAS_TRAFFIC_MERGE_SUM 0
+#define CAM_CPAS_TRAFFIC_MERGE_SUM_INTERLEAVE 1
+
+/* Feature bit type */
+#define CAM_CPAS_FEATURE_TYPE_DISABLE 0
+#define CAM_CPAS_FEATURE_TYPE_ENABLE 1
+#define CAM_CPAS_FEATURE_TYPE_VALUE 2
+
+/* Feature support bit positions in feature fuse register*/
+#define CAM_CPAS_QCFA_BINNING_ENABLE 0
+#define CAM_CPAS_SECURE_CAMERA_ENABLE 1
+#define CAM_CPAS_MF_HDR_ENABLE 2
+#define CAM_CPAS_MP_LIMIT_FUSE 3
+#define CAM_CPAS_ISP_FUSE      4
+#define CAM_CPAS_ISP_PIX_FUSE  5
+#define CAM_CPAS_FUSE_FEATURE_MAX 6
+
+#endif