From mboxrd@z Thu Jan  1 00:00:00 1970
Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand
        id S1754285AbeAGRzL (ORCPT <rfc822;ralf@linux-mips.org> + 1 other);
        Sun, 7 Jan 2018 12:55:11 -0500
Received: from mail-pg0-f65.google.com ([74.125.83.65]:44158 "EHLO
        mail-pg0-f65.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org
        with ESMTP id S1754192AbeAGRzK (ORCPT
        <rfc822;linux-kernel@vger.kernel.org>);
        Sun, 7 Jan 2018 12:55:10 -0500
X-Google-Smtp-Source: ACJfBouaCcZKDYh5f9pWD4KXZiwnlCUxl3A/dmzGYfhEHrfI5pls11g/uoGxlMYhxIRoVn3w+1q52A==
Date: Sun, 7 Jan 2018 09:55:03 -0800
From: Nicolin Chen <nicoleotsuka@gmail.com>
To: Guenter Roeck <linux@roeck-us.net>
Cc: Mark Brown <broonie@kernel.org>,
        Liam Girdwood <lgirdwood@gmail.com>,
        Fabio Estevam <fabio.estevam@nxp.com>,
        Xiubo Li <Xiubo.Lee@gmail.com>, alsa-devel@alsa-project.org,
        linuxppc-dev@lists.ozlabs.org, linux-kernel@vger.kernel.org,
        "Maciej S . Szmigiero" <mail@maciej.szmigiero.name>,
        Timur Tabi <timur@tabi.org>
Subject: Re: [PATCH -next] ASoC: fsl_ssi: Fix build error
Message-ID: <20180107175503.GA5148@Asurada>
References: <1515344750-6159-1-git-send-email-linux@roeck-us.net>
MIME-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
In-Reply-To: <1515344750-6159-1-git-send-email-linux@roeck-us.net>
User-Agent: Mutt/1.5.22 (2013-10-16)
Sender: linux-kernel-owner@vger.kernel.org
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org
Return-Path: <linux-kernel-owner@vger.kernel.org>

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@gmail.com>

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

Thanks

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