From patchwork Fri Oct 13 19:25:49 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mark Brown X-Patchwork-Id: 115826 Delivered-To: patch@linaro.org Received: by 10.140.22.163 with SMTP id 32csp1079470qgn; Fri, 13 Oct 2017 12:26:29 -0700 (PDT) X-Google-Smtp-Source: AOwi7QBTI/+41xOHA9jO8CrSMQBrTtGMuSz6/G8evKXy0kBm1lX9v39shkKPBQD/iml77eLZr5Zz X-Received: by 10.223.143.66 with SMTP id p60mr2505198wrb.142.1507922789893; Fri, 13 Oct 2017 12:26:29 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1507922789; cv=none; d=google.com; s=arc-20160816; b=Qujy3E1kKeYKgWGkW82ex8/fBN/gJHDZLrHZvmof2y6NPrXNG1JdYQ2y+H+g9CqWnG nlJqselJ1OYid/LK14tTJ1N7TbPyGAny6W9ts3VXmfJ8kgZUsRjXwWLrT1n3ncEiMKy1 OBlbd9WAhnsfOii8ZCk6s/lawRu9NHnckXYYkOV/48FIxKYDFp+GD/ORvom7nxBeV3Uv Wbxc+YyAaBSgvmuotenS3QBrazTLlqWw0gQ3r6v+bb4RAqZhaqYCq6uNsNGDl3zILbPJ SKons/H2Ex8xDK7EFfUtCnQ/YsgDR9okLTM3xgGPHWihBK0ttklXNjiab4Sihh7jK1uT Y0mQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:mime-version :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:cc:date:message-id:in-reply-to:to:from :dkim-signature:delivered-to:arc-authentication-results; bh=a6pgNkNqOJ+FyZrtmRRqXyiOQwpWMXEJXtNrpcCGw3w=; b=YxZC64ZXzxK4Dg4lsroqyNDt9Pe0v/trbHzMJNuMaBLUKzXX8LKZrKIA77vGyAQlUz Tr+Rxxt0fganrxc97NfSmhC65HipLZUjaueNdqsN5o52r+yHMCZKmEvOHDsYUsIE7Ah+ l5Mq1d4oazpqYlPpxm1PDu0dmdHRZKimFBsKbTSoUew7aCwdmgXQ+/UtStTCmDPgRUZE uxyE7v7u4kf+aMGvbjAFnmzbbR56mRWjVFdHRr2tfspbAhq0FZsCf9zscCnk+cJevEBu 8/4OD3J4xStsuhthu+uibZzRZ6Sjnudks3GZXODqht5fV6EN3J7YLJZkteUTO1Lp/ZAC fBkw== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@sirena.org.uk header.s=20170815-heliosphere header.b=t0rtnPpZ; spf=pass (google.com: domain of alsa-devel-bounces@alsa-project.org designates 77.48.224.243 as permitted sender) smtp.mailfrom=alsa-devel-bounces@alsa-project.org Return-Path: Received: from alsa0.perex.cz (alsa0.perex.cz. [77.48.224.243]) by mx.google.com with ESMTP id q7si1318402wrf.439.2017.10.13.12.26.28; Fri, 13 Oct 2017 12:26:29 -0700 (PDT) Received-SPF: pass (google.com: domain of alsa-devel-bounces@alsa-project.org designates 77.48.224.243 as permitted sender) client-ip=77.48.224.243; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@sirena.org.uk header.s=20170815-heliosphere header.b=t0rtnPpZ; spf=pass (google.com: domain of alsa-devel-bounces@alsa-project.org designates 77.48.224.243 as permitted sender) smtp.mailfrom=alsa-devel-bounces@alsa-project.org Received: from alsa0.perex.cz (localhost [127.0.0.1]) by alsa0.perex.cz (Postfix) with ESMTP id 399B826770F; Fri, 13 Oct 2017 21:26:09 +0200 (CEST) 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 4B02A267711; Fri, 13 Oct 2017 21:26:05 +0200 (CEST) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on mail1.perex.cz X-Spam-Level: X-Spam-Status: No, score=0.7 required=5.0 tests=DKIM_SIGNED,DKIM_VALID, HEADER_FROM_DIFFERENT_DOMAINS, SPF_NEUTRAL autolearn=disabled version=3.4.0 Received: from heliosphere.sirena.org.uk (heliosphere.sirena.org.uk [172.104.155.198]) by alsa0.perex.cz (Postfix) with ESMTP id B87E526770C for ; Fri, 13 Oct 2017 21:26:03 +0200 (CEST) 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=llQwoUrdgZCSxNGd0jkmfYQkPLBdm48x0Joz3S35KkI=; b=t0rtnPpZbEv1 FwLjAjiOywcIRiwjsHa2gM0pbSebiGx1HlXpA6k/mjsNl6/lrlJXr5wNLbUzKs2jHR6vYvzaeufrm h2YaBl13cqhg+e9CGA4ebe6JfEWCisIUFCCXVoVVyVlc5fZdwRXd55H9ZPHzi1Wc3r8ahkl83Gq7t R4EAk=; Received: from debutante.sirena.org.uk ([2001:470:1f1d:6b5::3] helo=debutante) by heliosphere.sirena.org.uk with esmtpsa (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.89) (envelope-from ) id 1e35af-0001VI-E2; Fri, 13 Oct 2017 19:25:49 +0000 Received: from broonie by debutante with local (Exim 4.89) (envelope-from ) id 1e35af-0006OL-0N; Fri, 13 Oct 2017 20:25:49 +0100 From: Mark Brown To: Guneshwor Singh In-Reply-To: <20171009055032.12158-3-guneshwor.o.singh@intel.com> Message-Id: Date: Fri, 13 Oct 2017 20:25:49 +0100 Cc: alsa-devel@alsa-project.org, Takashi Iwai , Patches Audio , Liam Girdwood , Vinod Koul , Mark Brown Subject: [alsa-devel] Applied "ASoC: Intel: Skylake: Add dai load ops for dais from topology" to the asoc tree 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 The patch ASoC: Intel: Skylake: Add dai load ops for dais from topology has been applied to the asoc tree at git://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 606e21fd6f43b9be8c7d9df8bc415f1637fbeb04 Mon Sep 17 00:00:00 2001 From: Guneshwor Singh Date: Mon, 9 Oct 2017 11:20:31 +0530 Subject: [PATCH] ASoC: Intel: Skylake: Add dai load ops for dais from topology Since FE dais can come from topology, add dai_load ops for the dais from topology. Signed-off-by: Guneshwor Singh Acked-By: Vinod Koul Signed-off-by: Mark Brown --- sound/soc/intel/skylake/skl-pcm.c | 8 ++++++++ sound/soc/intel/skylake/skl-topology.c | 1 + sound/soc/intel/skylake/skl-topology.h | 3 +++ 3 files changed, 12 insertions(+) -- 2.14.1 _______________________________________________ Alsa-devel mailing list Alsa-devel@alsa-project.org http://mailman.alsa-project.org/mailman/listinfo/alsa-devel diff --git a/sound/soc/intel/skylake/skl-pcm.c b/sound/soc/intel/skylake/skl-pcm.c index 9ca69b1fc128..4380e40c6af0 100644 --- a/sound/soc/intel/skylake/skl-pcm.c +++ b/sound/soc/intel/skylake/skl-pcm.c @@ -977,6 +977,14 @@ static struct snd_soc_dai_driver skl_platform_dai[] = { }, }; +int skl_dai_load(struct snd_soc_component *cmp, + struct snd_soc_dai_driver *pcm_dai) +{ + pcm_dai->ops = &skl_pcm_dai_ops; + + return 0; +} + static int skl_platform_open(struct snd_pcm_substream *substream) { struct snd_soc_pcm_runtime *rtd = substream->private_data; diff --git a/sound/soc/intel/skylake/skl-topology.c b/sound/soc/intel/skylake/skl-topology.c index 22f768ca3c73..ff4f53cdc0a1 100644 --- a/sound/soc/intel/skylake/skl-topology.c +++ b/sound/soc/intel/skylake/skl-topology.c @@ -3331,6 +3331,7 @@ static struct snd_soc_tplg_ops skl_tplg_ops = { .io_ops = skl_tplg_kcontrol_ops, .io_ops_count = ARRAY_SIZE(skl_tplg_kcontrol_ops), .manifest = skl_manifest_load, + .dai_load = skl_dai_load, }; /* diff --git a/sound/soc/intel/skylake/skl-topology.h b/sound/soc/intel/skylake/skl-topology.h index e11cc1fc0e43..d116599bfdd7 100644 --- a/sound/soc/intel/skylake/skl-topology.h +++ b/sound/soc/intel/skylake/skl-topology.h @@ -501,4 +501,7 @@ int skl_pcm_host_dma_prepare(struct device *dev, struct skl_pipe_params *params); int skl_pcm_link_dma_prepare(struct device *dev, struct skl_pipe_params *params); + +int skl_dai_load(struct snd_soc_component *cmp, + struct snd_soc_dai_driver *pcm_dai); #endif