Merge "ASoC: msm: add support for in-call music delivery on second sub" (5df047d2) · Commits · e / devices / android_kernel_sony_msm8994

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

+4 −2

Original line number	Original line	Diff line number	Diff line
	@@ -862,7 +862,7 @@ static struct snd_soc_dai_driver msm_fe_dais[] = {
	},		},
	{		{
	.playback = {		.playback = {
	.stream_name = "Multimedia9 Playback",		.stream_name = "MultiMedia9 Playback",
	.aif_name = "MM_DL9",		.aif_name = "MM_DL9",
	.rates = (SNDRV_PCM_RATE_8000_192000\|		.rates = (SNDRV_PCM_RATE_8000_192000\|
	SNDRV_PCM_RATE_KNOT),		SNDRV_PCM_RATE_KNOT),
	@@ -874,7 +874,7 @@ static struct snd_soc_dai_driver msm_fe_dais[] = {
	.rate_max = 192000,		.rate_max = 192000,
	},		},
	.capture = {		.capture = {
	.stream_name = "Multimedia9 Capture",		.stream_name = "MultiMedia9 Capture",
	.aif_name = "MM_UL9",		.aif_name = "MM_UL9",
	.rates = (SNDRV_PCM_RATE_8000_48000\|		.rates = (SNDRV_PCM_RATE_8000_48000\|
	SNDRV_PCM_RATE_KNOT),		SNDRV_PCM_RATE_KNOT),
	@@ -886,6 +886,7 @@ static struct snd_soc_dai_driver msm_fe_dais[] = {
	},		},
	.ops = &msm_fe_Multimedia_dai_ops,		.ops = &msm_fe_Multimedia_dai_ops,
	.name = "MultiMedia9",		.name = "MultiMedia9",
			.probe = fe_dai_probe,
	},		},
	{		{
	.playback = {		.playback = {
	@@ -910,6 +911,7 @@ static struct snd_soc_dai_driver msm_fe_dais[] = {
	},		},
	.ops = &msm_fe_dai_ops,		.ops = &msm_fe_dai_ops,
	.name = "QCHAT",		.name = "QCHAT",
			.probe = fe_dai_probe,
	},		},
	{		{
	.capture = {		.capture = {

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

+16 −0

Original line number	Original line	Diff line number	Diff line
	@@ -2003,6 +2003,12 @@ static const struct snd_kcontrol_new slimbus_4_rx_mixer_controls[] = {
	SOC_SINGLE_EXT("MultiMedia2", MSM_BACKEND_DAI_SLIMBUS_4_RX,		SOC_SINGLE_EXT("MultiMedia2", MSM_BACKEND_DAI_SLIMBUS_4_RX,
	MSM_FRONTEND_DAI_MULTIMEDIA2, 1, 0, msm_routing_get_audio_mixer,		MSM_FRONTEND_DAI_MULTIMEDIA2, 1, 0, msm_routing_get_audio_mixer,
	msm_routing_put_audio_mixer),		msm_routing_put_audio_mixer),
			SOC_SINGLE_EXT("MultiMedia5", MSM_BACKEND_DAI_SLIMBUS_4_RX,
			MSM_FRONTEND_DAI_MULTIMEDIA5, 1, 0, msm_routing_get_audio_mixer,
			msm_routing_put_audio_mixer),
			SOC_SINGLE_EXT("MultiMedia9", MSM_BACKEND_DAI_SLIMBUS_4_RX,
			MSM_FRONTEND_DAI_MULTIMEDIA9, 1, 0, msm_routing_get_audio_mixer,
			msm_routing_put_audio_mixer),
	};		};

	static const struct snd_kcontrol_new slimbus_6_rx_mixer_controls[] = {		static const struct snd_kcontrol_new slimbus_6_rx_mixer_controls[] = {
	@@ -2012,6 +2018,12 @@ static const struct snd_kcontrol_new slimbus_6_rx_mixer_controls[] = {
	SOC_SINGLE_EXT("MultiMedia2", MSM_BACKEND_DAI_SLIMBUS_6_RX,		SOC_SINGLE_EXT("MultiMedia2", MSM_BACKEND_DAI_SLIMBUS_6_RX,
	MSM_FRONTEND_DAI_MULTIMEDIA2, 1, 0, msm_routing_get_audio_mixer,		MSM_FRONTEND_DAI_MULTIMEDIA2, 1, 0, msm_routing_get_audio_mixer,
	msm_routing_put_audio_mixer),		msm_routing_put_audio_mixer),
			SOC_SINGLE_EXT("MultiMedia5", MSM_BACKEND_DAI_SLIMBUS_6_RX,
			MSM_FRONTEND_DAI_MULTIMEDIA5, 1, 0, msm_routing_get_audio_mixer,
			msm_routing_put_audio_mixer),
			SOC_SINGLE_EXT("MultiMedia9", MSM_BACKEND_DAI_SLIMBUS_6_RX,
			MSM_FRONTEND_DAI_MULTIMEDIA9, 1, 0, msm_routing_get_audio_mixer,
			msm_routing_put_audio_mixer),
	};		};

	static const struct snd_kcontrol_new int_bt_sco_rx_mixer_controls[] = {		static const struct snd_kcontrol_new int_bt_sco_rx_mixer_controls[] = {
	@@ -4142,9 +4154,13 @@ static const struct snd_soc_dapm_route intercon[] = {
	{"VOICE2_PLAYBACK_TX", NULL, "Incall_Music_2 Audio Mixer"},		{"VOICE2_PLAYBACK_TX", NULL, "Incall_Music_2 Audio Mixer"},
	{"SLIMBUS_4_RX Audio Mixer", "MultiMedia1", "MM_DL1"},		{"SLIMBUS_4_RX Audio Mixer", "MultiMedia1", "MM_DL1"},
	{"SLIMBUS_4_RX Audio Mixer", "MultiMedia2", "MM_DL2"},		{"SLIMBUS_4_RX Audio Mixer", "MultiMedia2", "MM_DL2"},
			{"SLIMBUS_4_RX Audio Mixer", "MultiMedia5", "MM_DL5"},
			{"SLIMBUS_4_RX Audio Mixer", "MultiMedia9", "MM_DL9"},
	{"SLIMBUS_4_RX", NULL, "SLIMBUS_4_RX Audio Mixer"},		{"SLIMBUS_4_RX", NULL, "SLIMBUS_4_RX Audio Mixer"},
	{"SLIMBUS_6_RX Audio Mixer", "MultiMedia1", "MM_DL1"},		{"SLIMBUS_6_RX Audio Mixer", "MultiMedia1", "MM_DL1"},
	{"SLIMBUS_6_RX Audio Mixer", "MultiMedia2", "MM_DL2"},		{"SLIMBUS_6_RX Audio Mixer", "MultiMedia2", "MM_DL2"},
			{"SLIMBUS_6_RX Audio Mixer", "MultiMedia5", "MM_DL5"},
			{"SLIMBUS_6_RX Audio Mixer", "MultiMedia9", "MM_DL9"},
	{"SLIMBUS_6_RX", NULL, "SLIMBUS_6_RX Audio Mixer"},		{"SLIMBUS_6_RX", NULL, "SLIMBUS_6_RX Audio Mixer"},

	{"MultiMedia1 Mixer", "VOC_REC_UL", "INCALL_RECORD_TX"},		{"MultiMedia1 Mixer", "VOC_REC_UL", "INCALL_RECORD_TX"},

sound/soc/msm/qdsp6v2/q6audio-v2.c

+3 −0

Original line number	Original line	Diff line number	Diff line
	@@ -53,6 +53,7 @@ int q6audio_get_port_index(u16 port_id)
	case SLIMBUS_2_TX: return IDX_SLIMBUS_2_TX;		case SLIMBUS_2_TX: return IDX_SLIMBUS_2_TX;
	case SLIMBUS_3_RX: return IDX_SLIMBUS_3_RX;		case SLIMBUS_3_RX: return IDX_SLIMBUS_3_RX;
	case SLIMBUS_3_TX: return IDX_SLIMBUS_3_TX;		case SLIMBUS_3_TX: return IDX_SLIMBUS_3_TX;
			case SLIMBUS_4_RX: return IDX_SLIMBUS_4_RX;
	case SLIMBUS_4_TX: return IDX_SLIMBUS_4_TX;		case SLIMBUS_4_TX: return IDX_SLIMBUS_4_TX;
	case SLIMBUS_5_TX: return IDX_SLIMBUS_5_TX;		case SLIMBUS_5_TX: return IDX_SLIMBUS_5_TX;
	case SLIMBUS_6_RX: return IDX_SLIMBUS_6_RX;		case SLIMBUS_6_RX: return IDX_SLIMBUS_6_RX;
	@@ -122,6 +123,7 @@ int q6audio_get_port_id(u16 port_id)
	case SLIMBUS_2_TX: return AFE_PORT_ID_SLIMBUS_MULTI_CHAN_2_TX;		case SLIMBUS_2_TX: return AFE_PORT_ID_SLIMBUS_MULTI_CHAN_2_TX;
	case SLIMBUS_3_RX: return AFE_PORT_ID_SLIMBUS_MULTI_CHAN_3_RX;		case SLIMBUS_3_RX: return AFE_PORT_ID_SLIMBUS_MULTI_CHAN_3_RX;
	case SLIMBUS_3_TX: return AFE_PORT_ID_SLIMBUS_MULTI_CHAN_3_TX;		case SLIMBUS_3_TX: return AFE_PORT_ID_SLIMBUS_MULTI_CHAN_3_TX;
			case SLIMBUS_4_RX: return AFE_PORT_ID_SLIMBUS_MULTI_CHAN_4_RX;
	case SLIMBUS_4_TX: return AFE_PORT_ID_SLIMBUS_MULTI_CHAN_4_TX;		case SLIMBUS_4_TX: return AFE_PORT_ID_SLIMBUS_MULTI_CHAN_4_TX;
	case SLIMBUS_5_TX: return AFE_PORT_ID_SLIMBUS_MULTI_CHAN_5_TX;		case SLIMBUS_5_TX: return AFE_PORT_ID_SLIMBUS_MULTI_CHAN_5_TX;
	case SLIMBUS_6_RX: return AFE_PORT_ID_SLIMBUS_MULTI_CHAN_6_RX;		case SLIMBUS_6_RX: return AFE_PORT_ID_SLIMBUS_MULTI_CHAN_6_RX;
	@@ -243,6 +245,7 @@ int q6audio_validate_port(u16 port_id)
	case SLIMBUS_2_TX:		case SLIMBUS_2_TX:
	case SLIMBUS_3_RX:		case SLIMBUS_3_RX:
	case SLIMBUS_3_TX:		case SLIMBUS_3_TX:
			case SLIMBUS_4_RX:
	case SLIMBUS_4_TX:		case SLIMBUS_4_TX:
	case SLIMBUS_5_TX:		case SLIMBUS_5_TX:
	case SLIMBUS_6_RX:		case SLIMBUS_6_RX: