From nobody Sun Apr 5 13:07:35 2026 Received: from smtpout-04.galae.net (smtpout-04.galae.net [185.171.202.116]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 1206A3009DA for ; Wed, 18 Feb 2026 12:18:31 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=185.171.202.116 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1771417114; cv=none; b=SNt2ReoWsa+HAVvvkg4DVWywzZKz+xJnda073FBvWXHtHiIkXsVdsdG62hDdiyShmbi5t9gKAUCdpcL7ozBgmawudEMOUA/JDmVf2JZQd7uwaOECDb3YFKfsv5x0G/a4D3uxTatsq2acCZGnUxavPhRLTsuIf7Grzf+SKwINhtM= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1771417114; c=relaxed/simple; bh=Pw3fZI9b2cVPG5utxMZwIpqznAduVP02xmFaGRrThcU=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:To:Cc; b=eXnzaKcMJ06sOmMbJUkI78/qOb1GI8VYM1oiVLELsyqI8aIsRA6z6c7camh8kZ2dProz9opDYCeAAuaDL6W4lYSSlwPdfb7PwSk1RUNoukRevlnc+pcO30hKb10Bdr2bzmwXvC+pP9+YqogSlI8+hx7+rw6nAY1Nb7a8puSb5Mo= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=bootlin.com; spf=pass smtp.mailfrom=bootlin.com; dkim=pass (2048-bit key) header.d=bootlin.com header.i=@bootlin.com header.b=c1zF88ol; arc=none smtp.client-ip=185.171.202.116 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=bootlin.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=bootlin.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=bootlin.com header.i=@bootlin.com header.b="c1zF88ol" Received: from smtpout-01.galae.net (smtpout-01.galae.net [212.83.139.233]) by smtpout-04.galae.net (Postfix) with ESMTPS id 97944C111A3; Wed, 18 Feb 2026 12:11:46 +0000 (UTC) Received: from mail.galae.net (mail.galae.net [212.83.136.155]) by smtpout-01.galae.net (Postfix) with ESMTPS id AD63F60738; Wed, 18 Feb 2026 12:11:34 +0000 (UTC) Received: from [127.0.0.1] (localhost [127.0.0.1]) by localhost (Mailerdaemon) with ESMTPSA id 4017710368B5D; Wed, 18 Feb 2026 13:11:29 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bootlin.com; s=dkim; t=1771416693; h=from:subject:date:message-id:to:cc:mime-version:content-type: content-transfer-encoding; bh=SZ+4RuppPKjR3qQWfgPnGLn2XDy90FMtkHwzrPksBgw=; b=c1zF88olfwh1e55esZHyUrYZ+A3rMtmzliwOZXO+KyGGXeKaDqg40ijVi9lrUnuqFiEk/4 Xi3uoRvk8S3j2gnY8aMHuHqFYJWFVN+KuYtCy1Ug9gtujt5He178rzVmmxt56zf2K4Fmzm 1BJJStUSs22nNRBxxiBMsTOKuc7lbAxZ8N1WLNDYwBGXPJVR2wkVL3rwTcEJ7bsvKRTwhf L7VLCoDqloOcMw85Leht4X/Pfy0sVCiWiVaGpxk0dc0NbOBtNTMnM6F7Bs5E+JnRhITVt0 lGE7T/Dhc6y2erlYRpYaGMOw0pd5tai0rtChvut1WSMk6GpzK5UOSlAkvsvw8A== From: Luca Ceresoli Date: Wed, 18 Feb 2026 13:11:24 +0100 Subject: [PATCH] Revert "ASoC: rockchip: i2s_tdm: Re-add the set_sysclk callback" Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-Id: <20260218-snd-rk3308-i2s-revert-set_sysclk-v1-1-79ab787f88ac@bootlin.com> X-B4-Tracking: v=1; b=H4sIAGuslWkC/x2NwQqDMBAFf0X23IUkFtH+SimiyWtdlLTsSqmI/ 27ocQ4zs5NBBUa3aifFV0zeuYC/VBSnIb/AkgpTcKFxwbdsObHOde1almBcHOjKhrW3zeIyM5L rYtP5K/xIJfNRPOX3X9wfx3EC2kzycnIAAAA= X-Change-ID: 20260218-snd-rk3308-i2s-revert-set_sysclk-ed09c6914e1b To: Nicolas Frattaroli , Liam Girdwood , Mark Brown , Jaroslav Kysela , Takashi Iwai , Heiko Stuebner , Detlev Casanova Cc: Thomas Petazzoni , linux-rockchip@lists.infradead.org, linux-sound@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, stable@vger.kernel.org, Luca Ceresoli X-Mailer: b4 0.14.3 X-Last-TLS-Session-Version: TLSv1.3 This reverts commit 5323186e2e8d33c073fad51e24f18e2d6dbae2da. The reverted commit broke this driver for the RK3308 I2S. The 'arecord -Vmono -d 2 -c 8 -f S16_LE -r 96000 /dev/null' command on RK3308 now results in: rockchip-i2s-tdm ff320000.i2s: ASoC error (-22): at snd_soc_dai_hw_params= () on ff320000.i2s ff320000.i2s-rk3308-hifi: ASoC error (-22): at __soc_pcm_hw_params() on = ff320000.i2s-rk3308-hifi Tested on: * Radxa Rock Pi S * Upstream Linux kernel * arm64 defconfig Tested kernel versions: * v6.12: OK * 5323186e2e8d (commit being reverted): FAIL * 5323186e2e8d^: OK * 21cfbeae7d7c (commit being reverted, on stable/linux-6.12.y): FAIL * 21cfbeae7d7c^: OK * v6.19: FAIL * v6.19 + 'git revert 5323186e2e8d': OK * v6.19-11566-g254edc893f3a (current master as of today): FAIL * v6.19-11566-g254edc893f3a (current master as of today) + this revert: OK Fixes: 5323186e2e8d ("ASoC: rockchip: i2s_tdm: Re-add the set_sysclk callba= ck") Cc: stable@vger.kernel.org Link: https://lore.kernel.org/lkml/DGB6VK7LC8N7.322SYGWZXPL5W@bootlin.com/ Signed-off-by: Luca Ceresoli --- sound/soc/rockchip/rockchip_i2s_tdm.c | 31 ++----------------------------- 1 file changed, 2 insertions(+), 29 deletions(-) diff --git a/sound/soc/rockchip/rockchip_i2s_tdm.c b/sound/soc/rockchip/roc= kchip_i2s_tdm.c index 770b9bfbb384..b056d72e61ff 100644 --- a/sound/soc/rockchip/rockchip_i2s_tdm.c +++ b/sound/soc/rockchip/rockchip_i2s_tdm.c @@ -22,6 +22,7 @@ =20 #define DRV_NAME "rockchip-i2s-tdm" =20 +#define DEFAULT_MCLK_FS 256 #define CH_GRP_MAX 4 /* The max channel 8 / 2 */ #define MULTIPLEX_CH_MAX 10 =20 @@ -69,8 +70,6 @@ struct rk_i2s_tdm_dev { bool has_playback; bool has_capture; struct snd_soc_dai_driver *dai; - unsigned int mclk_rx_freq; - unsigned int mclk_tx_freq; }; =20 static int to_ch_num(unsigned int val) @@ -618,27 +617,6 @@ static int rockchip_i2s_trcm_mode(struct snd_pcm_subst= ream *substream, return 0; } =20 -static int rockchip_i2s_tdm_set_sysclk(struct snd_soc_dai *cpu_dai, int st= ream, - unsigned int freq, int dir) -{ - struct rk_i2s_tdm_dev *i2s_tdm =3D to_info(cpu_dai); - - if (i2s_tdm->clk_trcm) { - i2s_tdm->mclk_tx_freq =3D freq; - i2s_tdm->mclk_rx_freq =3D freq; - } else { - if (stream =3D=3D SNDRV_PCM_STREAM_PLAYBACK) - i2s_tdm->mclk_tx_freq =3D freq; - else - i2s_tdm->mclk_rx_freq =3D freq; - } - - dev_dbg(i2s_tdm->dev, "The target mclk_%s freq is: %d\n", - stream ? "rx" : "tx", freq); - - return 0; -} - static int rockchip_i2s_tdm_hw_params(struct snd_pcm_substream *substream, struct snd_pcm_hw_params *params, struct snd_soc_dai *dai) @@ -653,19 +631,15 @@ static int rockchip_i2s_tdm_hw_params(struct snd_pcm_= substream *substream, =20 if (i2s_tdm->clk_trcm =3D=3D TRCM_TX) { mclk =3D i2s_tdm->mclk_tx; - mclk_rate =3D i2s_tdm->mclk_tx_freq; } else if (i2s_tdm->clk_trcm =3D=3D TRCM_RX) { mclk =3D i2s_tdm->mclk_rx; - mclk_rate =3D i2s_tdm->mclk_rx_freq; } else if (substream->stream =3D=3D SNDRV_PCM_STREAM_PLAYBACK) { mclk =3D i2s_tdm->mclk_tx; - mclk_rate =3D i2s_tdm->mclk_tx_freq; } else { mclk =3D i2s_tdm->mclk_rx; - mclk_rate =3D i2s_tdm->mclk_rx_freq; } =20 - err =3D clk_set_rate(mclk, mclk_rate); + err =3D clk_set_rate(mclk, DEFAULT_MCLK_FS * params_rate(params)); if (err) return err; =20 @@ -825,7 +799,6 @@ static const struct snd_soc_dai_ops rockchip_i2s_tdm_da= i_ops =3D { .hw_params =3D rockchip_i2s_tdm_hw_params, .set_bclk_ratio =3D rockchip_i2s_tdm_set_bclk_ratio, .set_fmt =3D rockchip_i2s_tdm_set_fmt, - .set_sysclk =3D rockchip_i2s_tdm_set_sysclk, .set_tdm_slot =3D rockchip_dai_tdm_slot, .trigger =3D rockchip_i2s_tdm_trigger, }; --- base-commit: 2961f841b025fb234860bac26dfb7fa7cb0fb122 change-id: 20260218-snd-rk3308-i2s-revert-set_sysclk-ed09c6914e1b Best regards, --=20 Luca Ceresoli