From patchwork Wed Mar 21 01:57:51 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mark Brown X-Patchwork-Id: 10298295 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 24A0E60385 for ; Wed, 21 Mar 2018 01:58:59 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 1273D2975C for ; Wed, 21 Mar 2018 01:58:59 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 073F329760; Wed, 21 Mar 2018 01:58:59 +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,DKIM_SIGNED, DKIM_VALID autolearn=ham version=3.3.1 Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 619542975F for ; Wed, 21 Mar 2018 01:58:58 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20170209; h=Sender: Content-Transfer-Encoding:Content-Type:MIME-Version:Cc:List-Subscribe: List-Help:List-Post:List-Archive:List-Unsubscribe:List-Id:Date:Message-Id: In-Reply-To:Subject:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: References:List-Owner; bh=owPFZ+QEVPbXXE0RPaar6SKCD/0+moikLSJWWIxgRMs=; b=Bvm 0g7457zT4lZ+GnKyT1zEI7YWlQiCG4Q7JmZV1l0GBcKZy125DIWDzBPDJGCXEANeM8L2S36j5gC+s XQSnMB7mbv81H7E+Dy8kRKJ1PWf5gmOiM+Rf3eLjOENcxJPJ1J04UJVVXGz6ckTwhkcn3nDC7G3U0 NwXFvy6nAXz1wNGfXpXg+AHdOGiZeU+PYxySIYpL0YYAm9BXS8sF+W3GPSVCQaOdDznMwZw02U2C/ ZNmbR+LWZ59bkF1/A3sAe0jWt64kICgw3wXMuvufaK7Ry9vRzm7S6dsoETENmZCC9IV8pKQk/btKW v3AtsgDUtcig0IsPjcr3+Xkerr6p1cA==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.90_1 #2 (Red Hat Linux)) id 1eyT1j-0004Pl-0R; Wed, 21 Mar 2018 01:58:55 +0000 Received: from merlin.infradead.org ([2001:8b0:10b:1231::1]) by bombadil.infradead.org with esmtps (Exim 4.90_1 #2 (Red Hat Linux)) id 1eyT1J-00047B-EN; Wed, 21 Mar 2018 01:58:29 +0000 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=infradead.org; s=merlin.20170209; h=Date:Message-Id:In-Reply-To:Subject:Cc: To:From:Sender:Reply-To:MIME-Version:Content-Type:Content-Transfer-Encoding: Content-ID:Content-Description:Resent-Date:Resent-From:Resent-Sender: Resent-To:Resent-Cc:Resent-Message-ID:References:List-Id:List-Help: List-Unsubscribe:List-Subscribe:List-Post:List-Owner:List-Archive; bh=xCgDpRtl5TpfTpBLkcLimwIre9BFIYTYL9uCSVzp0ak=; b=LQD+/FV/crIjQTFiVWCZsYMts1 kWVFYJuxzCzqzLpLDdzTT6QUSkSxOFBRw2UdE6cl8IoVDqStQB4WZztLmybn3nB3Hna9dBm/GbW5q l6yC43ilqN5v5aNvpEikNjV/jhxZjeVI6zsWGk2DxO0C8TagsS8ZW08SRKZoQvehtjSy+mHAvvzHh cfoOs4b2HNdCEsEgfXm2yJVyUPksUVB0PX87VixcvXNU/WCurZREM/aPGGeHZi9yfPwW8Z59Y77S/ 1kY1Zjzg1mNKXcJNrbXecAFPRPtLrCwf4Jf0eXRA+JIj0nsZxZMLc1fAbOBo7W+bqYfYnhvklDo6r jG90Y77Q==; Received: from heliosphere.sirena.org.uk ([2a01:7e01::f03c:91ff:fed4:a3b6]) by merlin.infradead.org with esmtps (Exim 4.90_1 #2 (Red Hat Linux)) id 1eyT1G-000447-S7; Wed, 21 Mar 2018 01:58:27 +0000 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=sirena.org.uk; s=20170815-heliosphere; h=Date:Message-Id:In-Reply-To: Subject:Cc:To:From:Sender:Reply-To:MIME-Version:Content-Type: Content-Transfer-Encoding:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:References: List-Id:List-Help:List-Unsubscribe:List-Subscribe:List-Post:List-Owner: List-Archive; bh=xCgDpRtl5TpfTpBLkcLimwIre9BFIYTYL9uCSVzp0ak=; b=wkGCK16/I5aX zcgauf86a6K88EBLZY0cNGjKLeppZFwvjsmJRxkkvy5mR9MM42fHxsP01HALEieJZG8z1Cb8xF8H7 1xidBy+doZMN6M9AB5Jj76RIjbAX7INi6HEX3VO4jJvECdbWu24hbG/yQ4VonBoSqi0tiGTenvS5r 7H7W0=; Received: from [218.255.99.6] (helo=finisterre.ee.mobilebroadband) by heliosphere.sirena.org.uk with esmtpsa (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.89) (envelope-from ) id 1eyT0k-00007I-6l; Wed, 21 Mar 2018 01:57:54 +0000 Received: by finisterre.ee.mobilebroadband (Postfix, from userid 1000) id 9D29644007A; Wed, 21 Mar 2018 01:57:51 +0000 (GMT) From: Mark Brown To: Ezequiel Garcia Subject: Applied "ASoC: rockchip: Fix dai_name for HDMI codec" to the asoc tree In-Reply-To: <20180320160332.13212-2-ezequiel@vanguardiasur.com.ar> Message-Id: <20180321015751.9D29644007A@finisterre.ee.mobilebroadband> Date: Wed, 21 Mar 2018 01:57:51 +0000 (GMT) X-Bad-Reply: In-Reply-To but no 'Re:' in Subject. X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20180320_215827_023954_881F12D2 X-CRM114-Status: GOOD ( 17.32 ) X-BeenThere: linux-rockchip@lists.infradead.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: Upstream kernel work for Rockchip platforms List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: alsa-devel@alsa-project.org, Heiko Stuebner , Liam Girdwood , Takashi Iwai , Jaroslav Kysela , linux-rockchip@lists.infradead.org, Sjoerd Simons , Mark Brown , kernel@collabora.com, linux-arm-kernel@lists.infradead.org MIME-Version: 1.0 Sender: "Linux-rockchip" Errors-To: linux-rockchip-bounces+patchwork-linux-rockchip=patchwork.kernel.org@lists.infradead.org X-Virus-Scanned: ClamAV using ClamSMTP The patch ASoC: rockchip: Fix dai_name for HDMI codec has been applied to the asoc tree at https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git All being well this means that it will be integrated into the linux-next tree (usually sometime in the next 24 hours) and sent to Linus during the next merge window (or sooner if it is a bug fix), however if problems are discovered then the patch may be dropped or reverted. You may get further e-mails resulting from automated or manual testing and review of the tree, please engage with people reporting problems and send followup patches addressing any issues that are reported if needed. If any updates are required or you are submitting further changes they should be sent as incremental updates against current git, existing patches will not be replaced. Please add any relevant lists and maintainers to the CCs when replying to this mail. Thanks, Mark From a5ad3b4b240b0335f9ea7d474efa79ba8463ade7 Mon Sep 17 00:00:00 2001 From: Ezequiel Garcia Date: Tue, 20 Mar 2018 13:03:30 -0300 Subject: [PATCH] ASoC: rockchip: Fix dai_name for HDMI codec Commit 24069b589b02 ("ASoC: hdmi-codec: remove multi detection support") changed the dai_name for the HDMI Codec, breaking the rk3288_hdmi_analog driver, which fails to register with a: rk3288-snd-hdmi-analog sound: ASoC: CODEC DAI hdmi-hifi.0 not registered This commit fixes the dai_name, fixing the issue. Fixes: 24069b589b02 ("ASoC: hdmi-codec: remove multi detection support") Signed-off-by: Ezequiel Garcia Signed-off-by: Mark Brown --- sound/soc/rockchip/rk3288_hdmi_analog.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sound/soc/rockchip/rk3288_hdmi_analog.c b/sound/soc/rockchip/rk3288_hdmi_analog.c index fa44e3901336..929b3fe289b0 100644 --- a/sound/soc/rockchip/rk3288_hdmi_analog.c +++ b/sound/soc/rockchip/rk3288_hdmi_analog.c @@ -155,7 +155,7 @@ static struct snd_soc_dai_link_component rk_codecs[] = { { }, { .name = "hdmi-audio-codec.2.auto", - .dai_name = "hdmi-hifi.0", + .dai_name = "i2s-hifi", }, };