Merge tag 'sound-4.13-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound

Pull sound updates from Takashi Iwai:
 "This development cycle resulted in a fair amount of changes in both
  core and driver sides. The most significant change in ALSA core is
  about PCM. Also the support of of-graph card and the new DAPM widget
  for DSP are noteworthy changes in ASoC core. And there're lots of
  small changes splat over the tree, as you can see in diffstat.

  Below are a few highlights:

  ALSA core:
   - Removal of set_fs() hackery from PCM core stuff, and the code
     reorganization / optimization thereafter
   - Improved support of PCM ack ops, and a new ABI for improved
     control/status mmap handling
   - Lots of constifications in various codes

  ASoC core:
   - The support of of-graph card, which may work as a better generic
     device for a replacement of simple-card
   - New widget types intended mainly for use with DSPs

  ASoC drivers:
   - New drivers for Allwinner V3s SoCs
   - Ensonic ES8316 codec support
   - More Intel SKL and KBL works
   - More device support for Intel SST Atom (mostly for cheap tablets
     and 2-in-1 devices)
   - Support for Rockchip PDM controllers
   - Support for STM32 I2S and S/PDIF controllers
   - Support for ZTE AUD96P22 codecs

  HD-audio:
   - Support of new Realtek codecs (ALC215/ALC285/ALC289), more quirks
     for HP and Dell machines
   - A few more fixes for i915 component binding"

* tag 'sound-4.13-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound: (418 commits)
  ALSA: hda - Fix unbalance of i915 module refcount
  ASoC: Intel: Skylake: Remove driver debugfs exit
  ASoC: Intel: Skylake: explicitly add the headers sst-dsp.h
  ALSA: hda/realtek - Remove GPIO_MASK
  ALSA: hda/realtek - Fix typo of pincfg for Dell quirk
  ALSA: pcm: add a documentation for tracepoints
  ALSA: atmel: ac97c: fix error return code in atmel_ac97c_probe()
  ALSA: x86: fix error return code in hdmi_lpe_audio_probe()
  ASoC: Intel: Skylake: Add support to read firmware registers
  ASoC: Intel: Skylake: Add sram address to sst_addr structure
  ASoC: Intel: Skylake: Debugfs facility to dump module config
  ASoC: Intel: Skylake: Add debugfs support
  ASoC: fix semicolon.cocci warnings
  ASoC: rt5645: Add quirk override by module option
  ASoC: rsnd: make arrays path and cmd_case static const
  ASoC: audio-graph-card: add widgets and routing for external amplifier support
  ASoC: audio-graph-card: update bindings for amplifier support
  ASoC: rt5665: calibration should be done before jack detection
  ASoC: rsnd: constify dev_pm_ops structures.
  ASoC: nau8825: change crosstalk-bypass property to bool type
  ...

1 files changed, 79 insertions, 7 deletions

diff --git a/sound/soc/soc-core.c b/sound/soc/soc-core.c
index 754e3ef8d7ae..921622a01944 100644
--- a/sound/soc/soc-core.c
+++ b/sound/soc/soc-core.c
@@ -34,6 +34,7 @@
 #include <linux/ctype.h>
 #include <linux/slab.h>
 #include <linux/of.h>
+#include <linux/of_graph.h>
 #include <linux/dmi.h>
 #include <sound/core.h>
 #include <sound/jack.h>
@@ -68,6 +69,20 @@ static int pmdown_time = 5000;
 module_param(pmdown_time, int, 0);
 MODULE_PARM_DESC(pmdown_time, "DAPM stream powerdown time (msecs)");
 
+/* If a DMI filed contain strings in this blacklist (e.g.
+ * "Type2 - Board Manufacturer" or  "Type1 - TBD by OEM"), it will be taken
+ * as invalid and dropped when setting the card long name from DMI info.
+ */
+static const char * const dmi_blacklist[] = {
+        "To be filled by OEM",
+        "TBD by OEM",
+        "Default String",
+        "Board Manufacturer",
+        "Board Vendor Name",
+        "Board Product Name",
+        NULL,   /* terminator */
+};
+
 /* returns the minimum number of bytes needed to represent
  * a particular given value */
 static int min_bytes_needed(unsigned long val)
@@ -1933,6 +1948,22 @@ static void cleanup_dmi_name(char *name)
         name[j] = '\0';
 }
 
