mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-09-05 02:19:51 +00:00
Merge remote-tracking branch 'asoc/fix/intel' into asoc-linus
This commit is contained in:
commit
6331d77e05
4 changed files with 13 additions and 8 deletions
|
@ -101,7 +101,7 @@ static const struct snd_soc_dapm_route kabylake_map[] = {
|
|||
{ "ssp0 Tx", NULL, "spk_out" },
|
||||
|
||||
{ "AIF Playback", NULL, "ssp1 Tx" },
|
||||
{ "ssp1 Tx", NULL, "hs_out" },
|
||||
{ "ssp1 Tx", NULL, "codec1_out" },
|
||||
|
||||
{ "hs_in", NULL, "ssp1 Rx" },
|
||||
{ "ssp1 Rx", NULL, "AIF Capture" },
|
||||
|
|
|
@ -109,7 +109,7 @@ static const struct snd_soc_dapm_route kabylake_map[] = {
|
|||
{ "ssp0 Tx", NULL, "spk_out" },
|
||||
|
||||
{ "AIF Playback", NULL, "ssp1 Tx" },
|
||||
{ "ssp1 Tx", NULL, "hs_out" },
|
||||
{ "ssp1 Tx", NULL, "codec1_out" },
|
||||
|
||||
{ "hs_in", NULL, "ssp1 Rx" },
|
||||
{ "ssp1 Rx", NULL, "AIF Capture" },
|
||||
|
|
|
@ -119,11 +119,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
|
||||
|
|
|
@ -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;
|
||||
}
|
||||
|
|
Loading…
Reference in a new issue