Received: by 2002:a05:7412:9c07:b0:fa:6e18:a558 with SMTP id lr7csp776765rdb; Sun, 28 Jan 2024 08:26:51 -0800 (PST) X-Google-Smtp-Source: AGHT+IH/I/2ECbZ/W2yuvOKl5JeNIkjvrGQVVZnKh79kvQre4yuGHZioKKQ71sxTQAAazYD/xR/7 X-Received: by 2002:a17:906:33d1:b0:a2e:100a:639e with SMTP id w17-20020a17090633d100b00a2e100a639emr2942655eja.69.1706459211673; Sun, 28 Jan 2024 08:26:51 -0800 (PST) ARC-Seal: i=2; a=rsa-sha256; t=1706459211; cv=pass; d=google.com; s=arc-20160816; b=JnstItgiermIUOO/atrW51EKYb9lINjMNTr/WXOY3V8GlM4kjqEopIGmpgYPyUzJN1 35gJGdVA1hk46N5SgLMThV85fHiqwYmoKjbJ/3tNhRlHswLWgFhKI0OwawcNfHCqq+o8 XYoBHgpn/q4/3q8+xwVzzTi1MqSKQPg/3hyblSdrSwXfz7TnD7BxjwbzLAUTxPLb26gq +gm0lYa+G8GDEiIHTN/rG/q28MYwqNZ/FbnnkHkgdeCdrpep2EdbObjUwPbYYjZFGKPx /fjn5mmd2IwJxRTCKFe0Ig5VHELrs03F40nEC4SX8jGa2jLoC2GkbjyKa2End2POPCzF 7B9w== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:mime-version:list-unsubscribe :list-subscribe:list-id:precedence:references:in-reply-to:message-id :date:subject:cc:to:from:dkim-signature; bh=D2NBwgmJOKu/xtuQq/LeWOm7Whti6DAfUGa5BhhszkM=; fh=Qh+3SniUPuo0MOutgPcBUn1qi2tjxzOpMFSxjjQrlCk=; b=broTpCnEgIdYpBDIOilIYIdjaz0YHR6cIDVsyREC74SsdiJtxi3S7iJV44Mqchdc+k fcAkRZVAFOrTHGzoUbETuThLRcHxuJVr3rSf3IhdniPnmBbGKSTt63Po4PGY5Caz9QuT YXESLMmUxA0SfVUl+6eNwS1GlXQiX9woYERHhBgYsdZlsKRH4cFttYmdjiBMlpCbhoQ+ fy3ow4NF/TSXGvZ9kGhSWsfcPyEmQNbz1TojEa+XyIVgqWKmiA5mty1iqVz/7b21ZUZO IrbDUX/h9QPtiYp1uiVT5jf121zkpHLtxijRd5Wp5xz10TH6ai92g91RwbjjRC9+fQTU XLKQ== ARC-Authentication-Results: i=2; mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=AoM2PIVR; arc=pass (i=1 dkim=pass dkdomain=kernel.org); spf=pass (google.com: domain of linux-kernel+bounces-41706-linux.lists.archive=gmail.com@vger.kernel.org designates 2604:1380:4601:e00::3 as permitted sender) smtp.mailfrom="linux-kernel+bounces-41706-linux.lists.archive=gmail.com@vger.kernel.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Return-Path: Received: from am.mirrors.kernel.org (am.mirrors.kernel.org. [2604:1380:4601:e00::3]) by mx.google.com with ESMTPS id i11-20020a170906250b00b00a1d1a631026si2681433ejb.518.2024.01.28.08.26.51 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 28 Jan 2024 08:26:51 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel+bounces-41706-linux.lists.archive=gmail.com@vger.kernel.org designates 2604:1380:4601:e00::3 as permitted sender) client-ip=2604:1380:4601:e00::3; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=AoM2PIVR; arc=pass (i=1 dkim=pass dkdomain=kernel.org); spf=pass (google.com: domain of linux-kernel+bounces-41706-linux.lists.archive=gmail.com@vger.kernel.org designates 2604:1380:4601:e00::3 as permitted sender) smtp.mailfrom="linux-kernel+bounces-41706-linux.lists.archive=gmail.com@vger.kernel.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: from smtp.subspace.kernel.org (wormhole.subspace.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by am.mirrors.kernel.org (Postfix) with ESMTPS id 921431F264D5 for ; Sun, 28 Jan 2024 16:18:21 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id 4E5895478B; Sun, 28 Jan 2024 16:12:14 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="AoM2PIVR" Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (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 6BB4254729; Sun, 28 Jan 2024 16:12:13 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1706458333; cv=none; b=K1sDhnTNkCsR0Jz+CLS6PDToQnwXiq6OX9TKTpcFxMD2NM7/lCwhju3VTfq9HFys2C2dw/gFTYA4B5IbcZ2xwf7boQB+3veEjtArcQ2aCjfI0LCHSuFjxveQcMgmX3B0e0Q/l0uz15k/u/KTKH7BSMtEAvg3vliaffNqpp4QXvU= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1706458333; c=relaxed/simple; bh=AYwjX9NZn8KyMuM5X9m/tzbJx+yYqjVr068BuOwxfGk=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=MFF1KhW+X6P4Wc+irw4yUnSbvBEXzqf/rx+5HHgF2w5PXblsJvDBL9n94lTbfAAKwz+rYPc+pM9kiCSxqHFFkv54Wg7QGOjMSzPFpotZapja+1d01SKaCQ4ZodF/u7EbutvLOGZNOf42jYlg6GOp4KjKu0hCnu5xcghNq7k6xiA= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=AoM2PIVR; arc=none smtp.client-ip=10.30.226.201 Received: by smtp.kernel.org (Postfix) with ESMTPSA id 32704C43394; Sun, 28 Jan 2024 16:12:12 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1706458333; bh=AYwjX9NZn8KyMuM5X9m/tzbJx+yYqjVr068BuOwxfGk=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=AoM2PIVRqziyZzqKIQnklR5mulKFCAQVELK2aXtBoYwHioXLOsxkqeW+GLvWxxcID O5BJUc6irQSvO53GRl6pXIUbcjlePY7bR2ENOhYjVMQCrlIWYperUScNsGYufZATCO aJx+NH201ixMJwK2OQnp0RTtshG6dQMpbHxpUl0ErQ6tMDXO2IjKL2SDDPeNcd2F2n 0m77R6pFCT44nKRbv6v5Pa0gUwputswfQlZWPUX3sJI2jhP86BfKbB69zy+VBZ81nt Hd5X7PO8oaD8VUHALv04b1QtrvDXwR8L1o0HsxhBGvArB/ftNsjV/E/7nKY7aUNiIs 0bV8sJPo54KAg== From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: ChiYuan Huang , Mark Brown , Sasha Levin , oder_chiou@realtek.com, lgirdwood@gmail.com, perex@perex.cz, tiwai@suse.com, linux-sound@vger.kernel.org Subject: [PATCH AUTOSEL 6.7 24/39] ASoC: codecs: rtq9128: Fix TDM enable and DAI format control flow Date: Sun, 28 Jan 2024 11:10:44 -0500 Message-ID: <20240128161130.200783-24-sashal@kernel.org> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20240128161130.200783-1-sashal@kernel.org> References: <20240128161130.200783-1-sashal@kernel.org> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore X-stable-base: Linux 6.7.2 Content-Transfer-Encoding: 8bit From: ChiYuan Huang [ Upstream commit 415d10ccef712f3ec73cd880c1fef3eb48601c3a ] To enable TDM mode, the current control flow limits the function calling order should be 'set_tdm_slot->set_dai_fmt'. But not all platform sound card like as simeple card to follow this design. To bypass this limit, adjust the DAI format setting in runtime 'hw_param' callback. Signed-off-by: ChiYuan Huang Link: https://msgid.link/r/c4c8df00d8d179b8b5b39a8521de3a85325c57e8.1703813842.git.cy_huang@richtek.com Signed-off-by: Mark Brown Signed-off-by: Sasha Levin --- sound/soc/codecs/rtq9128.c | 67 ++++++++++++++++++++------------------ 1 file changed, 36 insertions(+), 31 deletions(-) diff --git a/sound/soc/codecs/rtq9128.c b/sound/soc/codecs/rtq9128.c index bda64f9eeb62..aa3eadecd974 100644 --- a/sound/soc/codecs/rtq9128.c +++ b/sound/soc/codecs/rtq9128.c @@ -59,6 +59,7 @@ struct rtq9128_data { struct gpio_desc *enable; + unsigned int daifmt; int tdm_slots; int tdm_slot_width; bool tdm_input_data2_select; @@ -441,10 +442,7 @@ static const struct snd_soc_component_driver rtq9128_comp_driver = { static int rtq9128_dai_set_fmt(struct snd_soc_dai *dai, unsigned int fmt) { struct rtq9128_data *data = snd_soc_dai_get_drvdata(dai); - struct snd_soc_component *comp = dai->component; struct device *dev = dai->dev; - unsigned int audfmt, fmtval; - int ret; dev_dbg(dev, "%s: fmt 0x%8x\n", __func__, fmt); @@ -454,35 +452,10 @@ static int rtq9128_dai_set_fmt(struct snd_soc_dai *dai, unsigned int fmt) return -EINVAL; } - fmtval = fmt & SND_SOC_DAIFMT_FORMAT_MASK; - if (data->tdm_slots && fmtval != SND_SOC_DAIFMT_DSP_A && fmtval != SND_SOC_DAIFMT_DSP_B) { - dev_err(dev, "TDM is used, format only support DSP_A or DSP_B\n"); - return -EINVAL; - } + /* Store here and will be used in runtime hw_params for DAI format setting */ + data->daifmt = fmt; - switch (fmtval) { - case SND_SOC_DAIFMT_I2S: - audfmt = 8; - break; - case SND_SOC_DAIFMT_LEFT_J: - audfmt = 9; - break; - case SND_SOC_DAIFMT_RIGHT_J: - audfmt = 10; - break; - case SND_SOC_DAIFMT_DSP_A: - audfmt = data->tdm_slots ? 12 : 11; - break; - case SND_SOC_DAIFMT_DSP_B: - audfmt = data->tdm_slots ? 4 : 3; - break; - default: - dev_err(dev, "Unsupported format 0x%8x\n", fmt); - return -EINVAL; - } - - ret = snd_soc_component_write_field(comp, RTQ9128_REG_I2S_OPT, RTQ9128_AUDFMT_MASK, audfmt); - return ret < 0 ? ret : 0; + return 0; } static int rtq9128_dai_set_tdm_slot(struct snd_soc_dai *dai, unsigned int tx_mask, @@ -558,10 +531,38 @@ static int rtq9128_dai_hw_params(struct snd_pcm_substream *stream, struct snd_pc unsigned int width, slot_width, bitrate, audbit, dolen; struct snd_soc_component *comp = dai->component; struct device *dev = dai->dev; + unsigned int fmtval, audfmt; int ret; dev_dbg(dev, "%s: width %d\n", __func__, params_width(param)); + fmtval = FIELD_GET(SND_SOC_DAIFMT_FORMAT_MASK, data->daifmt); + if (data->tdm_slots && fmtval != SND_SOC_DAIFMT_DSP_A && fmtval != SND_SOC_DAIFMT_DSP_B) { + dev_err(dev, "TDM is used, format only support DSP_A or DSP_B\n"); + return -EINVAL; + } + + switch (fmtval) { + case SND_SOC_DAIFMT_I2S: + audfmt = 8; + break; + case SND_SOC_DAIFMT_LEFT_J: + audfmt = 9; + break; + case SND_SOC_DAIFMT_RIGHT_J: + audfmt = 10; + break; + case SND_SOC_DAIFMT_DSP_A: + audfmt = data->tdm_slots ? 12 : 11; + break; + case SND_SOC_DAIFMT_DSP_B: + audfmt = data->tdm_slots ? 4 : 3; + break; + default: + dev_err(dev, "Unsupported format 0x%8x\n", fmtval); + return -EINVAL; + } + switch (width = params_width(param)) { case 16: audbit = 0; @@ -615,6 +616,10 @@ static int rtq9128_dai_hw_params(struct snd_pcm_substream *stream, struct snd_pc return -EINVAL; } + ret = snd_soc_component_write_field(comp, RTQ9128_REG_I2S_OPT, RTQ9128_AUDFMT_MASK, audfmt); + if (ret < 0) + return ret; + ret = snd_soc_component_write_field(comp, RTQ9128_REG_I2S_OPT, RTQ9128_AUDBIT_MASK, audbit); if (ret < 0) return ret; -- 2.43.0