Received: by 2002:a05:6520:4d:b0:139:a872:a4c9 with SMTP id i13csp2566802lkm; Mon, 20 Sep 2021 18:53:55 -0700 (PDT) X-Google-Smtp-Source: ABdhPJyzYNQ1sQaFHZgvnH/n+enyJybOUDvAOeRY13Es8IZKMkmn4AGzST59p2rbiV61wziekAk/ X-Received: by 2002:a05:6638:3813:: with SMTP id i19mr21835172jav.16.1632188844921; Mon, 20 Sep 2021 18:47:24 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1632188844; cv=none; d=google.com; s=arc-20160816; b=dXmoffQTnrIva1DvOLjgIFT9xekSYYT1qzE4qjvNyQCmcOE4Iu/bQrWTrtTw1e41lw LGksRcoFNbi1R61Qe1kiJwEIwvVbGRysjmEBOuzooprcr75vz07A9DA3pVXRIBBvub9x 5W2KVKHiue1vKpRNJoQOU95C0EnvFkxx8pxvjictyUluKlSfX1MGTDbkfCFBxS3SMJIC NMfqW0uxYrCEZI1PB7F3stenTQS5bn5A/GFh9GPAw4Af9X75smvX3taZKqE6I3lWvCe4 1CMcWT2v/1wT0v2EzgvPFv/uVpDEEkYi0rGb1RYkRWiG2gBhNs/ULPTMHpbxn3doZx/a Edpg== 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=02Vb/1AXhuypWBIY6e1UYUhFEeFsOzLaSwvKUAMZpko=; b=KOS37xMfxdeQC/yUNradXAtswTr976nNLmxawxT86m7cfwjc9CHb7YTZl4CMIXOqjl u3wlCgVIYlez4v+0LfDWW5Shv1auEUkeBVpdRrU6StpQMMgdwKYohtejSszmqwVmr+Nm a9REU1kNx+iSwS3jKUoR7HhAeaYI8cxob18f14+D/WVIWQX6oat6j8QXLuBuCWrpIoyk MynT1pIuZfp+V2ZvWKfqQyJbotLU3fN98E9S6boO8XAq8rWorR9HsYUKjvMg7ZSwSTkd wmLty0Phe8YOXu2oSxhxyZ/cOzCbQyiXp2KWwfnsFT+LtaHYlQmGFYSqBLMCRTmbJuBA kAeg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=njapqFGe; 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 o12si16403706ilj.142.2021.09.20.18.47.13; Mon, 20 Sep 2021 18:47:24 -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=njapqFGe; 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 S1351183AbhITRc3 (ORCPT + 99 others); Mon, 20 Sep 2021 13:32:29 -0400 Received: from mail.kernel.org ([198.145.29.99]:35392 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1350833AbhITRaJ (ORCPT ); Mon, 20 Sep 2021 13:30:09 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id 8672D61ACE; Mon, 20 Sep 2021 17:03:59 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1632157440; bh=DVPcasjXqRCJ7pjR4tm+hxVvYjh0R8MRVB2pUj+6JXc=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=njapqFGeac5UufbOMaPwqqeryufphHFfbhLTD2bqnG4cKnpwjunlG6u1byed7i6Dd 46LHkQYX/FDs3Q1JLqxRV46AO/svKuTQHd1zd8Ahg9IZvBkkw3mER3hC4nMGOz5yVH DpDUFk12eWPcvMUIkOkALRDrcnQOPPsjpb4qRLEI= 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 4.14 178/217] ASoC: rockchip: i2s: Fixup config for DAIFMT_DSP_A/B Date: Mon, 20 Sep 2021 18:43:19 +0200 Message-Id: <20210920163930.661292274@linuxfoundation.org> X-Mailer: git-send-email 2.33.0 In-Reply-To: <20210920163924.591371269@linuxfoundation.org> References: <20210920163924.591371269@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 93a4829f80cc..8d1a7114f6c2 100644 --- a/sound/soc/rockchip/rockchip_i2s.c +++ b/sound/soc/rockchip/rockchip_i2s.c @@ -235,12 +235,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; @@ -259,12 +259,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