Browse Source

msm: camera: icp: CRE and OPE voting fixes

- Added Voting Option for APP Port send from UMD.
- Adding Path type and transaction type for CRE.

CRs-Fixed: 3081144
Change-Id: Id5e8eb8d41cc2354d76f9dbbad8dfb3e09cf66a3
Signed-off-by: Alok Pandey <[email protected]>
Signed-off-by: Ayush Kumar <[email protected]>
Ayush Kumar 3 years ago
parent
commit
a5afa0b63a

+ 3 - 0
drivers/cam_cpas/cam_cpas_intf.c

@@ -1,6 +1,7 @@
 // SPDX-License-Identifier: GPL-2.0-only
 /*
  * Copyright (c) 2017-2021, The Linux Foundation. All rights reserved.
+ * Copyright (c) 2022 Qualcomm Innovation Center, Inc. All rights reserved.
  */
 
 #include <linux/of.h>
@@ -85,6 +86,8 @@ const char *cam_cpas_axi_util_path_type_to_string(
 		return "IPE_WR_DISP";
 	case CAM_AXI_PATH_DATA_IPE_WR_REF:
 		return "IPE_WR_REF";
+	case CAM_AXI_PATH_DATA_IPE_WR_APP:
+		return "IPE_WR_APP";
 
 	/* OPE Paths */
 	case CAM_AXI_PATH_DATA_OPE_RD_IN:

+ 7 - 0
dt-bindings/msm-camera.h

@@ -1,6 +1,7 @@
 /* SPDX-License-Identifier: GPL-2.0-only */
 /*
  * Copyright (c) 2018-2021, The Linux Foundation. All rights reserved.
+ * Copyright (c) 2022 Qualcomm Innovation Center, Inc. All rights reserved.
  */
 
 #ifndef __MSM_CAMERA_H
@@ -51,6 +52,12 @@
 #define CAM_CPAS_PATH_DATA_SFE_MAX_OFFSET \
 	(CAM_CPAS_PATH_DATA_SFE_START_OFFSET + 31)
 
+#define CAM_CPAS_PATH_DATA_CRE_START_OFFSET    (CAM_CPAS_PATH_DATA_SFE_MAX_OFFSET + 1)
+#define CAM_CPAS_PATH_DATA_CRE_RD_IN           (CAM_CPAS_PATH_DATA_CRE_START_OFFSET + 0)
+#define CAM_CPAS_PATH_DATA_CRE_WR_OUT          (CAM_CPAS_PATH_DATA_CRE_START_OFFSET + 1)
+#define CAM_CPAS_PATH_DATA_CRE_MAX_OFFSET \
+	(CAM_CPAS_PATH_DATA_CRE_START_OFFSET + 31)
+
 #define CAM_CPAS_PATH_DATA_CONSO_OFFSET 256
 #define CAM_CPAS_PATH_DATA_ALL (CAM_CPAS_PATH_DATA_CONSO_OFFSET + 0)
 

+ 2 - 0
include/uapi/camera/media/cam_cpas.h

@@ -1,6 +1,7 @@
 /* SPDX-License-Identifier: GPL-2.0-only WITH Linux-syscall-note */
 /*
  * Copyright (c) 2016-2021, The Linux Foundation. All rights reserved.
+ * Copyright (c) 2022 Qualcomm Innovation Center, Inc. All rights reserved.
  */
 
 #ifndef __UAPI_CAM_CPAS_H__
@@ -40,6 +41,7 @@
 #define CAM_AXI_PATH_DATA_IPE_WR_VID    (CAM_AXI_PATH_DATA_IPE_START_OFFSET + 2)
 #define CAM_AXI_PATH_DATA_IPE_WR_DISP   (CAM_AXI_PATH_DATA_IPE_START_OFFSET + 3)
 #define CAM_AXI_PATH_DATA_IPE_WR_REF    (CAM_AXI_PATH_DATA_IPE_START_OFFSET + 4)
+#define CAM_AXI_PATH_DATA_IPE_WR_APP    (CAM_AXI_PATH_DATA_IPE_START_OFFSET + 5)
 #define CAM_AXI_PATH_DATA_IPE_MAX_OFFSET \
 	(CAM_AXI_PATH_DATA_IPE_START_OFFSET + 31)