From patchwork Wed Apr 25 06:18:34 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Ujfalusi X-Patchwork-Id: 10361677 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 DF0A4601BE for ; Wed, 25 Apr 2018 06:18:39 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id C9D4328C27 for ; Wed, 25 Apr 2018 06:18:39 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id BCD2628ECE; Wed, 25 Apr 2018 06:18:39 +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 5163328C27 for ; Wed, 25 Apr 2018 06:18:39 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751425AbeDYGSi (ORCPT ); Wed, 25 Apr 2018 02:18:38 -0400 Received: from lelnx193.ext.ti.com ([198.47.27.77]:55155 "EHLO lelnx193.ext.ti.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750949AbeDYGSh (ORCPT ); Wed, 25 Apr 2018 02:18:37 -0400 Received: from dlelxv90.itg.ti.com ([172.17.2.17]) by lelnx193.ext.ti.com (8.15.1/8.15.1) with ESMTP id w3P6IGAF007381; Wed, 25 Apr 2018 01:18:16 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=ti.com; s=ti-com-17Q1; t=1524637096; bh=FTDM7lB8X1V49/6KqC1ep1A794Rr3JZ3nv1sUV0YMZg=; h=From:To:CC:Subject:Date:In-Reply-To:References; b=hstywXiKDXeN+s4TcByh7HsQHRVKyej7z0GYBce/zbI1Vhl457/8wIIeKIpa3gv/F Sm/z3Dcz0fFdMMc6ufU0MRnCUn9OcY6jv9+j8BjWNIbAW3erSNhYTNV4ea7s+zPXM6 JOip7R5A2ClDAOzcxVe/sSUupEor0iC540QDb9eg= Received: from DLEE105.ent.ti.com (dlee105.ent.ti.com [157.170.170.35]) by dlelxv90.itg.ti.com (8.14.3/8.13.8) with ESMTP id w3P6IGcq014956; Wed, 25 Apr 2018 01:18:16 -0500 Received: from DLEE101.ent.ti.com (157.170.170.31) by DLEE105.ent.ti.com (157.170.170.35) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256_P256) id 15.1.1466.3; Wed, 25 Apr 2018 01:18:16 -0500 Received: from dflp33.itg.ti.com (10.64.6.16) by DLEE101.ent.ti.com (157.170.170.31) with Microsoft SMTP Server (version=TLS1_0, cipher=TLS_RSA_WITH_AES_256_CBC_SHA) id 15.1.1466.3 via Frontend Transport; Wed, 25 Apr 2018 01:18:16 -0500 Received: from feketebors.ti.com (ileax41-snat.itg.ti.com [10.172.224.153]) by dflp33.itg.ti.com (8.14.3/8.13.8) with ESMTP id w3P6I5pM025848; Wed, 25 Apr 2018 01:18:14 -0500 From: Peter Ujfalusi To: Mark Brown , Liam Girdwood , CC: , , Subject: [PATCH 4/7] ASoC: omap-dmic: Convert to use the sdma-pcm instead of omap-pcm Date: Wed, 25 Apr 2018 09:18:34 +0300 Message-ID: <20180425061837.14145-5-peter.ujfalusi@ti.com> X-Mailer: git-send-email 2.17.0 In-Reply-To: <20180425061837.14145-1-peter.ujfalusi@ti.com> References: <20180425061837.14145-1-peter.ujfalusi@ti.com> MIME-Version: 1.0 X-EXCLAIMER-MD-CONFIG: e1e8a2fd-e40a-4ac6-ac9b-f7e9cc9ee180 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 Use the new platform driver. Signed-off-by: Peter Ujfalusi --- sound/soc/omap/Kconfig | 4 ++-- sound/soc/omap/omap-dmic.c | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/sound/soc/omap/Kconfig b/sound/soc/omap/Kconfig index 879a25299099..13a2849ede82 100644 --- a/sound/soc/omap/Kconfig +++ b/sound/soc/omap/Kconfig @@ -11,7 +11,7 @@ config SND_SDMA_SOC config SND_OMAP_SOC_DMIC tristate "TI Digital Microphone Module (DMIC) support" - depends on SND_OMAP_SOC && (ARCH_OMAP4 || SOC_OMAP5) + depends on SND_SDMA_SOC && (ARCH_OMAP4 || SOC_OMAP5) help Say Y or M here if you want to have support for DMIC IP found in OMAP4 and OMAP5. @@ -118,7 +118,7 @@ config SND_OMAP_SOC_OMAP_TWL4030 config SND_OMAP_SOC_OMAP_ABE_TWL6040 tristate "SoC Audio support for OMAP boards using ABE and twl6040 codec" - depends on TWL6040_CORE && SND_OMAP_SOC && COMMON_CLK + depends on TWL6040_CORE && SND_OMAP_SOC && SND_SDMA_SOC && COMMON_CLK depends on ARCH_OMAP4 || (SOC_OMAP5 && MFD_PALMAS) || COMPILE_TEST select SND_OMAP_SOC_DMIC select SND_OMAP_SOC_MCPDM diff --git a/sound/soc/omap/omap-dmic.c b/sound/soc/omap/omap-dmic.c index b2f5d2fa354d..51dd7c65096b 100644 --- a/sound/soc/omap/omap-dmic.c +++ b/sound/soc/omap/omap-dmic.c @@ -40,9 +40,9 @@ #include #include #include -#include #include "omap-dmic.h" +#include "sdma-pcm.h" struct omap_dmic { struct device *dev; @@ -501,7 +501,7 @@ static int asoc_dmic_probe(struct platform_device *pdev) if (ret) return ret; - ret = omap_pcm_platform_register(&pdev->dev); + ret = sdma_pcm_platform_register(&pdev->dev, NULL, "up_link"); if (ret) return ret;