From: Cheng-Yi Chiang <cychiang@chromium.org>
To: linux-kernel@vger.kernel.org
Cc: alsa-devel@alsa-project.org, Heiko Stuebner <heiko@sntech.de>,
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>,
Cheng-Yi Chiang <cychiang@chromium.org>,
Takashi Iwai <tiwai@suse.com>,
linux-rockchip@lists.infradead.org, dgreid@chromium.org,
linux-media@vger.kernel.org, devicetree@vger.kernel.org,
tzungbi@chromium.org, Philipp Zabel <p.zabel@pengutronix.de>,
Bartlomiej Zolnierkiewicz <b.zolnierkie@samsung.com>,
Russell King <rmk+kernel@armlinux.org.uk>,
Rob Herring <robh+dt@kernel.org>,
Jaroslav Kysela <perex@perex.cz>,
linux-arm-kernel@lists.infradead.org,
Greg Kroah-Hartman <gregkh@linuxfoundation.org>,
dianders@chromium.org, Mark Brown <broonie@kernel.org>,
Daniel Vetter <daniel@ffwll.ch>
Subject: [PATCH 6/7] ASoC: rockchip_max98090: Add HDMI jack support
Date: Mon, 3 Jun 2019 12:32:50 +0800 [thread overview]
Message-ID: <20190603043251.226549-7-cychiang@chromium.org> (raw)
In-Reply-To: <20190603043251.226549-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/rockchip_max98090.c | 41 ++++++++++++++++++++++++++
1 file changed, 41 insertions(+)
diff --git a/sound/soc/rockchip/rockchip_max98090.c b/sound/soc/rockchip/rockchip_max98090.c
index 2dd247670c7a..17c50d9fbac1 100644
--- a/sound/soc/rockchip/rockchip_max98090.c
+++ b/sound/soc/rockchip/rockchip_max98090.c
@@ -18,6 +18,7 @@
*/
#include <linux/module.h>
+#include <linux/of_platform.h>
#include <linux/platform_device.h>
#include <linux/slab.h>
#include <linux/gpio.h>
@@ -27,6 +28,7 @@
#include <sound/pcm.h>
#include <sound/pcm_params.h>
#include <sound/soc.h>
+#include <sound/hdmi-codec.h>
#include "rockchip_i2s.h"
#include "../codecs/ts3a227e.h"
@@ -131,6 +133,26 @@ 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;
+ struct device *hdmi_dev = snd_soc_card_get_drvdata(card);
+ 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, hdmi_dev);
+}
+
/* max98090 and HDMI codec dai_link */
static struct snd_soc_dai_link rk_dailinks[] = {
[DAILINK_MAX98090] = {
@@ -148,6 +170,7 @@ static struct snd_soc_dai_link rk_dailinks[] = {
.ops = &rk_aif1_ops,
.dai_fmt = SND_SOC_DAIFMT_I2S | SND_SOC_DAIFMT_NB_NF |
SND_SOC_DAIFMT_CBS_CFS,
+ .init = rk_hdmi_init,
}
};
@@ -200,6 +223,8 @@ static int snd_rk_mc_probe(struct platform_device *pdev)
struct device_node *np = pdev->dev.of_node;
struct device_node *np_cpu;
struct of_phandle_args args;
+ struct device_node *np_hdmi;
+ struct platform_device *hdmi_pdev;
/* register the soc card */
card->dev = &pdev->dev;
@@ -248,6 +273,22 @@ static int snd_rk_mc_probe(struct platform_device *pdev)
return -EINVAL;
}
+ /* The hdmi device handles HDMI hotplug detection */
+ np_hdmi = of_parse_phandle(np, "rockchip,hdmi", 0);
+ if (!np_hdmi) {
+ dev_err(&pdev->dev, "Failed to find HDMI node\n");
+ return -EINVAL;
+ }
+
+ hdmi_pdev = of_find_device_by_node(np_hdmi);
+ if (!hdmi_pdev) {
+ dev_err(&pdev->dev, "Waiting for HDMI device %s\n",
+ np_hdmi->full_name);
+ return -EPROBE_DEFER;
+ }
+
+ snd_soc_card_set_drvdata(card, &hdmi_pdev->dev);
+
ret = snd_soc_of_parse_card_name(card, "rockchip,model");
if (ret) {
dev_err(&pdev->dev,
--
2.22.0.rc1.257.g3120a18244-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-06-03 4:34 UTC|newest]
Thread overview: 30+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-06-03 4:32 [PATCH 0/7] Add HDMI audio support on RK3288 veyron board Cheng-Yi Chiang
2019-06-03 4:32 ` [PATCH 1/7] video: add HDMI state notifier support Cheng-Yi Chiang
2019-06-03 7:45 ` Hans Verkuil
2019-06-03 8:09 ` Daniel Vetter
2019-06-03 9:05 ` Hans Verkuil
2019-06-04 7:19 ` Daniel Vetter
2019-06-04 2:32 ` Cheng-yi Chiang
2019-06-04 7:24 ` Daniel Vetter
2019-06-11 12:10 ` Cheng-yi Chiang
2019-06-11 12:34 ` Daniel Vetter
2019-06-18 11:48 ` Cheng-yi Chiang
2019-06-18 12:12 ` Daniel Vetter
2019-06-19 11:48 ` Cheng-yi Chiang
2019-06-20 9:25 ` Daniel Vetter
2019-06-20 13:23 ` Cheng-yi Chiang
2019-06-20 21:12 ` Daniel Vetter
2019-06-21 9:39 ` Cheng-yi Chiang
2019-06-11 13:10 ` Hans Verkuil
2019-06-18 11:54 ` Cheng-yi Chiang
2019-06-04 1:48 ` Cheng-yi Chiang
2019-06-03 4:32 ` [PATCH 2/7] ASoC: hdmi-codec: use HDMI state notifier to add jack support Cheng-Yi Chiang
2019-06-03 8:03 ` [alsa-devel] " Amadeusz Sławiński
2019-06-03 8:53 ` Cheng-yi Chiang
2019-06-03 4:32 ` [PATCH 3/7] drm/bridge/synopsys: dw-hdmi: Add HDMI notifier support Cheng-Yi Chiang
2019-06-03 4:32 ` [PATCH 4/7] ASoC: rockchip_max98090: Add dai_link for HDMI Cheng-Yi Chiang
2019-06-03 4:32 ` [PATCH 5/7] ASoC: rockchip: rockchip-max98090: Add node " Cheng-Yi Chiang
2019-07-09 20:01 ` Rob Herring
2019-07-10 4:11 ` Cheng-yi Chiang
2019-06-03 4:32 ` Cheng-Yi Chiang [this message]
2019-06-03 4:32 ` [PATCH 7/7] ARM: dts: rockchip: Specify HDMI node to sound card node Cheng-Yi Chiang
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=20190603043251.226549-7-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=b.zolnierkie@samsung.com \
--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=gregkh@linuxfoundation.org \
--cc=heiko@sntech.de \
--cc=hverkuil@xs4all.nl \
--cc=lgirdwood@gmail.com \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-media@vger.kernel.org \
--cc=linux-rockchip@lists.infradead.org \
--cc=p.zabel@pengutronix.de \
--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).