From patchwork Thu Jul 19 16:57:17 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mark Brown X-Patchwork-Id: 142364 Delivered-To: patch@linaro.org Received: by 2002:a2e:9754:0:0:0:0:0 with SMTP id f20-v6csp1961648ljj; Thu, 19 Jul 2018 09:58:02 -0700 (PDT) X-Google-Smtp-Source: AAOMgpcd4Q/FXz9Y7Sj91JyAcUM5LdQ4RmMEaKVQIGQR5UzatIu5hE+q9oyp6UYRiex0VBi1PohU X-Received: by 2002:adf:9aa3:: with SMTP id a32-v6mr8321370wrc.75.1532019482425; Thu, 19 Jul 2018 09:58:02 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1532019482; cv=none; d=google.com; s=arc-20160816; b=r1u8hHeu3vNaPBZliYL0z+mYRg4EM5z2NWzILZYSKhqsRc+mBu27ob1xFPUVtasqHT bLsxnSyy5IPevNZeUww5s/0muKSRk7/0trBJa5TB5af01gfjngcJSdlUnT5nsOLHVKj0 M9qMMXILoUZfFFVmKWzDG4MIIKgj4fgSF3h0eAD3YdQUT6iArsCIt2Dzhb87meq5UsKz /Qfcfk10rah1Qsj787xsDuFvyMoe5Ap4zBeNXEo1OwU1FsliVtTsloeKyHm/mHayQTKH 0Uz3LPZRKqE8eGBcu7UBGk16Al7ck60KP+eJghZCmLdYe9IUTF0/SVC0vtIllCwc4nrk 80Pg== 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=Q8/Qmg14dyR9MJbiYxiBr4baWuwFld+Rl8vOySxdCkU=; b=KKmfN85EaKlqPOkWah87Xx2Zq0fPaMKssULpeJLxCR3e7wwr1gqgdum1mq4eWcR0ue LsSIAQeIiI6tXVMrOnKLyiREitEq3JskU0L/femsoGl0c3NU13PbfcVzcxx3k4eiBmnJ F0IZO1OPdtfzZWquXwixeQ9OTp9qkodhduyB2SR8xHHcyXktM5ynyeFfvyoj+LEfvU2x 0c0k7pkh5ckTZreH2i9SMNnFQhOo8ehrcXfTpPs0WL2k3JrsmRlcOFD1RU8jT+G+ko5/ VSX6sbg5jUHkHWjdAXX+7o/03wnfYmdEPLVWL7nSJOk3mnsVJEjyAUMGFHjL2mvfJBsv vOHw== 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="Ppa68S/r"; 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; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=kernel.org Return-Path: Received: from alsa0.perex.cz (alsa0.perex.cz. [77.48.224.243]) by mx.google.com with ESMTP id d12-v6si5734004wra.117.2018.07.19.09.58.02; Thu, 19 Jul 2018 09:58:02 -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="Ppa68S/r"; 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; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: from alsa0.perex.cz (localhost [127.0.0.1]) by alsa0.perex.cz (Postfix) with ESMTP id 3BCB726777B; Thu, 19 Jul 2018 18:57:27 +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 84F9A26779A; Thu, 19 Jul 2018 18:57:24 +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.2 required=5.0 tests=DKIM_SIGNED,DKIM_VALID, HEADER_FROM_DIFFERENT_DOMAINS, RCVD_IN_DNSWL_NONE, SPF_PASS 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 C3DD1267786 for ; Thu, 19 Jul 2018 18:57:20 +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=WIqFhatfXJidt0kFZUbOOVQ521jYP41Av/H+JAx1v9U=; b=Ppa68S/rLKaa ymNAXwpYOC2BhXfCeZSc9rsS27omrYDUdy4VfGgsAkbOpttxswKTp6MVQhcGd7ISyBuY7zjnSzHUT AAgWZHQcsnWRoALZPEUFSCIVQkiTjF0aOqfyXAGWhM37JyK6j9kdJcKsuDGNDjcyL7jbrcAJLlDhe t8u2o=; 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 1fgCEv-0007JR-G0; Thu, 19 Jul 2018 16:57:17 +0000 Received: from broonie by debutante with local (Exim 4.91) (envelope-from ) id 1fgCEv-0005V5-1y; Thu, 19 Jul 2018 17:57:17 +0100 From: Mark Brown To: Richard Fitzgerald In-Reply-To: <20180719105039.28312-4-ckeepax@opensource.cirrus.com> Message-Id: Date: Thu, 19 Jul 2018 17:57:17 +0100 Cc: alsa-devel@alsa-project.org, Charles Keepax , patches@opensource.cirrus.com, lgirdwood@gmail.com, stuarth@opensource.cirrus.com, rf@opensource.cirrus.com, broonie@kernel.org Subject: [alsa-devel] Applied "ASoC: wm_adsp: Allow up to 8 channels for voice control" 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: wm_adsp: Allow up to 8 channels for voice control 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 3bbc2705a3d132b9a86a0e4083f82a2b3c9bfdfd Mon Sep 17 00:00:00 2001 From: Richard Fitzgerald Date: Thu, 19 Jul 2018 11:50:38 +0100 Subject: [PATCH] ASoC: wm_adsp: Allow up to 8 channels for voice control Newer voice control firmwares can capture multiple audio channels. Allow up to 8 channels for future-proofing. Signed-off-by: Richard Fitzgerald Signed-off-by: Charles Keepax Signed-off-by: Mark Brown --- sound/soc/codecs/wm_adsp.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- 2.18.0 _______________________________________________ Alsa-devel mailing list Alsa-devel@alsa-project.org http://mailman.alsa-project.org/mailman/listinfo/alsa-devel diff --git a/sound/soc/codecs/wm_adsp.c b/sound/soc/codecs/wm_adsp.c index eec73c98a141..aeb1b8c27670 100644 --- a/sound/soc/codecs/wm_adsp.c +++ b/sound/soc/codecs/wm_adsp.c @@ -418,7 +418,7 @@ static const struct wm_adsp_fw_caps ctrl_caps[] = { { .id = SND_AUDIOCODEC_BESPOKE, .desc = { - .max_ch = 1, + .max_ch = 8, .sample_rates = { 16000 }, .num_sample_rates = 1, .formats = SNDRV_PCM_FMTBIT_S16_LE,