From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtpbguseast3.qq.com (smtpbguseast3.qq.com [54.243.244.52]) (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 79E20248896 for ; Wed, 29 Apr 2026 01:39:47 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=54.243.244.52 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1777426790; cv=none; b=bgDuiVl5f/wo3xWaZresi7vGqg/YCr1NtoxeNJmGProoiG0/k8a5/xa3ArbZnhTGq0eq2+UddCBW4ls+RfuPnvFbd0Di4Hn81bRxRk+beyOWTB5ECbr9kdCt7SZzbGp4v0IQIDtNf18M3RTYnsMJitMTfrKrkhkP9kdRfvmejfQ= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1777426790; c=relaxed/simple; bh=RWny2LNzrPrEagJ3GrRqR5NlLn0/KK5X3ayFUZDi8u4=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=IO4DaYSUuo6XHZS4iY8xceRu32xEMjMWxmjQTs+CgN4cEgjfCoQ/PPVP2OKryB9o/p+emCjFuuks7r4ZmoSEICyabDY//atNei/HR0OV/cZxDaVMzXq/QAMfOMIYV0b589BBXrQxHAfZLlzu1zUvZ9USZpg4UYhgRv2cNtyAykk= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=linux.spacemit.com; spf=none smtp.mailfrom=linux.spacemit.com; dkim=pass (1024-bit key) header.d=linux.spacemit.com header.i=@linux.spacemit.com header.b=udupmZmB; arc=none smtp.client-ip=54.243.244.52 Authentication-Results: smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=linux.spacemit.com Authentication-Results: smtp.subspace.kernel.org; spf=none smtp.mailfrom=linux.spacemit.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linux.spacemit.com header.i=@linux.spacemit.com header.b="udupmZmB" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linux.spacemit.com; s=mxsw2412; t=1777426750; bh=jSE/lZ8lv/JgPhAki8HHzPUjZ2Vg7C6vpdz7KPeviJM=; h=From:Date:Subject:MIME-Version:Message-Id:To; b=udupmZmBA2/zt02suWoXllz7uMOxO//7M7oAq/UuE5pjpKH8uqBhz98gPorFi6ZsZ rb99gFCDBY56/9Uh8Gj2WvME4x702r/fvBrYPIZ4TBF8NYYmoNhLdrimkKv+GdvT7v yhbQLhOGQXTIRQ2FMVQNamoUyQLrHr2ljlwjMB/8= X-QQ-mid: zesmtpgz1t1777426743t04c28cc3 X-QQ-Originating-IP: X3b/ae0GrihuowuBpKcF5vlJDI0UwVsxLLurFmJWMKg= Received: from = ( [120.237.158.181]) by bizesmtp.qq.com (ESMTP) with id ; Wed, 29 Apr 2026 09:39:00 +0800 (CST) X-QQ-SSF: 0000000000000000000000000000000 X-QQ-GoodBg: 0 X-BIZMAIL-ID: 5249929831929191583 EX-QQ-RecipientCnt: 15 From: Troy Mitchell Date: Wed, 29 Apr 2026 09:38:47 +0800 Subject: [PATCH 2/7] ASoC: spacemit: move hw constraints from hw_params to startup Precedence: bulk X-Mailing-List: spacemit@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit Message-Id: <20260429-k3-i2s-v1-2-2fe99db11ecb@linux.spacemit.com> References: <20260429-k3-i2s-v1-0-2fe99db11ecb@linux.spacemit.com> In-Reply-To: <20260429-k3-i2s-v1-0-2fe99db11ecb@linux.spacemit.com> To: Liam Girdwood , Mark Brown , Jaroslav Kysela , Takashi Iwai , Yixun Lan , Jinmei Wei , Rob Herring , Krzysztof Kozlowski , Conor Dooley Cc: linux-sound@vger.kernel.org, linux-riscv@lists.infradead.org, spacemit@lists.linux.dev, linux-kernel@vger.kernel.org, devicetree@vger.kernel.org, Troy Mitchell X-Mailer: b4 0.15.2 X-Developer-Signature: v=1; a=ed25519-sha256; t=1777426731; l=3191; i=troy.mitchell@linux.spacemit.com; s=20250710; h=from:subject:message-id; bh=RWny2LNzrPrEagJ3GrRqR5NlLn0/KK5X3ayFUZDi8u4=; b=wwoi9MYNJCqKjdN/C6ghsVSY+1vMmYnAh65X69vBVqtWQ9L/9Ra/BZlqbfPps05yOXGcuEesX jQcUsC+UxWRCgIl4ZvcTXH85nDmWSZHLn+zvCoBDaJ1Rwz02ogrjIwH X-Developer-Key: i=troy.mitchell@linux.spacemit.com; a=ed25519; pk=lQa7BzLrq8DfZnChqmwJ5qQk8fP2USmY/4xZ2/MSsXc= X-QQ-SENDSIZE: 520 Feedback-ID: zesmtpgz:linux.spacemit.com:qybglogicsvrgz:qybglogicsvrgz3a-0 X-QQ-XMAILINFO: MKU+WaqC/A+ZJCGZ4glD6CdaTkRAPgZwk/18dohhOQSq7Vkhb+uKn5p3 T7E61003jpVvv2WgkaHGqQlhw4M34Tq978Jy28uFp2m7v39iyKcUd8X1LwD/UqHZVLwcpV+ zWljK3H8E8WeAmpKtoo5Hg1slAggfxpYqog1kZhHG8nX95pSLAi42XT+/yK2s+klGdnrVV5 e7oHABZX+0CkIe/YPnLbrpK07stBQmklXE17OOFU3veiES7hQN4BNgcIw5kL4iqWw2uPfWR 7/ZnVctKLZWlyBQCqnysI3b6kbnTNqulFO2HEpH1Ea/zcM7xjj/STVafw6jlLP4Tek9rzxA dZiVYNo0K9mc8NYJ4bSO3kyAuk72n/8atgycYAmzR1F70QaU6+Uvq8g2sVcodgs0DAcy7Ej blJCCYWJWDjxQBgylwQHmAHMGHfl+VjjWBi9gubXx1AW/C2UxuW7pSh+BHoAmYH5TeIc4g6 GW+zxAb5np4DNyXdaR/gLJYaXSRGh6cJgBQ4x9jZu/FJbijQY08o7tAZYCFX3nQOFHz/Az3 tJfFZTfVTfI4Hs8iMGNfddRGd4dUZLQzFh3ulEjKShIAEtd9o6yCm+xNjfUAbStMQk0fG1Y LjpL4LSLqBot2e/+O80H7vqGJ9uPLFxNL87T3xzZhoeGwUrWBFFUoa6Lgp1qGGsZaOWFWm7 ud1kq3jjRta5Lcejb/zHn885OYj6P7WsCLcgc8AY9gANs4qeTJ0mSt2v5T0p5ply83P12xC vvxp2hkYufOiR6z2LLqCahMID1iEKVRhkw9w+WnEW5NlvAneky+f0t0bqPDHSQfxl7snUVa z7B+UWd9HAoL2tGGnLipHVs0BjU5CnpJnO44O5O10j9krnFIN8DEjIO44En/4G83CylK7kP SJKtBMTS4Lro346R9ITq4Jk0K1pBsvaOZmK/mLyq+suEXnlym+IaOsYvpxiR2c7PUZTldLy YwzoR1kaoaIlt0OoGE0ti9NQAHPsz+Pyq06dTEpz7rkxIhd6QhCpjyb8NipL2TLCPKtRdXf PjcFoS+Ctm55zODy5A9R3rCuBBbACr+iu5Gt/nRtDxpZcF/N1rnBi/3e9ouuatG17nYd/NC +x8uWIWLFhYLTF6FHnXX5OOKrrBwAYZFJeFP+pBFBE4YoZEb3m03sOSdV0SkmWZwhEI5+aF e666 X-QQ-XMRINFO: OWPUhxQsoeAVwkVaQIEGSKwwgKCxK/fD5g== X-QQ-RECHKSPAM: 0 Hardware constraints should be applied in the startup callback rather than hw_params, as hw_params may be called too late for the constraints to take effect properly. Move the channel count and format constraints for I2S and DSP_A/DSP_B modes into a new startup callback. This also tightens the I2S mode channel constraint from 1-2 to exactly 2, matching the actual hardware behavior. Signed-off-by: Troy Mitchell --- sound/soc/spacemit/k1_i2s.c | 45 ++++++++++++++++++++++++++++++++------------- 1 file changed, 32 insertions(+), 13 deletions(-) diff --git a/sound/soc/spacemit/k1_i2s.c b/sound/soc/spacemit/k1_i2s.c index 5c878f02cc93..e59624b2e23a 100644 --- a/sound/soc/spacemit/k1_i2s.c +++ b/sound/soc/spacemit/k1_i2s.c @@ -106,6 +106,37 @@ static void spacemit_i2s_init(struct spacemit_i2s_dev *i2s) writel(0, i2s->base + SSINTEN); } +static int spacemit_i2s_startup(struct snd_pcm_substream *substream, + struct snd_soc_dai *dai) +{ + struct spacemit_i2s_dev *i2s = snd_soc_dai_get_drvdata(dai); + + switch (i2s->dai_fmt & SND_SOC_DAIFMT_FORMAT_MASK) { + case SND_SOC_DAIFMT_I2S: + snd_pcm_hw_constraint_minmax(substream->runtime, + SNDRV_PCM_HW_PARAM_CHANNELS, + 2, 2); + snd_pcm_hw_constraint_mask64(substream->runtime, + SNDRV_PCM_HW_PARAM_FORMAT, + SNDRV_PCM_FMTBIT_S16_LE); + break; + case SND_SOC_DAIFMT_DSP_A: + case SND_SOC_DAIFMT_DSP_B: + snd_pcm_hw_constraint_minmax(substream->runtime, + SNDRV_PCM_HW_PARAM_CHANNELS, + 1, 1); + snd_pcm_hw_constraint_mask64(substream->runtime, + SNDRV_PCM_HW_PARAM_FORMAT, + SNDRV_PCM_FMTBIT_S32_LE); + break; + default: + dev_dbg(i2s->dev, "unexpected format type"); + return -EINVAL; + } + + return 0; +} + static int spacemit_i2s_hw_params(struct snd_pcm_substream *substream, struct snd_pcm_hw_params *params, struct snd_soc_dai *dai) @@ -153,22 +184,9 @@ static int spacemit_i2s_hw_params(struct snd_pcm_substream *substream, dma_data->maxburst = 32; dma_data->addr_width = DMA_SLAVE_BUSWIDTH_4_BYTES; } - - snd_pcm_hw_constraint_minmax(substream->runtime, - SNDRV_PCM_HW_PARAM_CHANNELS, - 1, 2); - snd_pcm_hw_constraint_mask64(substream->runtime, - SNDRV_PCM_HW_PARAM_FORMAT, - SNDRV_PCM_FMTBIT_S16_LE); break; case SND_SOC_DAIFMT_DSP_A: case SND_SOC_DAIFMT_DSP_B: - snd_pcm_hw_constraint_minmax(substream->runtime, - SNDRV_PCM_HW_PARAM_CHANNELS, - 1, 1); - snd_pcm_hw_constraint_mask64(substream->runtime, - SNDRV_PCM_HW_PARAM_FORMAT, - SNDRV_PCM_FMTBIT_S32_LE); break; default: dev_dbg(i2s->dev, "unexpected format type"); @@ -303,6 +321,7 @@ static int spacemit_i2s_dai_remove(struct snd_soc_dai *dai) static const struct snd_soc_dai_ops spacemit_i2s_dai_ops = { .probe = spacemit_i2s_dai_probe, .remove = spacemit_i2s_dai_remove, + .startup = spacemit_i2s_startup, .hw_params = spacemit_i2s_hw_params, .set_sysclk = spacemit_i2s_set_sysclk, .set_fmt = spacemit_i2s_set_fmt, -- 2.54.0