From patchwork Tue Nov 13 18:28:18 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mark Brown X-Patchwork-Id: 150995 Delivered-To: patch@linaro.org Received: by 2002:a2e:299d:0:0:0:0:0 with SMTP id p29-v6csp4738672ljp; Tue, 13 Nov 2018 10:28:33 -0800 (PST) X-Google-Smtp-Source: AJdET5eKoVVRqPeQxv6IU0BKGAdxHHLtipbd8AaQSrT2EOhpi+QgA+Ivn32UPiJ21dl4h3JmN1IC X-Received: by 2002:adf:ebd2:: with SMTP id v18-v6mr6271780wrn.109.1542133713668; Tue, 13 Nov 2018 10:28:33 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1542133713; cv=none; d=google.com; s=arc-20160816; b=cZk+yjL6thDp5Gv2kTw/3UeDRwvk/lY5XmF7BxokqPxUEgvmx33OmVKJtLkPFm7HS/ FlrDQaCdwDnecoZxha/d0MQ7/0QUl3BPdvwuiOQRqFYohsWzmtFtkDPiBp3pPeuf+O4m ZNQIs6b3iKdI376o2p4KhKKeJLP7cuGy6hPiCn0Pn/PQyw1ieyhG4DnbMlFDk8Vva/2O PwAVmrRKbiFQS1SDGR7yYEaGYnQvdrgzDE4KNPidjzErRK8w1o/WYIqmLaA0u1kkk+ak 2Fxds7K0JLSwkRRpcuHwIGNVy6JnOMDdc9M4iuI1a0gnTDhj3lJE0tqNrlFfq11KS9/f 2brA== 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; bh=K9FNYai4u3BiYAl+Qy7djX+uKvSE7roI65LF9WaIx+Q=; b=nN3PuGlDJgDcd8QaAv17O0nO82F7nbIvUrfhcuRhz3Q84qw5SnqeQtcdGciiti2ZIc EQYa6Yk/tW7ZYd5OAcVS0GdJlouyDmHWMN2T9k8QUwkfz16QnJK6zcLvWRenl59PVtY/ echl6XK5vCvU2vtfgZG7MOn64moGZyEhJFM1zaB1M3FnTv8JCFKAZxgB0pJbB1GwCRm6 yjCIobtQi/1L/z2+dLwz6YQiaWjM2Tc2V/Fr9AL2tZX1uJfPYK7ycy74TSuzSzmvNqJm dwi6OqZd5MX1FRUdjXIp6LNzxjX7MA7op6zUO47We8vcsxmmcShKp4YnWQI6r7aDy2rH qxBA== 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=fgW0STx7; 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; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=kernel.org Return-Path: Received: from alsa0.perex.cz (alsa0.perex.cz. [77.48.224.243]) by mx.google.com with ESMTP id z128-v6si11000568wmg.3.2018.11.13.10.28.33; Tue, 13 Nov 2018 10:28:33 -0800 (PST) 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=fgW0STx7; 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; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: from alsa0.perex.cz (localhost [127.0.0.1]) by alsa0.perex.cz (Postfix) with ESMTP id 233BB267AC5; Tue, 13 Nov 2018 19:28:31 +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 B84A1267AC2; Tue, 13 Nov 2018 19:28:28 +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.0 required=5.0 tests=DKIM_SIGNED,DKIM_VALID, HEADER_FROM_DIFFERENT_DOMAINS,RCVD_IN_DNSWL_NONE 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 7F8BE267AC1 for ; Tue, 13 Nov 2018 19:28:26 +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=QdF/Xtrw/7c4TUDSG4j76OxXd4VVrSWLxyeYv3b+jvs=; b=fgW0STx77eul /+85DvnHQrnP2XD55saA8bGe05iR70BxQi1EIgJyxWICZxZIt2B5DyhPKyEkJoFhEIOLjzJepb1J2 GAjgYxumVrZDgK/vh1C43qz9XpU19q/bn2+lpVy6UdLNNXCwcqsIRPj8Y8hqcW7nCwd8f8+tV0uK7 h4f3I=; Received: from [64.114.255.97] (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 1gMdQH-0002O5-5A; Tue, 13 Nov 2018 18:28:25 +0000 Received: by finisterre.ee.mobilebroadband (Postfix, from userid 1000) id DDD95440078; Tue, 13 Nov 2018 18:28:18 +0000 (GMT) From: Mark Brown To: Katsuhiro Suzuki In-Reply-To: <20181110151844.21362-1-katsuhiro@katsuster.net> Message-Id: <20181113182818.DDD95440078@finisterre.ee.mobilebroadband> Date: Tue, 13 Nov 2018 18:28:18 +0000 (GMT) Cc: alsa-devel@alsa-project.org, Heiko Stuebner , Liam Girdwood , linux-kernel@vger.kernel.org, linux-rockchip@lists.infradead.org, Mark Brown , linux-arm-kernel@lists.infradead.org Subject: [alsa-devel] Applied "ASoC: rockchip: add missing slave_config setting for I2S" 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: add missing slave_config setting for I2S 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 16a8ee4c80b45984b6de1f90a49edcf336b7c621 Mon Sep 17 00:00:00 2001 From: Katsuhiro Suzuki Date: Sun, 11 Nov 2018 00:18:44 +0900 Subject: [PATCH] ASoC: rockchip: add missing slave_config setting for I2S This patch adds missing prepare_sleve_config that is needed for setup the DMA slave channel for I2S. Signed-off-by: Katsuhiro Suzuki Signed-off-by: Mark Brown --- sound/soc/rockchip/rockchip_pcm.c | 1 + 1 file changed, 1 insertion(+) -- 2.19.1 _______________________________________________ Alsa-devel mailing list Alsa-devel@alsa-project.org http://mailman.alsa-project.org/mailman/listinfo/alsa-devel diff --git a/sound/soc/rockchip/rockchip_pcm.c b/sound/soc/rockchip/rockchip_pcm.c index 9e7b5fa4cf59..4ac78d7a4b2d 100644 --- a/sound/soc/rockchip/rockchip_pcm.c +++ b/sound/soc/rockchip/rockchip_pcm.c @@ -33,6 +33,7 @@ static const struct snd_pcm_hardware snd_rockchip_hardware = { static const struct snd_dmaengine_pcm_config rk_dmaengine_pcm_config = { .pcm_hardware = &snd_rockchip_hardware, + .prepare_slave_config = snd_dmaengine_pcm_prepare_slave_config, .prealloc_buffer_size = 32 * 1024, };