ASoC: SDCA: Parse Function Reset max delay

Parse the DisCo property to get the timeout for a Function Reset.

Reviewed-by: Bard Liao <yung-chuan.liao@linux.intel.com>
Signed-off-by: Charles Keepax <ckeepax@opensource.cirrus.com>
Reviewed-by: Pierre-Louis Bossart <pierre-louis.bossart@linux.dev>
Link: https://patch.msgid.link/20251020155512.353774-12-ckeepax@opensource.cirrus.com
Signed-off-by: Mark Brown <broonie@kernel.org>

diff --git a/include/sound/sdca_function.h b/include/sound/sdca_function.h
index f2ce13162151d2a3fab0cd7eee0915c7dca21a79..2e988a30481c7ce0b4a5d978b24b080b3274546f 100644 (file)
--- a/include/sound/sdca_function.h
+++ b/include/sound/sdca_function.h
@@ -1323,6 +1323,8 @@ enum sdca_cluster_range {
  * @num_clusters: Number of Channel Clusters reported in this Function.
  * @busy_max_delay: Maximum Function busy delay in microseconds, before an
  * error should be reported.
+ * @reset_max_delay: Maximum Function reset delay in microseconds, before an
+ * error should be reported.
  */
 struct sdca_function_data {
        struct sdca_function_desc *desc;
@@ -1335,6 +1337,7 @@ struct sdca_function_data {
        int num_clusters;
 
        unsigned int busy_max_delay;
+       unsigned int reset_max_delay;
 };
 
 static inline u32 sdca_range(struct sdca_control_range *range,

diff --git a/sound/soc/sdca/sdca_functions.c b/sound/soc/sdca/sdca_functions.c
index 2e667484622137db33af435c59da5fda93b06410..6602727c73f731d0686e411a70b609fc0e639add 100644 (file)
--- a/sound/soc/sdca/sdca_functions.c
+++ b/sound/soc/sdca/sdca_functions.c
@@ -2033,8 +2033,14 @@ int sdca_parse_function(struct device *dev, struct sdw_slave *sdw,
        if (!ret)
                function->busy_max_delay = tmp;
 
-       dev_info(dev, "%pfwP: name %s delay %dus\n", function->desc->node,
-                function->desc->name, function->busy_max_delay);
+       ret = fwnode_property_read_u32(function_desc->node,
+                                      "mipi-sdca-function-reset-max-delay", &tmp);
+       if (!ret)
+               function->reset_max_delay = tmp;
+
+       dev_info(dev, "%pfwP: name %s busy delay %dus reset delay %dus\n",
+                function->desc->node, function->desc->name,
+                function->busy_max_delay, function->reset_max_delay);
 
        ret = find_sdca_init_table(dev, function_desc->node, function);
        if (ret)