Merge "asoc: add routing controls for SLIM_9_TX"
This commit is contained in:

committed by
Gerrit - the friendly Code Review server

commit
3e60a43938
@@ -19574,6 +19574,10 @@ static const struct snd_kcontrol_new mmul19_mixer_controls[] = {
|
|||||||
MSM_BACKEND_DAI_AFE_LOOPBACK_TX,
|
MSM_BACKEND_DAI_AFE_LOOPBACK_TX,
|
||||||
MSM_FRONTEND_DAI_MULTIMEDIA19, 1, 0, msm_routing_get_audio_mixer,
|
MSM_FRONTEND_DAI_MULTIMEDIA19, 1, 0, msm_routing_get_audio_mixer,
|
||||||
msm_routing_put_audio_mixer),
|
msm_routing_put_audio_mixer),
|
||||||
|
SOC_DOUBLE_EXT("SLIM_9_TX", SND_SOC_NOPM,
|
||||||
|
MSM_BACKEND_DAI_SLIMBUS_9_TX,
|
||||||
|
MSM_FRONTEND_DAI_MULTIMEDIA19, 1, 0, msm_routing_get_audio_mixer,
|
||||||
|
msm_routing_put_audio_mixer),
|
||||||
};
|
};
|
||||||
|
|
||||||
static const struct snd_kcontrol_new mmul20_mixer_controls[] = {
|
static const struct snd_kcontrol_new mmul20_mixer_controls[] = {
|
||||||
@@ -20452,6 +20456,10 @@ static const struct snd_kcontrol_new mmul28_mixer_controls[] = {
|
|||||||
MSM_BACKEND_DAI_AFE_LOOPBACK_TX,
|
MSM_BACKEND_DAI_AFE_LOOPBACK_TX,
|
||||||
MSM_FRONTEND_DAI_MULTIMEDIA28, 1, 0, msm_routing_get_audio_mixer,
|
MSM_FRONTEND_DAI_MULTIMEDIA28, 1, 0, msm_routing_get_audio_mixer,
|
||||||
msm_routing_put_audio_mixer),
|
msm_routing_put_audio_mixer),
|
||||||
|
SOC_DOUBLE_EXT("SLIM_9_TX", SND_SOC_NOPM,
|
||||||
|
MSM_BACKEND_DAI_SLIMBUS_9_TX,
|
||||||
|
MSM_FRONTEND_DAI_MULTIMEDIA28, 1, 0, msm_routing_get_audio_mixer,
|
||||||
|
msm_routing_put_audio_mixer),
|
||||||
};
|
};
|
||||||
|
|
||||||
static const struct snd_kcontrol_new mmul29_mixer_controls[] = {
|
static const struct snd_kcontrol_new mmul29_mixer_controls[] = {
|
||||||
@@ -20571,6 +20579,10 @@ static const struct snd_kcontrol_new mmul29_mixer_controls[] = {
|
|||||||
MSM_BACKEND_DAI_AFE_LOOPBACK_TX,
|
MSM_BACKEND_DAI_AFE_LOOPBACK_TX,
|
||||||
MSM_FRONTEND_DAI_MULTIMEDIA29, 1, 0, msm_routing_get_audio_mixer,
|
MSM_FRONTEND_DAI_MULTIMEDIA29, 1, 0, msm_routing_get_audio_mixer,
|
||||||
msm_routing_put_audio_mixer),
|
msm_routing_put_audio_mixer),
|
||||||
|
SOC_DOUBLE_EXT("SLIM_9_TX", SND_SOC_NOPM,
|
||||||
|
MSM_BACKEND_DAI_SLIMBUS_9_TX,
|
||||||
|
MSM_FRONTEND_DAI_MULTIMEDIA29, 1, 0, msm_routing_get_audio_mixer,
|
||||||
|
msm_routing_put_audio_mixer),
|
||||||
};
|
};
|
||||||
|
|
||||||
static const struct snd_kcontrol_new mmul30_mixer_controls[] = {
|
static const struct snd_kcontrol_new mmul30_mixer_controls[] = {
|
||||||
@@ -27267,10 +27279,13 @@ static const struct snd_soc_dapm_route intercon[] = {
|
|||||||
{"MultiMedia18 Mixer", "SLIM_1_TX", "SLIMBUS_1_TX"},
|
{"MultiMedia18 Mixer", "SLIM_1_TX", "SLIMBUS_1_TX"},
|
||||||
{"MultiMedia19 Mixer", "SLIM_0_TX", "SLIMBUS_0_TX"},
|
{"MultiMedia19 Mixer", "SLIM_0_TX", "SLIMBUS_0_TX"},
|
||||||
{"MultiMedia19 Mixer", "SLIM_1_TX", "SLIMBUS_1_TX"},
|
{"MultiMedia19 Mixer", "SLIM_1_TX", "SLIMBUS_1_TX"},
|
||||||
|
{"MultiMedia19 Mixer", "SLIM_9_TX", "SLIMBUS_9_TX"},
|
||||||
{"MultiMedia28 Mixer", "SLIM_0_TX", "SLIMBUS_0_TX"},
|
{"MultiMedia28 Mixer", "SLIM_0_TX", "SLIMBUS_0_TX"},
|
||||||
{"MultiMedia28 Mixer", "SLIM_1_TX", "SLIMBUS_1_TX"},
|
{"MultiMedia28 Mixer", "SLIM_1_TX", "SLIMBUS_1_TX"},
|
||||||
|
{"MultiMedia28 Mixer", "SLIM_9_TX", "SLIMBUS_9_TX"},
|
||||||
{"MultiMedia29 Mixer", "SLIM_0_TX", "SLIMBUS_0_TX"},
|
{"MultiMedia29 Mixer", "SLIM_0_TX", "SLIMBUS_0_TX"},
|
||||||
{"MultiMedia29 Mixer", "SLIM_1_TX", "SLIMBUS_1_TX"},
|
{"MultiMedia29 Mixer", "SLIM_1_TX", "SLIMBUS_1_TX"},
|
||||||
|
{"MultiMedia29 Mixer", "SLIM_9_TX", "SLIMBUS_9_TX"},
|
||||||
{"MultiMedia30 Mixer", "SLIM_0_TX", "SLIMBUS_0_TX"},
|
{"MultiMedia30 Mixer", "SLIM_0_TX", "SLIMBUS_0_TX"},
|
||||||
{"MultiMedia30 Mixer", "SLIM_1_TX", "SLIMBUS_1_TX"},
|
{"MultiMedia30 Mixer", "SLIM_1_TX", "SLIMBUS_1_TX"},
|
||||||
{"MultiMedia8 Mixer", "SLIM_0_TX", "SLIMBUS_0_TX"},
|
{"MultiMedia8 Mixer", "SLIM_0_TX", "SLIMBUS_0_TX"},
|
||||||
|
Reference in New Issue
Block a user