From: Nicolin Chen <nicoleotsuka@gmail.com>
To: Guenter Roeck <linux@roeck-us.net>
Cc: alsa-devel@alsa-project.org, Timur Tabi <timur@tabi.org>,
Xiubo Li <Xiubo.Lee@gmail.com>,
Liam Girdwood <lgirdwood@gmail.com>,
linux-kernel@vger.kernel.org, Mark Brown <broonie@kernel.org>,
Fabio Estevam <fabio.estevam@nxp.com>,
"Maciej S . Szmigiero" <mail@maciej.szmigiero.name>,
linuxppc-dev@lists.ozlabs.org
Subject: Re: [PATCH -next] ASoC: fsl_ssi: Fix build error
Date: Sun, 7 Jan 2018 09:55:03 -0800 [thread overview]
Message-ID: <20180107175503.GA5148@Asurada> (raw)
In-Reply-To: <1515344750-6159-1-git-send-email-linux@roeck-us.net>
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
>
WARNING: multiple messages have this Message-ID (diff)
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
Date: Sun, 7 Jan 2018 09:55:03 -0800 [thread overview]
Message-ID: <20180107175503.GA5148@Asurada> (raw)
In-Reply-To: <1515344750-6159-1-git-send-email-linux@roeck-us.net>
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
>
next prev parent reply other threads:[~2018-01-07 17:55 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-01-07 17:05 [PATCH -next] ASoC: fsl_ssi: Fix build error Guenter Roeck
2018-01-07 17:55 ` Nicolin Chen [this message]
2018-01-07 17:55 ` Nicolin Chen
2018-01-08 12:35 ` Applied "ASoC: fsl_ssi: Fix build error" to the asoc tree Mark Brown
2018-01-08 12:35 ` Mark Brown
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20180107175503.GA5148@Asurada \
--to=nicoleotsuka@gmail.com \
--cc=Xiubo.Lee@gmail.com \
--cc=alsa-devel@alsa-project.org \
--cc=broonie@kernel.org \
--cc=fabio.estevam@nxp.com \
--cc=lgirdwood@gmail.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux@roeck-us.net \
--cc=linuxppc-dev@lists.ozlabs.org \
--cc=mail@maciej.szmigiero.name \
--cc=timur@tabi.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.