From: Cheng-Yi Chiang <cychiang@chromium.org>
To: linux-kernel@vger.kernel.org
Cc: Mark Rutland <mark.rutland@arm.com>,
alsa-devel@alsa-project.org, Heiko Stuebner <heiko@sntech.de>,
Neil Armstrong <narmstrong@baylibre.com>,
David Airlie <airlied@linux.ie>,
dri-devel@lists.freedesktop.org,
Liam Girdwood <lgirdwood@gmail.com>,
Hans Verkuil <hverkuil@xs4all.nl>,
Andrzej Hajda <a.hajda@samsung.com>,
Laurent Pinchart <Laurent.pinchart@ideasonboard.com>,
Jerome Brunet <jbrunet@baylibre.com>,
Takashi Iwai <tiwai@suse.com>,
linux-rockchip@lists.infradead.org, dgreid@chromium.org,
Cheng-Yi Chiang <cychiang@chromium.org>,
devicetree@vger.kernel.org, tzungbi@chromium.org,
Jonas Karlman <jonas@kwiboo.se>,
Russell King <rmk+kernel@armlinux.org.uk>,
Rob Herring <robh+dt@kernel.org>,
Jaroslav Kysela <perex@perex.cz>,
linux-arm-kernel@lists.infradead.org,
Jernej Skrabec <jernej.skrabec@siol.net>,
dianders@chromium.org, Mark Brown <broonie@kernel.org>,
Daniel Vetter <daniel@ffwll.ch>
Subject: [PATCH v9 4/6] ASoC: rockchip_max98090: Add HDMI jack support
Date: Mon, 28 Oct 2019 15:19:28 +0800 [thread overview]
Message-ID: <20191028071930.145899-5-cychiang@chromium.org> (raw)
In-Reply-To: <20191028071930.145899-1-cychiang@chromium.org>
In machine driver, create a jack and let hdmi-codec report jack status.
Signed-off-by: Cheng-Yi Chiang <cychiang@chromium.org>
---
sound/soc/rockchip/Kconfig | 3 ++-
sound/soc/rockchip/rockchip_max98090.c | 22 ++++++++++++++++++++++
2 files changed, 24 insertions(+), 1 deletion(-)
diff --git a/sound/soc/rockchip/Kconfig b/sound/soc/rockchip/Kconfig
index b43657e6e655..d610b553ea3b 100644
--- a/sound/soc/rockchip/Kconfig
+++ b/sound/soc/rockchip/Kconfig
@@ -40,9 +40,10 @@ config SND_SOC_ROCKCHIP_MAX98090
select SND_SOC_ROCKCHIP_I2S
select SND_SOC_MAX98090
select SND_SOC_TS3A227E
+ select SND_SOC_HDMI_CODEC
help
Say Y or M here if you want to add support for SoC audio on Rockchip
- boards using the MAX98090 codec, such as Veyron.
+ boards using the MAX98090 codec and HDMI codec, such as Veyron.
config SND_SOC_ROCKCHIP_RT5645
tristate "ASoC support for Rockchip boards using a RT5645/RT5650 codec"
diff --git a/sound/soc/rockchip/rockchip_max98090.c b/sound/soc/rockchip/rockchip_max98090.c
index 50ef9b8e7ce4..5c2504a465f4 100644
--- a/sound/soc/rockchip/rockchip_max98090.c
+++ b/sound/soc/rockchip/rockchip_max98090.c
@@ -12,6 +12,7 @@
#include <linux/gpio.h>
#include <linux/of_gpio.h>
#include <sound/core.h>
+#include <sound/hdmi-codec.h>
#include <sound/jack.h>
#include <sound/pcm.h>
#include <sound/pcm_params.h>
@@ -218,6 +219,25 @@ enum {
DAILINK_HDMI,
};
+static struct snd_soc_jack rk_hdmi_jack;
+
+static int rk_hdmi_init(struct snd_soc_pcm_runtime *runtime)
+{
+ struct snd_soc_card *card = runtime->card;
+ struct snd_soc_component *component = runtime->codec_dai->component;
+ int ret;
+
+ /* enable jack detection */
+ ret = snd_soc_card_jack_new(card, "HDMI Jack", SND_JACK_LINEOUT,
+ &rk_hdmi_jack, NULL, 0);
+ if (ret) {
+ dev_err(card->dev, "Can't new HDMI Jack %d\n", ret);
+ return ret;
+ }
+
+ return hdmi_codec_set_jack_detect(component, &rk_hdmi_jack);
+}
+
/* max98090 dai_link */
static struct snd_soc_dai_link rk_max98090_dailinks[] = {
{
@@ -237,6 +257,7 @@ static struct snd_soc_dai_link rk_hdmi_dailinks[] = {
{
.name = "HDMI",
.stream_name = "HDMI",
+ .init = rk_hdmi_init,
.ops = &rk_aif1_ops,
.dai_fmt = SND_SOC_DAIFMT_I2S | SND_SOC_DAIFMT_NB_NF |
SND_SOC_DAIFMT_CBS_CFS,
@@ -259,6 +280,7 @@ static struct snd_soc_dai_link rk_max98090_hdmi_dailinks[] = {
[DAILINK_HDMI] = {
.name = "HDMI",
.stream_name = "HDMI",
+ .init = rk_hdmi_init,
.ops = &rk_aif1_ops,
.dai_fmt = SND_SOC_DAIFMT_I2S | SND_SOC_DAIFMT_NB_NF |
SND_SOC_DAIFMT_CBS_CFS,
--
2.24.0.rc0.303.g954a862665-goog
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
next prev parent reply other threads:[~2019-10-28 7:21 UTC|newest]
Thread overview: 15+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-10-28 7:19 [PATCH v9 0/6] Add HDMI jack support on RK3288 Cheng-Yi Chiang
2019-10-28 7:19 ` [PATCH v9 1/6] drm: bridge: dw-hdmi: Report connector status using callback Cheng-Yi Chiang
2019-10-29 12:56 ` Applied "drm: bridge: dw-hdmi: Report connector status using callback" to the asoc tree Mark Brown
2019-10-28 7:19 ` [PATCH v9 2/6] ASoC: rockchip-max98090: Support usage with and without HDMI Cheng-Yi Chiang
2019-10-29 12:56 ` Applied "ASoC: rockchip-max98090: Support usage with and without HDMI" to the asoc tree Mark Brown
2019-10-28 7:19 ` [PATCH v9 3/6] ASoC: rockchip_max98090: Optionally support HDMI use case Cheng-Yi Chiang
2019-10-29 12:56 ` Applied "ASoC: rockchip_max98090: Optionally support HDMI use case" to the asoc tree Mark Brown
2019-10-28 7:19 ` Cheng-Yi Chiang [this message]
2019-10-29 12:56 ` Applied "ASoC: rockchip_max98090: Add HDMI jack support" " Mark Brown
2019-10-28 7:19 ` [PATCH v9 5/6] ARM: dts: rockchip: Add HDMI support to rk3288-veyron-analog-audio Cheng-Yi Chiang
2019-10-30 9:09 ` Tzung-Bi Shih
2019-10-30 9:14 ` Heiko Stuebner
2019-10-31 10:51 ` Heiko Stuebner
2019-10-28 7:19 ` [PATCH v9 6/6] ARM: dts: rockchip: Add HDMI audio support to rk3288-veyron-mickey.dts Cheng-Yi Chiang
2019-10-31 10:52 ` Heiko Stuebner
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=20191028071930.145899-5-cychiang@chromium.org \
--to=cychiang@chromium.org \
--cc=Laurent.pinchart@ideasonboard.com \
--cc=a.hajda@samsung.com \
--cc=airlied@linux.ie \
--cc=alsa-devel@alsa-project.org \
--cc=broonie@kernel.org \
--cc=daniel@ffwll.ch \
--cc=devicetree@vger.kernel.org \
--cc=dgreid@chromium.org \
--cc=dianders@chromium.org \
--cc=dri-devel@lists.freedesktop.org \
--cc=heiko@sntech.de \
--cc=hverkuil@xs4all.nl \
--cc=jbrunet@baylibre.com \
--cc=jernej.skrabec@siol.net \
--cc=jonas@kwiboo.se \
--cc=lgirdwood@gmail.com \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-rockchip@lists.infradead.org \
--cc=mark.rutland@arm.com \
--cc=narmstrong@baylibre.com \
--cc=perex@perex.cz \
--cc=rmk+kernel@armlinux.org.uk \
--cc=robh+dt@kernel.org \
--cc=tiwai@suse.com \
--cc=tzungbi@chromium.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;
as well as URLs for NNTP newsgroup(s).