From patchwork Fri Oct 12 17:00:22 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mark Brown X-Patchwork-Id: 148792 Delivered-To: patch@linaro.org Received: by 2002:a2e:8595:0:0:0:0:0 with SMTP id b21-v6csp961910lji; Fri, 12 Oct 2018 10:00:36 -0700 (PDT) X-Google-Smtp-Source: ACcGV62QeZTGrkdWnh9nc6em0jGt/4HuLMjDN6+s7BpSjyy6vdL4WTC/iXCzhN4dWF0c7QAojodf X-Received: by 2002:adf:93e6:: with SMTP id 93-v6mr5955470wrp.81.1539363636220; Fri, 12 Oct 2018 10:00:36 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1539363636; cv=none; d=google.com; s=arc-20160816; b=Dhv3tD6PW0w5akJfpXCNOTST/k/NDaKHsSE8u0VQJeDfW7zjKXH1ACrFXgotllttb3 CoOB2LdQkkHaMUNk5CXyiKRgBTitiQk5ZykczPJHttpaOdFVzimPFxhMCJBx9qavBC5R ZEBn/LuA/d5vipOIZDBvo6iEdYT3JP5ofHAb5NrKIhPBEs5CpB5KGB1kMsd6XNeo/oDA 35ZaXYQ2t5PEr0ON1cwYnd3SMvZD8+1nf32xJueK3TTHfEnI5IFZTJXa4mFijVgi08wr RjsvXQaP8EsphPUd5iCcDn6ObGXKeSZuPSftFl6RP7BQWh3z9FStGOZv5DozqHyBSDNw VQmA== 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=sQZIhtefT4pxnNykeS0m1j8eOEkxwlXnLG1KQDQ+7WI=; b=iRE1n/tDtJApSIUH5D/Ywj0ESmnkc13/mRRFFw6LSr9UiNbFekLJ6X7STJbdOB8G0e olnOA13JWA58s3I38CKw35znBamnbijnNKVBsurwknU9+cm1dhhVViuJppanxKgcM1RP a8cycXaYLenLKg7o97ptOVNiWvkeUtCESoELM+LYpZarMV2rk7Z5cycnB7iR8LLv6lI3 mCkp+lUmPqot+WJZepPb1xvlnMdqVP1rW8BpkiBInnzAnstaiuoRn75V8/FQvL1DkOBW slp5to2Zg52iJi4keRgI0f2FZR3Gl8vWnJj8FBFAJBsT2g6nGS7s6rqEqczg+zE7BaJS GkjA== 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=ZTfddYGH; 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 6-v6si1506575wro.25.2018.10.12.10.00.36; Fri, 12 Oct 2018 10:00: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; dkim=neutral (body hash did not verify) header.i=@sirena.org.uk header.s=20170815-heliosphere header.b=ZTfddYGH; 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 44D15267874; Fri, 12 Oct 2018 19:00:30 +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 C635B2678CA; Fri, 12 Oct 2018 19:00:27 +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 BE303267845 for ; Fri, 12 Oct 2018 19:00:25 +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=tl7IKQElAKV7NNek8VfjyS08gPGinGvxDNximYotkhc=; b=ZTfddYGHZeyF B+RsaLCaVtR3+k1vvEAfNOeyfwg8Wc8oqB+vvQwmagEq/N4L3GEAUJibMVtyIk/YmLNDxTeeipfD1 53gZTbZG45Zvg0QTQuF7Kj5ALAVdJMEsxceMNPGQDNV0Np6HU4m5Jdvm2jPaamLvibjayikcwZqOq p9ONM=; 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 1gB0nY-0006dd-83; Fri, 12 Oct 2018 17:00:24 +0000 Received: by finisterre.ee.mobilebroadband (Postfix, from userid 1000) id A0DA9440078; Fri, 12 Oct 2018 19:00:22 +0200 (CEST) From: Mark Brown To: Kuninori Morimoto In-Reply-To: <87murjbs45.wl-kuninori.morimoto.gx@renesas.com> Message-Id: <20181012170022.A0DA9440078@finisterre.ee.mobilebroadband> Date: Fri, 12 Oct 2018 19:00:22 +0200 (CEST) Cc: alsa-devel@alsa-project.org, Mark Brown Subject: [alsa-devel] Applied "ASoC: pcm3168a: add I2S/Left_J TDM support" 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 I2S/Left_J TDM support 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 471a7ba89158c6d52dae69636c94c4aa1a6b7b22 Mon Sep 17 00:00:00 2001 From: Kuninori Morimoto Date: Fri, 12 Oct 2018 06:31:49 +0000 Subject: [PATCH] ASoC: pcm3168a: add I2S/Left_J TDM support pcm3168a is supporting TDM on I2S/Left_J, but there is no settings for it. This patch add it. Signed-off-by: Kuninori Morimoto Signed-off-by: Mark Brown --- sound/soc/codecs/pcm3168a.c | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) -- 2.19.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/pcm3168a.c b/sound/soc/codecs/pcm3168a.c index f0e2b886323e..63aa02592bc0 100644 --- a/sound/soc/codecs/pcm3168a.c +++ b/sound/soc/codecs/pcm3168a.c @@ -33,6 +33,8 @@ #define PCM3168A_FMT_RIGHT_J_16 0x3 #define PCM3168A_FMT_DSP_A 0x4 #define PCM3168A_FMT_DSP_B 0x5 +#define PCM3168A_FMT_I2S_TDM 0x6 +#define PCM3168A_FMT_LEFT_J_TDM 0x7 #define PCM3168A_FMT_DSP_MASK 0x4 #define PCM3168A_NUM_SUPPLIES 6 @@ -401,9 +403,11 @@ static int pcm3168a_hw_params(struct snd_pcm_substream *substream, bool tx, master_mode; u32 val, mask, shift, reg; unsigned int rate, fmt, ratio, max_ratio; + unsigned int chan; int i, min_frame_size; rate = params_rate(params); + chan = params_channels(params); ratio = pcm3168a->sysclk / rate; @@ -456,6 +460,21 @@ static int pcm3168a_hw_params(struct snd_pcm_substream *substream, return -EINVAL; } + /* for TDM */ + if (chan > 2) { + switch (fmt) { + case PCM3168A_FMT_I2S: + fmt = PCM3168A_FMT_I2S_TDM; + break; + case PCM3168A_FMT_LEFT_J: + fmt = PCM3168A_FMT_LEFT_J_TDM; + break; + default: + dev_err(component->dev, "TDM is supported under I2S/Left_J only\n"); + return -EINVAL; + } + } + if (master_mode) val = ((i + 1) << shift); else