From patchwork Sun Jun 2 14:55:49 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Janusz Krzysztofik X-Patchwork-Id: 10971773 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 C4AAB13AD for ; Sun, 2 Jun 2019 14:57:06 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id AD93728660 for ; Sun, 2 Jun 2019 14:57:06 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 9DD44287C3; Sun, 2 Jun 2019 14:57:06 +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=-1.9 required=2.0 tests=BAYES_00,DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED,DKIM_VALID,FREEMAIL_FROM,HK_RANDOM_FROM,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]) (using TLSv1.2 with cipher DHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 99CA928660 for ; Sun, 2 Jun 2019 14:57:05 +0000 (UTC) Received: from alsa1.perex.cz (alsa1.perex.cz [207.180.221.201]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by alsa0.perex.cz (Postfix) with ESMTPS id 1B5721662; Sun, 2 Jun 2019 16:56:13 +0200 (CEST) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa0.perex.cz 1B5721662 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=alsa-project.org; s=default; t=1559487423; bh=QSrQ+CZ1ssezSWy306zhP8x4UvjOB42QMWumekSe790=; h=From:To:Date:Cc:Subject:List-Id:List-Unsubscribe:List-Archive: List-Post:List-Help:List-Subscribe:From; b=hjoftg7/jefjdJ5zLrm7vOp6/mzZdDdJV89rIwvM0oWIPG0iNSokMcXfvQ88zP8NH jAOImMj/dYEBV50Y6gBa9UwTozBtU1Yn9i+QxrN6lV/p2rrH45v5hZki48Tz1/LeaT HWUgnXrYGvRDuXZcT8qgOwr8YJubtjObhNjmmDW4= Received: from alsa1.perex.cz (localhost.localdomain [127.0.0.1]) by alsa1.perex.cz (Postfix) with ESMTP id 59212F896EF; Sun, 2 Jun 2019 16:56:12 +0200 (CEST) X-Original-To: alsa-devel@alsa-project.org Delivered-To: alsa-devel@alsa-project.org Received: by alsa1.perex.cz (Postfix, from userid 50401) id 97660F896F7; Sun, 2 Jun 2019 16:56:10 +0200 (CEST) Received: from mail-lj1-x243.google.com (mail-lj1-x243.google.com [IPv6:2a00:1450:4864:20::243]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by alsa1.perex.cz (Postfix) with ESMTPS id 0889CF80CC4 for ; Sun, 2 Jun 2019 16:56:07 +0200 (CEST) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa1.perex.cz 0889CF80CC4 Authentication-Results: alsa1.perex.cz; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="WsL5NCHO" Received: by mail-lj1-x243.google.com with SMTP id e13so13793013ljl.11 for ; Sun, 02 Jun 2019 07:56:07 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=DW2E0BpzAc0HLFFmW75+Kp5tG91kuZE20dTCBSAHOjQ=; b=WsL5NCHO/hx1ZcYASq4bsmolID5vN3N1r5wG/oh7g8v9HayVY74o1nj2uE6NvUpM+t dByuvmgtCWtJmogFel7dFCHTiIsgOSJclkZ3LElEGL5FLevDqF3Tm25/Mz/fftMMWMha kWImrXq7jvQXlgq5Dlw2jVjERZ0/NNI0ApMjPxRfOvDp9aykkipBF4yhaERnX1ZuGSI5 haG2X8KSUGAtGdmSFDJDI3I8XCzb5BgO5DVX0NV4JRBFWRcKAHeH/QGERFelXs2+l4Hc w7DL2pR3j8JMZEKcvfgE8Sg1D/QP7Rx8ELE3zkJnd8XCkXEhpyJSFm01SHb+BAjswNGu EqpQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=DW2E0BpzAc0HLFFmW75+Kp5tG91kuZE20dTCBSAHOjQ=; b=TP4OqBRrL010RgGuc6QQzsHHoA25SvXxmWIfXzDQW91yCiPk5SeFmnuVephvdpO1az 98kZDja7DEoObs01qKnh0rgybLSKb/6YIS86y+uHgetu0JexvHosmN5n7zDvbrmRveqR UU4dggrdszMQdbcrcilMIrCcsM2On/C2qgTQ/KWBxTYzTpdkCt6OVC9H+/PpZyFKjURk QT69n0bF5CZaEmaBSnRAenl6c0whvf9r6+wkniHqh7v5rLCwlIx22fp28pw5P6U15fu6 L/AgT/ILcomaR0cClB4TCTZCIxdu99kL9bSJEpTn91PNbMfSPnEe+o2YAkx2pUrj1wtz Udww== X-Gm-Message-State: APjAAAWjVtxEGtbE3cFRADWsrdw3IlobOiU/NBOzvrYmZzPKoJHQ+Cuw ejsuZDgppQsf1OYaXIr84dA= X-Google-Smtp-Source: APXvYqxuvhbc5F1/SxRPxqwQh4RZAsUd4T+CyhZn3U7SOKGpwqiR7EKjrJoNpV/YsRm9j6xUQKE+3g== X-Received: by 2002:a2e:5d49:: with SMTP id r70mr11553508ljb.102.1559487366917; Sun, 02 Jun 2019 07:56:06 -0700 (PDT) Received: from z50.gdansk-morena.vectranet.pl (109241207190.gdansk.vectranet.pl. [109.241.207.190]) by smtp.gmail.com with ESMTPSA id x14sm2523212lfe.83.2019.06.02.07.56.05 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sun, 02 Jun 2019 07:56:06 -0700 (PDT) From: Janusz Krzysztofik To: Peter Ujfalusi , Mark Brown Date: Sun, 2 Jun 2019 16:55:49 +0200 Message-Id: <20190602145549.30899-1-jmkrzyszt@gmail.com> X-Mailer: git-send-email 2.21.0 MIME-Version: 1.0 Cc: alsa-devel@alsa-project.org, linux-kernel@vger.kernel.org, Janusz Krzysztofik , Takashi Iwai , Liam Girdwood , linux-omap@vger.kernel.org, Jarkko Nikula Subject: [alsa-devel] [PATCH] ASoC: ti: Fix SDMA users not providing channel names X-BeenThere: alsa-devel@alsa-project.org X-Mailman-Version: 2.1.15 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: , Errors-To: alsa-devel-bounces@alsa-project.org Sender: "Alsa-devel" X-Virus-Scanned: ClamAV using ClamSMTP McBSP used to work correctly as long as compat DMA probing, removed by commit 642aafea8889 ("ASoC: ti: remove compat dma probing"), was available. New method of DMA probing apparently requires users to provide channel names when registering with SDMA, while McBSP passes NULLs. Fix it. The same probably applies to McASP (not tested), hence the patch fixes both. Fixes: 642aafea8889 ("ASoC: ti: remove compat dma probing") Signed-off-by: Janusz Krzysztofik --- sound/soc/ti/davinci-mcasp.c | 2 +- sound/soc/ti/omap-mcbsp.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/sound/soc/ti/davinci-mcasp.c b/sound/soc/ti/davinci-mcasp.c index 9fbc759fdefe..f31805920e3e 100644 --- a/sound/soc/ti/davinci-mcasp.c +++ b/sound/soc/ti/davinci-mcasp.c @@ -2237,7 +2237,7 @@ static int davinci_mcasp_probe(struct platform_device *pdev) ret = edma_pcm_platform_register(&pdev->dev); break; case PCM_SDMA: - ret = sdma_pcm_platform_register(&pdev->dev, NULL, NULL); + ret = sdma_pcm_platform_register(&pdev->dev, "tx", "rx"); break; default: dev_err(&pdev->dev, "No DMA controller found (%d)\n", ret); diff --git a/sound/soc/ti/omap-mcbsp.c b/sound/soc/ti/omap-mcbsp.c index a395598f1f20..610c5e706fd2 100644 --- a/sound/soc/ti/omap-mcbsp.c +++ b/sound/soc/ti/omap-mcbsp.c @@ -1438,7 +1438,7 @@ static int asoc_mcbsp_probe(struct platform_device *pdev) if (ret) return ret; - return sdma_pcm_platform_register(&pdev->dev, NULL, NULL); + return sdma_pcm_platform_register(&pdev->dev, "tx", "rx"); } static int asoc_mcbsp_remove(struct platform_device *pdev)