Received: by 2002:a25:ab43:0:0:0:0:0 with SMTP id u61csp2657838ybi; Mon, 17 Jun 2019 08:25:48 -0700 (PDT) X-Google-Smtp-Source: APXvYqwu2uZKLoNbG8p7MQXdPwfUhsdPPBBs3hZuEPYrWiHl7l4lg6tYlIDydl+yzHqFTxjG8Sb8 X-Received: by 2002:a63:e608:: with SMTP id g8mr4092516pgh.382.1560785148365; Mon, 17 Jun 2019 08:25:48 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1560785148; cv=none; d=google.com; s=arc-20160816; b=NxnmlF09zD62zrBcBd4fs3BOardpwEhj2KwzpffMriIhWu3PmFWtaDv9o0Y6sc6V/6 XxXB2WYfoMN2DOqKDzRwmUzIVT6PCxcn77/zaPfhQoznEyAGcQglfrObQMxlzs+HO4DQ +9voUelfOGcHrDrsYAkq8t/mk+IneQ5+nx6FWXrunKJHbLxXMX3d34nWgZDY3ItL/bBp +cITEg8GLoRVK3sMy4Zi6Q8KLfHb7nBVBj1g2ZiL2NHPfTyaWzHzTlFTTMuVUKgGP+7Y mhjkEcNlMBmcRdsCSC43y6wtNWnW8fLQTbT6CvX4fvybJ23zOGxhziL0tJIn0+XtC1yH YyYA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:date:message-id:in-reply-to:subject:cc:to :from:dkim-signature; bh=LWWfVkNgyVFokMWjFV/DxwVfUI19XJ2WqG9OcJTkUBs=; b=XpCVndj8vVekX9p1pOC5siTxjKVMVPk68nt2YBRJaXdGom+agYBpUt/BZ5W4AO+Csj ICVmzzAARvQ7B6IRNKgp3a9AmzLoGD3HxYWfx3ZUS4+24GGp5CmiXvDmQaqcBIdVXELR FMIz4lm3Ltm3oJclAmCpVjpMiro1Ie3zC+ahG+Sg/cq/L9ucu5OxwUVsTdOjMyJX8y6y Lb0Zfr8NbwbiMumoMqfXfWZ9I/G4vHuEzsal/J0WZuqoQB98Qa9bxuYvn0gFttPe4j9U iXLoUFS1DftKUiex64Nt0KYH/O8t16TLsgR6EeuoLZd5oanB9TlDaPPSoiokhJLM9Imo eq8w== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@sirena.org.uk header.s=20170815-heliosphere header.b=ItYKhsb5; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id a2si10623147pgt.217.2019.06.17.08.25.33; Mon, 17 Jun 2019 08:25:48 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=fail header.i=@sirena.org.uk header.s=20170815-heliosphere header.b=ItYKhsb5; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728550AbfFQPY0 (ORCPT + 99 others); Mon, 17 Jun 2019 11:24:26 -0400 Received: from heliosphere.sirena.org.uk ([172.104.155.198]:51290 "EHLO heliosphere.sirena.org.uk" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728521AbfFQPYZ (ORCPT ); Mon, 17 Jun 2019 11:24:25 -0400 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=LWWfVkNgyVFokMWjFV/DxwVfUI19XJ2WqG9OcJTkUBs=; b=ItYKhsb5Aogt 9gdYTdy8lzRNqkiEXjZEL6iD40+JhIOtnfTNDv98xHIsrOktrptesRbPBZfQ47Z8aTGA2X5lBZGQc NLAn9Wpk9Kf8yF0ehyHhy0r5QtJSXNNDS02SR3QQ5gPn4g4l0S+0D9UTpIPWD53BsnzratuYFAXfQ uv8ZI=; Received: from cpc102320-sgyl38-2-0-cust46.18-2.cable.virginm.net ([82.37.168.47] helo=finisterre.sirena.org.uk) by heliosphere.sirena.org.uk with esmtpsa (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.89) (envelope-from ) id 1hctUW-0001wo-7Y; Mon, 17 Jun 2019 15:24:16 +0000 Received: by finisterre.sirena.org.uk (Postfix, from userid 1000) id B68AF440046; Mon, 17 Jun 2019 16:24:15 +0100 (BST) From: Mark Brown To: Janusz Krzysztofik Cc: alsa-devel@alsa-project.org, Jarkko Nikula , Jaroslav Kysela , Liam Girdwood , linux-kernel@vger.kernel.org, linux-omap@vger.kernel.org, Mark Brown , Peter Ujfalusi , Takashi Iwai Subject: Applied "ASoC: ti: Fix SDMA users not providing channel names" to the asoc tree In-Reply-To: <20190602145549.30899-1-jmkrzyszt@gmail.com> X-Patchwork-Hint: ignore Message-Id: <20190617152415.B68AF440046@finisterre.sirena.org.uk> Date: Mon, 17 Jun 2019 16:24:15 +0100 (BST) Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org The patch ASoC: ti: Fix SDMA users not providing channel names has been applied to the asoc tree at https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git for-5.2 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 3e802e90ffcce333127d928eaefdfcc34af233e8 Mon Sep 17 00:00:00 2001 From: Janusz Krzysztofik Date: Sun, 2 Jun 2019 16:55:49 +0200 Subject: [PATCH] ASoC: ti: Fix SDMA users not providing channel names 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 Signed-off-by: Mark Brown --- 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) -- 2.20.1