From patchwork Sat Mar 8 18:16:54 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lars-Peter Clausen X-Patchwork-Id: 3798581 Return-Path: X-Original-To: patchwork-alsa-devel@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork2.web.kernel.org (Postfix) with ESMTP id E4EC9BF540 for ; Sat, 8 Mar 2014 18:17:14 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 1D9842037B for ; Sat, 8 Mar 2014 18:17:14 +0000 (UTC) Received: from alsa0.perex.cz (alsa0.perex.cz [77.48.224.243]) by mail.kernel.org (Postfix) with ESMTP id DB9B520377 for ; Sat, 8 Mar 2014 18:17:12 +0000 (UTC) Received: by alsa0.perex.cz (Postfix, from userid 1000) id 84EB426554C; Sat, 8 Mar 2014 19:17:11 +0100 (CET) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Spam-Level: X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00,NO_DNS_FOR_FROM, UNPARSEABLE_RELAY autolearn=no version=3.3.1 Received: from alsa0.perex.cz (localhost [IPv6:::1]) by alsa0.perex.cz (Postfix) with ESMTP id 1C524265523; Sat, 8 Mar 2014 19:16:37 +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 B950C26551D; Sat, 8 Mar 2014 19:16:34 +0100 (CET) Received: from smtp-out-129.synserver.de (smtp-out-043.synserver.de [212.40.185.43]) by alsa0.perex.cz (Postfix) with ESMTP id CDA3326550D for ; Sat, 8 Mar 2014 19:16:27 +0100 (CET) Received: (qmail 7399 invoked by uid 0); 8 Mar 2014 18:16:20 -0000 X-SynServer-TrustedSrc: 1 X-SynServer-AuthUser: lars@metafoo.de X-SynServer-PPID: 7359 Received: from ppp-46-244-139-86.dynamic.mnet-online.de (HELO lars-adi-laptop.fritz.box) [46.244.139.86] by 217.119.54.77 with SMTP; 8 Mar 2014 18:16:20 -0000 From: Lars-Peter Clausen To: Mark Brown , Liam Girdwood Date: Sat, 8 Mar 2014 19:16:54 +0100 Message-Id: <1394302616-15991-1-git-send-email-lars@metafoo.de> X-Mailer: git-send-email 1.8.0 Cc: Peter Ujfalusi , alsa-devel@alsa-project.org, Lars-Peter Clausen , Grazvydas Ignotas , Jarkko Nikula Subject: [alsa-devel] [PATCH 1/3] ASoC: omap-abe-twl6040: No need to register DMIC routes seperatly 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 When using table based DAPM setup there is no need to register DAPM elements for different sub-components separately. The widgets will be registered before the first sub-component is initialized, the routes are only added after the last sub-component has been initialized, meaning everything will be available when it is needed. Signed-off-by: Lars-Peter Clausen --- sound/soc/omap/omap-abe-twl6040.c | 19 ++++--------------- 1 file changed, 4 insertions(+), 15 deletions(-) diff --git a/sound/soc/omap/omap-abe-twl6040.c b/sound/soc/omap/omap-abe-twl6040.c index ebb1390..5011bfa 100644 --- a/sound/soc/omap/omap-abe-twl6040.c +++ b/sound/soc/omap/omap-abe-twl6040.c @@ -163,6 +163,10 @@ static const struct snd_soc_dapm_route audio_map[] = { {"AFML", NULL, "Line In"}, {"AFMR", NULL, "Line In"}, + + /* DMIC routing */ + {"DMic", NULL, "Digital Mic"}, + {"Digital Mic", NULL, "Digital Mic1 Bias"}, }; static int omap_abe_twl6040_init(struct snd_soc_pcm_runtime *rtd) @@ -196,20 +200,6 @@ static int omap_abe_twl6040_init(struct snd_soc_pcm_runtime *rtd) return ret; } -static const struct snd_soc_dapm_route dmic_audio_map[] = { - {"DMic", NULL, "Digital Mic"}, - {"Digital Mic", NULL, "Digital Mic1 Bias"}, -}; - -static int omap_abe_dmic_init(struct snd_soc_pcm_runtime *rtd) -{ - struct snd_soc_codec *codec = rtd->codec; - struct snd_soc_dapm_context *dapm = &codec->dapm; - - return snd_soc_dapm_add_routes(dapm, dmic_audio_map, - ARRAY_SIZE(dmic_audio_map)); -} - /* Digital audio interface glue - connects codec <--> CPU */ static struct snd_soc_dai_link abe_twl6040_dai_links[] = { { @@ -229,7 +219,6 @@ static struct snd_soc_dai_link abe_twl6040_dai_links[] = { .codec_dai_name = "dmic-hifi", .platform_name = "omap-pcm-audio", .codec_name = "dmic-codec", - .init = omap_abe_dmic_init, .ops = &omap_abe_dmic_ops, }, };