Merge "msm: camera: custom: Enable driver compilation & minor fixes" into camera-kernel.lnx.4.0

config/lahainacamera.conf

@@ -14,4 +14,5 @@ export CONFIG_SPECTRA_ISP=y
 export CONFIG_SPECTRA_SENSOR=y
 export CONFIG_SPECTRA_ICP=y
 export CONFIG_SPECTRA_JPEG=y
+export CONFIG_SPECTRA_CUSTOM=y
 endif

config/lahainacameraconf.h

@@ -1,6 +1,6 @@
 /* SPDX-License-Identifier: GPL-2.0-only */
 /*
- * Copyright (c) 2019, The Linux Foundation. All rights reserved.
+ * Copyright (c) 2019-2020, The Linux Foundation. All rights reserved.
  */
 
 
@@ -9,3 +9,4 @@
 #define CONFIG_SPECTRA_SENSOR 1
 #define CONFIG_SPECTRA_ICP    1
 #define CONFIG_SPECTRA_JPEG   1
+#define CONFIG_SPECTRA_CUSTOM 1

drivers/cam_cust/cam_custom_hw_mgr/cam_custom_hw1/cam_custom_sub_mod_dev.c

@@ -117,7 +117,7 @@ static int cam_custom_hw_sub_mod_component_bind(struct device *dev,
 	/* needs to be invoked when custom hw is in place */
 	//cam_custom_hw_sub_mod_init_hw(hw, NULL, 0);
 
-	CAM_DBG(CAM_CUSTOM, "HW idx:%d component bound successfully");
+	CAM_DBG(CAM_CUSTOM, "HW idx:%d component bound successfully",
 		hw_intf->hw_idx);
 	return rc;
 

drivers/cam_cust/cam_custom_hw_mgr/cam_custom_hw_mgr.c

@@ -489,16 +489,15 @@ static int cam_custom_hw_mgr_notify(
 		custom_ctx->event_cb(custom_ctx->cb_priv,
 			CAM_CUSTOM_HW_EVENT_RUP_DONE, &reg_upd_data);
 		break;
-	case CAM_CUSTOM_HW_EVENT_RUP_DONE:
+	case CAM_CUSTOM_HW_EVENT_FRAME_DONE:
 		CAM_DBG(CAM_CUSTOM, "Notify FRAME DONE for ctx %u",
 			custom_ctx->ctx_index);
 		/* fill the evt data struct */
 		done_evt_data.num_handles = 1;
-		done_evt_data.resource_handle = 0;
 		custom_ctx->event_cb(custom_ctx->cb_priv,
 			CAM_CUSTOM_HW_EVENT_RUP_DONE, &done_evt_data);
 		break;
-	case CAM_CUSTOM_HW_EVENT_RUP_DONE:
+	case CAM_CUSTOM_HW_EVENT_ERROR:
 		CAM_DBG(CAM_CUSTOM, "Notify ERROR for ctx %u",
 			custom_ctx->ctx_index);
 		/* fill the evt data struct */

drivers/cam_utils/cam_debug_util.c

@@ -196,6 +196,7 @@ const char *cam_get_module_name(unsigned int module_id)
 		break;
 	case CAM_CUSTOM:
 		name = "CAM-CUSTOM";
+		break;
 	case CAM_OPE:
 		name = "CAM-OPE";
 		break;