[alsa-devel] [PATCH -next] ASoC: fsl_ssi: Fix build error

[Nicolin Chen]

On Sun, Jan 07, 2018 at 09:05:50AM -0800, Guenter Roeck wrote:
> 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 at gmail.com>

Acked-by: Nicolin Chen <nicoleotsuka at gmail.com>

Thanks

> Cc: Maciej S. Szmigiero <mail at maciej.szmigiero.name>
> Cc: Timur Tabi <timur at tabi.org>
> Signed-off-by: Guenter Roeck <linux at roeck-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
>