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.

Signed-off-by: Srinivas Kandagatla <srinivas.kandagatla@oss.qualcomm.com>
Reviewed-by: Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org>
Link: https://patch.msgid.link/20250819100151.1294047-2-srinivas.kandagatla@oss.qualcomm.com
Signed-off-by: Mark Brown <broonie@kernel.org>

diff --git a/include/uapi/sound/snd_ar_tokens.h b/include/uapi/sound/snd_ar_tokens.h
index b9b9093b4396c970ac6a6d1064b258220d5b013d..bc0b1bede00cc43c9d2392598fd536d96a5f863a 100644 (file)
--- a/include/uapi/sound/snd_ar_tokens.h
+++ b/include/uapi/sound/snd_ar_tokens.h
@@ -184,8 +184,8 @@ enum ar_event_types {
 #define AR_TKN_U32_MODULE_INSTANCE_ID          201
 #define AR_TKN_U32_MODULE_MAX_IP_PORTS         202
 #define AR_TKN_U32_MODULE_MAX_OP_PORTS         203
-#define AR_TKN_U32_MODULE_IN_PORTS             204
-#define AR_TKN_U32_MODULE_OUT_PORTS            205
+#define AR_TKN_U32_MODULE_IN_PORTS             204 /* deprecated */
+#define AR_TKN_U32_MODULE_OUT_PORTS            205 /* deprecated */
 #define AR_TKN_U32_MODULE_SRC_OP_PORT_ID       206
 #define AR_TKN_U32_MODULE_DST_IN_PORT_ID       207
 #define AR_TKN_U32_MODULE_SRC_INSTANCE_ID      208

diff --git a/sound/soc/qcom/qdsp6/audioreach.h b/sound/soc/qcom/qdsp6/audioreach.h
index 61a69df4f50f6cc90b56697c272ade6f1411bbf2..9b30177463e636d8eca5488fcd426772140601b1 100644 (file)
--- a/sound/soc/qcom/qdsp6/audioreach.h
+++ b/sound/soc/qcom/qdsp6/audioreach.h
@@ -707,9 +707,6 @@ struct audioreach_module {
        uint32_t max_ip_port;
        uint32_t max_op_port;
 
-       uint32_t in_port;
-       uint32_t out_port;
-
        uint32_t num_connections;
        /* Connections */
        uint32_t src_mod_inst_id;

diff --git a/sound/soc/qcom/qdsp6/topology.c b/sound/soc/qcom/qdsp6/topology.c
index 83319a928f291714bd24ad8b5036a75ef326610b..a3b0f558260c2614a36c92e638e07ef90ce64ecf 100644 (file)
--- a/sound/soc/qcom/qdsp6/topology.c
+++ b/sound/soc/qcom/qdsp6/topology.c
@@ -412,7 +412,7 @@ static struct audioreach_module *audioreach_parse_common_tokens(struct q6apm *ap
                                                        struct snd_soc_tplg_private *private,
                                                        struct snd_soc_dapm_widget *w)
 {
-       uint32_t max_ip_port = 0, max_op_port = 0, in_port = 0, out_port = 0;
+       uint32_t max_ip_port = 0, max_op_port = 0;
        uint32_t src_mod_op_port_id[AR_MAX_MOD_LINKS] = { 0, };
        uint32_t dst_mod_inst_id[AR_MAX_MOD_LINKS] = { 0, };
        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
                case AR_TKN_U32_MODULE_MAX_OP_PORTS:
                        max_op_port = le32_to_cpu(mod_elem->value);
                        break;
-               case AR_TKN_U32_MODULE_IN_PORTS:
-                       in_port = le32_to_cpu(mod_elem->value);
-                       break;
-               case AR_TKN_U32_MODULE_OUT_PORTS:
-                       out_port = le32_to_cpu(mod_elem->value);
-                       break;
                case AR_TKN_U32_MODULE_SRC_INSTANCE_ID:
                        src_mod_inst_id = le32_to_cpu(mod_elem->value);
                        break;
@@ -550,8 +544,6 @@ static struct audioreach_module *audioreach_parse_common_tokens(struct q6apm *ap
                mod->module_id = module_id;
                mod->max_ip_port = max_ip_port;
                mod->max_op_port = max_op_port;
-               mod->in_port = in_port;
-               mod->out_port = out_port;
                mod->src_mod_inst_id = src_mod_inst_id;
                for (pn = 0; pn < mod->max_op_port; pn++) {
                        if (src_mod_op_port_id[pn] && dst_mod_inst_id[pn] &&