From patchwork Wed May 9 09:31:28 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mark Brown X-Patchwork-Id: 10388869 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id E81EB60548 for ; Wed, 9 May 2018 09:31:38 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id DA99128E88 for ; Wed, 9 May 2018 09:31:38 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id CF69E28E94; Wed, 9 May 2018 09:31:38 +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=-7.8 required=2.0 tests=BAYES_00,DKIM_SIGNED, MAILING_LIST_MULTI, RCVD_IN_DNSWL_HI, T_DKIM_INVALID autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 6BD9628E89 for ; Wed, 9 May 2018 09:31:38 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S933805AbeEIJbh (ORCPT ); Wed, 9 May 2018 05:31:37 -0400 Received: from heliosphere.sirena.org.uk ([172.104.155.198]:42418 "EHLO heliosphere.sirena.org.uk" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S933783AbeEIJbg (ORCPT ); Wed, 9 May 2018 05:31:36 -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=jJ66WJXMC96XSfG0RybNnJpSA52pw4oTgUfXHl8gA64=; b=kIlo9FvMh4t7 d8HQWiSpaoWqgso878K9t5cDdk3tTw8J+0c3Ujoxrt95STIqfgqk9pL5smDePXHJ7XKVwsN7tN6TZ jPtpLf0yd59TzpkWgiFK0Ccj1f6euDRwApMV+ed/dCMccuts1YwHctryJSXwlJU9bnBDKnO5dDyHR ibpas=; Received: from [2001:268:c0d0:8b7f:9590:ade9:80e5:b26d] (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 1fGLRc-0007nO-4g; Wed, 09 May 2018 09:31:32 +0000 Received: by finisterre.ee.mobilebroadband (Postfix, from userid 1000) id 5EF1244007A; Wed, 9 May 2018 10:31:28 +0100 (BST) From: Mark Brown To: Peter Ujfalusi Cc: Jarkko Nikula , Mark Brown , Mark Brown , Liam Girdwood , jarkko.nikula@bitmer.com, alsa-devel@alsa-project.org, linux-omap@vger.kernel.org, aaro.koskinen@iki.fi, alsa-devel@alsa-project.org Subject: Applied "ASoC: omap-hdmi-audio: Convert to use the sdma-pcm instead of omap-pcm" to the asoc tree In-Reply-To: <20180425061837.14145-4-peter.ujfalusi@ti.com> Message-Id: <20180509093128.5EF1244007A@finisterre.ee.mobilebroadband> Date: Wed, 9 May 2018 10:31:28 +0100 (BST) Sender: linux-omap-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-omap@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP The patch ASoC: omap-hdmi-audio: Convert to use the sdma-pcm instead of omap-pcm 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 b1a549c6be09243f20e597d8d3fa007ec412544a Mon Sep 17 00:00:00 2001 From: Peter Ujfalusi Date: Mon, 7 May 2018 11:49:56 +0300 Subject: [PATCH] ASoC: omap-hdmi-audio: Convert to use the sdma-pcm instead of omap-pcm Use the new platform driver. Signed-off-by: Peter Ujfalusi Acked-by: Jarkko Nikula Signed-off-by: Mark Brown --- sound/soc/omap/Kconfig | 2 +- sound/soc/omap/omap-hdmi-audio.c | 5 +++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/sound/soc/omap/Kconfig b/sound/soc/omap/Kconfig index 2576fc92bff7..829b5515b3c5 100644 --- a/sound/soc/omap/Kconfig +++ b/sound/soc/omap/Kconfig @@ -20,7 +20,7 @@ config SND_OMAP_SOC_MCPDM config SND_OMAP_SOC_HDMI_AUDIO tristate "HDMI audio support for OMAP4+ based SoCs" - depends on SND_OMAP_SOC + depends on SND_SDMA_SOC help For HDMI audio to work OMAPDSS HDMI support should be enabled. diff --git a/sound/soc/omap/omap-hdmi-audio.c b/sound/soc/omap/omap-hdmi-audio.c index 8eeac7cab1c1..8a99a8837dc9 100644 --- a/sound/soc/omap/omap-hdmi-audio.c +++ b/sound/soc/omap/omap-hdmi-audio.c @@ -26,9 +26,10 @@ #include #include #include -#include #include +#include "sdma-pcm.h" + #define DRV_NAME "omap-hdmi-audio" struct hdmi_audio_data { @@ -352,7 +353,7 @@ static int omap_hdmi_audio_probe(struct platform_device *pdev) if (ret) return ret; - ret = omap_pcm_platform_register(ad->dssdev); + ret = sdma_pcm_platform_register(ad->dssdev, "audio_tx", NULL); if (ret) return ret;