Received: by 2002:a05:6a10:eb17:0:0:0:0 with SMTP id hx23csp510968pxb; Thu, 9 Sep 2021 06:09:57 -0700 (PDT) X-Google-Smtp-Source: ABdhPJyZPeAJR6WFduRKPpzAytmhvC7Z7NWxRUmvxd6byOM/+EmXklmFpguD5q2/AgGhx1T9HiyM X-Received: by 2002:a02:90d0:: with SMTP id c16mr2827595jag.106.1631192997432; Thu, 09 Sep 2021 06:09:57 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1631192997; cv=none; d=google.com; s=arc-20160816; b=XjXqzJNdDr45SGeYz/43/7wGTcI7rn83lctBfFmzMxkGPtKlwGjKlj2/Sxb2t/V4Vo rUauXPFgNey4QMubzG2jIi0Fn0pewI2ejWTKH5nmoP+/nLjQVqNSSDVgPl+OhKv84L+S 7Dsqt6MzJ9FESUBq7Uq0iFzJXknSSL1EIZDKXfMDRisjM6/OB15xq/PBw9Ub/9jg79rB lseoH6EAHEtKPXAlSYGTFrkUsb2ZRkEvv+r3RFvzopf9sjVZkExFsecMPtIOTr+2cxd1 5N0zQeQnC81T+7qg9VX6xC+2F7WxBoHAxwiow7NStHtHqFy+dNUylnAeGR+SuVmtMDeP cA5A== 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=5jZ6GVAaHDZ+hFuT4R6WGSOfq1yNr2rPN9ETNT7opyY=; b=HwF/FBleQvss690CO0D0GtSo5wVTvHXXjreVN/E8GAI2t008lYBeGILwrKzGQ5Ej4S J7qokZVFW10VrKf97mkJ6A0891+tkyWTfkKfhvdytgioC0ZWlfNszFiXZ9kMXJ9Ejvob 9Hj5a/BYDgKG8wcBWiUI2INyn6IfdF4jAvNm/UCLzENdyeEcMKkyMGatEvRNji3ZeFO8 SrkWjQP7CRHlzlUcXFbr6c7h5gqSyJ/ItU730//HDLBdu+3AgLzQHf6YZhFk1YcVnSf3 dzZbdwtL0tY2PtVZi4en1nvv/K3KKWrKyD9JZ9HhJFLWbKAB6Mh3SxBIZt4sXid7g5yC 5KmA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=NVvIK72U; 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 d14si1494252jaf.71.2021.09.09.06.09.42; Thu, 09 Sep 2021 06:09:57 -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=NVvIK72U; 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 S1355947AbhIINDx (ORCPT + 99 others); Thu, 9 Sep 2021 09:03:53 -0400 Received: from mail.kernel.org ([198.145.29.99]:40980 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1354512AbhIIMvK (ORCPT ); Thu, 9 Sep 2021 08:51:10 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id D23786323B; Thu, 9 Sep 2021 11:57:10 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1631188631; bh=P+/wLJ/gFGrvYwx3f2jPm2N/LlOMEr7UHMQiQaYEkU4=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=NVvIK72UegHJM4h7kfuEqom91ZQV4lYMwOOtEMURBHQdSKkV4zeVOAttJYLs23s2l 7qnO4VWcA5BIipYLy6PSczIYhBYFSBeUQtemaJwhFCERPAfCcLQUZviqKzNfFPMpv9 oEjAB3Q3aVcqQgAN4oseBSHFgNJOmuLwVHwt8dq7mW3w5N4+HwogDiNjBznml2HmMa 0mpHz9V3arQykicoZqykJZbWYUPQF7rDmBLGiO83zJ6ISgCphND1Evpf789vTSEU/G OJKlDybEp0LbDZAKFowh+tm23l9+SmKvNPhzYFIT9KmBOF3il0K/98P/HVJ+P8M33X 1wQYtaoJvj+GQ== 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 5.4 098/109] ASoC: rockchip: i2s: Fixup config for DAIFMT_DSP_A/B Date: Thu, 9 Sep 2021 07:54:55 -0400 Message-Id: <20210909115507.147917-98-sashal@kernel.org> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20210909115507.147917-1-sashal@kernel.org> References: <20210909115507.147917-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 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