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

Commit d36dc15e authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "asoc: sdm660: update cpu_dai_name for quin_tdm"

parents 5b52f142 091ff790

asoc/sdm660-ext-dai-links.c

+2 −2
Original line number Diff line number Diff line
@@ -1573,7 +1573,7 @@ static struct snd_soc_dai_link msm_ext_common_be_dai[] = { 
	{

		.name = LPASS_BE_QUIN_TDM_RX_0,

		.stream_name = "Quinary TDM0 Playback",

		.cpu_dai_name = "msm-dai-q6-tdm.37184",

		.cpu_dai_name = "msm-dai-q6-tdm.36928",

		.platform_name = "msm-pcm-routing",

		.codec_name = "msm-stub-codec.1",

		.codec_dai_name = "msm-stub-rx",
@@ -1587,7 +1587,7 @@ static struct snd_soc_dai_link msm_ext_common_be_dai[] = { 
	{

		.name = LPASS_BE_QUIN_TDM_TX_0,

		.stream_name = "Quinary TDM0 Capture",

		.cpu_dai_name = "msm-dai-q6-tdm.37185",

		.cpu_dai_name = "msm-dai-q6-tdm.36929",

		.platform_name = "msm-pcm-routing",

		.codec_name = "msm-stub-codec.1",

		.codec_dai_name = "msm-stub-tx",

asoc/sdm660-internal.c

+2 −2
Original line number Diff line number Diff line
@@ -2612,7 +2612,7 @@ static struct snd_soc_dai_link msm_int_be_dai[] = { 
	{

		.name = LPASS_BE_QUIN_TDM_RX_0,

		.stream_name = "Quinary TDM0 Playback",

		.cpu_dai_name = "msm-dai-q6-tdm.37184",

		.cpu_dai_name = "msm-dai-q6-tdm.36928",

		.platform_name = "msm-pcm-routing",

		.codec_name = "msm-stub-codec.1",

		.codec_dai_name = "msm-stub-rx",
@@ -2626,7 +2626,7 @@ static struct snd_soc_dai_link msm_int_be_dai[] = { 
	{

		.name = LPASS_BE_QUIN_TDM_TX_0,

		.stream_name = "Quinary TDM0 Capture",

		.cpu_dai_name = "msm-dai-q6-tdm.37185",

		.cpu_dai_name = "msm-dai-q6-tdm.36929",

		.platform_name = "msm-pcm-routing",

		.codec_name = "msm-stub-codec.1",

		.codec_dai_name = "msm-stub-tx",

soc/pinctrl-lpi.c

+1 −1
Original line number Diff line number Diff line
@@ -81,7 +81,7 @@ enum lpi_gpio_func_index { 
 * @function: See lpi_gpio_functions[]

 */

struct lpi_gpio_pad {

	u16		offset;

	u32		offset;

	bool		output_enabled;

	bool		value;

	char __iomem	*base;