From patchwork Thu Feb 14 09:37:41 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Sylwester Nawrocki/Kernel \\(PLT\\) /SRPOL/Staff Engineer/Samsung Electronics" X-Patchwork-Id: 10812235 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 4FFB3184E for ; Thu, 14 Feb 2019 09:56:32 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 3E6F828703 for ; Thu, 14 Feb 2019 09:56:32 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 3253A2D0D3; Thu, 14 Feb 2019 09:56:32 +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.7 required=2.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,RCVD_IN_DNSWL_NONE autolearn=ham version=3.3.1 Received: from alsa0.perex.cz (alsa0.perex.cz [77.48.224.243]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id EDCF829417 for ; Thu, 14 Feb 2019 09:56:30 +0000 (UTC) Received: from alsa0.perex.cz (localhost [127.0.0.1]) by alsa0.perex.cz (Postfix) with ESMTP id 0E3CA267A3C; Thu, 14 Feb 2019 10:39:04 +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 3211C267A2D; Thu, 14 Feb 2019 10:38:56 +0100 (CET) Received: from mailout3.samsung.com (mailout3.samsung.com [203.254.224.33]) by alsa0.perex.cz (Postfix) with ESMTP id 3BF7B267A2F for ; Thu, 14 Feb 2019 10:38:44 +0100 (CET) Received: from epcas1p3.samsung.com (unknown [182.195.41.47]) by mailout3.samsung.com (KnoxPortal) with ESMTP id 20190214093842epoutp03ad8167977eaad08cc468479435ac5f01~DMYAVnsnc0713907139epoutp03D; Thu, 14 Feb 2019 09:38:42 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 mailout3.samsung.com 20190214093842epoutp03ad8167977eaad08cc468479435ac5f01~DMYAVnsnc0713907139epoutp03D DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=samsung.com; s=mail20170921; t=1550137122; bh=J6H+Vy/rMx02aXMq9DQh06tQn/cC6LHTpLKn919N9e0=; h=From:To:Cc:Subject:Date:In-reply-to:References:From; b=O9bM0ywdvYQNtrbiE98bkqhRIj4kGY98E3HeTxy/J5/vCcDezHsJn6v3FLogx7hyr PkLH5iXWD5HdPvLqtNi7uU861c6YgUO6DGEbydSU/MiTDT+gWRZXzw6rJhR89vbvW7 zGKFh6ojJ8R7I6VoXW+gK1Is+ZNxDhJXk9i9ZBVo= Received: from epsmges1p4.samsung.com (unknown [182.195.42.56]) by epcas1p4.samsung.com (KnoxPortal) with ESMTP id 20190214093842epcas1p43261c10e6848cb87f7aa4c5e9f303de9~DMX-69sag0727007270epcas1p4L; Thu, 14 Feb 2019 09:38:42 +0000 (GMT) Received: from epcas1p4.samsung.com ( [182.195.41.48]) by epsmges1p4.samsung.com (Symantec Messaging Gateway) with SMTP id ED.14.04288.227356C5; Thu, 14 Feb 2019 18:38:42 +0900 (KST) Received: from epsmgms2p1new.samsung.com (unknown [182.195.42.142]) by epcas1p1.samsung.com (KnoxPortal) with ESMTP id 20190214093842epcas1p154bd9c945a6897d5211c152aefabb32c~DMX-hwURB0747507475epcas1p1W; Thu, 14 Feb 2019 09:38:42 +0000 (GMT) X-AuditID: b6c32a38-c0fff700000010c0-94-5c65372227e7 Received: from epmmp2 ( [203.254.227.17]) by epsmgms2p1new.samsung.com (Symantec Messaging Gateway) with SMTP id 4B.F3.04015.127356C5; Thu, 14 Feb 2019 18:38:42 +0900 (KST) Received: from AMDC3061.digital.local ([106.116.147.40]) by mmp2.samsung.com (Oracle Communications Messaging Server 7.0.5.31.0 64bit (built May 5 2014)) with ESMTPA id <0PMW0074FTFANE00@mmp2.samsung.com>; Thu, 14 Feb 2019 18:38:41 +0900 (KST) From: Sylwester Nawrocki To: broonie@kernel.org Date: Thu, 14 Feb 2019 10:37:41 +0100 Message-id: <20190214093747.2414-8-s.nawrocki@samsung.com> X-Mailer: git-send-email 2.17.1 In-reply-to: <20190214093747.2414-1-s.nawrocki@samsung.com> X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFprNIsWRmVeSWpSXmKPExsWy7bCmga6SeWqMwZkJUhZXLh5ispj68Amb xfnzG9gtvl3pYLK4vGsOm8XhN+2sFhdXfGFyYPfY8LmJzWPnrLvsHptWdbJ59G1ZxejxeZNc AGsUl01Kak5mWWqRvl0CV8auY7NYClplKi4c7WBsYNwn3sXIySEhYCJxYN8/JhBbSGAHo8TV c+VdjFxA9ndGifUf2hhhihZP28gIkdjAKLF3xSMo5xejRP+JbSwgVWwChhK9R/vAOkQExCRu z+lkBiliFljJKLFl3yY2kISwQKrE344OsAYWAVWJF2dOgDXwClhJHJq+jBlinbzE6g0HwGxO AWuJmZu2Q53Rwybx4kI2hO0icX/dX6CZHEC2tMSlo7YQ4WqJXdu7wfZKCHQwSrRc2A4101ri 8PGLrCA2swCfxLuvPawQvbwSHW1CECUeEg3HvrJBPNYH9P6JlWwTGCUWMDKsYhRLLSjOTU8t Niww0StOzC0uzUvXS87P3cQIjjItix2Me875HGIU4GBU4uGtEEqJEWJNLCuuzD3EKMHBrCTC e9EoNUaINyWxsiq1KD++qDQntfgQozQHi5I473oH5xghgfTEktTs1NSC1CKYLBMHp1QDo7vT jpcMy+4I3v/DnCDnqnxywaeNp6p046r0p8Y+Wq4lmLXVZEX304feRuHch3szjqhOV14e+Fss qdO44GLSlTexaY9qu0um7mPdtafTNvSKk/VMU738iY/lnr5uCNhzYGLe0Qpvjcizby0qtdQi JbOXCjZOuCe8cdPk35+9r22qdNxoWfxvlhJLcUaioRZzUXEiAIFyIUuuAgAA X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFupmluLIzCtJLcpLzFFi42I5/e+xoK6SeWqMwa5zjBZXLh5ispj68Amb xfnzG9gtvl3pYLK4vGsOm8XhN+2sFhdXfGFyYPfY8LmJzWPnrLvsHptWdbJ59G1ZxejxeZNc AGsUl01Kak5mWWqRvl0CV8auY7NYClplKi4c7WBsYNwn3sXIySEhYCKxeNpGRhBbSGAdo8Sv w6pdjFxA9i9Gid8n5jGBJNgEDCV6j/aBFYkIiEncntPJDFLELLCSUeLI91VgCWGBVIm/HR0s IDaLgKrEizMnwOK8AlYSh6YvY4bYJi+xesMBMJtTwFpi5qbtQDUcQNusJNYdKp/AyLOAkWEV o2RqQXFuem6xUYFhXmq5XnFibnFpXrpecn7uJkZgEG07rNW3g/H+kvhDjAIcjEo8vAoCKTFC rIllxZW5hxglOJiVRHgvGqXGCPGmJFZWpRblxxeV5qQWH2KU5mBREue9nXcsUkggPbEkNTs1 tSC1CCbLxMEp1cCYp+lr0ZPixHksZs1K5ZT9r5bzaXRmqLAGT39x9ZWub8+t7skfpv6qDj1d 9idawEdd79+97nQFa4XpyjKBc6+q/FVNms/68MaGdtblt5+bCc+9nbVOzDXV3WdHLsdu70d/ BCKqqq78e1p2+VdDfNzP1+uPNIsfUObpt0hJ8Dj/+qWL+Po4ozlKLMUZiYZazEXFiQDW/ofJ HgIAAA== X-CMS-MailID: 20190214093842epcas1p154bd9c945a6897d5211c152aefabb32c CMS-TYPE: 101P X-CMS-RootMailID: 20190214093842epcas1p154bd9c945a6897d5211c152aefabb32c References: <20190214093747.2414-1-s.nawrocki@samsung.com> Cc: alsa-devel@alsa-project.org, sbkim73@samsung.com, lgirdwood@gmail.com, krzk@kernel.org, linux-kernel@vger.kernel.org, Sylwester Nawrocki Subject: [alsa-devel] [PATCH v3 Resend 07/13] ASoC: samsung: Specify DMA channel names through custom DMA config 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 X-Virus-Scanned: ClamAV using ClamSMTP This is a part of conversion of Samsung platforms to use the custom DMA config for specifying DMA channel names, in addition to passing custom DMA device for the secondary CPU DAI's "PCM" component for some variants of the I2S controller. We also don't set the SND_DMAENGINE_PCM_FLAG_CUSTOM_CHANNEL_NAME any more as setting it wouldn't allow to specify DMA channels through the custom DMA config. Signed-off-by: Sylwester Nawrocki Acked-by: Krzysztof Kozlowski --- sound/soc/samsung/dmaengine.c | 12 ++++-------- sound/soc/samsung/i2s.c | 2 +- sound/soc/samsung/s3c2412-i2s.c | 2 +- sound/soc/samsung/s3c24xx-i2s.c | 2 +- 4 files changed, 7 insertions(+), 11 deletions(-) diff --git a/sound/soc/samsung/dmaengine.c b/sound/soc/samsung/dmaengine.c index 84601fa9aa46..302871974cb3 100644 --- a/sound/soc/samsung/dmaengine.c +++ b/sound/soc/samsung/dmaengine.c @@ -28,7 +28,6 @@ int samsung_asoc_dma_platform_register(struct device *dev, dma_filter_fn filter, const char *tx, const char *rx, struct device *dma_dev) { - unsigned int flags = SND_DMAENGINE_PCM_FLAG_COMPAT; struct snd_dmaengine_pcm_config *pcm_conf; pcm_conf = devm_kzalloc(dev, sizeof(*pcm_conf), GFP_KERNEL); @@ -39,14 +38,11 @@ int samsung_asoc_dma_platform_register(struct device *dev, dma_filter_fn filter, pcm_conf->compat_filter_fn = filter; pcm_conf->dma_dev = dma_dev; - if (dev->of_node) { - pcm_conf->chan_names[SNDRV_PCM_STREAM_PLAYBACK] = tx; - pcm_conf->chan_names[SNDRV_PCM_STREAM_CAPTURE] = rx; - } else { - flags |= SND_DMAENGINE_PCM_FLAG_CUSTOM_CHANNEL_NAME; - } + pcm_conf->chan_names[SNDRV_PCM_STREAM_PLAYBACK] = tx; + pcm_conf->chan_names[SNDRV_PCM_STREAM_CAPTURE] = rx; - return devm_snd_dmaengine_pcm_register(dev, pcm_conf, flags); + return devm_snd_dmaengine_pcm_register(dev, pcm_conf, + SND_DMAENGINE_PCM_FLAG_COMPAT); } EXPORT_SYMBOL_GPL(samsung_asoc_dma_platform_register); diff --git a/sound/soc/samsung/i2s.c b/sound/soc/samsung/i2s.c index 692a752b194c..6ab99e38e6dd 100644 --- a/sound/soc/samsung/i2s.c +++ b/sound/soc/samsung/i2s.c @@ -1460,7 +1460,7 @@ static int samsung_i2s_probe(struct platform_device *pdev) pri_dai->drv->playback.channels_max = 6; ret = samsung_asoc_dma_platform_register(&pdev->dev, pri_dai->filter, - NULL, NULL, NULL); + "tx", "rx", NULL); if (ret < 0) goto err_disable_clk; diff --git a/sound/soc/samsung/s3c2412-i2s.c b/sound/soc/samsung/s3c2412-i2s.c index 67dfa27ae321..c08638b0e458 100644 --- a/sound/soc/samsung/s3c2412-i2s.c +++ b/sound/soc/samsung/s3c2412-i2s.c @@ -177,7 +177,7 @@ static int s3c2412_iis_dev_probe(struct platform_device *pdev) ret = samsung_asoc_dma_platform_register(&pdev->dev, pdata->dma_filter, - NULL, NULL, NULL); + "tx", "rx", NULL); if (ret) { pr_err("failed to register the DMA: %d\n", ret); return ret; diff --git a/sound/soc/samsung/s3c24xx-i2s.c b/sound/soc/samsung/s3c24xx-i2s.c index ba0f2b94f8d4..a8026b640c95 100644 --- a/sound/soc/samsung/s3c24xx-i2s.c +++ b/sound/soc/samsung/s3c24xx-i2s.c @@ -446,7 +446,7 @@ static int s3c24xx_iis_dev_probe(struct platform_device *pdev) s3c24xx_i2s_pcm_stereo_in.addr = res->start + S3C2410_IISFIFO; ret = samsung_asoc_dma_platform_register(&pdev->dev, NULL, - NULL, NULL, NULL); + "tx", "rx", NULL); if (ret) { dev_err(&pdev->dev, "Failed to register the DMA: %d\n", ret); return ret;