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

Commit 0ef5e3e5 authored by Linux Build Service Account's avatar Linux Build Service Account
Browse files

Merge fed8cf26 on remote branch 

Change-Id: I039e883ed2fa1672d8a5f765d764edaa218efe0a
parents 3775ffed fed8cf26

asoc/codecs/msm_stub.c

+1 −1
Original line number Diff line number Diff line
@@ -21,7 +21,7 @@ static struct snd_soc_dai_driver msm_stub_dais[] = { 
			.channels_min = 1,

			.channels_max = 32,

			.rates = SNDRV_PCM_RATE_8000_48000,

			.formats = SNDRV_PCM_FMTBIT_S16_LE,

			.formats = SNDRV_PCM_FMTBIT_S16_LE | SNDRV_PCM_FMTBIT_S24_LE,

		},

	},

	{

asoc/codecs/wcd934x/wcd934x-routing.h

+41 −35
Original line number Diff line number Diff line 
/* SPDX-License-Identifier: GPL-2.0-only */

/*

 * Copyright (c) 2015-2018, The Linux Foundation. All rights reserved.

 * Copyright (c) 2022 Qualcomm Innovation Center, Inc. All rights reserved.

 */

#ifndef WCD934X_ROUTING_H

#define WCD934X_ROUTING_H
@@ -71,41 +72,46 @@ const struct snd_soc_dapm_route tavil_slim_audio_map[] = { 
	{"SLIM TX11", NULL, "CDC_IF TX11 MUX"},

	{"SLIM TX13", NULL, "CDC_IF TX13 MUX"},



	{"SLIM RX0 MUX", "AIF1_PB", "AIF1 PB"},

	{"SLIM RX1 MUX", "AIF1_PB", "AIF1 PB"},

	{"SLIM RX2 MUX", "AIF1_PB", "AIF1 PB"},

	{"SLIM RX3 MUX", "AIF1_PB", "AIF1 PB"},

	{"SLIM RX4 MUX", "AIF1_PB", "AIF1 PB"},

	{"SLIM RX5 MUX", "AIF1_PB", "AIF1 PB"},

	{"SLIM RX6 MUX", "AIF1_PB", "AIF1 PB"},

	{"SLIM RX7 MUX", "AIF1_PB", "AIF1 PB"},



	{"SLIM RX0 MUX", "AIF2_PB", "AIF2 PB"},

	{"SLIM RX1 MUX", "AIF2_PB", "AIF2 PB"},

	{"SLIM RX2 MUX", "AIF2_PB", "AIF2 PB"},

	{"SLIM RX3 MUX", "AIF2_PB", "AIF2 PB"},

	{"SLIM RX4 MUX", "AIF2_PB", "AIF2 PB"},

	{"SLIM RX5 MUX", "AIF2_PB", "AIF2 PB"},

	{"SLIM RX6 MUX", "AIF2_PB", "AIF2 PB"},

	{"SLIM RX7 MUX", "AIF2_PB", "AIF2 PB"},



	{"SLIM RX0 MUX", "AIF3_PB", "AIF3 PB"},

	{"SLIM RX1 MUX", "AIF3_PB", "AIF3 PB"},

	{"SLIM RX2 MUX", "AIF3_PB", "AIF3 PB"},

	{"SLIM RX3 MUX", "AIF3_PB", "AIF3 PB"},

	{"SLIM RX4 MUX", "AIF3_PB", "AIF3 PB"},

	{"SLIM RX5 MUX", "AIF3_PB", "AIF3 PB"},

	{"SLIM RX6 MUX", "AIF3_PB", "AIF3 PB"},

	{"SLIM RX7 MUX", "AIF3_PB", "AIF3 PB"},



	{"SLIM RX0 MUX", "AIF4_PB", "AIF4 PB"},

	{"SLIM RX1 MUX", "AIF4_PB", "AIF4 PB"},

	{"SLIM RX2 MUX", "AIF4_PB", "AIF4 PB"},

	{"SLIM RX3 MUX", "AIF4_PB", "AIF4 PB"},

	{"SLIM RX4 MUX", "AIF4_PB", "AIF4 PB"},

	{"SLIM RX5 MUX", "AIF4_PB", "AIF4 PB"},

	{"SLIM RX6 MUX", "AIF4_PB", "AIF4 PB"},

	{"SLIM RX7 MUX", "AIF4_PB", "AIF4 PB"},

	{"AIF4 PB MIX", NULL, "AIF4 PB"},

	{"AIF3 PB MIX", NULL, "AIF3 PB"},

	{"AIF2 PB MIX", NULL, "AIF2 PB"},

	{"AIF1 PB MIX", NULL, "AIF1 PB"},



	{"SLIM RX0 MUX", "AIF1_PB", "AIF1 PB MIX"},

	{"SLIM RX1 MUX", "AIF1_PB", "AIF1 PB MIX"},

	{"SLIM RX2 MUX", "AIF1_PB", "AIF1 PB MIX"},

	{"SLIM RX3 MUX", "AIF1_PB", "AIF1 PB MIX"},

	{"SLIM RX4 MUX", "AIF1_PB", "AIF1 PB MIX"},

	{"SLIM RX5 MUX", "AIF1_PB", "AIF1 PB MIX"},

	{"SLIM RX6 MUX", "AIF1_PB", "AIF1 PB MIX"},

	{"SLIM RX7 MUX", "AIF1_PB", "AIF1 PB MIX"},



	{"SLIM RX0 MUX", "AIF2_PB", "AIF2 PB MIX"},

	{"SLIM RX1 MUX", "AIF2_PB", "AIF2 PB MIX"},

	{"SLIM RX2 MUX", "AIF2_PB", "AIF2 PB MIX"},

	{"SLIM RX3 MUX", "AIF2_PB", "AIF2 PB MIX"},

	{"SLIM RX4 MUX", "AIF2_PB", "AIF2 PB MIX"},

	{"SLIM RX5 MUX", "AIF2_PB", "AIF2 PB MIX"},

	{"SLIM RX6 MUX", "AIF2_PB", "AIF2 PB MIX"},

	{"SLIM RX7 MUX", "AIF2_PB", "AIF2 PB MIX"},



	{"SLIM RX0 MUX", "AIF3_PB", "AIF3 PB MIX"},

	{"SLIM RX1 MUX", "AIF3_PB", "AIF3 PB MIX"},

	{"SLIM RX2 MUX", "AIF3_PB", "AIF3 PB MIX"},

	{"SLIM RX3 MUX", "AIF3_PB", "AIF3 PB MIX"},

	{"SLIM RX4 MUX", "AIF3_PB", "AIF3 PB MIX"},

	{"SLIM RX5 MUX", "AIF3_PB", "AIF3 PB MIX"},

	{"SLIM RX6 MUX", "AIF3_PB", "AIF3 PB MIX"},

	{"SLIM RX7 MUX", "AIF3_PB", "AIF3 PB MIX"},



	{"SLIM RX0 MUX", "AIF4_PB", "AIF4 PB MIX"},

	{"SLIM RX1 MUX", "AIF4_PB", "AIF4 PB MIX"},

	{"SLIM RX2 MUX", "AIF4_PB", "AIF4 PB MIX"},

	{"SLIM RX3 MUX", "AIF4_PB", "AIF4 PB MIX"},

	{"SLIM RX4 MUX", "AIF4_PB", "AIF4 PB MIX"},

	{"SLIM RX5 MUX", "AIF4_PB", "AIF4 PB MIX"},

	{"SLIM RX6 MUX", "AIF4_PB", "AIF4 PB MIX"},

	{"SLIM RX7 MUX", "AIF4_PB", "AIF4 PB MIX"},



	{"SLIM RX0", NULL, "SLIM RX0 MUX"},

	{"SLIM RX1", NULL, "SLIM RX1 MUX"},

asoc/codecs/wcd934x/wcd934x.c

+18 −12
Original line number Diff line number Diff line
@@ -7835,8 +7835,10 @@ static const struct snd_kcontrol_new lo2_mixer[] = { 
};



static const struct snd_soc_dapm_widget tavil_dapm_slim_widgets[] = {

	SND_SOC_DAPM_AIF_IN_E("AIF4 PB", "AIF4 Playback", 0, SND_SOC_NOPM,

			      AIF4_PB, 0, tavil_codec_enable_rx,

	SND_SOC_DAPM_AIF_IN("AIF4 PB", "AIF4 Playback", 0, SND_SOC_NOPM, 0, 0),



	SND_SOC_DAPM_MIXER_E("AIF4 PB MIX", SND_SOC_NOPM, AIF4_PB, 0,

		NULL, 0, tavil_codec_enable_rx,

		SND_SOC_DAPM_POST_PMU | SND_SOC_DAPM_POST_PMD),



	SND_SOC_DAPM_AIF_OUT_E("AIF4 VI", "VIfeed", 0, SND_SOC_NOPM,
@@ -7884,14 +7886,18 @@ static const struct snd_soc_dapm_widget tavil_dapm_slim_widgets[] = { 
};



static const struct snd_soc_dapm_widget tavil_dapm_widgets[] = {

	SND_SOC_DAPM_AIF_IN_E("AIF1 PB", "AIF1 Playback", 0, SND_SOC_NOPM,

			      AIF1_PB, 0, tavil_codec_enable_rx,

	SND_SOC_DAPM_AIF_IN("AIF1 PB", "AIF1 Playback", 0, SND_SOC_NOPM, 0, 0),

	SND_SOC_DAPM_AIF_IN("AIF2 PB", "AIF2 Playback", 0, SND_SOC_NOPM, 0, 0),

	SND_SOC_DAPM_AIF_IN("AIF3 PB", "AIF3 Playback", 0, SND_SOC_NOPM, 0, 0),



	SND_SOC_DAPM_MIXER_E("AIF1 PB MIX", SND_SOC_NOPM, AIF1_PB, 0,

		NULL, 0, tavil_codec_enable_rx,

		SND_SOC_DAPM_POST_PMU | SND_SOC_DAPM_POST_PMD),

	SND_SOC_DAPM_AIF_IN_E("AIF2 PB", "AIF2 Playback", 0, SND_SOC_NOPM,

			      AIF2_PB, 0, tavil_codec_enable_rx,

	SND_SOC_DAPM_MIXER_E("AIF2 PB MIX", SND_SOC_NOPM, AIF2_PB, 0,

		NULL, 0, tavil_codec_enable_rx,

		SND_SOC_DAPM_POST_PMU | SND_SOC_DAPM_POST_PMD),

	SND_SOC_DAPM_AIF_IN_E("AIF3 PB", "AIF3 Playback", 0, SND_SOC_NOPM,

			      AIF3_PB, 0, tavil_codec_enable_rx,

	SND_SOC_DAPM_MIXER_E("AIF3 PB MIX", SND_SOC_NOPM, AIF3_PB, 0,

		NULL, 0, tavil_codec_enable_rx,

		SND_SOC_DAPM_POST_PMU | SND_SOC_DAPM_POST_PMD),



	WCD_DAPM_MUX("CDC_IF RX0 MUX", WCD934X_RX0, cdc_if_rx0),

asoc/msm-dai-stub-v2.c

+5 −3
Original line number Diff line number Diff line
@@ -86,7 +86,7 @@ static struct snd_soc_dai_driver msm_dai_stub_dai_rx = { 
		.aif_name = "STUB_RX",

		.rates = SNDRV_PCM_RATE_48000 | SNDRV_PCM_RATE_8000 |

			SNDRV_PCM_RATE_16000,

		.formats = SNDRV_PCM_FMTBIT_S16_LE,

		.formats = SNDRV_PCM_FMTBIT_S16_LE | SNDRV_PCM_FMTBIT_S24_LE,

		.channels_min = 1,

		.channels_max = 2,

		.rate_min = 8000,
@@ -104,7 +104,8 @@ static struct snd_soc_dai_driver msm_dai_stub_dai_tx[] = { 
			.aif_name = "STUB_TX",

			.rates = SNDRV_PCM_RATE_48000 | SNDRV_PCM_RATE_8000 |

				SNDRV_PCM_RATE_16000,

			.formats = SNDRV_PCM_FMTBIT_S16_LE,

			.formats = SNDRV_PCM_FMTBIT_S16_LE | SNDRV_PCM_FMTBIT_S24_LE | SNDRV_PCM_FMTBIT_S24_3LE |

				SNDRV_PCM_FMTBIT_S32_LE,

			.channels_min = 1,

			.channels_max = 2,

			.rate_min = 8000,
@@ -120,7 +121,8 @@ static struct snd_soc_dai_driver msm_dai_stub_dai_tx[] = { 
			.aif_name = "STUB_1_TX",

			.rates = SNDRV_PCM_RATE_48000 | SNDRV_PCM_RATE_8000 |

				SNDRV_PCM_RATE_16000,

			.formats = SNDRV_PCM_FMTBIT_S16_LE,

			.formats = SNDRV_PCM_FMTBIT_S16_LE |SNDRV_PCM_FMTBIT_S24_LE | SNDRV_PCM_FMTBIT_S24_3LE |

				SNDRV_PCM_FMTBIT_S32_LE,

			.channels_min = 1,

			.channels_max = 2,

			.rate_min = 8000,

asoc/msm-pcm-host-voice-v2.c

+1 −0
Original line number Diff line number Diff line
@@ -1524,6 +1524,7 @@ int __init msm_voice_host_init(void) 
void msm_voice_host_exit(void)

{

	platform_driver_unregister(&msm_pcm_driver);

	mutex_destroy(&hpcm_drv.lock);

}



MODULE_DESCRIPTION("PCM module platform driver");