Received: by 2002:a05:6a10:2726:0:0:0:0 with SMTP id ib38csp748728pxb; Tue, 5 Apr 2022 21:37:19 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxmoqwXxIH5qyI4YJRAPojpqEyWQHPCTq0iuq71kA6DjHQchYK0X2IfGq76xH51CyV//TTc X-Received: by 2002:a05:6a00:298c:b0:4fa:8e7b:349d with SMTP id cj12-20020a056a00298c00b004fa8e7b349dmr7162797pfb.26.1649219839190; Tue, 05 Apr 2022 21:37:19 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1649219839; cv=none; d=google.com; s=arc-20160816; b=jn0wX7GuDvY/ZUtcrpnTTCldmWIRX8JLCtVU0d4zCVG82uxdg9Z+VEcVulmYghJUFO N1U0osUrSxrfCPN8MfFHgXQfIZdtKVWx3cfDCcS97HOe3eFKUu83NPnUwKzdx4H8RnTJ eDbqT8CdONwEYz0Rt3VL4Iv5hXgWZLgorbwf2E4bE6sDkoL6zPG8atwcgc3dN7Q0N201 eXixuB+C0W+/2vt0Hy/Lz0ECjVnXNeGCi68eNRmHzIQfuF/Zco74WDVsy1H3MT3vGYaq vXxi5dNFVdu0lQfmetVl7/0mf0Ga75zZvVuTv359JrVt8LVy3eXLZkejJX/Pla/kY61g zlJA== 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=aYJvSSOFIvQ26NM/sEWgDRVqW/4dxHmtbGSMmD/A3ew=; b=PQvqZrnJerbSBtoz8wrASnmVZ4PYSIvC9SloFCFa5lAVZOTYTTjmY1/p+RfzHeZVvw R5iaqZN3GXAiFhxF9/UyEMMDqqEzmzwVTsCD42ey3O992aRPdjonCo/BuaBchUDo3x3o rwLw/Z69ahWgfXMpVqbJXIWRJmBs5AKdPTifS9LccYJ236/A7DWh1zVytQchPVOKXwVm yL7k4YXTIR/jAipOFUT1TmHKs6VNAgw8p5WKlmlNSuC2T6AiqhnQ+1u5CV+wRkVT6z8T RwXT4Q7NjMiHmkpPhyTWMgMGnYHKGKSCBSA3LCE+1kg6ehA8qDVYWgJ9u0LIx/nT7afM /a/A== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=YKV1F5fs; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1: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 lindbergh.monkeyblade.net (lindbergh.monkeyblade.net. [2620:137:e000::1:18]) by mx.google.com with ESMTPS id q16-20020a17090311d000b00153b2d1655csi15437617plh.356.2022.04.05.21.37.18 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 05 Apr 2022 21:37:19 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:18 as permitted sender) client-ip=2620:137:e000::1:18; Authentication-Results: mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=YKV1F5fs; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1: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: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by lindbergh.monkeyblade.net (Postfix) with ESMTP id 246C84EDE6; Tue, 5 Apr 2022 20:03:54 -0700 (PDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1357619AbiDEK0k (ORCPT + 99 others); Tue, 5 Apr 2022 06:26:40 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:33774 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S241112AbiDEIct (ORCPT ); Tue, 5 Apr 2022 04:32:49 -0400 Received: from dfw.source.kernel.org (dfw.source.kernel.org [139.178.84.217]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 9BD3015A03; Tue, 5 Apr 2022 01:27:47 -0700 (PDT) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by dfw.source.kernel.org (Postfix) with ESMTPS id 38AA6609D0; Tue, 5 Apr 2022 08:27:47 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 4BABEC385A1; Tue, 5 Apr 2022 08:27:46 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1649147266; bh=EnA4E1E6YC+Ts/nEjs3dxfm5+HpqhwGpXCsmYHQ1Iew=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=YKV1F5fsYRU6H1/K6SZdhwv1GxZBiBSjaDfMfyOClbOOgJfm6lbEXOypuqEx0YO4n P9z/6ma/GP5Ba9kywAOkF1FFVnnNip/GEW7crJLB4v8HzLGeoaxtMQGbjtD3K2gioN EiUiostJJZZO+qHC5is1gbbsMcz+BAEoCiMYp90c= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Meng Tang , Mark Brown Subject: [PATCH 5.17 1045/1126] ASoC: rockchip: i2s_tdm: Fixup config for SND_SOC_DAIFMT_DSP_A/B Date: Tue, 5 Apr 2022 09:29:52 +0200 Message-Id: <20220405070438.145487194@linuxfoundation.org> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20220405070407.513532867@linuxfoundation.org> References: <20220405070407.513532867@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Spam-Status: No, score=-2.0 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS, MAILING_LIST_MULTI,RDNS_NONE,SPF_HELO_NONE,T_SCC_BODY_TEXT_LINE autolearn=no 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 From: Meng Tang commit 2f45a4e2897793cc6ae25f5fe78b485ce7fd01d0 upstream. 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 Link: https://lore.kernel.org/r/20220318100146.23991-1-tangmeng@uniontech.com Signed-off-by: Mark Brown Signed-off-by: Greg Kroah-Hartman --- sound/soc/rockchip/rockchip_i2s_tdm.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) --- 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(stru 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;