Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Unverified Commit 6331d77e authored by Mark Brown's avatar Mark Brown
Browse files

Merge remote-tracking branch 'asoc/fix/intel' into asoc-linus

parents 1291a0d5 4362934a

sound/soc/intel/boards/kbl_rt5663_max98927.c

+1 −1
Original line number Diff line number Diff line
@@ -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" },

sound/soc/intel/boards/kbl_rt5663_rt5514_max98927.c

+1 −1
Original line number Diff line number Diff line
@@ -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" },

sound/soc/intel/skylake/skl-nhlt.c

+10 −5
Original line number Diff line number Diff line
@@ -119,10 +119,15 @@ 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))

			(epnt->direction == dirn)) {

		/* do not check dev_type for DMIC link type */

		if (epnt->linktype == NHLT_LINK_DMIC)

			return true;

	else



		if (epnt->device_type == dev_type)

			return true;

	}



	return false;

}

sound/soc/intel/skylake/skl-topology.c

+1 −1
Original line number Diff line number Diff line
@@ -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;

	}