ASoC: Intel: Skylake: Add support to topology for module static pin

Some module pin connection are static and defined by the topology.
This patch adds support for static pin definitions in topology widget
private data

Signed-off-by: Jeeja KP <jeeja.kp@intel.com>
Signed-off-by: Vinod Koul <vinod.koul@intel.com>
Signed-off-by: Mark Brown <broonie@kernel.org>

diff --git a/sound/soc/intel/skylake/skl-topology.c b/sound/soc/intel/skylake/skl-topology.c
index 68e1b00ce7ed7347d0445958e68861804e2a7e08..a7854c8fc523e832f6137437c6e7737cc5eee46c 100644 (file)
--- a/sound/soc/intel/skylake/skl-topology.c
+++ b/sound/soc/intel/skylake/skl-topology.c
@@ -1034,18 +1034,17 @@ static const struct snd_soc_tplg_widget_events skl_tplg_widget_ops[] = {
  * The topology binary passes the pin info for a module so initialize the pin
  * info passed into module instance
  */
-static void skl_fill_module_pin_info(struct device *dev,
-                       struct skl_module_pin *m_pin,
-                       int max_pin)
+static void skl_fill_module_pin_info(struct skl_dfw_module_pin *dfw_pin,
+                                               struct skl_module_pin *m_pin,
+                                               bool is_dynamic, int max_pin)
 {
        int i;
 
        for (i = 0; i < max_pin; i++) {
-               m_pin[i].id.module_id = 0;
-               m_pin[i].id.instance_id = 0;
+               m_pin[i].id.module_id = dfw_pin[i].module_id;
+               m_pin[i].id.instance_id = dfw_pin[i].instance_id;
                m_pin[i].in_use = false;
-               m_pin[i].is_dynamic = true;
-               m_pin[i].pin_index = i;
+               m_pin[i].is_dynamic = is_dynamic;
        }
 }
 
@@ -1164,17 +1163,20 @@ static int skl_tplg_widget_load(struct snd_soc_component *cmpnt,
        if (!mconfig->m_in_pin)
                return -ENOMEM;
 
-       mconfig->m_out_pin = devm_kzalloc(bus->dev,
-                               (mconfig->max_in_queue) *
-                                       sizeof(*mconfig->m_out_pin),
-                               GFP_KERNEL);
+       mconfig->m_out_pin = devm_kzalloc(bus->dev, (mconfig->max_out_queue) *
+                                               sizeof(*mconfig->m_out_pin),
+                                               GFP_KERNEL);
        if (!mconfig->m_out_pin)
                return -ENOMEM;
 
-       skl_fill_module_pin_info(bus->dev, mconfig->m_in_pin,
-                               mconfig->max_in_queue);
-       skl_fill_module_pin_info(bus->dev, mconfig->m_out_pin,
-                               mconfig->max_out_queue);
+       skl_fill_module_pin_info(dfw_config->in_pin, mconfig->m_in_pin,
+                                               dfw_config->is_dynamic_in_pin,
+                                               mconfig->max_in_queue);
+
+       skl_fill_module_pin_info(dfw_config->out_pin, mconfig->m_out_pin,
+                                                dfw_config->is_dynamic_out_pin,
+                                                       mconfig->max_out_queue);
+
 
        if (mconfig->formats_config.caps_size == 0)
                goto bind_event;

diff --git a/sound/soc/intel/skylake/skl-tplg-interface.h b/sound/soc/intel/skylake/skl-tplg-interface.h
index 718d3d5df9a8df24130abb9e81a8a9d9ee943cf3..2bc396d54cbed52fa257c1c499749eaed8ebc111 100644 (file)
--- a/sound/soc/intel/skylake/skl-tplg-interface.h
+++ b/sound/soc/intel/skylake/skl-tplg-interface.h
@@ -113,8 +113,6 @@ enum skl_dev_type {
 struct skl_dfw_module_pin {
        u16 module_id;
        u16 instance_id;
-       u8 pin_id;
-       bool is_dynamic;
 } __packed;
 
 struct skl_dfw_module_fmt {
@@ -155,9 +153,13 @@ struct skl_dfw_module {
        u32 converter;
        u32 module_type;
        u32 vbus_id;
+       u8 is_dynamic_in_pin;
+       u8 is_dynamic_out_pin;
        struct skl_dfw_pipe pipe;
        struct skl_dfw_module_fmt in_fmt;
        struct skl_dfw_module_fmt out_fmt;
+       struct skl_dfw_module_pin in_pin[MAX_IN_QUEUE];
+       struct skl_dfw_module_pin out_pin[MAX_OUT_QUEUE];
        struct skl_dfw_module_caps caps;
 } __packed;