From patchwork Tue Aug 22 16:21:01 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mark Brown X-Patchwork-Id: 9915707 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 0CBD3603F9 for ; Tue, 22 Aug 2017 16:23:10 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id E566E288CB for ; Tue, 22 Aug 2017 16:23:09 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id D834D288DF; Tue, 22 Aug 2017 16:23:09 +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=-2.6 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,RCVD_IN_DNSWL_LOW 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 34B89288DB for ; Tue, 22 Aug 2017 16:23:08 +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=8GjLsD6wiU10PeoNtrcXrB6mQtw0OWLyJ2i9FqTVOLU=; b=A+f vbuy/N2k/MK6i1f8NlKSvd05uIgsAzGv7eKHmanYx2TzNyT7R42M3U10CDEaq5J38IDzKl2DrvMPS EJiqK/XXLfX6iYuIak0I9+xR1FF2FPsLVTAKTYSE64jLEFDKyXn1CqUyhNMfYIfR7CY2KNWvodDun AZiyzXkHY9NcuNKxCFSHnKxkloCtPGKbBdA8+rw1kT9Ge9lUY5ccggJibxnqdkCNTWtT6i/ADEF3C ky8av+gDImsIBJ1+Ffeeoe2hwwVqqBipGxkBYCQSruKZEACg2n1VBpcZf6us2KFpd/LRPOSRRixek WqW1IQ7UEJnxITVhrbNqrmlmDzUt6mA==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.87 #1 (Red Hat Linux)) id 1dkBwh-00018J-KF; Tue, 22 Aug 2017 16:22:27 +0000 Received: from merlin.infradead.org ([2001:8b0:10b:1231::1]) by bombadil.infradead.org with esmtps (Exim 4.87 #1 (Red Hat Linux)) id 1dkBwf-00017F-9E; Tue, 22 Aug 2017 16:22:25 +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=nPGknEi2hZhdin5aQIzEI7wtqpQov6fEGOBwLERCg0A=; b=VzYziBttJcnNuqOywMiFtINEzb toGTPNSPLyfL/DEudzmSgUy7QnJMcT+B+lLoVax8HfajuJEMC0u1Yo/Fxp+g/YNa7zxlwH4H/Cgod tfIKRh7I3YMj44hFAVnGYoQQxjgXdB4vCjT+cOeB7t1S0ODyy+xI3y5BI69evYSj4mBYIGzTCA8Of s3fUKwp8+jAV09XAASnxuQQCcme3fPLnn3+0Up61S2Fdx2LYmA4HoF5j6IPkiVeYKkE5vzMpf17aU /PD3wwsxc6eCt7iNY9BroEBmw/1RiphemioUKJR2eqAMMNIdFBgYBVJvCIx/dbNLsflGllaHSqAXf I+j/PAsw==; Received: from heliosphere.sirena.org.uk ([2a01:7e01::f03c:91ff:fed4:a3b6]) by merlin.infradead.org with esmtps (Exim 4.87 #1 (Red Hat Linux)) id 1dkBwc-0003pX-0A; Tue, 22 Aug 2017 16:22:23 +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=nPGknEi2hZhdin5aQIzEI7wtqpQov6fEGOBwLERCg0A=; b=MWrzcckGR6e0 mltRNPuo3c8bPwxMaEaPc5V4iMa1KlD1DiuxEVeDjrOF6uqZyoYpcw4X6vpuRucVgrjP6eKsotmQM iczFtPAbV11wbBKjleMA1SkZjSHTXYgfgHyxPjZAoGI1H2WFav5QHqYmE4ZBGQD6ppmGsrHObLggQ r9WFo=; 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 1dkBvK-0002x5-1g; Tue, 22 Aug 2017 16:21:02 +0000 Received: from broonie by debutante with local (Exim 4.89) (envelope-from ) id 1dkBvJ-0004PE-KG; Tue, 22 Aug 2017 17:21:01 +0100 From: Mark Brown To: Jeffy Chen Subject: Applied "ASoC: rockchip: Correct 'dmic-delay' property name" to the asoc tree In-Reply-To: <20170822151009.19014-2-jeffy.chen@rock-chips.com> Message-Id: Date: Tue, 22 Aug 2017 17:21:01 +0100 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, dianders@chromium.org, heiko@sntech.de, briannorris@chromium.org, linux-kernel@vger.kernel.org, Liam Girdwood , linux-rockchip@lists.infradead.org, Mark Brown , Takashi Iwai , dgreid@chromium.org, mka@chromium.org, 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: Correct 'dmic-delay' property name has been applied to the asoc tree at git://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 f628c4ed3de499f027d3ae70cbb46c6dfadfc098 Mon Sep 17 00:00:00 2001 From: Jeffy Chen Date: Tue, 22 Aug 2017 23:35:48 +0800 Subject: [PATCH] ASoC: rockchip: Correct 'dmic-delay' property name The 'dmic-delay' property name is different with the dt-binding. So correct it with 'dmic-wakeup-delay-ms'. Fixes: 3a6f9dce6116 (ASoC: rk3399_gru_sound: fix recording pop at first attempt) Signed-off-by: Jeffy Chen Signed-off-by: Mark Brown --- sound/soc/rockchip/rk3399_gru_sound.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/sound/soc/rockchip/rk3399_gru_sound.c b/sound/soc/rockchip/rk3399_gru_sound.c index 70c0908fb9b4..566ccb39fb31 100644 --- a/sound/soc/rockchip/rk3399_gru_sound.c +++ b/sound/soc/rockchip/rk3399_gru_sound.c @@ -38,7 +38,7 @@ #define SOUND_FS 256 -static unsigned int rt5514_dmic_delay; +static unsigned int dmic_wakeup_delay; static struct snd_soc_jack rockchip_sound_jack; @@ -126,7 +126,7 @@ static int rockchip_sound_rt5514_hw_params(struct snd_pcm_substream *substream, } /* Wait for DMIC stable */ - msleep(rt5514_dmic_delay); + msleep(dmic_wakeup_delay); return 0; } @@ -348,13 +348,13 @@ static int rockchip_sound_probe(struct platform_device *pdev) return -ENODEV; } - /* Set DMIC delay */ - ret = device_property_read_u32(&pdev->dev, "dmic-delay", - &rt5514_dmic_delay); + /* Set DMIC wakeup delay */ + ret = device_property_read_u32(&pdev->dev, "dmic-wakeup-delay-ms", + &dmic_wakeup_delay); if (ret) { - rt5514_dmic_delay = 0; + dmic_wakeup_delay = 0; dev_dbg(&pdev->dev, - "no optional property 'dmic-delay' found, default: no delay\n"); + "no optional property 'dmic-wakeup-delay-ms' found, default: no delay\n"); } rockchip_dailinks[DAILINK_RT5514_DSP].cpu_name = kstrdup_const(dev_name(dev), GFP_KERNEL);