diff options
author | Rohit kumar <rohitkr@codeaurora.org> | 2018-12-14 07:29:29 -0500 |
---|---|---|
committer | Mark Brown <broonie@kernel.org> | 2018-12-14 07:48:59 -0500 |
commit | 0718f87b0df49570cdcb96179997bd372cac1742 (patch) | |
tree | 828ab5401346e5b975f023b92e589d20cc06a014 /sound | |
parent | 32d2c61ba05944aa1e61d186611310dd911e1703 (diff) |
ASoC: qdsp6: q6routing: add display_port_rx port routing
This patch add support to Display_port_rx mixers required to
select path between ASM stream and AFE ports.
Signed-off-by: Rohit kumar <rohitkr@codeaurora.org>
Acked-by: Srinivas Kandagatla <srinivas.kandagatla@linaro.org>
Signed-off-by: Mark Brown <broonie@kernel.org>
Diffstat (limited to 'sound')
-rw-r--r-- | sound/soc/qcom/qdsp6/q6routing.c | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/sound/soc/qcom/qdsp6/q6routing.c b/sound/soc/qcom/qdsp6/q6routing.c index d61b8404f7da..ddcd9978cf57 100644 --- a/sound/soc/qcom/qdsp6/q6routing.c +++ b/sound/soc/qcom/qdsp6/q6routing.c | |||
@@ -453,6 +453,9 @@ static int msm_routing_put_audio_mixer(struct snd_kcontrol *kcontrol, | |||
453 | static const struct snd_kcontrol_new hdmi_mixer_controls[] = { | 453 | static const struct snd_kcontrol_new hdmi_mixer_controls[] = { |
454 | Q6ROUTING_RX_MIXERS(HDMI_RX) }; | 454 | Q6ROUTING_RX_MIXERS(HDMI_RX) }; |
455 | 455 | ||
456 | static const struct snd_kcontrol_new display_port_mixer_controls[] = { | ||
457 | Q6ROUTING_RX_MIXERS(DISPLAY_PORT_RX) }; | ||
458 | |||
456 | static const struct snd_kcontrol_new primary_mi2s_rx_mixer_controls[] = { | 459 | static const struct snd_kcontrol_new primary_mi2s_rx_mixer_controls[] = { |
457 | Q6ROUTING_RX_MIXERS(PRIMARY_MI2S_RX) }; | 460 | Q6ROUTING_RX_MIXERS(PRIMARY_MI2S_RX) }; |
458 | 461 | ||
@@ -655,6 +658,10 @@ static const struct snd_soc_dapm_widget msm_qdsp6_widgets[] = { | |||
655 | hdmi_mixer_controls, | 658 | hdmi_mixer_controls, |
656 | ARRAY_SIZE(hdmi_mixer_controls)), | 659 | ARRAY_SIZE(hdmi_mixer_controls)), |
657 | 660 | ||
661 | SND_SOC_DAPM_MIXER("DISPLAY_PORT_RX Audio Mixer", SND_SOC_NOPM, 0, 0, | ||
662 | display_port_mixer_controls, | ||
663 | ARRAY_SIZE(display_port_mixer_controls)), | ||
664 | |||
658 | SND_SOC_DAPM_MIXER("SLIMBUS_0_RX Audio Mixer", SND_SOC_NOPM, 0, 0, | 665 | SND_SOC_DAPM_MIXER("SLIMBUS_0_RX Audio Mixer", SND_SOC_NOPM, 0, 0, |
659 | slimbus_rx_mixer_controls, | 666 | slimbus_rx_mixer_controls, |
660 | ARRAY_SIZE(slimbus_rx_mixer_controls)), | 667 | ARRAY_SIZE(slimbus_rx_mixer_controls)), |
@@ -833,6 +840,8 @@ static const struct snd_soc_dapm_widget msm_qdsp6_widgets[] = { | |||
833 | 840 | ||
834 | static const struct snd_soc_dapm_route intercon[] = { | 841 | static const struct snd_soc_dapm_route intercon[] = { |
835 | Q6ROUTING_RX_DAPM_ROUTE("HDMI Mixer", "HDMI_RX"), | 842 | Q6ROUTING_RX_DAPM_ROUTE("HDMI Mixer", "HDMI_RX"), |
843 | Q6ROUTING_RX_DAPM_ROUTE("DISPLAY_PORT_RX Audio Mixer", | ||
844 | "DISPLAY_PORT_RX"), | ||
836 | Q6ROUTING_RX_DAPM_ROUTE("SLIMBUS_0_RX Audio Mixer", "SLIMBUS_0_RX"), | 845 | Q6ROUTING_RX_DAPM_ROUTE("SLIMBUS_0_RX Audio Mixer", "SLIMBUS_0_RX"), |
837 | Q6ROUTING_RX_DAPM_ROUTE("SLIMBUS_1_RX Audio Mixer", "SLIMBUS_1_RX"), | 846 | Q6ROUTING_RX_DAPM_ROUTE("SLIMBUS_1_RX Audio Mixer", "SLIMBUS_1_RX"), |
838 | Q6ROUTING_RX_DAPM_ROUTE("SLIMBUS_2_RX Audio Mixer", "SLIMBUS_2_RX"), | 847 | Q6ROUTING_RX_DAPM_ROUTE("SLIMBUS_2_RX Audio Mixer", "SLIMBUS_2_RX"), |