From patchwork Tue Dec 19 14:54:16 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Luca Ceresoli X-Patchwork-Id: 13498407 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 3A3D1C46CD3 for ; Tue, 19 Dec 2023 14:55:14 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:Cc:To:In-Reply-To:References:Message-Id :MIME-Version:Subject:Date:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=m9TynDT6Tx6bzqILo8U/ggCmlNqo729/XggkwisXLxI=; b=CKGYEGu8TNW/rb 3Wyq/wlg34/ltsx/Qmw+g+OEeKzJr+1vl36NvkFaZ3lA9OFKuV4/a+5l60lpRNydHn8Cm1ZdO4T1g pu43xS2FL6gV9QjxWmjV74AArqkHVc1aa6NC76huvXZX6C0r0qI69+Gv58rlZYGqMufKUuOo72gNr PtQXFARGm0DOfihobG2oIRRHfXd9KPoJtQFh1i7EpWqOPkR82YXw5sbdxmbm9rNWQjwIGiuB69qD3 EEgeqBBmTSq3n255c2R/NhV/1cOB17J4oBWC3YYctS0ONioD6BRCjcK4Tm0VgEk0OV26xkOTTbwq5 Xy0IB9El3tDdI7Wmq92Q==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.96 #2 (Red Hat Linux)) id 1rFbUs-00ERqt-1x; Tue, 19 Dec 2023 14:55:02 +0000 Received: from relay2-d.mail.gandi.net ([217.70.183.194]) by bombadil.infradead.org with esmtps (Exim 4.96 #2 (Red Hat Linux)) id 1rFbUg-00ERif-0M; Tue, 19 Dec 2023 14:54:53 +0000 Received: by mail.gandi.net (Postfix) with ESMTPSA id EA2D94000E; Tue, 19 Dec 2023 14:54:45 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bootlin.com; s=gm1; t=1702997687; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=WiWcy74D30aNuMveYw8b25DRrVXgNKfkfMFNESGJ9/s=; b=kpNGGetVkN0bkG/7+B6ioUkNPzkF11LNpB0EUYklvQxNxM2Ee0yXh3j51ywWSyEc/9OCsL M8qSKPOScAhXsvmjBvy11zoJCSnRkz/iV5LFS3at3ujLpLCSC2xhRy4j5iSmoufE4pi58B VxDlpiXndbIzztY21mkLsExht10oJ+NENgSlKum0HviactbBdPIyPKUUfApomjMiABim7b 5kUcuveVv977SS4+KqAlCOl+8A62q8suSeSLCzLF+EBH5VAaNVNn+OEeaeyGQjYhS0tyLW iXsFceokjiocJjSRv4R1xMoAA2xUFxR56Hr2cTUrX0K6a8M55UWkfpgwXsTDjw== From: Luca Ceresoli Date: Tue, 19 Dec 2023 15:54:16 +0100 Subject: [PATCH v2 1/6] ASoC: rockchip: i2s-tdm: Fix clk_id usage in .set_sysclk() MIME-Version: 1.0 Message-Id: <20231219-rk3308-audio-codec-v2-1-c70d06021946@bootlin.com> References: <20231219-rk3308-audio-codec-v2-0-c70d06021946@bootlin.com> In-Reply-To: <20231219-rk3308-audio-codec-v2-0-c70d06021946@bootlin.com> To: Nicolas Frattaroli , Liam Girdwood , Mark Brown , Jaroslav Kysela , Takashi Iwai , Heiko Stuebner , Rob Herring , Krzysztof Kozlowski , Conor Dooley , Philipp Zabel Cc: Thomas Petazzoni , linux-rockchip@lists.infradead.org, linux-sound@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, devicetree@vger.kernel.org, Luca Ceresoli X-Mailer: b4 0.12.4 X-GND-Sasl: luca.ceresoli@bootlin.com X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20231219_065450_426258_0F588BBB X-CRM114-Status: GOOD ( 18.25 ) X-BeenThere: linux-rockchip@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Upstream kernel work for Rockchip platforms List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "Linux-rockchip" Errors-To: linux-rockchip-bounces+linux-rockchip=archiver.kernel.org@lists.infradead.org There are two problems with the second parameter of rockchip_i2s_tdm_set_sysclk(): 1. The second argument to a .set_sysclk() op is a clk_id, not a stream index, so it is incorrect to compare it with SNDRV_PCM_STREAM_PLAYBACK. Technically this code works correctly anyway because SNDRV_PCM_STREAM_PLAYBACK is defined as 0, which is also the clk_id for the mclk_tx as enforced by the device tree bindings. So this is a formal error, not triggering incorrect behaviour. 2. The else branch will consider any nonzero value as "rx", while only value 1 should be allowed for the mclk_rx clock. This does trigger incorrect behaviour if passing clk_id not equal to 0 or 1. Fix problem 1 by adding a new enum for the clock indexes as enforced in device tree and replace accordingly: * stream -> clk_id * SNDRV_PCM_STREAM_PLAYBACK -> CLK_MCLK_TX (value 0) Fix problem 2 by returning error if clk_id is not 0 or 1. Also simplify and improve dev_dbg() messages. Fixes: 081068fd6414 ("ASoC: rockchip: add support for i2s-tdm controller") Signed-off-by: Luca Ceresoli --- Changed in v2: - use switch statement instead of if/then/else --- sound/soc/rockchip/rockchip_i2s_tdm.c | 22 ++++++++++++++++------ 1 file changed, 16 insertions(+), 6 deletions(-) diff --git a/sound/soc/rockchip/rockchip_i2s_tdm.c b/sound/soc/rockchip/rockchip_i2s_tdm.c index 860e66ec85e8..35b36aa3b970 100644 --- a/sound/soc/rockchip/rockchip_i2s_tdm.c +++ b/sound/soc/rockchip/rockchip_i2s_tdm.c @@ -32,6 +32,9 @@ #define TRCM_TX 1 #define TRCM_RX 2 +/* Clock indexes as enforced by the DT bindings */ +enum { CLK_IDX_MCLK_TX, CLK_IDX_MCLK_RX }; + struct txrx_config { u32 addr; u32 reg; @@ -973,7 +976,7 @@ static int rockchip_i2s_tdm_trigger(struct snd_pcm_substream *substream, return 0; } -static int rockchip_i2s_tdm_set_sysclk(struct snd_soc_dai *cpu_dai, int stream, +static int rockchip_i2s_tdm_set_sysclk(struct snd_soc_dai *cpu_dai, int clk_id, unsigned int freq, int dir) { struct rk_i2s_tdm_dev *i2s_tdm = to_info(cpu_dai); @@ -982,15 +985,22 @@ static int rockchip_i2s_tdm_set_sysclk(struct snd_soc_dai *cpu_dai, int stream, if (i2s_tdm->clk_trcm) { i2s_tdm->mclk_tx_freq = freq; i2s_tdm->mclk_rx_freq = freq; + + dev_dbg(i2s_tdm->dev, "mclk freq: %u", freq); } else { - if (stream == SNDRV_PCM_STREAM_PLAYBACK) + switch (clk_id) { + case CLK_IDX_MCLK_TX: i2s_tdm->mclk_tx_freq = freq; - else + break; + case CLK_IDX_MCLK_RX: i2s_tdm->mclk_rx_freq = freq; - } + break; + default: + return -ENOTSUPP; + } - dev_dbg(i2s_tdm->dev, "The target mclk_%s freq is: %d\n", - stream ? "rx" : "tx", freq); + dev_dbg(i2s_tdm->dev, "mclk[%d] freq: %u", clk_id, freq); + } return 0; }