From patchwork Tue Nov 15 18:52:40 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Philipp Zabel X-Patchwork-Id: 9430347 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 B1AE560471 for ; Tue, 15 Nov 2016 18:53:35 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id A0F0028C63 for ; Tue, 15 Nov 2016 18:53:35 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 95D6728C65; Tue, 15 Nov 2016 18:53:35 +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=-4.2 required=2.0 tests=BAYES_00, RCVD_IN_DNSWL_MED autolearn=ham version=3.3.1 Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.9]) (using TLSv1.2 with cipher AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 4683E28C63 for ; Tue, 15 Nov 2016 18:53:35 +0000 (UTC) Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.85_2 #1 (Red Hat Linux)) id 1c6irO-0004DP-SN; Tue, 15 Nov 2016 18:53:34 +0000 Received: from metis.ext.pengutronix.de ([2001:67c:670:201:290:27ff:fe1d:cc33]) by bombadil.infradead.org with esmtps (Exim 4.85_2 #1 (Red Hat Linux)) id 1c6irK-00048r-Tn for linux-mediatek@lists.infradead.org; Tue, 15 Nov 2016 18:53:32 +0000 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-Rn; Tue, 15 Nov 2016 19:52:58 +0100 From: Philipp Zabel To: alsa-devel@alsa-project.org Subject: [PATCH v9 3/3] ASoC: mediatek: Add jack detection support to the mt8173-rt5650 machine driver Date: Tue, 15 Nov 2016 19:52:40 +0100 Message-Id: <1479235960-23696-4-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: linux-mediatek@lists.infradead.org X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20161115_105331_254274_461795C3 X-CRM114-Status: GOOD ( 15.44 ) X-BeenThere: linux-mediatek@lists.infradead.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , 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 , kernel@pengutronix.de, PC Liao , Matthias Brugger , linux-mediatek@lists.infradead.org MIME-Version: 1.0 Sender: "Linux-mediatek" Errors-To: linux-mediatek-bounces+patchwork-linux-mediatek=patchwork.kernel.org@lists.infradead.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. 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.c | 42 +++++++++++++++++++++++++++++++ 1 file changed, 42 insertions(+) diff --git a/sound/soc/mediatek/mt8173/mt8173-rt5650.c b/sound/soc/mediatek/mt8173/mt8173-rt5650.c index ba65f41..daf00cf 100644 --- a/sound/soc/mediatek/mt8173/mt8173-rt5650.c +++ b/sound/soc/mediatek/mt8173/mt8173-rt5650.c @@ -17,7 +17,9 @@ #include #include #include +#include #include +#include #include #include "../../codecs/rt5645.h" @@ -166,6 +168,27 @@ static struct snd_soc_dai_link_component mt8173_rt5650_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, @@ -228,6 +251,7 @@ static struct snd_soc_dai_link mt8173_rt5650_dais[] = { .no_pcm = 1, .codec_dai_name = "i2s-hifi", .dpcm_playback = 1, + .init = mt8173_hdmi_init, }, }; @@ -249,6 +273,8 @@ static int mt8173_rt5650_dev_probe(struct platform_device *pdev) struct snd_soc_card *card = &mt8173_rt5650_card; struct device_node *platform_node; struct device_node *np; + struct device_node *cec_np; + struct platform_device *cec_pdev; const char *codec_capture_dai; int i, ret; @@ -313,6 +339,22 @@ static int mt8173_rt5650_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",