+/* Check if a DMI field is valid, i.e. not containing any string
+ * in the black list.
+ */
+static int is_dmi_valid(const char *field)
+{
+        int i = 0;
+
+        while (dmi_blacklist[i]) {
+                if (strstr(field, dmi_blacklist[i]))
+                        return 0;
+                i++;
+        }
+
+        return 1;
+}
+
 /**
  * snd_soc_set_dmi_name() - Register DMI names to card
  * @card: The card to register DMI names
@@ -1975,17 +2006,18 @@ int snd_soc_set_dmi_name(struct snd_soc_card *card, const char *flavour)
 
         /* make up dmi long name as: vendor.product.version.board */
         vendor = dmi_get_system_info(DMI_BOARD_VENDOR);
-        if (!vendor) {
+        if (!vendor || !is_dmi_valid(vendor)) {
                 dev_warn(card->dev, "ASoC: no DMI vendor name!\n");
                 return 0;
         }
 
+
         snprintf(card->dmi_longname, sizeof(card->snd_card->longname),
                          "%s", vendor);
         cleanup_dmi_name(card->dmi_longname);
 
         product = dmi_get_system_info(DMI_PRODUCT_NAME);
-        if (product) {
+        if (product && is_dmi_valid(product)) {
                 len = strlen(card->dmi_longname);
                 snprintf(card->dmi_longname + len,
                          longname_buf_size - len,
@@ -1999,7 +2031,7 @@ int snd_soc_set_dmi_name(struct snd_soc_card *card, const char *flavour)
                  * name in the product version field
                  */
                 product_version = dmi_get_system_info(DMI_PRODUCT_VERSION);
-                if (product_version) {
+                if (product_version && is_dmi_valid(product_version)) {
                         len = strlen(card->dmi_longname);
                         snprintf(card->dmi_longname + len,
                                  longname_buf_size - len,
@@ -2012,7 +2044,7 @@ int snd_soc_set_dmi_name(struct snd_soc_card *card, const char *flavour)
         }
 
         board = dmi_get_system_info(DMI_BOARD_NAME);
-        if (board) {
+        if (board && is_dmi_valid(board)) {
                 len = strlen(card->dmi_longname);
                 snprintf(card->dmi_longname + len,
                          longname_buf_size - len,
@@ -3961,11 +3993,15 @@ unsigned int snd_soc_of_parse_daifmt(struct device_node *np,
                 prefix = "";
 
         /*
-         * check "[prefix]format = xxx"
+         * check "dai-format = xxx"
+         * or    "[prefix]format = xxx"
          * SND_SOC_DAIFMT_FORMAT_MASK area
          */
-        snprintf(prop, sizeof(prop), "%sformat", prefix);
-        ret = of_property_read_string(np, prop, &str);
+        ret = of_property_read_string(np, "dai-format", &str);
+        if (ret < 0) {
+                snprintf(prop, sizeof(prop), "%sformat", prefix);
+                ret = of_property_read_string(np, prop, &str);
+        }
         if (ret == 0) {
                 for (i = 0; i < ARRAY_SIZE(of_fmt_table); i++) {
                         if (strcmp(str, of_fmt_table[i].name) == 0) {
@@ -4045,6 +4081,42 @@ unsigned int snd_soc_of_parse_daifmt(struct device_node *np,
 }
 EXPORT_SYMBOL_GPL(snd_soc_of_parse_daifmt);
 
+int snd_soc_get_dai_id(struct device_node *ep)
+{
+        struct snd_soc_component *pos;
+        struct device_node *node;
+        int ret;
+
+        node = of_graph_get_port_parent(ep);
+
+        /*
+         * For example HDMI case, HDMI has video/sound port,
+         * but ALSA SoC needs sound port number only.
+         * Thus counting HDMI DT port/endpoint doesn't work.
+         * Then, it should have .of_xlate_dai_id
+         */
+        ret = -ENOTSUPP;
+        mutex_lock(&client_mutex);
+        list_for_each_entry(pos, &component_list, list) {
+                struct device_node *component_of_node = pos->dev->of_node;
+
+                if (!component_of_node && pos->dev->parent)
+                        component_of_node = pos->dev->parent->of_node;
+
+                if (component_of_node != node)
+                        continue;
+
+                if (pos->driver->of_xlate_dai_id)
+                        ret = pos->driver->of_xlate_dai_id(pos, ep);
+
+                break;
+        }
+        mutex_unlock(&client_mutex);
+
+        return ret;
+}
+EXPORT_SYMBOL_GPL(snd_soc_get_dai_id);
+
 int snd_soc_get_dai_name(struct of_phandle_args *args,
                                 const char **dai_name)
 {