Received: by 2002:a05:6a11:4021:0:0:0:0 with SMTP id ky33csp1570156pxb; Thu, 16 Sep 2021 10:07:04 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxnGJiB3gNqghfToaReuVmhe6CribPJ7pAUrrrkqmBMV8G3iSbkgj7ORB4Tfs8Vgqlr0N9w X-Received: by 2002:a05:6402:1437:: with SMTP id c23mr2712190edx.247.1631812023922; Thu, 16 Sep 2021 10:07:03 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1631812023; cv=none; d=google.com; s=arc-20160816; b=jhv4RaFgeuS543x+TkEp16C2uhCpkrxZejRM1GsbOeqMlZsURI84lTDhpdqGweNZs0 JaNKz7EgWzUOgWDgIIAMKlI6dvbaSkmfC0HhLfIt0GR4QGWysxe56lS06ddAsQ2ymOQY 7G842sig4RtWXiuFWUD+/Zhq0McQBOTxJB+aEwZ20MNjSU+WEyiPynapc7/smpO86A+W OREa9D0LZDPOoGrw/baBB6X9YKOR04ZMr78SzfgC3hPz0TYY3eHLyOlioaveHYkQ3LlZ VrGP5gQgdqjiwfWjP2p+r9+C7lgC83RRk28BWGwViytfxfcDsvdLyCnFWj0eNjb0JFOc x2mw== 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=pc0jsd1qA0fgutQKT96N66JE+3iqbaqhuhgV8/cmMIE=; b=V+SsPa8LL6hSDuCcQ1DBvyduRpteZYyD9g+LxftXxq2VGB2YpKW0iO35AH+HASVnFM Q22ZRxG6de1vR7rE3yVNQmPhji6h1UVyZn8dxH97e6x35Zrfx446WKuvSHQwTPI+QXjG PID/I7uXd6IpLvizXXw/lV0nMip0rOdRzhXxrHAtri6NBHMeRZOh2Pum1fxvyQ1kuPCK FPpklacrOU2NjTFBEWMKpjooRdC8QE5KKNlNFxblSajClEsyu56+YJTI81n9DNzxCzld /Zg8XFAHZkALhQdm4ohENOHL/ow11i6DmmPLge0GK61Qp1nJ5LybZv1AxykVuZFIdRlR 3kYA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=y7sYY9Ov; 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 z28si1503860edl.12.2021.09.16.10.06.38; Thu, 16 Sep 2021 10:07:03 -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=y7sYY9Ov; 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 S1349442AbhIPRFs (ORCPT + 99 others); Thu, 16 Sep 2021 13:05:48 -0400 Received: from mail.kernel.org ([198.145.29.99]:34040 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1347886AbhIPRAq (ORCPT ); Thu, 16 Sep 2021 13:00:46 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id D9D9661AF7; Thu, 16 Sep 2021 16:32:57 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1631809978; bh=wqRdXXdYW5J3ccVYSV5ysXtiIt5KP0f/0WlRa/QUiAU=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=y7sYY9OvcMAQy+bYjmItwGm8ZnTIuGipjf+h0vK4n3zvq9PriATaoaJnsICw7AhKG Rk/PbJfWRb0pc9nQIOQeAK1OmmFhBylH7fGKVVT9jYNybd3Lvf9Lg/+BOHY50nzUHL 8x/xViXHHc2Se/+/rxttYAcryBkhDACPiXWSs4wc= 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.13 321/380] ASoC: rockchip: i2s: Fixup config for DAIFMT_DSP_A/B Date: Thu, 16 Sep 2021 18:01:18 +0200 Message-Id: <20210916155814.963030864@linuxfoundation.org> X-Mailer: git-send-email 2.33.0 In-Reply-To: <20210916155803.966362085@linuxfoundation.org> References: <20210916155803.966362085@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 d020cb2bdbc4..ac9980ed266e 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