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

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

Merge changes Iad04e136,I17d27125 into msm-3.10 

* changes:
  ASoC: msm: update routing driver for host less.
  ASoC: msm: update machine driver for host less.
parents b9281f50 7f40d1e5

sound/soc/msm/msm-dai-fe.c

+0 −15
Original line number Diff line number Diff line
@@ -713,21 +713,6 @@ static struct snd_soc_dai_driver msm_fe_dais[] = { 
		.name = "SEC_MI2S_RX_HOSTLESS",

		.probe = fe_dai_probe,

	},

	{

		.playback = {

			.stream_name = "Primary MI2S_RX Hostless Playback",

			.aif_name = "PRI_MI2S_DL_HL",

			.rates = SNDRV_PCM_RATE_8000_48000,

			.formats = SNDRV_PCM_FMTBIT_S16_LE,

			.channels_min = 1,

			.channels_max = 2,

			.rate_min =     8000,

			.rate_max =    48000,

		},

		.ops = &msm_fe_dai_ops,

		.name = "PRI_MI2S_RX_HOSTLESS",

		.probe = fe_dai_probe,

	},

	{

		.playback = {

			.stream_name = "Voice2 Playback",

sound/soc/msm/msm8x16.c

+4 −4
Original line number Diff line number Diff line
@@ -492,8 +492,8 @@ static struct snd_soc_dai_link msm8x16_dai[] = { 
	},

	/* Hostless PCM purpose */

	{/* hw:x,5 */

		.name = "Primary MI2S RX Hostless",

		.stream_name = "Primary MI2S_RX Hostless Playback",

		.name = "Primary MI2S_RX Hostless",

		.stream_name = "Primary MI2S_RX Hostless",

		.cpu_dai_name = "PRI_MI2S_RX_HOSTLESS",

		.platform_name	= "msm-pcm-hostless",

		.dynamic = 1,
@@ -572,8 +572,8 @@ static struct snd_soc_dai_link msm8x16_dai[] = { 
		.codec_name = "snd-soc-dummy",

	},

	{/* hw:x,11 */

		.name = "Tertiary MI2S TX Hostless",

		.stream_name = "Tertiary MI2S_TX Hostless Capture",

		.name = "Tertiary MI2S_TX Hostless",

		.stream_name = "Tertiary MI2S_TX Hostless",

		.cpu_dai_name = "TERT_MI2S_TX_HOSTLESS",

		.platform_name  = "msm-pcm-hostless",

		.dynamic = 1,

sound/soc/msm/qdsp6v2/msm-pcm-routing-v2.c

+6 −4
Original line number Diff line number Diff line
@@ -2598,6 +2598,12 @@ static const struct snd_kcontrol_new primary_mi2s_rx_port_mixer_controls[] = { 
	SOC_SINGLE_EXT("SEC_MI2S_TX", MSM_BACKEND_DAI_PRI_MI2S_RX,

	MSM_BACKEND_DAI_SECONDARY_MI2S_TX, 1, 0, msm_routing_get_port_mixer,

	msm_routing_put_port_mixer),

	SOC_SINGLE_EXT("TERT_MI2S_TX", MSM_BACKEND_DAI_PRI_MI2S_RX,

	MSM_BACKEND_DAI_TERTIARY_MI2S_TX, 1, 0, msm_routing_get_port_mixer,

	msm_routing_put_port_mixer),

	SOC_SINGLE_EXT("INTERNAL_FM_TX", MSM_BACKEND_DAI_PRI_MI2S_RX,

	MSM_BACKEND_DAI_INT_FM_TX, 1, 0, msm_routing_get_port_mixer,

	msm_routing_put_port_mixer),

	SOC_SINGLE_EXT("QUAT_MI2S_TX", MSM_BACKEND_DAI_PRI_MI2S_RX,

	MSM_BACKEND_DAI_QUATERNARY_MI2S_TX, 1, 0, msm_routing_get_port_mixer,

	msm_routing_put_port_mixer),
@@ -2998,10 +3004,6 @@ static const struct snd_soc_dapm_widget msm_qdsp6_widgets[] = { 
	SND_SOC_DAPM_AIF_OUT("PRI_MI2S_UL_HL",

		"Primary MI2S_TX Hostless Capture",

		0, 0, 0, 0),

	SND_SOC_DAPM_AIF_IN("PRI_MI2S_DL_HL",

		"Primary MI2S_RX Hostless Playback",

		0, 0, 0, 0),



	SND_SOC_DAPM_AIF_OUT("MI2S_DL_HL", "MI2S_RX_HOSTLESS Playback",

		0, 0, 0, 0),

	SND_SOC_DAPM_AIF_IN("DTMF_DL_HL", "DTMF_RX_HOSTLESS Playback",