From mboxrd@z Thu Jan 1 00:00:00 1970 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754250AbeAGRFz (ORCPT + 1 other); Sun, 7 Jan 2018 12:05:55 -0500 Received: from mail-pl0-f67.google.com ([209.85.160.67]:44514 "EHLO mail-pl0-f67.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754036AbeAGRFy (ORCPT ); Sun, 7 Jan 2018 12:05:54 -0500 X-Google-Smtp-Source: ACJfBov5/lCsy6kpNOsH42XeoT5IAl1jz7scNAHwY48IK9u8EcqJ0y0L2hsSb2OZ1cPq9bYpj1h9kA== From: Guenter Roeck To: Mark Brown Cc: Liam Girdwood , Fabio Estevam , Xiubo Li , alsa-devel@alsa-project.org, linuxppc-dev@lists.ozlabs.org, linux-kernel@vger.kernel.org, Guenter Roeck , Nicolin Chen , "Maciej S . Szmigiero" , Timur Tabi Subject: [PATCH -next] ASoC: fsl_ssi: Fix build error Date: Sun, 7 Jan 2018 09:05:50 -0800 Message-Id: <1515344750-6159-1-git-send-email-linux@roeck-us.net> X-Mailer: git-send-email 2.7.4 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Return-Path: powerpc:mpc85xx_defconfig fails to build with the following errors. sound/soc/fsl/fsl_dma.c: In function 'fsl_soc_dma_probe': sound/soc/fsl/fsl_dma.c:916:34: error: 'CCSR_SSI_STX0' undeclared sound/soc/fsl/fsl_dma.c:917:34: error: 'CCSR_SSI_SRX0' undeclared Fixes: a818aa5f967b ("ASoC: fsl_ssi: Rename registers and fields macros") Cc: Nicolin Chen Cc: Maciej S. Szmigiero Cc: Timur Tabi Signed-off-by: Guenter Roeck --- I would suggest to merge this patch into the offending patch to preserve bisectability. sound/soc/fsl/fsl_dma.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sound/soc/fsl/fsl_dma.c b/sound/soc/fsl/fsl_dma.c index 0c11f434a374..8c2981b70f64 100644 --- a/sound/soc/fsl/fsl_dma.c +++ b/sound/soc/fsl/fsl_dma.c @@ -913,8 +913,8 @@ static int fsl_soc_dma_probe(struct platform_device *pdev) dma->dai.pcm_free = fsl_dma_free_dma_buffers; /* Store the SSI-specific information that we need */ - dma->ssi_stx_phys = res.start + CCSR_SSI_STX0; - dma->ssi_srx_phys = res.start + CCSR_SSI_SRX0; + dma->ssi_stx_phys = res.start + REG_SSI_STX0; + dma->ssi_srx_phys = res.start + REG_SSI_SRX0; iprop = of_get_property(ssi_np, "fsl,fifo-depth", NULL); if (iprop) -- 2.7.4