Received: by 2002:a05:6a10:413:0:0:0:0 with SMTP id 19csp2114057pxp; Fri, 18 Mar 2022 03:39:37 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzqqfHaZX6UN20sNpK2l0g1jtiamm73qOV4o4ZgwO7MV4LsOUTe0NmGHZigbSZuZdlpHjl5 X-Received: by 2002:a17:906:36ce:b0:6d6:e540:ed65 with SMTP id b14-20020a17090636ce00b006d6e540ed65mr8433894ejc.330.1647599977613; Fri, 18 Mar 2022 03:39:37 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1647599977; cv=none; d=google.com; s=arc-20160816; b=pU85gCOMg1ZZNd5yWK3ZffM4jEWlir3NYfQXPB2lVCFimcIcU/geSX8Etgg7HR2hlq 5ooqS5aaNMj67tohhUJ+/WZCCmj0ExL36aX7R6xOU5rSBM3Vy7IWg4FPRMhJo1hEmGbt XWXJ5x9ifMT1wtqq3T20yTVmWdGgw5RcxFNRiukx9R0on31X6cYonX8Y+cGO0/rBSsvZ B4SI/WHXdIDxVN8ZPYgmtpALYPqO/OaMHvvCZhnnZ5CyaGVDtvp1nOW/blaI0HjbGnCb f2xjdihEA9Pte5r1jjuH7IO/a66JnjQsXgzXkt/iyc6aIOst+7aj4tYW9Iz06k4EvYkV 0vlQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:feedback-id:content-transfer-encoding :mime-version:message-id:date:subject:cc:to:from; bh=hMzP1FFBfV6cQN21FU/2eWscgVZ8fDNgMeIIaKFnen8=; b=aJCFqBzqa6eZ/liNMH+QUO131vsEJEazkRWJ9c+464XSb7f6+b+aXOdeOFonSiH5kq Pi1co+cpofedhjdpV+YtOVTQzaUoJJM9ocBdXLGGWU3T8DbZlOKbwiAY/TebjjjOf4hR 4lNVC4f1qhdjHqDYcsWXvVSr+R/3mReeUUxvMqtAB/2+b8trv5M1S9QqYBBPTJ6I3f3r TfoHGqao7+rlbnob62mwMyqRcptzCrLABkx8x0kSlb8G/1vW0iBP563/EfqsTuwKRnJ7 Sp2ySO780bX59LFkuxah1k2rujGj5CGFrCIiMGTFujr983eCsk9rBOSVeRCZL17lk/7d drJQ== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id v6-20020a50a446000000b00418c2b5be45si3098206edb.295.2022.03.18.03.39.12; Fri, 18 Mar 2022 03:39:37 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S234808AbiCRKDi (ORCPT + 99 others); Fri, 18 Mar 2022 06:03:38 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:52504 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S234079AbiCRKDg (ORCPT ); Fri, 18 Mar 2022 06:03:36 -0400 Received: from smtpbgjp3.qq.com (smtpbgjp3.qq.com [54.92.39.34]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 8CFA52EA91A for ; Fri, 18 Mar 2022 03:02:17 -0700 (PDT) X-QQ-mid: bizesmtp87t1647597713tmh93ghn Received: from localhost.localdomain ( [58.240.82.166]) by bizesmtp.qq.com (ESMTP) with id ; Fri, 18 Mar 2022 18:01:47 +0800 (CST) X-QQ-SSF: 01400000002000D0I000000A0000000 X-QQ-FEAT: tV/YCL8KvSigEojevuX8Z4ksKFjFwYMDDUbPH/+nVcU7UGmXSmpaGh5Fw2TTJ ijQgE8ge+s9vAMzDJ2oQSggoIqRj1D8rYiQVWISYIsQzywwW2GZY4boK0F509frGzxeSetM /YeeeSwqAc/FIlE/SWOjLFvAM1TXdkVQSWHNw9oGipU0RYnkbheHybma516x3Es1MGb2HGf nZy9DSHMivEJDGBc0sMUVL0+OPHNff0hPUvo4UIyGJj0LcN14XHH2iamuk0Jgf3KQLlDOUF NS4P4pwdT2GhiWXrVT8IjFfyrjWWgd1kT6jFUbR2t56wNPiQVjaSXZO/jLMTWZ5xhExWs1O XTUcae4Sxw1eeuY1t+yFgoFtai4KT4X8Lq+pOiBcM7kQ5XQD2s= X-QQ-GoodBg: 1 From: Meng Tang To: frattaroli.nicolas@gmail.com, lgirdwood@gmail.com, broonie@kernel.org, perex@perex.cz, tiwai@suse.com, heiko@sntech.de Cc: linux-rockchip@lists.infradead.org, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, Meng Tang Subject: [PATCH] ASoC: rockchip: i2s_tdm: Fixup config for SND_SOC_DAIFMT_DSP_A/B Date: Fri, 18 Mar 2022 18:01:46 +0800 Message-Id: <20220318100146.23991-1-tangmeng@uniontech.com> X-Mailer: git-send-email 2.20.1 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-QQ-SENDSIZE: 520 Feedback-ID: bizesmtp:uniontech.com:qybgforeign:qybgforeign3 X-QQ-Bgrelay: 1 X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00,RCVD_IN_DNSWL_NONE, RCVD_IN_MSPIKE_H2,SPF_HELO_PASS,SPF_PASS,T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org SND_SOC_DAIFMT_DSP_A: PCM delay 1 bit mode, L data MSB after FRM LRC SND_SOC_DAIFMT_DSP_B: PCM no delay mode, L data MSB during FRM LRC Fixes: 081068fd64140 (ASoC: rockchip: add support for i2s-tdm controller) Signed-off-by: Meng Tang --- sound/soc/rockchip/rockchip_i2s_tdm.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/sound/soc/rockchip/rockchip_i2s_tdm.c b/sound/soc/rockchip/rockchip_i2s_tdm.c index 5f9cb5c4c7f0..f21296679bff 100644 --- a/sound/soc/rockchip/rockchip_i2s_tdm.c +++ b/sound/soc/rockchip/rockchip_i2s_tdm.c @@ -469,14 +469,14 @@ static int rockchip_i2s_tdm_set_fmt(struct snd_soc_dai *cpu_dai, txcr_val = I2S_TXCR_IBM_NORMAL; rxcr_val = I2S_RXCR_IBM_NORMAL; break; - case SND_SOC_DAIFMT_DSP_A: /* PCM no delay mode */ - txcr_val = I2S_TXCR_TFS_PCM; - rxcr_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 mode */ txcr_val = I2S_TXCR_TFS_PCM | I2S_TXCR_PBM_MODE(1); rxcr_val = I2S_RXCR_TFS_PCM | I2S_RXCR_PBM_MODE(1); break; + case SND_SOC_DAIFMT_DSP_B: /* PCM no delay mode */ + txcr_val = I2S_TXCR_TFS_PCM; + rxcr_val = I2S_RXCR_TFS_PCM; + break; default: ret = -EINVAL; goto err_pm_put; -- 2.20.1