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: 132170 Delivered-To: patch@linaro.org Received: by 10.46.84.29 with SMTP id i29csp1579164ljb; Tue, 20 Mar 2018 18:58:00 -0700 (PDT) X-Google-Smtp-Source: AG47ELvC9p+zXEeB1u6SoE9SOj6lcye1V6jvP/E9twTWn5cHrdziIOV+LkxP1mKLp8IH/OSq8m42 X-Received: by 10.223.209.198 with SMTP id m6mr13479439wri.267.1521597480488; Tue, 20 Mar 2018 18:58:00 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1521597480; cv=none; d=google.com; s=arc-20160816; b=IdUDIs3fFljh5hEPugJP5OA5QoHj8PJoNKTh6ZAL0not+J6xfev3asQXywaUY4Hn7K FBhzV6nm1+BAkX2vMoGbSFaqmflIwI5qcjOHb9sHzDnruAnoRkLjP9ANYL1ZZ4GVyHIx Cz17RAQM5++H+1eBnhxDV81Cx5BdIt9XD4G4uKq+7y9NN1rgTvamLPTwma6BJH2pTi9W WmNkGpSIyq9zlQNZjOPyraWbRnWGlptIBU6eXYwR4Xmx75jAdvc6MAdzfzoKdGdvNRVY MH118INhKmaTYGE/hqVXM3uLTClbVN0Y5TbMAVZlYYMrUtukSkIYeKA3mChNzpqTo1rA 6eFg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:mime-version :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:cc:date:message-id:in-reply-to:to:from :dkim-signature:delivered-to:arc-authentication-results; bh=YosfkvuulUsBPBCm5sZsY9J/DALWMviOJ0VEEa0x6iw=; b=GUqYrWVUOwvqkZQn1CR329XQI1QOLkt8J2xZp6xLhsv9mX87oB0MxDksi8LLO+hDQ1 tKPtL3c+/R3ZZLhLaWzBkGk4JtHQlZpm4WR2mKyb5zN3A3UjpMQD22zYeTWImvWheEgJ /qoWL2x3kPMhofg+WVxzWZ23nBOjR1Y938GG8z7kB+BNTtUHvlrZDug48HOkgrBZKDyq KAiJlhV/Z7/V0I0GI3lm1nHGza+uAF1uS9c+8vkxQKJMxD4Mulm3xezf5VtQHTMj5ZZ9 XCRQZPvNA8Zpfx+0zEr/o6FjXTK4Rh9b5ZdQktSM2Ml6hSOAKwF4ZEsaOS85sPpRXdkp HQig== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@sirena.org.uk header.s=20170815-heliosphere header.b=wkGCK16/; spf=pass (google.com: domain of alsa-devel-bounces@alsa-project.org designates 77.48.224.243 as permitted sender) smtp.mailfrom=alsa-devel-bounces@alsa-project.org Return-Path: Received: from alsa0.perex.cz (alsa0.perex.cz. [77.48.224.243]) by mx.google.com with ESMTP id 4si2236214wrl.466.2018.03.20.18.58.00; Tue, 20 Mar 2018 18:58:00 -0700 (PDT) Received-SPF: pass (google.com: domain of alsa-devel-bounces@alsa-project.org designates 77.48.224.243 as permitted sender) client-ip=77.48.224.243; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@sirena.org.uk header.s=20170815-heliosphere header.b=wkGCK16/; spf=pass (google.com: domain of alsa-devel-bounces@alsa-project.org designates 77.48.224.243 as permitted sender) smtp.mailfrom=alsa-devel-bounces@alsa-project.org Received: from alsa0.perex.cz (localhost [127.0.0.1]) by alsa0.perex.cz (Postfix) with ESMTP id 9F1F22673C8; Wed, 21 Mar 2018 02:57:59 +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 450CC2673CF; Wed, 21 Mar 2018 02:57:57 +0100 (CET) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on mail1.perex.cz X-Spam-Level: X-Spam-Status: No, score=0.2 required=5.0 tests=DKIM_SIGNED,DKIM_VALID, HEADER_FROM_DIFFERENT_DOMAINS, SPF_PASS, T_RP_MATCHES_RCVD autolearn=disabled version=3.4.0 Received: from heliosphere.sirena.org.uk (heliosphere.sirena.org.uk [172.104.155.198]) by alsa0.perex.cz (Postfix) with ESMTP id 1DA7E267359 for ; Wed, 21 Mar 2018 02:57:54 +0100 (CET) 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 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) Cc: alsa-devel@alsa-project.org, Heiko Stuebner , Liam Girdwood , Takashi Iwai , linux-rockchip@lists.infradead.org, Sjoerd Simons , Mark Brown , kernel@collabora.com, linux-arm-kernel@lists.infradead.org Subject: [alsa-devel] Applied "ASoC: rockchip: Fix dai_name for HDMI codec" to the asoc tree 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 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(-) -- 2.16.2 _______________________________________________ Alsa-devel mailing list Alsa-devel@alsa-project.org http://mailman.alsa-project.org/mailman/listinfo/alsa-devel 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", }, };