From patchwork Thu Jan 25 12:15:22 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mark Brown X-Patchwork-Id: 10183961 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 16CC160383 for ; Thu, 25 Jan 2018 12:16:15 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 06F2728A87 for ; Thu, 25 Jan 2018 12:16:15 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id EEE4E28A89; Thu, 25 Jan 2018 12:16:14 +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,DKIM_SIGNED, DKIM_VALID,RCVD_IN_DNSWL_MED autolearn=unavailable version=3.3.1 Received: from bombadil.infradead.org (bombadil.infradead.org [65.50.211.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 7AE9E28A87 for ; Thu, 25 Jan 2018 12:16:14 +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=2c6U/GoUoMU8fgNh7goK/fs+/p0u0tu8f2q6Rny0bo0=; b=OiM cNLJFuEvqB3kOvzgKdV+bvMj1B61qDt3KeNx3rqUP2kqoupao2vayFq+urP9ekVtYSxvH3PRa3ejS ajMGHh079jgE99EZFWq3CGJhfh1BjafQ8sFJUiXTpygaIimI3PKrLO4GpfAI3UsYgnXYvaqob9GP7 mI237wXR9YPVraSWQjAsVnKrs+69rutHJ8riLxuiy8W/VtI/gNStOiUfBFC97ZmhBbhlHyKbAhX8E 6/Q9AuuXnVy1QhROoD7KFjCknbWKN0LAoURCNWjWE+2y9qe9EeadYGX5oMD0wQXEMyHkh56lxGKA7 IyoL5/6F6YWNKbeNBhiNrtekA7AEBjw==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.89 #1 (Red Hat Linux)) id 1eegRw-0006fc-Va; Thu, 25 Jan 2018 12:16:12 +0000 Received: from merlin.infradead.org ([2001:8b0:10b:1231::1]) by bombadil.infradead.org with esmtps (Exim 4.89 #1 (Red Hat Linux)) id 1eegRv-0006bs-Bz; Thu, 25 Jan 2018 12:16:11 +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=LG0kw/j+rzNkvBemCRDSL63IhzpsbaKbaciDcrGw/r8=; b=M2R2jZQbV9TPgqHwzofhmZOcyF 6DzRljX/N/EP5icdvB2hBYCkZv2IWeAYOx0lqOv8UsiuuEB6K/BxXcnl+Jy37YODBFu/wq6M3w7at k4J+70C9+ndTOMQkPxUTkGlt4Hgf2Qo0uCcnmCt9t200I5xUrvkEgMBxMjgqCGoWPYFZpHTmYoTtM W2KZqU8XXvtJSfPa8Nr2AYQUyVW3R2JC3Bi8WN0HOvFloV4HdeNk5icpJ+3jH4rj8pT+sVJU3iYuN twZGr5C6KNM0zJKS+M9nEx7/qrZOoTqkJg0aDbZgnpyYrCEP9Op6Rrm8GKoUvg6+QlV4gk2tGMDvl XMPCshtA==; Received: from heliosphere.sirena.org.uk ([2a01:7e01::f03c:91ff:fed4:a3b6]) by merlin.infradead.org with esmtps (Exim 4.89 #1 (Red Hat Linux)) id 1eegRs-0007Es-0G; Thu, 25 Jan 2018 12:16:09 +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=LG0kw/j+rzNkvBemCRDSL63IhzpsbaKbaciDcrGw/r8=; b=OnUfI+sVG72x Pg6wMkNRPJXnAk8YqvYzZmg3WwpnAIrD27FdRlQZ+F1miOt2kQGNU2HIX/5oDIKq4l9tFvtVsMRWp l1Cqf3ZTqfYC8diRj7dHfCIF2rqAdX+g1BHG0Ra66SMYSwxcGhpBPUdM/VfwUNYTcS2oy0S6LyMcG OCX54=; Received: from debutante.sirena.org.uk ([2001:470:1f1d:6b5::3] helo=debutante) by heliosphere.sirena.org.uk with esmtpsa (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.89) (envelope-from ) id 1eegR8-0005KB-Fy; Thu, 25 Jan 2018 12:15:22 +0000 Received: from broonie by debutante with local (Exim 4.90) (envelope-from ) id 1eegR8-0006Sc-0T; Thu, 25 Jan 2018 12:15:22 +0000 From: Mark Brown To: Jeffy Chen Subject: Applied "ASoC: rockchip: Use dummy_dai for rt5514 dsp dailink" to the asoc tree In-Reply-To: <20171121082517.17233-1-jeffy.chen@rock-chips.com> Message-Id: Date: Thu, 25 Jan 2018 12:15:22 +0000 X-Bad-Reply: In-Reply-To but no 'Re:' in Subject. 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 , Brian Norris , linux-kernel@vger.kernel.org, Liam Girdwood , linux-rockchip@lists.infradead.org, Mark Brown , Takashi Iwai , mka@chromium.org, linux-arm-kernel@lists.infradead.org, cychiang@google.com 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: Use dummy_dai for rt5514 dsp dailink 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 fde7f9dbc71365230eeb8c8ea97ce9b552c8e5bd Mon Sep 17 00:00:00 2001 From: Jeffy Chen Date: Tue, 21 Nov 2017 16:25:17 +0800 Subject: [PATCH] ASoC: rockchip: Use dummy_dai for rt5514 dsp dailink The rt5514 dsp captures pcm data through spi directly, so we should not use rockchip-i2s as it's cpu dai like other codecs. Use dummy_dai for rt5514 dsp dailink to make voice wakeup work again. Reported-by: Jimmy Cheng-Yi Chiang Fixes: (72cfb0f20c75 ASoC: rockchip: Use codec of_node and dai_name for rt5514 dsp) Signed-off-by: Jeffy Chen Tested-by: Brian Norris Signed-off-by: Mark Brown --- sound/soc/rockchip/rk3399_gru_sound.c | 19 ++++++++++++++++--- 1 file changed, 16 insertions(+), 3 deletions(-) diff --git a/sound/soc/rockchip/rk3399_gru_sound.c b/sound/soc/rockchip/rk3399_gru_sound.c index d64fbbd50544..aa8ffd035377 100644 --- a/sound/soc/rockchip/rk3399_gru_sound.c +++ b/sound/soc/rockchip/rk3399_gru_sound.c @@ -367,7 +367,8 @@ static const struct snd_soc_dai_link rockchip_dais[] = { [DAILINK_RT5514_DSP] = { .name = "RT5514 DSP", .stream_name = "Wake on Voice", - .codec_dai_name = "rt5514-dsp-cpu-dai", + .codec_name = "snd-soc-dummy", + .codec_dai_name = "snd-soc-dummy-dai", }, }; @@ -528,7 +529,18 @@ static int rockchip_sound_of_parse_dais(struct device *dev, if (index < 0) continue; - np_cpu = (index == DAILINK_CDNDP) ? np_cpu1 : np_cpu0; + switch (index) { + case DAILINK_CDNDP: + np_cpu = np_cpu1; + break; + case DAILINK_RT5514_DSP: + np_cpu = np_codec; + break; + default: + np_cpu = np_cpu0; + break; + } + if (!np_cpu) { dev_err(dev, "Missing 'rockchip,cpu' for %s\n", rockchip_dais[index].name); @@ -538,7 +550,8 @@ static int rockchip_sound_of_parse_dais(struct device *dev, dai = &card->dai_link[card->num_links++]; *dai = rockchip_dais[index]; - dai->codec_of_node = np_codec; + if (!dai->codec_name) + dai->codec_of_node = np_codec; dai->platform_of_node = np_cpu; dai->cpu_of_node = np_cpu;