[<prev] [next>] [thread-next>] [day] [month] [year] [list]
Message-Id: <1515344750-6159-1-git-send-email-linux@roeck-us.net>
Date: Sun, 7 Jan 2018 09:05:50 -0800
From: Guenter Roeck <linux@...ck-us.net>
To: Mark Brown <broonie@...nel.org>
Cc: Liam Girdwood <lgirdwood@...il.com>,
Fabio Estevam <fabio.estevam@....com>,
Xiubo Li <Xiubo.Lee@...il.com>, alsa-devel@...a-project.org,
linuxppc-dev@...ts.ozlabs.org, linux-kernel@...r.kernel.org,
Guenter Roeck <linux@...ck-us.net>,
Nicolin Chen <nicoleotsuka@...il.com>,
"Maciej S . Szmigiero" <mail@...iej.szmigiero.name>,
Timur Tabi <timur@...i.org>
Subject: [PATCH -next] ASoC: fsl_ssi: Fix build error
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 <nicoleotsuka@...il.com>
Cc: Maciej S. Szmigiero <mail@...iej.szmigiero.name>
Cc: Timur Tabi <timur@...i.org>
Signed-off-by: Guenter Roeck <linux@...ck-us.net>
---
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
Powered by blists - more mailing lists