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 v5 5/5] ASoC: rockchip_max98090: Add HDMI jack support Date: Wed, 17 Jul 2019 16:33:27 +0800 [thread overview] Message-ID: <20190717083327.47646-6-cychiang@chromium.org> (raw) In-Reply-To: <20190717083327.47646-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 | 20 ++++++++++++++++++++ 2 files changed, 22 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 c82948e383da..c81c4acda917 100644 --- a/sound/soc/rockchip/rockchip_max98090.c +++ b/sound/soc/rockchip/rockchip_max98090.c @@ -134,6 +134,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] = { @@ -151,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, SND_SOC_DAILINK_REG(hdmi), } }; -- 2.22.0.510.g264f2c817a-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 v5 5/5] ASoC: rockchip_max98090: Add HDMI jack support Date: Wed, 17 Jul 2019 16:33:27 +0800 [thread overview] Message-ID: <20190717083327.47646-6-cychiang@chromium.org> (raw) In-Reply-To: <20190717083327.47646-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 | 20 ++++++++++++++++++++ 2 files changed, 22 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 c82948e383da..c81c4acda917 100644 --- a/sound/soc/rockchip/rockchip_max98090.c +++ b/sound/soc/rockchip/rockchip_max98090.c @@ -134,6 +134,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] = { @@ -151,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, SND_SOC_DAILINK_REG(hdmi), } }; -- 2.22.0.510.g264f2c817a-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-17 8:34 UTC|newest] Thread overview: 36+ messages / expand[flat|nested] mbox.gz Atom feed top 2019-07-17 8:33 [PATCH v5 0/5] Add HDMI jack support on RK3288 Cheng-Yi Chiang 2019-07-17 8:33 ` Cheng-Yi Chiang 2019-07-17 8:33 ` [PATCH v5 1/5] ASoC: hdmi-codec: Add an op to set callback function for plug event Cheng-Yi Chiang 2019-07-17 8:33 ` Cheng-Yi Chiang 2019-07-17 8:33 ` [PATCH v5 2/5] drm: bridge: dw-hdmi: Report connector status using callback Cheng-Yi Chiang 2019-07-17 8:33 ` Cheng-Yi Chiang 2019-07-17 8:33 ` [PATCH v5 3/5] drm: dw-hdmi-i2s: Use fixed id for codec device Cheng-Yi Chiang 2019-07-17 8:33 ` Cheng-Yi Chiang 2019-07-17 8:33 ` [PATCH v5 4/5] ASoC: rockchip_max98090: Add dai_link for HDMI Cheng-Yi Chiang 2019-07-17 8:33 ` Cheng-Yi Chiang 2019-07-17 8:33 ` Cheng-Yi Chiang [this message] 2019-07-17 8:33 ` [PATCH v5 5/5] ASoC: rockchip_max98090: Add HDMI jack support Cheng-Yi Chiang 2019-07-17 10:28 ` [PATCH v5 0/5] Add HDMI jack support on RK3288 Tzung-Bi Shih 2019-07-17 10:28 ` Tzung-Bi Shih 2019-08-30 2:55 ` Cheng-yi Chiang 2019-08-30 2:55 ` Cheng-yi Chiang 2019-09-08 13:51 ` Cheng-yi Chiang 2019-09-08 13:51 ` Cheng-yi Chiang 2019-09-08 13:51 ` Cheng-yi Chiang 2019-09-08 13:51 ` [alsa-devel] " Cheng-yi Chiang 2019-09-09 7:37 ` Neil Armstrong 2019-09-09 7:37 ` Neil Armstrong 2019-09-09 7:37 ` Neil Armstrong 2019-09-09 7:37 ` [alsa-devel] " Neil Armstrong 2019-09-09 13:53 ` Mark Brown 2019-09-09 13:53 ` Mark Brown 2019-09-09 13:53 ` Mark Brown 2019-09-09 13:53 ` [alsa-devel] " Mark Brown 2019-09-13 9:32 ` Neil Armstrong 2019-09-13 9:32 ` Neil Armstrong 2019-09-13 9:32 ` Neil Armstrong 2019-09-13 9:32 ` [alsa-devel] " Neil Armstrong 2019-09-18 7:28 ` Cheng-yi Chiang 2019-09-18 7:28 ` Cheng-yi Chiang 2019-09-18 7:28 ` Cheng-yi Chiang 2019-09-18 7:28 ` [alsa-devel] " 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=20190717083327.47646-6-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.