Revert "msm: camera: enable TFE compilation on Lanai"

This reverts commit bdcbaa0573171df271cfc1ad75a92a334ad2f6a9.

Change-Id: I1fff7c0caf4698069d24b459480dc935b7cbc72d
Signed-off-by: Sridhar Gujje <[email protected]>

Kconfig

@@ -6,13 +6,6 @@ config SPECTRA_ISP
 	  This will enable camera ISP driver to handle IFE driver.
 	  Core camera driver to handle VFE HW.
 
-config SPECTRA_TFE
-	bool "enable camera tfe modele"
-        help
-	  This is enabling camera tfe module.
-	  tfe module files will be included to enable tfe based driver,
-	  files.
-
 config SPECTRA_ICP
 	bool "enable camera ICP module"
 	help

camera_modules.bzl

@@ -1,6 +1,5 @@
 load("//build/kernel/kleaf:kernel.bzl", "ddk_module")
 load("//build/bazel_common_rules/dist:dist.bzl", "copy_to_dist_dir")
-load("//msm-kernel:target_variants.bzl", "get_all_variants")
 
 def _define_module(target, variant):
     tv = "{}_{}".format(target, variant)
@@ -136,23 +135,6 @@ def _define_module(target, variant):
                     "drivers/cam_icp/hfi.c",
                 ],
             },
-            "CONFIG_SPECTRA_TFE": {
-                True: [
-                    "drivers/cam_isp/isp_hw_mgr/isp_hw/ppi_hw/cam_csid_ppi_core.c",
-                    "drivers/cam_isp/isp_hw_mgr/isp_hw/ppi_hw/cam_csid_ppi_dev.c",
-                    "drivers/cam_isp/isp_hw_mgr/isp_hw/ppi_hw/cam_csid_ppi100.c",
-                    "drivers/cam_isp/isp_hw_mgr/isp_hw/tfe_csid_hw/cam_tfe_csid.c",
-                    "drivers/cam_isp/isp_hw_mgr/isp_hw/tfe_csid_hw/cam_tfe_csid_dev.c",
-                    "drivers/cam_isp/isp_hw_mgr/isp_hw/tfe_csid_hw/cam_tfe_csid_core.c",
-                    "drivers/cam_isp/isp_hw_mgr/isp_hw/tfe_csid_hw/cam_tfe_csid_soc.c",
-                    "drivers/cam_isp/isp_hw_mgr/isp_hw/tfe_hw/cam_tfe_bus.c",
-                    "drivers/cam_isp/isp_hw_mgr/isp_hw/tfe_hw/cam_tfe_core.c",
-                    "drivers/cam_isp/isp_hw_mgr/isp_hw/tfe_hw/cam_tfe_soc.c",
-                    "drivers/cam_isp/isp_hw_mgr/isp_hw/tfe_hw/cam_tfe.c",
-                    "drivers/cam_isp/isp_hw_mgr/isp_hw/tfe_hw/cam_tfe_dev.c",
-                    "drivers/cam_isp/isp_hw_mgr/cam_tfe_hw_mgr.c",
-                ],
-            },
             "CONFIG_SPECTRA_JPEG": {
                 True: [
                     "drivers/cam_jpeg/jpeg_hw/jpeg_enc_hw/jpeg_enc_dev.c",
@@ -255,7 +237,7 @@ def _define_module(target, variant):
     )
 
     copy_to_dist_dir(
-	name = "{}_camera_dist".format(target),
+        name = "{}_camera_dist".format(tv),
         data = [":{}_camera".format(tv)],
         dist_dir = "out/target/product/{}/dlkm/lib/modules/".format(target),
         flat = True,
@@ -265,5 +247,5 @@ def _define_module(target, variant):
     )
 
 def define_camera_module():
-    for (t, v) in get_all_variants():
-           _define_module(t, v)
+    _define_module("pineapple", "gki")
+    _define_module("pineapple", "consolidate")

crow_defconfig

@@ -1,7 +0,0 @@
-CONFIG_SPECTRA_ISP=y
-CONFIG_SPECTRA_ICP=y
-CONFIG_SPECTRA_TFE=y
-CONFIG_SPECTRA_JPEG=y
-CONFIG_SPECTRA_CRE=y
-CONFIG_SPECTRA_SENSOR=y
-CONFIG_INTERCONNECT_QCOM=y

drivers/cam_isp/isp_hw_mgr/cam_tfe_hw_mgr.c

@@ -5149,13 +5149,14 @@ static int cam_tfe_mgr_cmd_get_last_consumed_addr(
 	uint32_t                      res_id_out;
 	struct cam_isp_resource_node *res;
 	struct cam_isp_hw_mgr_res     *hw_mgr_res;
+	struct list_head              *res_list_isp_src;
 
 	res_id_out = done->resource_handle & 0xFF;
 
 	if (res_id_out >= CAM_TFE_HW_OUT_RES_MAX) {
 		CAM_ERR(CAM_ISP, "Invalid out resource id :%x",
-			res_id_out);
-		return rc;
+			res_id);
+		return;
 	}
 
 	hw_mgr_res =

drivers/cam_isp/isp_hw_mgr/isp_hw/tfe_hw/cam_tfe_core.c

@@ -1499,7 +1499,6 @@ static int cam_tfe_top_get_reg_update(
 	struct cam_isp_resource_node         *in_res;
 	struct cam_isp_mode_switch_data      *mup_config = NULL;
 	struct cam_tfe_top_reg_offset_common *common_reg;
-	struct cam_hw_soc_info               *soc_info;
 
 	if (arg_size != sizeof(struct cam_isp_hw_get_cmd_update)) {
 		CAM_ERR(CAM_ISP, "Invalid cmd size");

pineapple_gki_defconfig

@@ -0,0 +1,13 @@
+CONFIG_SPECTRA_ISP=y
+CONFIG_SPECTRA_ICP=y
+CONFIG_SPECTRA_JPEG=y
+CONFIG_SPECTRA_CRE=y
+CONFIG_SPECTRA_SENSOR=y
+CONFIG_SPECTRA_USE_CLK_CRM_API=y
+CONFIG_SPECTRA_USE_RPMH_DRV_API=y
+CONFIG_SPECTRA_LLCC_STALING=y
+CONFIG_TARGET_SYNX_ENABLE=y
+CONFIG_MSM_MMRM=y
+CONFIG_INTERCONNECT_QCOM=y
+CONFIG_DOMAIN_ID_SECURE_CAMERA=y
+CONFIG_DYNAMIC_FD_PORT_CONFIG=y