From patchwork Fri Oct 12 17:00:35 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mark Brown X-Patchwork-Id: 10638951 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 28D5314E2 for ; Fri, 12 Oct 2018 17:00:57 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 175E22C078 for ; Fri, 12 Oct 2018 17:00:57 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 0BA3E2C1FF; Fri, 12 Oct 2018 17:00:57 +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=-2.7 required=2.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,RCVD_IN_DNSWL_NONE autolearn=ham version=3.3.1 Received: from alsa0.perex.cz (alsa0.perex.cz [77.48.224.243]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 4258D2C235 for ; Fri, 12 Oct 2018 17:00:56 +0000 (UTC) Received: from alsa0.perex.cz (localhost [127.0.0.1]) by alsa0.perex.cz (Postfix) with ESMTP id 933E72679A7; Fri, 12 Oct 2018 19:00:39 +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 66F732679A8; Fri, 12 Oct 2018 19:00:37 +0200 (CEST) Received: from heliosphere.sirena.org.uk (heliosphere.sirena.org.uk [172.104.155.198]) by alsa0.perex.cz (Postfix) with ESMTP id CDDA2267845 for ; Fri, 12 Oct 2018 19:00:35 +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=i0Q1xjznMaw2gRBDi/ZdmMOIJze3Gqz3GuplmryJv/U=; b=mjbmOmOWoN01 dc9drEN0uMl9iW+kqXxB5KwSrlHQldvFnqyUrx59PhU5q3PYScP8qkHT/CgCMyaVscHTlXPrIR39y xkW1qj9koKHF8Orijr8JfMB3A1rkXwA69Skyi2/m3bQneDDhBB43IOFssI01pV13zq7n6bEiX8E0k Sire8=; Received: from [91.126.136.150] (helo=finisterre.ee.mobilebroadband) by heliosphere.sirena.org.uk with esmtpsa (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.89) (envelope-from ) id 1gB0nj-0006dr-Gv; Fri, 12 Oct 2018 17:00:35 +0000 Received: by finisterre.ee.mobilebroadband (Postfix, from userid 1000) id 184CD440078; Fri, 12 Oct 2018 19:00:35 +0200 (CEST) From: Mark Brown To: Kuninori Morimoto In-Reply-To: <87o9bzbs4t.wl-kuninori.morimoto.gx@renesas.com> Message-Id: <20181012170035.184CD440078@finisterre.ee.mobilebroadband> Date: Fri, 12 Oct 2018 19:00:35 +0200 (CEST) Cc: alsa-devel@alsa-project.org, Mark Brown Subject: [alsa-devel] Applied "ASoC: pcm3168a: add hw constraint for channel" 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 X-Virus-Scanned: ClamAV using ClamSMTP The patch ASoC: pcm3168a: add hw constraint for channel 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 594680ea4a394f19d38a39a7d7c673fbad02a3d6 Mon Sep 17 00:00:00 2001 From: Kuninori Morimoto Date: Fri, 12 Oct 2018 06:31:18 +0000 Subject: [PATCH] ASoC: pcm3168a: add hw constraint for channel LEFT_J / I2S only can use TDM. This patch adds channel constraint for it. Signed-off-by: Kuninori Morimoto Signed-off-by: Mark Brown --- sound/soc/codecs/pcm3168a.c | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/sound/soc/codecs/pcm3168a.c b/sound/soc/codecs/pcm3168a.c index 233a8df5d7a5..f0e2b886323e 100644 --- a/sound/soc/codecs/pcm3168a.c +++ b/sound/soc/codecs/pcm3168a.c @@ -484,6 +484,7 @@ static int pcm3168a_startup(struct snd_pcm_substream *substream, bool tx = substream->stream == SNDRV_PCM_STREAM_PLAYBACK; unsigned int fmt; unsigned int sample_min; + unsigned int channel_max; if (tx) fmt = pcm3168a->dac_fmt; @@ -496,19 +497,38 @@ static int pcm3168a_startup(struct snd_pcm_substream *substream, * RIGHT_J : 24 / 16 * LEFT_J : 24 * I2S : 24 + * + * TDM available + * + * I2S + * LEFT_J */ switch (fmt) { case PCM3168A_FMT_RIGHT_J: sample_min = 16; + channel_max = 2; + break; + case PCM3168A_FMT_LEFT_J: + sample_min = 24; + channel_max = 8; + break; + case PCM3168A_FMT_I2S: + sample_min = 24; + channel_max = 8; break; default: sample_min = 24; + channel_max = 2; } snd_pcm_hw_constraint_minmax(substream->runtime, SNDRV_PCM_HW_PARAM_SAMPLE_BITS, sample_min, 32); + snd_pcm_hw_constraint_minmax(substream->runtime, + SNDRV_PCM_HW_PARAM_CHANNELS, + 2, channel_max); + return 0; } static const struct snd_soc_dai_ops pcm3168a_dac_dai_ops = {