History

ASoC: qcom: audioreach: deprecate AR_TKN_U32_MODULE_[IN/OUT]_PORTS

Deprecate usage of AR_TKN_U32_MODULE_IN_PORTS and AR_TKN_U32_MODULE_OUT_PORTS as the connectivity of modules is taken care by AR_TKN_U32_MODULE_SRC_OP_PORT_ID* and AR_TKN_U32_MODULE_DST_IN_PORT_ID* Also this property is never used in the drivers.

Srinivas Kandagatla committed 1 year ago

Commit 12cc0ff1 parent c17b7503 files · +3 −14Browse files

Unified · Split

3 files
  1. include/uapi/sound/snd_ar_tokens.h +2 −2
  2. sound/soc/qcom/qdsp6/audioreach.h +0 −3
  3. sound/soc/qcom/qdsp6/topology.c +1 −9
include/uapi/sound/snd_ar_tokens.h+2−2
@@ -184,8 +184,8 @@ enum ar_event_types { · 183 unmodified lines
184#define AR_TKN_U32_MODULE_INSTANCE_ID 201184#define AR_TKN_U32_MODULE_INSTANCE_ID 201
185#define AR_TKN_U32_MODULE_MAX_IP_PORTS 202185#define AR_TKN_U32_MODULE_MAX_IP_PORTS 202
186#define AR_TKN_U32_MODULE_MAX_OP_PORTS 203186#define AR_TKN_U32_MODULE_MAX_OP_PORTS 203
187#define AR_TKN_U32_MODULE_IN_PORTS 204187#define AR_TKN_U32_MODULE_IN_PORTS 204 /* deprecated */
188#define AR_TKN_U32_MODULE_OUT_PORTS 205188#define AR_TKN_U32_MODULE_OUT_PORTS 205 /* deprecated */
189#define AR_TKN_U32_MODULE_SRC_OP_PORT_ID 206189#define AR_TKN_U32_MODULE_SRC_OP_PORT_ID 206
190#define AR_TKN_U32_MODULE_DST_IN_PORT_ID 207190#define AR_TKN_U32_MODULE_DST_IN_PORT_ID 207
191#define AR_TKN_U32_MODULE_SRC_INSTANCE_ID 208191#define AR_TKN_U32_MODULE_SRC_INSTANCE_ID 208
sound/soc/qcom/qdsp6/audioreach.h+0−3
@@ -707,9 +707,6 @@ struct audioreach_module { · 706 unmodified lines
707 uint32_t max_ip_port;707 uint32_t max_ip_port;
708 uint32_t max_op_port;708 uint32_t max_op_port;
709 709
710 uint32_t in_port;
711 uint32_t out_port;
712
713 uint32_t num_connections;710 uint32_t num_connections;
714 /* Connections */711 /* Connections */
715 uint32_t src_mod_inst_id;712 uint32_t src_mod_inst_id;
sound/soc/qcom/qdsp6/topology.c+1−9
@@ -412,7 +412,7 @@ static struct audioreach_module *audioreach_parse_common_tokens(struct q6apm *ap · 411 unmodified lines
412 struct snd_soc_tplg_private *private,412 struct snd_soc_tplg_private *private,
413 struct snd_soc_dapm_widget *w)413 struct snd_soc_dapm_widget *w)
414{414{
415 uint32_t max_ip_port = 0, max_op_port = 0, in_port = 0, out_port = 0;415 uint32_t max_ip_port = 0, max_op_port = 0;
416 uint32_t src_mod_op_port_id[AR_MAX_MOD_LINKS] = { 0, };416 uint32_t src_mod_op_port_id[AR_MAX_MOD_LINKS] = { 0, };
417 uint32_t dst_mod_inst_id[AR_MAX_MOD_LINKS] = { 0, };417 uint32_t dst_mod_inst_id[AR_MAX_MOD_LINKS] = { 0, };
418 uint32_t dst_mod_ip_port_id[AR_MAX_MOD_LINKS] = { 0, };418 uint32_t dst_mod_ip_port_id[AR_MAX_MOD_LINKS] = { 0, };
@@ -455,12 +455,6 @@ static struct audioreach_module *audioreach_parse_common_tokens(struct q6apm *ap · 36 unmodified lines
455 case AR_TKN_U32_MODULE_MAX_OP_PORTS:455 case AR_TKN_U32_MODULE_MAX_OP_PORTS:
456 max_op_port = le32_to_cpu(mod_elem->value);456 max_op_port = le32_to_cpu(mod_elem->value);
457 break;457 break;
458 case AR_TKN_U32_MODULE_IN_PORTS:
459 in_port = le32_to_cpu(mod_elem->value);
460 break;
461 case AR_TKN_U32_MODULE_OUT_PORTS:
462 out_port = le32_to_cpu(mod_elem->value);
463 break;
464 case AR_TKN_U32_MODULE_SRC_INSTANCE_ID:458 case AR_TKN_U32_MODULE_SRC_INSTANCE_ID:
465 src_mod_inst_id = le32_to_cpu(mod_elem->value);459 src_mod_inst_id = le32_to_cpu(mod_elem->value);
466 break;460 break;
@@ -550,8 +544,6 @@ static struct audioreach_module *audioreach_parse_common_tokens(struct q6apm *ap · 83 unmodified lines
550 mod->module_id = module_id;544 mod->module_id = module_id;
551 mod->max_ip_port = max_ip_port;545 mod->max_ip_port = max_ip_port;
552 mod->max_op_port = max_op_port;546 mod->max_op_port = max_op_port;
553 mod->in_port = in_port;
554 mod->out_port = out_port;
555 mod->src_mod_inst_id = src_mod_inst_id;547 mod->src_mod_inst_id = src_mod_inst_id;
556 for (pn = 0; pn < mod->max_op_port; pn++) {548 for (pn = 0; pn < mod->max_op_port; pn++) {
557 if (src_mod_op_port_id[pn] && dst_mod_inst_id[pn] &&549 if (src_mod_op_port_id[pn] && dst_mod_inst_id[pn] &&