From: Cheng-Yi Chiang <cychiang@chromium.org> To: linux-kernel@vger.kernel.org Cc: Hans Verkuil <hverkuil@xs4all.nl>, Mark Brown <broonie@kernel.org>, Liam Girdwood <lgirdwood@gmail.com>, Takashi Iwai <tiwai@suse.com>, Jaroslav Kysela <perex@perex.cz>, Russell King <rmk+kernel@armlinux.org.uk>, Andrzej Hajda <a.hajda@samsung.com>, Laurent Pinchart <Laurent.pinchart@ideasonboard.com>, David Airlie <airlied@linux.ie>, Daniel Vetter <daniel@ffwll.ch>, Heiko Stuebner <heiko@sntech.de>, dianders@chromium.org, dgreid@chromium.org, tzungbi@chromium.org, alsa-devel@alsa-project.org, dri-devel@lists.freedesktop.org, linux-arm-kernel@lists.infradead.org, linux-rockchip@lists.infradead.org, Cheng-Yi Chiang <cychiang@chromium.org> Subject: [PATCH 4/4] ASoC: rockchip_max98090: Add HDMI jack support Date: Fri, 5 Jul 2019 12:26:23 +0800 [thread overview] Message-ID: <20190705042623.129541-5-cychiang@chromium.org> (raw) In-Reply-To: <20190705042623.129541-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 | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) diff --git a/sound/soc/rockchip/rockchip_max98090.c b/sound/soc/rockchip/rockchip_max98090.c index 195309d1225a..c0e430ca4d12 100644 --- a/sound/soc/rockchip/rockchip_max98090.c +++ b/sound/soc/rockchip/rockchip_max98090.c @@ -15,6 +15,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" @@ -129,6 +130,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 and HDMI codec dai_link */ static struct snd_soc_dai_link rk_dailinks[] = { [DAILINK_MAX98090] = { @@ -146,6 +166,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, SND_SOC_DAILINK_REG(hdmi), } }; -- 2.22.0.410.gd8fdbe21b5-goog
WARNING: multiple messages have this Message-ID (diff)
From: Cheng-Yi Chiang <cychiang@chromium.org> To: linux-kernel@vger.kernel.org Cc: alsa-devel@alsa-project.org, dianders@chromium.org, Heiko Stuebner <heiko@sntech.de>, linux-rockchip@lists.infradead.org, David Airlie <airlied@linux.ie>, dri-devel@lists.freedesktop.org, Takashi Iwai <tiwai@suse.com>, Liam Girdwood <lgirdwood@gmail.com>, tzungbi@chromium.org, Jaroslav Kysela <perex@perex.cz>, Hans Verkuil <hverkuil@xs4all.nl>, Andrzej Hajda <a.hajda@samsung.com>, Russell King <rmk+kernel@armlinux.org.uk>, Mark Brown <broonie@kernel.org>, Laurent Pinchart <Laurent.pinchart@ideasonboard.com>, Daniel Vetter <daniel@ffwll.ch>, dgreid@chromium.org, linux-arm-kernel@lists.infradead.org, Cheng-Yi Chiang <cychiang@chromium.org> Subject: [PATCH 4/4] ASoC: rockchip_max98090: Add HDMI jack support Date: Fri, 5 Jul 2019 12:26:23 +0800 [thread overview] Message-ID: <20190705042623.129541-5-cychiang@chromium.org> (raw) In-Reply-To: <20190705042623.129541-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 | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) diff --git a/sound/soc/rockchip/rockchip_max98090.c b/sound/soc/rockchip/rockchip_max98090.c index 195309d1225a..c0e430ca4d12 100644 --- a/sound/soc/rockchip/rockchip_max98090.c +++ b/sound/soc/rockchip/rockchip_max98090.c @@ -15,6 +15,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" @@ -129,6 +130,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 and HDMI codec dai_link */ static struct snd_soc_dai_link rk_dailinks[] = { [DAILINK_MAX98090] = { @@ -146,6 +166,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, SND_SOC_DAILINK_REG(hdmi), } }; -- 2.22.0.410.gd8fdbe21b5-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-07-05 4:27 UTC|newest] Thread overview: 50+ messages / expand[flat|nested] mbox.gz Atom feed top 2019-07-05 4:26 [PATCH 0/4] Add HDMI jack support on RK3288 Cheng-Yi Chiang 2019-07-05 4:26 ` Cheng-Yi Chiang 2019-07-05 4:26 ` [PATCH 1/4] ASoC: hdmi-codec: Add an op to set callback function for plug event Cheng-Yi Chiang 2019-07-05 4:26 ` Cheng-Yi Chiang 2019-07-05 7:08 ` Tzung-Bi Shih 2019-07-05 7:08 ` Tzung-Bi Shih 2019-07-05 12:12 ` Mark Brown 2019-07-05 12:12 ` Mark Brown 2019-07-05 12:12 ` Mark Brown 2019-07-08 5:03 ` Cheng-yi Chiang 2019-07-08 5:03 ` Cheng-yi Chiang 2019-07-08 5:03 ` Cheng-yi Chiang 2019-07-09 11:58 ` Cheng-yi Chiang 2019-07-09 11:58 ` Cheng-yi Chiang 2019-07-09 11:47 ` Cezary Rojewski 2019-07-09 11:47 ` Cezary Rojewski 2019-07-09 11:47 ` Cezary Rojewski 2019-07-09 11:55 ` Cheng-yi Chiang 2019-07-09 11:55 ` Cheng-yi Chiang 2019-07-09 11:55 ` Cheng-yi Chiang 2019-07-05 4:26 ` [PATCH 2/4] drm: bridge: dw-hdmi: Report connector status using callback Cheng-Yi Chiang 2019-07-05 4:26 ` Cheng-Yi Chiang 2019-07-05 5:45 ` [alsa-devel] " Jonas Karlman 2019-07-05 5:45 ` Jonas Karlman 2019-07-05 5:45 ` Jonas Karlman 2019-07-05 7:31 ` Cheng-yi Chiang 2019-07-05 7:31 ` Cheng-yi Chiang 2019-07-05 7:31 ` Cheng-yi Chiang 2019-07-05 17:16 ` Mark Brown 2019-07-05 17:16 ` Mark Brown 2019-07-05 17:16 ` Mark Brown 2019-07-06 10:17 ` Cheng-yi Chiang 2019-07-06 10:17 ` Cheng-yi Chiang 2019-07-06 10:17 ` Cheng-yi Chiang 2019-07-05 7:09 ` Tzung-Bi Shih 2019-07-05 7:09 ` Tzung-Bi Shih 2019-07-05 7:35 ` Cheng-yi Chiang 2019-07-05 7:35 ` Cheng-yi Chiang 2019-07-05 4:26 ` [PATCH 3/4] ASoC: rockchip_max98090: Add dai_link for HDMI Cheng-Yi Chiang 2019-07-05 4:26 ` Cheng-Yi Chiang 2019-07-05 7:09 ` Tzung-Bi Shih 2019-07-05 7:09 ` Tzung-Bi Shih 2019-07-06 9:58 ` Cheng-yi Chiang 2019-07-06 9:58 ` Cheng-yi Chiang 2019-07-06 9:58 ` Cheng-yi Chiang 2019-07-05 4:26 ` Cheng-Yi Chiang [this message] 2019-07-05 4:26 ` [PATCH 4/4] ASoC: rockchip_max98090: Add HDMI jack support Cheng-Yi Chiang 2019-07-05 8:30 ` [PATCH 0/4] Add HDMI jack support on RK3288 Daniel Vetter 2019-07-05 8:30 ` Daniel Vetter 2019-07-05 8:30 ` Daniel Vetter
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=20190705042623.129541-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=dgreid@chromium.org \ --cc=dianders@chromium.org \ --cc=dri-devel@lists.freedesktop.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-rockchip@lists.infradead.org \ --cc=perex@perex.cz \ --cc=rmk+kernel@armlinux.org.uk \ --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: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.