Received: by 2002:a05:6602:18e:0:0:0:0 with SMTP id m14csp1714856ioo; Mon, 23 May 2022 01:16:27 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxvG/odjv9y1F79E9VQSXUODKNZrTYplnZHYhuQEQXMDPGHkc3u4uFZZrVambr7GSqHa+oe X-Received: by 2002:a17:90a:690f:b0:1df:336d:5533 with SMTP id r15-20020a17090a690f00b001df336d5533mr24939535pjj.222.1653293786875; Mon, 23 May 2022 01:16:26 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1653293786; cv=none; d=google.com; s=arc-20160816; b=BkbHRXPcf5pmCmPm/OeuTsrWz5D/55FRG4im9AcOQD50+b/I4M4qwZuLAOtIF3KCrD d5hllPlrav3RcBSgqCTMEG5zLz1xjNbvVFe39Bwod1qsvazgVxpniC1LODLU5axNRvnO IxVf4Jb0ai3IOpMVN6cmyB3ukINsc/LKJMy3ZAPs5mtvHONeFD3T2gt20RGGPRtoU4c+ HLuWtKSErbtZrlPMieV7C7w+Tsr6sGBK3Kqgm33eumbWJW2Toyiwz09QJAa/Zjr9q+th hRDMorUyQ9sr6MEUdgEenySbE+PJP4MU30NQWIs4DK9T3FPugwqXriUgmRL9lpJ/3OrJ BhtA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:message-id:date:subject:cc:to:from; bh=XVdt3ai50rgGnnE7h5N22AUzoIpbvtzbKBp0c0a7oNo=; b=w5tC8F1bhEbV9f6FKABI5NFPg4/bn4b15EK5tRKQTwtKUxFcB9Pqgs7MjiqfUvQuHl PT9qctbpGP4sfiCpbs20gLp63jhpGtDEZ0/kbutqxEzecQfUzx5tjzE5f0S6jdxl3uh+ e3dqOp+31ARRLL8mkn3vH6d5BqbPeeKabeaW8YI1g66xBPyQOt8Wlnm+ah21S39R17Sy qlmqBmf6eI59IoXBcI62h+R4+M8VZbvBvIEm1tQem+E/MRTCh/H4hPEVBDRgkP+h7sgX 6Y0yqvh2VRtXDyljX1cc8y2JxtjOtqNaoWJCLg6jA6tuuXzx1tW30DH4t3K9Fa3CbMw5 graw== ARC-Authentication-Results: i=1; mx.google.com; spf=softfail (google.com: domain of transitioning linux-kernel-owner@vger.kernel.org does not designate 23.128.96.19 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=nxp.com Return-Path: Received: from lindbergh.monkeyblade.net (lindbergh.monkeyblade.net. [23.128.96.19]) by mx.google.com with ESMTPS id na4-20020a17090b4c0400b001df214c339dsi14048068pjb.122.2022.05.23.01.16.26 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 23 May 2022 01:16:26 -0700 (PDT) Received-SPF: softfail (google.com: domain of transitioning linux-kernel-owner@vger.kernel.org does not designate 23.128.96.19 as permitted sender) client-ip=23.128.96.19; Authentication-Results: mx.google.com; spf=softfail (google.com: domain of transitioning linux-kernel-owner@vger.kernel.org does not designate 23.128.96.19 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=nxp.com Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by lindbergh.monkeyblade.net (Postfix) with ESMTP id 5677B14B2DF; Mon, 23 May 2022 00:10:25 -0700 (PDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229633AbiEWF5k (ORCPT + 99 others); Mon, 23 May 2022 01:57:40 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:40824 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231765AbiEWF5h (ORCPT ); Mon, 23 May 2022 01:57:37 -0400 Received: from inva020.nxp.com (inva020.nxp.com [92.121.34.13]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id CA51717061 for ; Sun, 22 May 2022 22:57:25 -0700 (PDT) Received: from inva020.nxp.com (localhost [127.0.0.1]) by inva020.eu-rdc02.nxp.com (Postfix) with ESMTP id 20DEE1A172C; Mon, 23 May 2022 07:57:17 +0200 (CEST) Received: from aprdc01srsp001v.ap-rdc01.nxp.com (aprdc01srsp001v.ap-rdc01.nxp.com [165.114.16.16]) by inva020.eu-rdc02.nxp.com (Postfix) with ESMTP id DE95B1A1734; Mon, 23 May 2022 07:57:16 +0200 (CEST) Received: from localhost.localdomain (shlinux2.ap.freescale.net [10.192.224.44]) by aprdc01srsp001v.ap-rdc01.nxp.com (Postfix) with ESMTP id 5FC28180031D; Mon, 23 May 2022 13:57:15 +0800 (+08) From: Shengjiu Wang To: nicoleotsuka@gmail.com, Xiubo.Lee@gmail.com, festevam@gmail.com, shengjiu.wang@gmail.com, lgirdwood@gmail.com, broonie@kernel.org, perex@perex.cz, tiwai@suse.com, alsa-devel@alsa-project.org Cc: linuxppc-dev@lists.ozlabs.org, linux-kernel@vger.kernel.org Subject: [PATCH] ASoC: fsl_sai: Fix FSL_SAI_xDR/xFR definition Date: Mon, 23 May 2022 13:44:21 +0800 Message-Id: <1653284661-18964-1-git-send-email-shengjiu.wang@nxp.com> X-Mailer: git-send-email 2.7.4 X-Virus-Scanned: ClamAV using ClamSMTP X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00, 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 There are multiple xDR and xFR registers, the index is from 0 to 7. FSL_SAI_xDR and FSL_SAI_xFR is abandoned, replace them with FSL_SAI_xDR0 and FSL_SAI_xFR0. Fixes: 4f7a0728b530 ("ASoC: fsl_sai: Add support for SAI new version") Signed-off-by: Shengjiu Wang --- sound/soc/fsl/fsl_sai.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sound/soc/fsl/fsl_sai.h b/sound/soc/fsl/fsl_sai.h index e4965efe6102..1c8f5ca07f9d 100644 --- a/sound/soc/fsl/fsl_sai.h +++ b/sound/soc/fsl/fsl_sai.h @@ -80,8 +80,8 @@ #define FSL_SAI_xCR3(tx, ofs) (tx ? FSL_SAI_TCR3(ofs) : FSL_SAI_RCR3(ofs)) #define FSL_SAI_xCR4(tx, ofs) (tx ? FSL_SAI_TCR4(ofs) : FSL_SAI_RCR4(ofs)) #define FSL_SAI_xCR5(tx, ofs) (tx ? FSL_SAI_TCR5(ofs) : FSL_SAI_RCR5(ofs)) -#define FSL_SAI_xDR(tx, ofs) (tx ? FSL_SAI_TDR(ofs) : FSL_SAI_RDR(ofs)) -#define FSL_SAI_xFR(tx, ofs) (tx ? FSL_SAI_TFR(ofs) : FSL_SAI_RFR(ofs)) +#define FSL_SAI_xDR0(tx) (tx ? FSL_SAI_TDR0 : FSL_SAI_RDR0) +#define FSL_SAI_xFR0(tx) (tx ? FSL_SAI_TFR0 : FSL_SAI_RFR0) #define FSL_SAI_xMR(tx) (tx ? FSL_SAI_TMR : FSL_SAI_RMR) /* SAI Transmit/Receive Control Register */ -- 2.17.1