From patchwork Wed Dec 5 09:34:21 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sasha Levin X-Patchwork-Id: 10713511 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 0DFD61731 for ; Wed, 5 Dec 2018 09:37:54 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id EF5342BBB9 for ; Wed, 5 Dec 2018 09:37:53 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id E36D42C985; Wed, 5 Dec 2018 09:37:53 +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=-5.2 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,MAILING_LIST_MULTI,RCVD_IN_DNSWL_MED 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 866E42BBB9 for ; Wed, 5 Dec 2018 09:37:53 +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:References: In-Reply-To:Message-Id:Date:Subject:To:From:Reply-To:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:List-Owner; bh=XYosJJVYTxiMrkbT/uhmCsFeZF+FR445tlemIXMH1I0=; b=B4wZzyyiuzRCoEk7D6J3E7uDHN AStc3Oxb5RdNOtVeMkRvMgQMSaXXUdf7LUqIt4Qm1GwkXeq1Hxqd4TWvA96f6gl049VPD/BO8E5PB 5s7Djeax+ZmSaMSUQgqMix0Ji0u6xrlRt8UI8ttLZc17cRDu9a53jDmeJ9UXTad+PP4xTqa2nNlhk er/PlB4zA5ob+qaw7zM3ffRGLCguaAERVcMWy0YHxsDl4+v5UWS2s9BIMpsvW0kG4KX/dpP2RmUDO Rr/rSld87lM5Y4DN+1UKZgwrTmfg4vsMSlXJewGt5kHFFPo8OiTYHaXMeF4ZflDRLOhYtC8yftdxd A6VaT2sw==; 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 1gUTcs-00075e-2r; Wed, 05 Dec 2018 09:37:50 +0000 Received: from mail.kernel.org ([198.145.29.99]) by bombadil.infradead.org with esmtps (Exim 4.90_1 #2 (Red Hat Linux)) id 1gUTco-00073s-Hw for linux-rockchip@lists.infradead.org; Wed, 05 Dec 2018 09:37:48 +0000 Received: from sasha-vm.mshome.net (unknown [213.57.143.11]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 143312084C; Wed, 5 Dec 2018 09:37:33 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1544002655; bh=45qWXggnbEiZ9tYExoP4s8/LevdnzRKWsO2UFe9Jux0=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=AZmHa9hPBvQ1/lhNHeVphau/UYIa5bAOLxjI0H9NgaFGtCNRqx4Yq65zj4+B4jtTI nz+25AgsIm0DA2/4F/MiJVS1x6ausQ3B8bxEIJ8HCWdw2rIfvYkK/k4hJhg8Z7CPVq 2aFB1GCwNB9qTCX6LldYHEGrhNLmh5lPjQ/Owia4= From: Sasha Levin To: stable@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH AUTOSEL 4.19 029/123] ASoC: rockchip: add missing slave_config setting for I2S Date: Wed, 5 Dec 2018 04:34:21 -0500 Message-Id: <20181205093555.5386-29-sashal@kernel.org> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20181205093555.5386-1-sashal@kernel.org> References: <20181205093555.5386-1-sashal@kernel.org> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20181205_013746_647843_1B71DCD8 X-CRM114-Status: UNSURE ( 9.03 ) X-CRM114-Notice: Please train this message. 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: Katsuhiro Suzuki , Sasha Levin , Mark Brown , linux-rockchip@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 From: Katsuhiro Suzuki [ Upstream commit 16a8ee4c80b45984b6de1f90a49edcf336b7c621 ] 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 Signed-off-by: Sasha Levin --- sound/soc/rockchip/rockchip_pcm.c | 1 + 1 file changed, 1 insertion(+) diff --git a/sound/soc/rockchip/rockchip_pcm.c b/sound/soc/rockchip/rockchip_pcm.c index f77538319221..7029e0b85f9e 100644 --- a/sound/soc/rockchip/rockchip_pcm.c +++ b/sound/soc/rockchip/rockchip_pcm.c @@ -32,6 +32,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, };