From: jeffy.chen@rock-chips.com (Jeffy Chen)
To: linux-arm-kernel@lists.infradead.org
Subject: [PATCH v3 1/5] ASoC: rockchip: Add dapm route for HDMI
Date: Tue, 19 Sep 2017 20:57:56 +0800 [thread overview]
Message-ID: <20170919125800.336-2-jeffy.chen@rock-chips.com> (raw)
In-Reply-To: <20170919125800.336-1-jeffy.chen@rock-chips.com>
Add dapm route for DP codec.
Signed-off-by: Jeffy Chen <jeffy.chen@rock-chips.com>
---
Changes in v3:
Rebase onto for-next 20170919
Changes in v2:
Separate HDMI/DMIC patches.
sound/soc/rockchip/rk3399_gru_sound.c | 3 +++
1 file changed, 3 insertions(+)
diff --git a/sound/soc/rockchip/rk3399_gru_sound.c b/sound/soc/rockchip/rk3399_gru_sound.c
index 0513fe480353..b050510be65f 100644
--- a/sound/soc/rockchip/rk3399_gru_sound.c
+++ b/sound/soc/rockchip/rk3399_gru_sound.c
@@ -47,6 +47,7 @@ static const struct snd_soc_dapm_widget rockchip_dapm_widgets[] = {
SND_SOC_DAPM_SPK("Speakers", NULL),
SND_SOC_DAPM_MIC("Headset Mic", NULL),
SND_SOC_DAPM_MIC("Int Mic", NULL),
+ SND_SOC_DAPM_LINE("HDMI", NULL),
};
static const struct snd_soc_dapm_route rockchip_dapm_routes[] = {
@@ -59,6 +60,7 @@ static const struct snd_soc_dapm_route rockchip_dapm_routes[] = {
{"Headphones", NULL, "HPL"},
{"Headphones", NULL, "HPR"},
{"Speakers", NULL, "Speaker"},
+ {"HDMI", NULL, "TX"},
};
static const struct snd_kcontrol_new rockchip_controls[] = {
@@ -66,6 +68,7 @@ static const struct snd_kcontrol_new rockchip_controls[] = {
SOC_DAPM_PIN_SWITCH("Speakers"),
SOC_DAPM_PIN_SWITCH("Headset Mic"),
SOC_DAPM_PIN_SWITCH("Int Mic"),
+ SOC_DAPM_PIN_SWITCH("HDMI"),
};
static int rockchip_sound_max98357a_hw_params(struct snd_pcm_substream *substream,
--
2.11.0
next prev parent reply other threads:[~2017-09-19 12:57 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-09-19 12:57 [PATCH v3 0/5] This series of patches fix the boot time dapm route warnings(without rt5514): Jeffy Chen
2017-09-19 12:57 ` Jeffy Chen [this message]
2017-09-19 12:57 ` [PATCH v3 2/5] ASoC: rockchip: Add dapm route for DMic Jeffy Chen
2017-09-19 12:57 ` [PATCH v3 3/5] ASoC: rockchip: Init dapm routes dynamically Jeffy Chen
2017-09-19 12:57 ` [PATCH v3 4/5] ASoC: rockchip: Use bus_type to distinguish rt5514 dsp from rt5514 codec Jeffy Chen
2017-09-19 13:46 ` Applied "ASoC: rockchip: Use bus_type to distinguish rt5514 dsp from rt5514 codec" to the asoc tree Mark Brown
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20170919125800.336-2-jeffy.chen@rock-chips.com \
--to=jeffy.chen@rock-chips.com \
--cc=linux-arm-kernel@lists.infradead.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox