Catch up diff

Change-Id: Ie11e070d33e9dc83e96f7ae783fcc2e5e0273a40
Signed-off-by: Abhijit Trivedi <quic_abhijitt@quicinc.com>
This commit is contained in:
Abhijit Trivedi
2022-11-16 13:56:46 -08:00
committed by Camera Software Integration
parent 0daca91448
commit 7f3c540b78
28 changed files with 292 additions and 97 deletions

View File

@@ -73,11 +73,16 @@
#define CAM_AXI_PATH_DATA_ALL 256
#define CAM_CPAS_FUSES_MAX 32
#define CAM_CPAS_DOMAIN_ID_MAX 5
/* DRV Vote level */
#define CAM_CPAS_VOTE_LEVEL_HIGH 1
#define CAM_CPAS_VOTE_LEVEL_LOW 2
/* Domain id types */
#define CAM_CPAS_NON_SECURE_DOMAIN 0
#define CAM_CPAS_SECURE_DOMAIN 1
/**
* struct cam_cpas_fuse_value - CPAS fuse value
*
@@ -100,6 +105,41 @@ struct cam_cpas_fuse_info {
struct cam_cpas_fuse_value fuse_val[CAM_CPAS_FUSES_MAX];
};
/**
* struct cam_cpas_domain_id_pairing - CPAS domain id mapping
*
* @domain_type : Domain type
* @mapping_id : ID of domain type
*/
struct cam_cpas_domain_id_pairing {
__u32 domain_type;
__u32 mapping_id;
__u32 num_valid_params;
__u32 valid_param_mask;
__u32 params[4];
};
/**
* struct cam_cpas_domain_id_caps - CPAS domain id info
*
* @is_supported : If domain id is supported on target
* @num_mapping : Number of domain id types supported, if any
* @entries : Stores mapping between domain type and its ID
* @num_valid_params : Number of valid params
* @valid_param_mask : Valid param mask
* @params : These fields are reserved for future extensions
* to this structure.
*/
struct cam_cpas_domain_id_caps {
__u32 is_supported;
__u32 num_mapping;
struct cam_cpas_domain_id_pairing entries[CAM_CPAS_DOMAIN_ID_MAX];
__u32 num_valid_params;
__u32 valid_param_mask;
__u32 params[6];
};
/**
* struct cam_cpas_query_cap - CPAS query device capability payload
*
@@ -134,6 +174,34 @@ struct cam_cpas_query_cap_v2 {
struct cam_cpas_fuse_info fuse_info;
};
/**
* struct cam_cpas_query_cap - CPAS query device capability payload
*
* @version : Struct version
* @camera_family : Camera family type
* @camera_caps : Camera capability
* @camera_version : Camera platform version
* @cpas_version : Camera CPAS version within camera platform
* @fuse_info : Camera fuse info
* @domain_id_info : Domain id info
* @num_valid_params : Number of valid params
* @valid_param_mask : Valid param mask
* @params : Reserved fields to make this query cap
* extendable in the future
*/
struct cam_cpas_query_cap_v3 {
__u32 version;
__u32 camera_family;
__u32 camera_caps;
struct cam_hw_version camera_version;
struct cam_hw_version cpas_version;
struct cam_cpas_fuse_info fuse_info;
struct cam_cpas_domain_id_caps domain_id_info;
__u32 num_valid_params;
__u32 valid_param_mask;
__u32 params[10];
};
/**
* struct cam_axi_per_path_bw_vote_v2 - Per path bandwidth vote information
*

View File

@@ -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_DEFS_H__
@@ -28,6 +29,7 @@
#define CAM_ACQUIRE_HW (CAM_COMMON_OPCODE_BASE_v2 + 0x1)
#define CAM_RELEASE_HW (CAM_COMMON_OPCODE_BASE_v2 + 0x2)
#define CAM_DUMP_REQ (CAM_COMMON_OPCODE_BASE_v2 + 0x3)
#define CAM_QUERY_CAP_V3 (CAM_COMMON_OPCODE_BASE_v2 + 0x4)
#define CAM_EXT_OPCODE_BASE 0x200
#define CAM_CONFIG_DEV_EXTERNAL (CAM_EXT_OPCODE_BASE + 0x1)