Received: by 2002:a05:6a10:eb17:0:0:0:0 with SMTP id hx23csp465519pxb; Thu, 9 Sep 2021 05:12:43 -0700 (PDT) X-Google-Smtp-Source: ABdhPJyXXtr9ATVrlZ+pno8lg8cXCruiKfoTRw6R17h6JGX/rZ3JUkDSCaFQ+1cgvoY1XFSukjxV X-Received: by 2002:a17:906:318c:: with SMTP id 12mr3147374ejy.28.1631189563348; Thu, 09 Sep 2021 05:12:43 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1631189563; cv=none; d=google.com; s=arc-20160816; b=r7nVBokLX2MHU28pMyzl3CL/sVjoO4x0/SYjEm2YXhi5DkUxtudkXukLYMLFbq68d/ 6cQkawcnYnyZOpSTc97YnbH/AyLEdOdV7Z1Hb+TZv48EmRu298ixY1X4ojCSkqwwgOO6 LNdexv/+JA8Nt6ggm/n+SjwDSsKfQNpAp5f+sILR2vc9W7pt3pofMXe8RZ2JvPB95Gw4 Jyirnoga2ZrX9M4io/nSXDdVaILHFZQ0Ys4bOC30kVYGiDzYqJVRzFrul6NQQSoeFWqf CdBSOt8Wc1Y59UiolFU1lsOxeTZ3odZb0RVycA+jVzHT++Qua5+PAw8Arb2jvmHadL1h GYVQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=R8JDYASdQ8EGB2Qjql6zM4rRmBJLo27yKWylZkONaew=; b=D890GGicZnwfvu+CeXuZRIx+JmhgixecTyqqrI/wFyVaXNOe4F9huMKtM5KubWdOa+ 2WMH1C2l8i3rs7bgNM/C1Kp4YWRUpU1ab4WBH9YrGx7DPyCz4kTdUcLPtiYED/IW4baA 62N61ZCviuVwHQC6HP5vZMUzP7dnPsVMg3NbBZvpEMPhUv3ny3Q6evn4dkqfn2lbUPKJ oYL0Cf9nVkI2osbNs8lMFKY4q/r5YTiJkJS11ee4FtvpVSA/d1mVgPvXZYBkqA9Jhdij o66sI2hMdyvuSmZWPTysa5eZfhKui0qiE5wwIOfnMS9r70Rr7xxjy9zfUM36bFLoJEYt 0jXA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=nyKnLCsp; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id j10si1673844ejo.344.2021.09.09.05.12.14; Thu, 09 Sep 2021 05:12:43 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=nyKnLCsp; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1347419AbhIIMLj (ORCPT + 99 others); Thu, 9 Sep 2021 08:11:39 -0400 Received: from mail.kernel.org ([198.145.29.99]:40914 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1344325AbhIIL7F (ORCPT ); Thu, 9 Sep 2021 07:59:05 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id 235FC6140F; Thu, 9 Sep 2021 11:45:56 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1631187957; bh=7znTvPL8pBcDv4O+L3rPJsoXndPJdGh5ym7doU5Uw0M=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=nyKnLCspqhnCXE/V62qVjnRDufs05duk7DD7LwHr8So6D3E9C5ZWL6IO0694zRTSK dBEvycea+41ffDpwnfrH7bT2QKZALKi13DDbjwEhWB4/JNQzuAYCnE5c2i+qvxYGI0 2eUETnFYxDdgFlvE+ZvlzAMQAeQqypFxGCfuoAu7wsVhI4sZT3tf3aBE8SA5k4uxk/ T6qPTlkINWqssHGnv4JgqWnHp3W55zHV5qTEWO7BTsAXdhzi8u7wv9DPRoPE+54/1L sdvMIe3JDW4ItQHEnJRbVhWa5qcz5IO34pjbUya0YeGS16X30zSFAlzP54ykx/5+e3 idUyux6/tvp/g== From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Xiaotan Luo , Sugar Zhang , Mark Brown , Sasha Levin , alsa-devel@alsa-project.org, linux-arm-kernel@lists.infradead.org, linux-rockchip@lists.infradead.org Subject: [PATCH AUTOSEL 5.14 223/252] ASoC: rockchip: i2s: Fixup config for DAIFMT_DSP_A/B Date: Thu, 9 Sep 2021 07:40:37 -0400 Message-Id: <20210909114106.141462-223-sashal@kernel.org> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20210909114106.141462-1-sashal@kernel.org> References: <20210909114106.141462-1-sashal@kernel.org> MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Xiaotan Luo [ Upstream commit 1bf56843e664eef2525bdbfae6a561e98910f676 ] - DSP_A: PCM delay 1 bit mode, L data MSB after FRM LRC - DSP_B: PCM no delay mode, L data MSB during FRM LRC Signed-off-by: Xiaotan Luo Signed-off-by: Sugar Zhang Link: https://lore.kernel.org/r/1629950562-14281-3-git-send-email-sugar.zhang@rock-chips.com Signed-off-by: Mark Brown Signed-off-by: Sasha Levin --- sound/soc/rockchip/rockchip_i2s.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/sound/soc/rockchip/rockchip_i2s.c b/sound/soc/rockchip/rockchip_i2s.c index 1fd47e56c77f..b65dfbc3545b 100644 --- a/sound/soc/rockchip/rockchip_i2s.c +++ b/sound/soc/rockchip/rockchip_i2s.c @@ -233,12 +233,12 @@ static int rockchip_i2s_set_fmt(struct snd_soc_dai *cpu_dai, case SND_SOC_DAIFMT_I2S: val = I2S_TXCR_IBM_NORMAL; break; - case SND_SOC_DAIFMT_DSP_A: /* PCM no delay mode */ - val = I2S_TXCR_TFS_PCM; - break; - case SND_SOC_DAIFMT_DSP_B: /* PCM delay 1 mode */ + case SND_SOC_DAIFMT_DSP_A: /* PCM delay 1 bit mode */ val = I2S_TXCR_TFS_PCM | I2S_TXCR_PBM_MODE(1); break; + case SND_SOC_DAIFMT_DSP_B: /* PCM no delay mode */ + val = I2S_TXCR_TFS_PCM; + break; default: ret = -EINVAL; goto err_pm_put; @@ -257,12 +257,12 @@ static int rockchip_i2s_set_fmt(struct snd_soc_dai *cpu_dai, case SND_SOC_DAIFMT_I2S: val = I2S_RXCR_IBM_NORMAL; break; - case SND_SOC_DAIFMT_DSP_A: /* PCM no delay mode */ - val = I2S_RXCR_TFS_PCM; - break; - case SND_SOC_DAIFMT_DSP_B: /* PCM delay 1 mode */ + case SND_SOC_DAIFMT_DSP_A: /* PCM delay 1 bit mode */ val = I2S_RXCR_TFS_PCM | I2S_RXCR_PBM_MODE(1); break; + case SND_SOC_DAIFMT_DSP_B: /* PCM no delay mode */ + val = I2S_RXCR_TFS_PCM; + break; default: ret = -EINVAL; goto err_pm_put; -- 2.30.2