diff options
| author | Mark Brown <broonie@kernel.org> | 2018-01-12 21:59:19 +0300 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2018-01-12 21:59:19 +0300 |
| commit | 9d66a875ecc7d6dd414121e4508340d6c08f51b0 (patch) | |
| tree | d446bb455780d9058efe1760745bfb63207090de /sound/soc/intel/skylake | |
| parent | 987da3fe175933c28aab2293505c3597052ff0e2 (diff) | |
| parent | dd1dbf94d2826a045fbbe2649d84b27d48620d56 (diff) | |
| download | linux-9d66a875ecc7d6dd414121e4508340d6c08f51b0.tar.xz | |
Merge branch 'acpi-gpio' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm into asoc-intel
Diffstat (limited to 'sound/soc/intel/skylake')
| -rw-r--r-- | sound/soc/intel/skylake/skl-nhlt.c | 15 | ||||
| -rw-r--r-- | sound/soc/intel/skylake/skl-topology.c | 2 |
2 files changed, 11 insertions, 6 deletions
diff --git a/sound/soc/intel/skylake/skl-nhlt.c b/sound/soc/intel/skylake/skl-nhlt.c index d9b3dc89a1dc..3b1d2b828c1b 100644 --- a/sound/soc/intel/skylake/skl-nhlt.c +++ b/sound/soc/intel/skylake/skl-nhlt.c @@ -121,11 +121,16 @@ static bool skl_check_ep_match(struct device *dev, struct nhlt_endpoint *epnt, if ((epnt->virtual_bus_id == instance_id) && (epnt->linktype == link_type) && - (epnt->direction == dirn) && - (epnt->device_type == dev_type)) - return true; - else - return false; + (epnt->direction == dirn)) { + /* do not check dev_type for DMIC link type */ + if (epnt->linktype == NHLT_LINK_DMIC) + return true; + + if (epnt->device_type == dev_type) + return true; + } + + return false; } struct nhlt_specific_cfg diff --git a/sound/soc/intel/skylake/skl-topology.c b/sound/soc/intel/skylake/skl-topology.c index 6a5f8462c380..28bc16a8e09a 100644 --- a/sound/soc/intel/skylake/skl-topology.c +++ b/sound/soc/intel/skylake/skl-topology.c @@ -2908,7 +2908,7 @@ static int skl_tplg_control_load(struct snd_soc_component *cmpnt, break; default: - dev_warn(bus->dev, "Control load not supported %d:%d:%d\n", + dev_dbg(bus->dev, "Control load not supported %d:%d:%d\n", hdr->ops.get, hdr->ops.put, hdr->ops.info); break; } |