From patchwork Wed May 24 17:41:44 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mark Brown X-Patchwork-Id: 104356 Delivered-To: patch@linaro.org Received: by 10.140.96.100 with SMTP id j91csp390782qge; Wed, 24 May 2017 10:43:36 -0700 (PDT) X-Received: by 10.223.135.213 with SMTP id c21mr24698453wrc.10.1495647816773; Wed, 24 May 2017 10:43:36 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1495647816; cv=none; d=google.com; s=arc-20160816; b=YYofQTmzr4Wp2kkJHytskB5R5SmTuDRjSCX6IMYG7tNktTudgdIAGm7tYlvygrYVV0 UFDKGqV63EJX68xKmKD3y+RAFK1jYDuVwGtj12ymLka/ivSj3o4HVvkkI5BZmAxUVaN4 ZPr7sae2JrG8UmSdfa5Nmmq9qwPJqdQh4wNyGLLfbIPuoPD4sT6+oOzsyogfurZDDs3+ subO6tIWtTOMzSj7F+/d3EDqKj0EJ+QFeQqdyQ6JJHrj5Uz6pvJtQdhYNxN/zaKpsWND FH8IRM2dCyVqetlQ5N2WISvhFv6S/KBybx39FyjoLazfgaOc6Hz86DnPoVPmODYQrIHG rQEQ== 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 :delivered-to:arc-authentication-results; bh=DPztvUTpBbh6Xh1MBr7YZe9Wt5c4vRVF0ZLgViZjWsQ=; b=axM2y6CoIou7FFSCMTtjsgStKyNDlGMI/IKJrunSiOzJTWqs858Vuf5cfQnz9pFRdB /Wj6ytvBAk0mQ/XJItyOSihmNGtdnSkLox52+eFdymls6t5r7HiJARXvJUpTIb4F/g0s Amc1d7daDhy2asaRFdKFmYKmoGLJJP1sOIRn3cutm0nRLssr/+M8karf5zXvpQ7koiJX VCKSHKXD5919N137HLdrpuxKUj7u3uYKxXXajj9s2XcI8q0NNVyQKCyD9beOLXg87zx+ fIYLlf139D4CIiJdlKm0CO/4hVVbi0wCLkL8c3oLhwRjPBiBQ0SPeyqp5PEZrDTm8eFO mqGw== ARC-Authentication-Results: i=1; mx.google.com; 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 d6si4693936wrc.300.2017.05.24.10.43.36; Wed, 24 May 2017 10:43:36 -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; 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 496BD2673A0; Wed, 24 May 2017 19:42:16 +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 9D0F02673A1; Wed, 24 May 2017 19:42:13 +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.0 required=5.0 tests=HEADER_FROM_DIFFERENT_DOMAINS, RP_MATCHES_RCVD, SPF_PASS, URIBL_BLOCKED autolearn=disabled version=3.4.0 Received: from mezzanine.sirena.org.uk (mezzanine.sirena.org.uk [106.187.55.193]) by alsa0.perex.cz (Postfix) with ESMTP id B6353267376 for ; Wed, 24 May 2017 19:41:53 +0200 (CEST) Received: from [2001:470:1f1d:6b5::3] (helo=debutante) by mezzanine.sirena.org.uk with esmtpsa (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.84_2) (envelope-from ) id 1dDaI7-0004vY-Lq; Wed, 24 May 2017 17:41:49 +0000 Received: from broonie by debutante with local (Exim 4.89) (envelope-from ) id 1dDaI4-0002nU-TE; Wed, 24 May 2017 18:41:44 +0100 From: Mark Brown To: Shreyas NC In-Reply-To: <1494857671-19257-3-git-send-email-subhransu.s.prusty@intel.com> Message-Id: Date: Wed, 24 May 2017 18:41:44 +0100 X-SA-Exim-Connect-IP: 2001:470:1f1d:6b5::3 X-SA-Exim-Mail-From: broonie@sirena.org.uk X-SA-Exim-Version: 4.2.1 (built Mon, 26 Dec 2011 16:24:06 +0000) X-SA-Exim-Scanned: No (on mezzanine.sirena.org.uk); Unknown failure Cc: alsa-devel@alsa-project.org, Vinod Koul , lgirdwood@gmail.com, patches.audio@intel.com, tiwai@suse.de, broonie@kernel.org, "Subhransu S. Prusty" Subject: [alsa-devel] Applied "ASoC: Intel: Skylake: Support for multiple data blocks" 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: Support for multiple data blocks 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 133e6e5c27340fe2205537373e50d43881a0f745 Mon Sep 17 00:00:00 2001 From: Shreyas NC Date: Mon, 15 May 2017 19:44:31 +0530 Subject: [PATCH] ASoC: Intel: Skylake: Support for multiple data blocks Module init params are additional data block in the module private data. Skylake driver doesn't yet have support to parse multiple data blocks if it appears in private data. Add support for parsing of multiple data blocks and module init params. Signed-off-by: Shreyas NC Signed-off-by: Subhransu S. Prusty Acked-by: Vinod Koul Signed-off-by: Mark Brown --- sound/soc/intel/skylake/skl-topology.c | 19 ++++++++++++++++--- 1 file changed, 16 insertions(+), 3 deletions(-) -- 2.11.0 _______________________________________________ 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-topology.c b/sound/soc/intel/skylake/skl-topology.c index b28199a5348c..4c3bdff092bd 100644 --- a/sound/soc/intel/skylake/skl-topology.c +++ b/sound/soc/intel/skylake/skl-topology.c @@ -2070,6 +2070,16 @@ static int skl_tplg_get_token(struct device *dev, break; + case SKL_TKN_U32_CAPS_SET_PARAMS: + mconfig->formats_config.set_params = + tkn_elem->value; + break; + + case SKL_TKN_U32_CAPS_PARAMS_ID: + mconfig->formats_config.param_id = + tkn_elem->value; + break; + case SKL_TKN_U32_PROC_DOMAIN: mconfig->domain = tkn_elem->value; @@ -2147,7 +2157,7 @@ static int skl_tplg_get_tokens(struct device *dev, tuple_size += tkn_count * sizeof(*tkn_elem); } - return 0; + return off; } /* @@ -2198,10 +2208,11 @@ static int skl_tplg_get_pvt_data(struct snd_soc_tplg_dapm_widget *tplg_w, num_blocks = ret; off += array->size; - array = (struct snd_soc_tplg_vendor_array *)(tplg_w->priv.data + off); - /* Read the BLOCK_TYPE and BLOCK_SIZE descriptor */ while (num_blocks > 0) { + array = (struct snd_soc_tplg_vendor_array *) + (tplg_w->priv.data + off); + ret = skl_tplg_get_desc_blocks(dev, array); if (ret < 0) @@ -2237,7 +2248,9 @@ static int skl_tplg_get_pvt_data(struct snd_soc_tplg_dapm_widget *tplg_w, memcpy(mconfig->formats_config.caps, data, mconfig->formats_config.caps_size); --num_blocks; + ret = mconfig->formats_config.caps_size; } + off += ret; } return 0;