Merge series from srinivas.kandagatla@oss.qualcomm.com: Sorry to resend this series once again, as some of the patches seems to be dropped/rejected by email client from previous send. This patchset: - cleans up some of the audioreach tokens which are unused - adds missing documentation - add support for static calibration support which is required for ECNS an speaker protection support. Tested this with Single Mic ECNS on SM8450 platform.
Showing the changes to include/uapi (1 of 4 files). Show all
Unified · Split
| @@ -3,6 +3,8 @@ · 2 unmodified lines | |||
| 3 | #ifndef __SND_AR_TOKENS_H__ | 3 | #ifndef __SND_AR_TOKENS_H__ |
| 4 | #define __SND_AR_TOKENS_H__ | 4 | #define __SND_AR_TOKENS_H__ |
| 5 | 5 | ||
| 6 | #include <linux/types.h> | ||
| 7 | |||
| 6 | #define APM_SUB_GRAPH_PERF_MODE_LOW_POWER 0x1 | 8 | #define APM_SUB_GRAPH_PERF_MODE_LOW_POWER 0x1 |
| 7 | #define APM_SUB_GRAPH_PERF_MODE_LOW_LATENCY 0x2 | 9 | #define APM_SUB_GRAPH_PERF_MODE_LOW_LATENCY 0x2 |
| 8 | 10 | ||
| @@ -118,6 +120,12 @@ enum ar_event_types { · 109 unmodified lines | |||
| 118 | * LPAIF_WSA = 2, | 120 | * LPAIF_WSA = 2, |
| 119 | * LPAIF_VA = 3, | 121 | * LPAIF_VA = 3, |
| 120 | * LPAIF_AXI = 4 | 122 | * LPAIF_AXI = 4 |
| 123 | * Possible values for MI2S | ||
| 124 | * I2S_INTF_TYPE_PRIMARY = 0, | ||
| 125 | * I2S_INTF_TYPE_SECONDARY = 1, | ||
| 126 | * I2S_INTF_TYPE_TERTIARY = 2, | ||
| 127 | * I2S_INTF_TYPE_QUATERNARY = 3, | ||
| 128 | * I2S_INTF_TYPE_QUINARY = 4, | ||
| 121 | * | 129 | * |
| 122 | * %AR_TKN_U32_MODULE_FMT_INTERLEAVE: PCM Interleaving | 130 | * %AR_TKN_U32_MODULE_FMT_INTERLEAVE: PCM Interleaving |
| 123 | * PCM_INTERLEAVED = 1, | 131 | * PCM_INTERLEAVED = 1, |
| @@ -184,8 +192,8 @@ enum ar_event_types { · 60 unmodified lines | |||
| 184 | #define AR_TKN_U32_MODULE_INSTANCE_ID 201 | 192 | #define AR_TKN_U32_MODULE_INSTANCE_ID 201 |
| 185 | #define AR_TKN_U32_MODULE_MAX_IP_PORTS 202 | 193 | #define AR_TKN_U32_MODULE_MAX_IP_PORTS 202 |
| 186 | #define AR_TKN_U32_MODULE_MAX_OP_PORTS 203 | 194 | #define AR_TKN_U32_MODULE_MAX_OP_PORTS 203 |
| 187 | #define AR_TKN_U32_MODULE_IN_PORTS 204 | 195 | #define AR_TKN_U32_MODULE_IN_PORTS 204 /* deprecated */ |
| 188 | #define AR_TKN_U32_MODULE_OUT_PORTS 205 | 196 | #define AR_TKN_U32_MODULE_OUT_PORTS 205 /* deprecated */ |
| 189 | #define AR_TKN_U32_MODULE_SRC_OP_PORT_ID 206 | 197 | #define AR_TKN_U32_MODULE_SRC_OP_PORT_ID 206 |
| 190 | #define AR_TKN_U32_MODULE_DST_IN_PORT_ID 207 | 198 | #define AR_TKN_U32_MODULE_DST_IN_PORT_ID 207 |
| 191 | #define AR_TKN_U32_MODULE_SRC_INSTANCE_ID 208 | 199 | #define AR_TKN_U32_MODULE_SRC_INSTANCE_ID 208 |
| @@ -232,4 +240,12 @@ enum ar_event_types { · 40 unmodified lines | |||
| 232 | #define AR_TKN_U32_MODULE_LOG_TAP_POINT_ID 260 | 240 | #define AR_TKN_U32_MODULE_LOG_TAP_POINT_ID 260 |
| 233 | #define AR_TKN_U32_MODULE_LOG_MODE 261 | 241 | #define AR_TKN_U32_MODULE_LOG_MODE 261 |
| 234 | 242 | ||
| 243 | #define SND_SOC_AR_TPLG_MODULE_CFG_TYPE 0x01001006 | ||
| 244 | struct audioreach_module_priv_data { | ||
| 245 | __le32 size; /* size in bytes of the array, including all elements */ | ||
| 246 | __le32 type; /* SND_SOC_AR_TPLG_MODULE_CFG_TYPE */ | ||
| 247 | __le32 priv[2]; /* Private data for future expansion */ | ||
| 248 | __le32 data[0]; /* config data */ | ||
| 249 | }; | ||
| 250 | |||
| 235 | #endif /* __SND_AR_TOKENS_H__ */ | 251 | #endif /* __SND_AR_TOKENS_H__ */ |