Merge tag 'asoc-v4.7' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into for-linus

ASoC: Updates for v4.7

The updates this time around are almost all driver code:

 - Further slow progress on the topology code.
 - Substantial updates and improvements for the da7219, es8328, fsl-ssi
   Intel and rcar drivers.

3 files changed, 79 insertions, 0 deletions

diff --git a/sound/hda/ext/hdac_ext_bus.c b/sound/hda/ext/hdac_ext_bus.c
index 64de0a3d6d93..31b510c5ca0b 100644
--- a/sound/hda/ext/hdac_ext_bus.c
+++ b/sound/hda/ext/hdac_ext_bus.c
@@ -105,6 +105,9 @@ int snd_hdac_ext_bus_init(struct hdac_ext_bus *ebus, struct device *dev,
         INIT_LIST_HEAD(&ebus->hlink_list);
         ebus->idx = idx++;
 
+        mutex_init(&ebus->lock);
+        ebus->cmd_dma_state = true;
+
         return 0;
 }
 EXPORT_SYMBOL_GPL(snd_hdac_ext_bus_init);
diff --git a/sound/hda/ext/hdac_ext_controller.c b/sound/hda/ext/hdac_ext_controller.c
index 548cc1e4114b..860f8cad6602 100644
--- a/sound/hda/ext/hdac_ext_controller.c
+++ b/sound/hda/ext/hdac_ext_controller.c
@@ -186,6 +186,9 @@ int snd_hdac_ext_bus_get_ml_capabilities(struct hdac_ext_bus *ebus)
                 hlink->lcaps  = readl(hlink->ml_addr + AZX_REG_ML_LCAP);
                 hlink->lsdiid = readw(hlink->ml_addr + AZX_REG_ML_LSDIID);
 
+                /* since link in On, update the ref */
+                hlink->ref_count = 1;
+
                 list_add_tail(&hlink->list, &ebus->hlink_list);
         }
 
@@ -327,3 +330,66 @@ int snd_hdac_ext_bus_link_power_down_all(struct hdac_ext_bus *ebus)
         return 0;
 }
 EXPORT_SYMBOL_GPL(snd_hdac_ext_bus_link_power_down_all);
+
+int snd_hdac_ext_bus_link_get(struct hdac_ext_bus *ebus,
+                                struct hdac_ext_link *link)
+{
+        int ret = 0;
+
+        mutex_lock(&ebus->lock);
+
+        /*
+         * if we move from 0 to 1, count will be 1 so power up this link
+         * as well, also check the dma status and trigger that
+         */
+        if (++link->ref_count == 1) {
+                if (!ebus->cmd_dma_state) {
+                        snd_hdac_bus_init_cmd_io(&ebus->bus);
+                        ebus->cmd_dma_state = true;
+                }
+
+                ret = snd_hdac_ext_bus_link_power_up(link);
+        }
+
+        mutex_unlock(&ebus->lock);
+        return ret;
+}
+EXPORT_SYMBOL_GPL(snd_hdac_ext_bus_link_get);
+
+int snd_hdac_ext_bus_link_put(struct hdac_ext_bus *ebus,
+                                struct hdac_ext_link *link)
+{
+        int ret = 0;
+        struct hdac_ext_link *hlink;
+        bool link_up = false;
+
+        mutex_lock(&ebus->lock);
+
+        /*
+         * if we move from 1 to 0, count will be 0
+         * so power down this link as well
+         */
+        if (--link->ref_count == 0) {
+                ret = snd_hdac_ext_bus_link_power_down(link);
+
+                /*
+                 * now check if all links are off, if so turn off
+                 * cmd dma as well
+                 */
+                list_for_each_entry(hlink, &ebus->hlink_list, list) {
+                        if (hlink->ref_count) {
+                                link_up = true;
+                                break;
+                        }
+                }
+
+                if (!link_up) {
+                        snd_hdac_bus_stop_cmd_io(&ebus->bus);
+                        ebus->cmd_dma_state = false;
+                }
+        }
+
+        mutex_unlock(&ebus->lock);
+        return ret;
+}
+EXPORT_SYMBOL_GPL(snd_hdac_ext_bus_link_put);
diff --git a/sound/hda/local.h b/sound/hda/local.h
index d692f417ddc0..0d5bb159d538 100644
--- a/sound/hda/local.h
+++ b/sound/hda/local.h
@@ -16,6 +16,16 @@ static inline int get_wcaps_type(unsigned int wcaps)
         return (wcaps & AC_WCAP_TYPE) >> AC_WCAP_TYPE_SHIFT;
 }
 
+static inline unsigned int get_wcaps_channels(u32 wcaps)
+{
+        unsigned int chans;
+
+        chans = (wcaps & AC_WCAP_CHAN_CNT_EXT) >> 13;
+        chans = (chans + 1) * 2;
+
+        return chans;
+}
+
 extern const struct attribute_group *hdac_dev_attr_groups[];
 int hda_widget_sysfs_init(struct hdac_device *codec);
 void hda_widget_sysfs_exit(struct hdac_device *codec);