From patchwork Fri Oct 19 12:27:18 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mark Brown X-Patchwork-Id: 149266 Delivered-To: patch@linaro.org Received: by 2002:a2e:8595:0:0:0:0:0 with SMTP id b21-v6csp3241793lji; Fri, 19 Oct 2018 05:27:33 -0700 (PDT) X-Google-Smtp-Source: ACcGV62ooxROen59viZJdMjhqCrtH5sdZiUV9UxDitXnsYmME1hqU5tyk2VDnnBC9lAO3u2GEQWR X-Received: by 2002:a1c:e12:: with SMTP id 18-v6mr4594453wmo.30.1539952053117; Fri, 19 Oct 2018 05:27:33 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1539952053; cv=none; d=google.com; s=arc-20160816; b=c/RuST7MAhioFHUtIRnWP2aTdSXMR45cHJ/OZTFuhl+mK/PETarCQzAPkbO8Uz/CX/ wW2dV7C9we7xCKufwBYr7d9AkCHdT6jSpLbRwT/QCDPEc38mSYxsQkqpE/Wy0Wu2ulx1 U6WM2VfzMmXfkuLryZdF90LwCAzcTwjzR7p48XnsRuEa/Iy/G/qzHgu3LlHGYhFawXXj KPVL5m6CVsM7IUtSiy/Bgwjdhj69t0gxStmEGXFXpfRAUwwry4WZep7XM+i8lL+/qork 0QViUNVZ/nPPct1qvxkLCy7yn2Be4zgZzZPUCNMFDZF6pQ3QClRhSQUHmqYc3ZC/k9bP xK5w== 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; bh=BDyYfQDEdHwchwRNy/QBm1YuZD3rd/0dQiWp6K9iaf0=; b=VYThYmbHWg/NyVyM/0jyu5qM1pwOOb6WidwismYJ4soUoQ0fQI16VEAuyv60vMlN32 Nvrrt8t8haRB1e+MOCbwx77t8sdZKaFQ0pbHdeySURiit/Q208FvD05YWkcikZ67NKQL cJszIIycl9b4l0zlMXku0tb88YMrX8lGuGJtsgzp1tzkOkNHjGnQgal+mXPnrB7SxBn3 GAwakr69mBjfM50XTdFT7KgBm49u0vSBQcKmvAOSMhVVlcGkrVUMMRxiGGBP6PnlwaUn A+tnTR6r+iJ3gqFrlbxi78qa49SBaDMs0iyiSs9vAFCfLAavCEfkAEU7IgIe8lz4Wky6 xbCA== 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=CsRMzKcS; 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 a18-v6si18527034wrt.328.2018.10.19.05.27.32; Fri, 19 Oct 2018 05:27:33 -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=CsRMzKcS; 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 6A7392679B4; Fri, 19 Oct 2018 14:27:23 +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 36EE92679F4; Fri, 19 Oct 2018 14:27:21 +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 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 9987E2679E4 for ; Fri, 19 Oct 2018 14:27:19 +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=nT7x1JSwh+MkGmDuUN48gyq1/c1ag2YxsUB5wuMTXqI=; b=CsRMzKcS6GBI tte8EgMWCemC0Pb3jNLBpr+YlO7buuoa2LnGuwlHc6+OXKS7rcV46FvKpVUmYAVlSxXVnXW/Rz9di W7qnBSRi4lGDgJaeS2xeJZPFtmyCXxYlFlYO3lr6n5OEnRRo4lRSf8wD1O08IoPYEqB35ZUQqK8mI B7E1s=; Received: from cpc102320-sgyl38-2-0-cust46.18-2.cable.virginm.net ([82.37.168.47] helo=debutante.sirena.org.uk) by heliosphere.sirena.org.uk with esmtpa (Exim 4.89) (envelope-from ) id 1gDTs7-0008Ve-6R; Fri, 19 Oct 2018 12:27:19 +0000 Received: by debutante.sirena.org.uk (Postfix, from userid 1000) id E94941122548; Fri, 19 Oct 2018 13:27:18 +0100 (BST) From: Mark Brown To: Kuninori Morimoto In-Reply-To: <87o9btz6oi.wl-kuninori.morimoto.gx@renesas.com> Message-Id: <20181019122718.E94941122548@debutante.sirena.org.uk> Date: Fri, 19 Oct 2018 13:27:18 +0100 (BST) Cc: alsa-devel@alsa-project.org, Mark Brown Subject: [alsa-devel] Applied "ASoC: pcm3168a: add hw constraint for capture 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 The patch ASoC: pcm3168a: add hw constraint for capture 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 4e9e07c5675706983ed649cfb92521a4d8aa1d6d Mon Sep 17 00:00:00 2001 From: Kuninori Morimoto Date: Wed, 17 Oct 2018 01:54:33 +0000 Subject: [PATCH] ASoC: pcm3168a: add hw constraint for capture channel LEFT_J / I2S only can use TDM. commit 594680ea4a394 ("ASoC: pcm3168a: add hw constraint for channel") commit 3809688980205 ("ASoC: pcm3168a: add HW constraint for non RIGHT_J") added channel constraint for it, but, it was only for playback. This patch adds constraint for capture. Signed-off-by: Kuninori Morimoto Signed-off-by: Mark Brown --- sound/soc/codecs/pcm3168a.c | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) -- 2.19.0.rc2 _______________________________________________ Alsa-devel mailing list Alsa-devel@alsa-project.org http://mailman.alsa-project.org/mailman/listinfo/alsa-devel diff --git a/sound/soc/codecs/pcm3168a.c b/sound/soc/codecs/pcm3168a.c index 63aa02592bc0..52cc950c9fd1 100644 --- a/sound/soc/codecs/pcm3168a.c +++ b/sound/soc/codecs/pcm3168a.c @@ -529,11 +529,17 @@ static int pcm3168a_startup(struct snd_pcm_substream *substream, break; case PCM3168A_FMT_LEFT_J: sample_min = 24; - channel_max = 8; + if (tx) + channel_max = 8; + else + channel_max = 6; break; case PCM3168A_FMT_I2S: sample_min = 24; - channel_max = 8; + if (tx) + channel_max = 8; + else + channel_max = 6; break; default: sample_min = 24; @@ -559,6 +565,7 @@ static const struct snd_soc_dai_ops pcm3168a_dac_dai_ops = { }; static const struct snd_soc_dai_ops pcm3168a_adc_dai_ops = { + .startup = pcm3168a_startup, .set_fmt = pcm3168a_set_dai_fmt_adc, .set_sysclk = pcm3168a_set_dai_sysclk, .hw_params = pcm3168a_hw_params