From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.8 required=3.0 tests=DKIM_SIGNED,DKIM_VALID, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id EF43BC4CEC4 for ; Wed, 18 Sep 2019 10:12:04 +0000 (UTC) Received: from alsa0.perex.cz (alsa0.perex.cz [77.48.224.243]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 7C01821920 for ; Wed, 18 Sep 2019 10:12:04 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (1024-bit key) header.d=alsa-project.org header.i=@alsa-project.org header.b="eIjvK7NC" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 7C01821920 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=codethink.co.uk Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=alsa-devel-bounces@alsa-project.org Received: from alsa1.perex.cz (alsa1.perex.cz [207.180.221.201]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by alsa0.perex.cz (Postfix) with ESMTPS id 9E0451667; Wed, 18 Sep 2019 12:11:12 +0200 (CEST) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa0.perex.cz 9E0451667 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=alsa-project.org; s=default; t=1568801522; bh=/0PpuMmV4uibBS2PXUZpBKTNspE+9WjUcxPJlGCVGP0=; h=Date:From:To:In-Reply-To:References:Cc:Subject:List-Id: List-Unsubscribe:List-Archive:List-Post:List-Help:List-Subscribe: From; b=eIjvK7NCYZ0NWpC7Z6sd2Ltm1gbKt07jDVjqXZoQ0WbEDn91byl+GKBkpObAZboOR na1KEa5G0Tt3dpZjNguyrapBoln782eNQ7hx1PfrGqf2B+06l1kb/fNbwx1fYlc1tk XycSD64LQC+9p8RioyuG2xhNdWVswN5ly9gx3SSQ= Received: from alsa1.perex.cz (localhost.localdomain [127.0.0.1]) by alsa1.perex.cz (Postfix) with ESMTP id 331C1F80292; Wed, 18 Sep 2019 12:11:12 +0200 (CEST) Received: by alsa1.perex.cz (Postfix, from userid 50401) id C44BCF804FF; Wed, 18 Sep 2019 12:11:10 +0200 (CEST) Received: from imap1.codethink.co.uk (imap1.codethink.co.uk [176.9.8.82]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by alsa1.perex.cz (Postfix) with ESMTPS id 34882F80146 for ; Wed, 18 Sep 2019 12:11:07 +0200 (CEST) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa1.perex.cz 34882F80146 Received: from [78.40.148.177] (helo=localhost) by imap1.codethink.co.uk with esmtpsa (Exim 4.84_2 #1 (Debian)) id 1iAWvP-0005qm-SX; Wed, 18 Sep 2019 11:11:04 +0100 MIME-Version: 1.0 Date: Wed, 18 Sep 2019 11:11:03 +0100 From: Ben Dooks To: Jon Hunter In-Reply-To: <7b21823a-86e8-d3de-10b5-e047a5e025ef@nvidia.com> References: <20190917181233.534-1-ben.dooks@codethink.co.uk> <20190917181233.534-2-ben.dooks@codethink.co.uk> <7b21823a-86e8-d3de-10b5-e047a5e025ef@nvidia.com> Message-ID: <72705cbf3b70934bdf8e7a6116f420b5@codethink.co.uk> X-Sender: ben.dooks@codethink.co.uk User-Agent: Roundcube Webmail/1.3.10 Cc: linux-kernel@lists.codethink.co.uk, alsa-devel@alsa-project.org, Liam Girdwood , Takashi Iwai , Mark Brown , Thierry Reding , Edward Cragg , linux-tegra@vger.kernel.org, linux-tegra-owner@vger.kernel.org Subject: Re: [alsa-devel] [PATCH 1/8] ASoC: tegra: Add a TDM configuration callback X-BeenThere: alsa-devel@alsa-project.org X-Mailman-Version: 2.1.15 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: , Content-Transfer-Encoding: 7bit Content-Type: text/plain; charset="us-ascii"; Format="flowed" Errors-To: alsa-devel-bounces@alsa-project.org Sender: "Alsa-devel" On 2019-09-18 09:42, Jon Hunter wrote: > On 17/09/2019 19:12, Ben Dooks wrote: >> From: Edward Cragg >> >> Add a callback to configure TDM settings for the Tegra30 I2S ASoC >> 'platform' >> driver. >> >> Signed-off-by: Edward Cragg >> --- >> sound/soc/tegra/tegra30_i2s.c | 34 ++++++++++++++++++++++++++++++++++ >> 1 file changed, 34 insertions(+) >> >> diff --git a/sound/soc/tegra/tegra30_i2s.c >> b/sound/soc/tegra/tegra30_i2s.c >> index ac6983c6bd72..d36b4662b420 100644 >> --- a/sound/soc/tegra/tegra30_i2s.c >> +++ b/sound/soc/tegra/tegra30_i2s.c >> @@ -254,6 +254,39 @@ static int tegra30_i2s_trigger(struct >> snd_pcm_substream *substream, int cmd, >> return 0; >> } >> >> +/* >> + * Set up TDM >> + */ >> +static int tegra30_i2s_set_tdm(struct snd_soc_dai *dai, >> + unsigned int tx_mask, unsigned int rx_mask, >> + int slots, int slot_width) >> +{ >> + struct tegra30_i2s *i2s = snd_soc_dai_get_drvdata(dai); >> + unsigned int mask = 0, val = 0; >> + >> + dev_info(dai->dev, "%s: setting TDM: tx_mask: 0x%08x rx_mask: 0x%08x >> " > > dev_dbg() please. Also I don't think it is necessary to print both the > function name and 'setting TDM', the function name should be > sufficient. Yes, already sorted from previous review. >> + "slots: 0x%08x " "width: %d\n", > > Why are there extra quotes here? No idea, I'll remove these later. >> + __func__, tx_mask, rx_mask, slots, slot_width)> + >> + /* Set up slots and tx/rx masks */ >> + mask = TEGRA30_I2S_SLOT_CTRL_TOTAL_SLOTS_MASK | >> + TEGRA30_I2S_SLOT_CTRL_RX_SLOT_ENABLES_MASK | >> + TEGRA30_I2S_SLOT_CTRL_TX_SLOT_ENABLES_MASK; >> + >> + val = (tx_mask << TEGRA30_I2S_SLOT_CTRL_TX_SLOT_ENABLES_SHIFT) | >> + (rx_mask << TEGRA30_I2S_SLOT_CTRL_RX_SLOT_ENABLES_SHIFT) | >> + ((slots - 1) << TEGRA30_I2S_SLOT_CTRL_TOTAL_SLOTS_SHIFT); >> + >> + regmap_update_bits(i2s->regmap, TEGRA30_I2S_SLOT_CTRL, mask, val); >> + >> + /* Set FSYNC width */ >> + regmap_update_bits(i2s->regmap, TEGRA30_I2S_CH_CTRL, >> + TEGRA30_I2S_CH_CTRL_FSYNC_WIDTH_MASK, >> + (slot_width - 1) << TEGRA30_I2S_CH_CTRL_FSYNC_WIDTH_SHIFT); > > What happens if there is only one slot? The fsync will be the width of > the slot. Typically, TDM is used with DSP-A/B formats and although the > driver does not appear to program the fsync width, it probably should > during the tegra30_i2s_set_fmt() depending on the format used rather > than here. Hmm, should we check. The work was done to keep as close to the original client's 2.6 kernel as possible which set the fsync field to a whole data word. We could try and just set this to say 2 here and have a much shorter frame-sync pulse. I'll add a check for slots < 2 and set the fsync width to 2. Thanks for the review. > > Cheers > Jon _______________________________________________ Alsa-devel mailing list Alsa-devel@alsa-project.org https://mailman.alsa-project.org/mailman/listinfo/alsa-devel