Received: by 2002:a05:6a11:4021:0:0:0:0 with SMTP id ky33csp2349046pxb; Mon, 20 Sep 2021 19:42:14 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwcWnb/fHP8Gzo/pspMoYQUIbieSGza2JJNNhVsccw7JuJxNYbrsNHnrlS5AXAghTEYTgka X-Received: by 2002:a17:907:2658:: with SMTP id ar24mr33283075ejc.329.1632192134366; Mon, 20 Sep 2021 19:42:14 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1632192134; cv=none; d=google.com; s=arc-20160816; b=p9mrlsB20f12DiYluAun+VH3BzjAiMLujDQ5/uS6QLXDZDAsQ8JtrClBfnqbASCI6m qxwkcU/aIjVjVB5Ft0bhgs8K5+kOfLHZIh1QbQQSfGieeHXbd9SVKXh6cR3Ja5M95/bh mnpmTNqD/IPdUUbZ+hA1R2uMg+nHJMa+2UxnrPixYQLHGVDcrUgRPfVcuslI4GBOANnf 16HbDl8EicpdvAE27+5ME6ZF2Z9ByZg42R/wp4Krh71eeCIgrYQNHBorw3u92VaYSTJL JGIVy+wbXpHX13e0qRVpQAIfuib4YoAVEXpB144OT4DPzTw+tXMdwnTC0FURz9h7gGfZ vvQg== 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=5jZ6GVAaHDZ+hFuT4R6WGSOfq1yNr2rPN9ETNT7opyY=; b=CSf+xdsO4fLH3VIXf/6whsyEED7fv5b497YJe/zZHynmbgq4QGUwHudSwdxaRw6z6G MeRT9GsyrQ6Kj431gKUqd7/Y/q1/AF+06RSnLZ76KntAj+s0bONFKSryR/U8GbvDJoEQ GHH/twJn85/wJK7s1LMK5pGQTXoKolHYbFbYvNAn3eBD88hxRHa5rje8wx0HHJ0QpuD9 O7DnUp0dgnBC5IRZ+p9L3Tl+Q8WBcJ9ngdSja7Fe9WOaUkipHtN72FvFqAqZcw8v0Uxc a+rEVmrZkT1y23yvwhqeehKQ9wpLRdsgw5tWKxIJFYiKlb7TWBTNaceWwuZWvpsgfLkB un6g== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=EAKC5onY; 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 p4si11819771ejr.151.2021.09.20.19.41.50; Mon, 20 Sep 2021 19:42:14 -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=EAKC5onY; 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 S1346378AbhITSSD (ORCPT + 99 others); Mon, 20 Sep 2021 14:18:03 -0400 Received: from mail.kernel.org ([198.145.29.99]:35804 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1350767AbhITSMT (ORCPT ); Mon, 20 Sep 2021 14:12:19 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id EFE6B63280; Mon, 20 Sep 2021 17:20:48 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1632158449; bh=P+/wLJ/gFGrvYwx3f2jPm2N/LlOMEr7UHMQiQaYEkU4=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=EAKC5onYgy9nhLeMdbgRo93VnnOlYSg8Mr2rRLj2or6iR4m17iFXA9aRwm8eOCgZT EAnNHSlciZtPtNn2BIKDDaa9UQyjskuXb6cLGm6FiSfWJtb77yr1mrfXrz5tAFGgi6 FJKGcFdjgX9LueqOLmu+Uqwu5SLrH4qXcQ72AQ6c= 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.4 162/260] ASoC: rockchip: i2s: Fixup config for DAIFMT_DSP_A/B Date: Mon, 20 Sep 2021 18:43:00 +0200 Message-Id: <20210920163936.602313797@linuxfoundation.org> X-Mailer: git-send-email 2.33.0 In-Reply-To: <20210920163931.123590023@linuxfoundation.org> References: <20210920163931.123590023@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 f48b146cd96a..086c90e09577 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