Received: by 2002:a05:6a11:4021:0:0:0:0 with SMTP id ky33csp1538974pxb; Thu, 16 Sep 2021 09:30:07 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwDp2pn/NId1FrlESx0Lnkfghgi0daulmDxNKyTE1rXGRW9kUKr5vr9CfALUUsyxV3Ty67Q X-Received: by 2002:a05:6638:14cf:: with SMTP id l15mr5093949jak.8.1631809807823; Thu, 16 Sep 2021 09:30:07 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1631809807; cv=none; d=google.com; s=arc-20160816; b=eEEV8nDBBmGO5FuQKkk39qgqEghcEMoabinAUJZf5DfqUHQGRiYGII2wjW/o6gVr3a R49fDrc6Z5nhdBgTXg/hwksMXmXw6EcXFO5yW+jNZUrRBfEO9Fp5BB2+zrDy0w/9VxCG rEZrVnul+b+oRDhD0GTBXv+jsoAxZjlIYIrYYr92J284f0ZrgAW+bEICT+Ap4jzrQN3o y1b4fpY4ChdO9anB340OecDEfmeE8W0Fu80hLI0DygZB12/Bvy4ORfDZZszl6I+bZlSi 28kCrDKeLBIs5y7giQVR8Wr0rppP5YlVoR0z1GhJwdqEhGgIgedZ6UifWe58Hu7itaQh +Klw== 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 :user-agent:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=L3HL2Q3z0frxnYULgM2CGN6ViZW4wAGDEbGqDPEt4no=; b=SK7j5jWN3Ljw+UluM8Zf48NnPkDEGtW+bVUIhM3baj2DLhpH5O22fQPl00KwKrtaAB F4eNj9j8wjV/s3/XLTL1gBq3v+9i/WIdrS0krnGx3pquRzzifVXKJD2br120fl+MUy10 ecG7OVixrzukKpXh1uCWy294CwCD+8EmKeworrBuf9/fM4d37r91k8aQPdkb5BaMvOEi l0LogKe2Hwu1/rn8wnpgjTdqK+2VAHsz8QWDXQwuTSc7IIoQNLSFXAmKQV3PumVBESKV AGypnBa+9yY69QIuFXLRMwx/kUdUW3W3NnIKzA1iYUZxZ+GLEfiLAUDEoPolKhEc2y2d EbvA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=2AmQb0lA; 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=linuxfoundation.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id 11si3290167ilq.55.2021.09.16.09.29.55; Thu, 16 Sep 2021 09:30:07 -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=@linuxfoundation.org header.s=korg header.b=2AmQb0lA; 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=linuxfoundation.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S243131AbhIPQaD (ORCPT + 99 others); Thu, 16 Sep 2021 12:30:03 -0400 Received: from mail.kernel.org ([198.145.29.99]:58820 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S241086AbhIPQVO (ORCPT ); Thu, 16 Sep 2021 12:21:14 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id 4C87F6140A; Thu, 16 Sep 2021 16:14:42 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1631808882; bh=U2Xdfcl5vcq/srV+eQa0soW0VkO6ChXX7XPzMXxIDQg=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=2AmQb0lALMj4/IcEbM8NW4JeVVr1hDd4Ap0XK+eJuSJa8PhLkDVBiyjyBusADkZ0+ zm4pLU8zbo2m+WPyDhHCF2mF1bePB7z5V5Bb9DxIyqIC0KD1c53PBjk6Lt00gcsoFT 05xYC9nLQq3Y2eHPXWIKd57SzFTGWd+XjQxFb1Q8= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Xiaotan Luo , Sugar Zhang , Mark Brown , Sasha Levin Subject: [PATCH 5.10 258/306] ASoC: rockchip: i2s: Fixup config for DAIFMT_DSP_A/B Date: Thu, 16 Sep 2021 18:00:03 +0200 Message-Id: <20210916155802.867269739@linuxfoundation.org> X-Mailer: git-send-email 2.33.0 In-Reply-To: <20210916155753.903069397@linuxfoundation.org> References: <20210916155753.903069397@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 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 43522d7701e9..fa84ec695b52 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