Received: by 2002:a05:6a10:eb17:0:0:0:0 with SMTP id hx23csp520348pxb; Thu, 9 Sep 2021 06:20:10 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxIoHNAtOJv4GMPf9mY/tiW33VBVfqJrWWkHeBAYhR9xxFypf/2usaSH56mcduCRaWYhFE+ X-Received: by 2002:a02:a18d:: with SMTP id n13mr2887981jah.120.1631193610453; Thu, 09 Sep 2021 06:20:10 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1631193610; cv=none; d=google.com; s=arc-20160816; b=h9LL+E6kaveIP82E78D9/NgCGA5jnC0zTYYS36cOWND6xLF+bTnEc8jK2yADYEToYk K/5v68t0WWmUgHoIF2r2VFv+MSWYhxGTphQgWhfV6yfboZ4scL9WpNekmixKmvB/8s8M l0LP/a0p6d6PzbbnjrinlqGdjKbrP9SURSaReeF6ef6+H/+thNRBCL9MZw+aRtbIV3Lf Uwn5uHTGHL9pSlBK6b0SAcX0fPVfC0KVXaF01OmLqncLtKbNEWtfA/8U0lNySsaxqV4D S/P6eFF7fkdKlrAYPXjNFNtHaLUiKz2zpTFAkb1DHuBFXHFvERdgm75Tnxz+cbKNgraS ZXvw== 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=02Vb/1AXhuypWBIY6e1UYUhFEeFsOzLaSwvKUAMZpko=; b=K5SvKqgQYsIs8syMR6IGWyYjHFg1EvFnRNa7jVMLKDs16SCgcRuGy8W3FaO9fBN9zG jGp84Vbvs2g9iDeFvamQ2yOWil5IrcDX8Sr4+Qj8hzHaS5OZRQ4KmVOSDfL+zIlpePHB u5qJiQJaFTOH77/Yb0Vsc8+DSB0ws1BbjzTcZ6CT7N7IxULvHfw8HUS7jWbjrAHWinnV Wkqp2+kAyrKlNUbtnQXi+loSZvGdIxUMXxeu/I4RkX45KPfo677I2iVWugJ3tbQj9mzR osOm2Yy8zIGuBOXtB/ESzCcQLiA4pLlaBT0iDnnuxLi0R6j33XQ9aCzqdRJpc7f0fF8v dofw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=qKpUcbnJ; 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 z17si155804ill.150.2021.09.09.06.19.57; Thu, 09 Sep 2021 06:20:10 -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=qKpUcbnJ; 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 S1344874AbhIINTB (ORCPT + 99 others); Thu, 9 Sep 2021 09:19:01 -0400 Received: from mail.kernel.org ([198.145.29.99]:46260 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1357884AbhIINFS (ORCPT ); Thu, 9 Sep 2021 09:05:18 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id C37B56329D; Thu, 9 Sep 2021 12:00:07 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1631188808; bh=DVPcasjXqRCJ7pjR4tm+hxVvYjh0R8MRVB2pUj+6JXc=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=qKpUcbnJS1ViHJn5VlSTxrTxexuDrRCKAQ3BPIQya5vUVVtWGagGY58hTa0EsQoqu CATNL+/d0PaOjwAGVqtAzQOnFSsA5Erpk9hTzB8s+kgUi6xQnqjn4Pej1pYbYebIul gLsbsue+/3TMkw/UV8WVUDGSSlt2cOyj/Nqrdc0o0tXt9aaSOReOIwtnJi03Z15wf7 DZKGkPmjNbEKPmX2qVJfhSkcWLj+Ahyje2I40ASG8Nl4iGjdqZBQM9OEZxdBKtuRgK ihe3hXUSv5i0baCsRBDBIKCUP/Tq38tmIaKhnxR55y2I0Ic2fxeeJuA8EI74d05rvk oBVo1SIINLmXQ== 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 4.14 54/59] ASoC: rockchip: i2s: Fixup config for DAIFMT_DSP_A/B Date: Thu, 9 Sep 2021 07:58:55 -0400 Message-Id: <20210909115900.149795-54-sashal@kernel.org> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20210909115900.149795-1-sashal@kernel.org> References: <20210909115900.149795-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 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