From patchwork Tue Nov 15 18:52:39 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Philipp Zabel X-Patchwork-Id: 9430751 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 23EC860471 for ; Wed, 16 Nov 2016 01:13:55 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 0532D28D18 for ; Wed, 16 Nov 2016 01:13:55 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id EA97928D16; Wed, 16 Nov 2016 01:13:54 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-1.9 required=2.0 tests=BAYES_00, RCVD_IN_DNSWL_NONE autolearn=unavailable version=3.3.1 Received: from alsa0.perex.cz (alsa0.perex.cz [77.48.224.243]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 2D0EE28D16 for ; Wed, 16 Nov 2016 01:13:53 +0000 (UTC) Received: by alsa0.perex.cz (Postfix, from userid 1000) id 7BE7426735F; Wed, 16 Nov 2016 02:13:52 +0100 (CET) Received: from alsa0.perex.cz (localhost [127.0.0.1]) by alsa0.perex.cz (Postfix) with ESMTP id EFEE426735E; Wed, 16 Nov 2016 02:11:33 +0100 (CET) X-Original-To: alsa-devel@alsa-project.org Delivered-To: alsa-devel@alsa-project.org Received: by alsa0.perex.cz (Postfix, from userid 1000) id A3B95267200; Tue, 15 Nov 2016 19:53:04 +0100 (CET) Received: from metis.ext.4.pengutronix.de (metis.ext.4.pengutronix.de [92.198.50.35]) by alsa0.perex.cz (Postfix) with ESMTP id 965E726663B for ; Tue, 15 Nov 2016 19:52:58 +0100 (CET) Received: from paszta.hi.4.pengutronix.de ([10.1.0.120] helo=paszta.pengutronix.de.) by metis.ext.pengutronix.de with esmtp (Exim 4.80) (envelope-from ) id 1c6iqo-000240-4y; Tue, 15 Nov 2016 19:52:58 +0100 From: Philipp Zabel To: alsa-devel@alsa-project.org Date: Tue, 15 Nov 2016 19:52:39 +0100 Message-Id: <1479235960-23696-3-git-send-email-p.zabel@pengutronix.de> X-Mailer: git-send-email 2.1.4 In-Reply-To: <1479235960-23696-1-git-send-email-p.zabel@pengutronix.de> References: <1479235960-23696-1-git-send-email-p.zabel@pengutronix.de> X-SA-Exim-Connect-IP: 10.1.0.120 X-SA-Exim-Mail-From: p.zabel@pengutronix.de X-SA-Exim-Scanned: No (on metis.ext.pengutronix.de); SAEximRunCond expanded to false X-PTX-Original-Recipient: alsa-devel@alsa-project.org Cc: Jean-Francois Moine , Koro Chen , Lars-Peter Clausen , Russell King - ARM Linux , Philipp Zabel , Arnaud Pouliquen , Liam Girdwood , Jyri Sarha , Cawa Cheng , Mark Brown , Hans Verkuil , Daniel Kurtz , kernel@pengutronix.de, PC Liao , Matthias Brugger , linux-mediatek@lists.infradead.org Subject: [alsa-devel] [PATCH v9 2/3] ASoC: mediatek: Add jack detection support to mt8173-rt5650-rt5676 machine driver X-BeenThere: alsa-devel@alsa-project.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: "Alsa-devel mailing list for ALSA developers - http://www.alsa-project.org" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: alsa-devel-bounces@alsa-project.org Sender: alsa-devel-bounces@alsa-project.org X-Virus-Scanned: ClamAV using ClamSMTP Find the HDMI state notifier device (CEC) in the device tree and pass it to hdmi-codec. Signed-off-by: Philipp Zabel --- Changes since v8: - Rebased onto the "video: add HDMI state notifier support" patch [1]. Now we look for the CEC device in the device tree to pass it to hdmi_codec_set_jack_detect. --- sound/soc/mediatek/mt8173/mt8173-rt5650-rt5676.c | 42 ++++++++++++++++++++++++ 1 file changed, 42 insertions(+) diff --git a/sound/soc/mediatek/mt8173/mt8173-rt5650-rt5676.c b/sound/soc/mediatek/mt8173/mt8173-rt5650-rt5676.c index 1b8b2a7..58fa01e 100644 --- a/sound/soc/mediatek/mt8173/mt8173-rt5650-rt5676.c +++ b/sound/soc/mediatek/mt8173/mt8173-rt5650-rt5676.c @@ -17,7 +17,9 @@ #include #include #include +#include #include +#include #include #include "../../codecs/rt5645.h" #include "../../codecs/rt5677.h" @@ -131,6 +133,27 @@ static struct snd_soc_dai_link_component mt8173_rt5650_rt5676_codecs[] = { }, }; +static struct snd_soc_jack mt8173_hdmi_card_jack; + +static int mt8173_hdmi_init(struct snd_soc_pcm_runtime *runtime) +{ + struct snd_soc_card *card = runtime->card; + struct snd_soc_codec *codec = runtime->codec; + struct device *cec_dev = snd_soc_card_get_drvdata(card); + int ret; + + /* Enable jack detection */ + ret = snd_soc_card_jack_new(card, "HDMI Jack", SND_JACK_LINEOUT, + &mt8173_hdmi_card_jack, NULL, 0); + if (ret) { + dev_err(card->dev, "HDMI Jack creation failed: %d\n", ret); + return ret; + } + + return hdmi_codec_set_jack_detect(codec, &mt8173_hdmi_card_jack, + cec_dev); +} + enum { DAI_LINK_PLAYBACK, DAI_LINK_CAPTURE, @@ -195,6 +218,7 @@ static struct snd_soc_dai_link mt8173_rt5650_rt5676_dais[] = { .no_pcm = 1, .codec_dai_name = "i2s-hifi", .dpcm_playback = 1, + .init = mt8173_hdmi_init, }, /* rt5676 <-> rt5650 intercodec link: Sets rt5676 I2S2 as master */ [DAI_LINK_INTERCODEC] = { @@ -235,6 +259,8 @@ static int mt8173_rt5650_rt5676_dev_probe(struct platform_device *pdev) { struct snd_soc_card *card = &mt8173_rt5650_rt5676_card; struct device_node *platform_node; + struct device_node *cec_np; + struct platform_device *cec_pdev; int i, ret; platform_node = of_parse_phandle(pdev->dev.of_node, @@ -281,6 +307,22 @@ static int mt8173_rt5650_rt5676_dev_probe(struct platform_device *pdev) card->dev = &pdev->dev; platform_set_drvdata(pdev, card); + /* The CEC module handles HDMI hotplug detection */ + cec_np = of_find_compatible_node(pdev->dev.of_node->parent, NULL, + "mediatek,mt8173-cec"); + if (!cec_np) { + dev_err(&pdev->dev, "Failed to find CEC node\n"); + return -EINVAL; + } + + cec_pdev = of_find_device_by_node(cec_np); + if (!cec_pdev) { + dev_err(&pdev->dev, "Waiting for CEC device %s\n", + cec_np->full_name); + return -EPROBE_DEFER; + } + + snd_soc_card_set_drvdata(card, &cec_pdev->dev); ret = devm_snd_soc_register_card(&pdev->dev, card); if (ret) dev_err(&pdev->dev, "%s snd_soc_register_card fail %d\n",