* [PATCH] Fix compilation error on S3C2440
@ 2013-01-28 17:07 Alexey Galakhov
2013-01-29 6:06 ` Kukjin Kim
0 siblings, 1 reply; 6+ messages in thread
From: Alexey Galakhov @ 2013-01-28 17:07 UTC (permalink / raw)
To: linux-samsung-soc; +Cc: Alexey Galakhov
There was a compilation error introduced on Dec 7, 2012
by commit a08485d8fdf6f67ca5f173b68d8f873c574745f2.
Combination of CONFIG_CPU_S3C2440 and CONFIG_SND_S3C24XX_I2S
caused the following:
sound/soc/samsung/s3c24xx-i2s.c: In function 's3c24xx_iis_dev_probe':
sound/soc/samsung/s3c24xx-i2s.c:472:2: error: implicit declaration of
function 's3c_i2sv2_register_dai' [-Werror=implicit-function-declaration]
sound/soc/samsung/s3c24xx-i2s.c:472:48: error: 's3c2412_i2s_dai'
undeclared (first use in this function)
This patch fixes the problem and makes S3C2440 I2S usable again.
Signed-off-by: Alexey Galakhov <agalakhov@gmail.com>
---
sound/soc/samsung/s3c24xx-i2s.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/sound/soc/samsung/s3c24xx-i2s.c b/sound/soc/samsung/s3c24xx-i2s.c
index ee10e87..13f6dd1 100644
--- a/sound/soc/samsung/s3c24xx-i2s.c
+++ b/sound/soc/samsung/s3c24xx-i2s.c
@@ -469,7 +469,7 @@ static int s3c24xx_iis_dev_probe(struct platform_device *pdev)
{
int ret = 0;
- ret = s3c_i2sv2_register_dai(&pdev->dev, -1, &s3c2412_i2s_dai);
+ ret = snd_soc_register_dai(&pdev->dev, &s3c24xx_i2s_dai);
if (ret) {
pr_err("failed to register the dai\n");
return ret;
--
1.7.10.4
^ permalink raw reply related [flat|nested] 6+ messages in thread* RE: [PATCH] Fix compilation error on S3C2440
2013-01-28 17:07 [PATCH] Fix compilation error on S3C2440 Alexey Galakhov
@ 2013-01-29 6:06 ` Kukjin Kim
2013-01-30 2:18 ` Mark Brown
0 siblings, 1 reply; 6+ messages in thread
From: Kukjin Kim @ 2013-01-29 6:06 UTC (permalink / raw)
To: 'Alexey Galakhov', linux-samsung-soc
Cc: 'Padmavathi Venna', 'Sangbeom Kim',
'Mark Brown', 'Kukjin Kim'
Alexey Galakhov wrote:
>
> There was a compilation error introduced on Dec 7, 2012
> by commit a08485d8fdf6f67ca5f173b68d8f873c574745f2.
>
Following is better:
The commit a08485d8 ("ASoC: Samsung: Do not register samsung audio dma
device as pdev") introduced compilation error.
> Combination of CONFIG_CPU_S3C2440 and CONFIG_SND_S3C24XX_I2S
> caused the following:
> sound/soc/samsung/s3c24xx-i2s.c: In function 's3c24xx_iis_dev_probe':
> sound/soc/samsung/s3c24xx-i2s.c:472:2: error: implicit declaration of
> function 's3c_i2sv2_register_dai' [-Werror=implicit-function-declaration]
> sound/soc/samsung/s3c24xx-i2s.c:472:48: error: 's3c2412_i2s_dai'
> undeclared (first use in this function)
>
> This patch fixes the problem and makes S3C2440 I2S usable again.
>
> Signed-off-by: Alexey Galakhov <agalakhov@gmail.com>
Cc: Padmavathi Venna <padma.v@samsung.com>
Cc: Sangbeom Kim <sbkim73@samsung.com>
Cc: Mark Brown <broonie@opensource.wolfsonmicro.com>
> ---
> sound/soc/samsung/s3c24xx-i2s.c | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/sound/soc/samsung/s3c24xx-i2s.c
> b/sound/soc/samsung/s3c24xx-i2s.c
> index ee10e87..13f6dd1 100644
> --- a/sound/soc/samsung/s3c24xx-i2s.c
> +++ b/sound/soc/samsung/s3c24xx-i2s.c
> @@ -469,7 +469,7 @@ static int s3c24xx_iis_dev_probe(struct
> platform_device *pdev)
> {
> int ret = 0;
>
> - ret = s3c_i2sv2_register_dai(&pdev->dev, -1, &s3c2412_i2s_dai);
> + ret = snd_soc_register_dai(&pdev->dev, &s3c24xx_i2s_dai);
> if (ret) {
> pr_err("failed to register the dai\n");
> return ret;
> --
> 1.7.10.4
^ permalink raw reply [flat|nested] 6+ messages in thread* Re: [PATCH] Fix compilation error on S3C2440
2013-01-29 6:06 ` Kukjin Kim
@ 2013-01-30 2:18 ` Mark Brown
2013-01-30 9:35 ` Alexey Galakhov
2013-01-30 9:48 ` Alexey Galakhov
0 siblings, 2 replies; 6+ messages in thread
From: Mark Brown @ 2013-01-30 2:18 UTC (permalink / raw)
To: Kukjin Kim
Cc: 'Alexey Galakhov', linux-samsung-soc,
'Padmavathi Venna', 'Sangbeom Kim'
[-- Attachment #1: Type: text/plain, Size: 586 bytes --]
On Mon, Jan 28, 2013 at 10:06:24PM -0800, Kukjin Kim wrote:
> Alexey Galakhov wrote:
> >
> > There was a compilation error introduced on Dec 7, 2012
> > by commit a08485d8fdf6f67ca5f173b68d8f873c574745f2.
> >
> Following is better:
>
> The commit a08485d8 ("ASoC: Samsung: Do not register samsung audio dma
> device as pdev") introduced compilation error.
Can someone send me the patch formatted in an e-mail (rather than
quoted) so I can apply please? Though I've got a horrible feeling this
will conflict with Padma's work...
Always sned patches to maintainers.
[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 836 bytes --]
^ permalink raw reply [flat|nested] 6+ messages in thread* [PATCH] Fix compilation error on S3C2440
2013-01-30 2:18 ` Mark Brown
@ 2013-01-30 9:35 ` Alexey Galakhov
2013-01-31 6:49 ` Mark Brown
2013-01-30 9:48 ` Alexey Galakhov
1 sibling, 1 reply; 6+ messages in thread
From: Alexey Galakhov @ 2013-01-30 9:35 UTC (permalink / raw)
To: broonie; +Cc: kgene.kim, linux-samsung-soc, padma.v, bkim73, Alexey Galakhov
The commit a08485d8 ("ASoC: Samsung: Do not register samsung audio dma
device as pdev") introduced compilation error.
Combination of CONFIG_CPU_S3C2440 and CONFIG_SND_S3C24XX_I2S
caused undefined symbols 's3c_i2sv2_register_dai' and 's3c2412_i2s_dai'
in sound/soc/samsung/s3c24xx-i2s.c.
This patch fixes the problem and makes S3C2440 I2S usable again. It does
not affect S3C2412 (aka I2S-v2).
Signed-off-by: Alexey Galakhov <agalakhov@gmail.com>
---
sound/soc/samsung/s3c24xx-i2s.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/sound/soc/samsung/s3c24xx-i2s.c b/sound/soc/samsung/s3c24xx-i2s.c
index ee10e87..13f6dd1 100644
--- a/sound/soc/samsung/s3c24xx-i2s.c
+++ b/sound/soc/samsung/s3c24xx-i2s.c
@@ -469,7 +469,7 @@ static int s3c24xx_iis_dev_probe(struct platform_device *pdev)
{
int ret = 0;
- ret = s3c_i2sv2_register_dai(&pdev->dev, -1, &s3c2412_i2s_dai);
+ ret = snd_soc_register_dai(&pdev->dev, &s3c24xx_i2s_dai);
if (ret) {
pr_err("failed to register the dai\n");
return ret;
--
1.7.10.4
^ permalink raw reply related [flat|nested] 6+ messages in thread* Re: [PATCH] Fix compilation error on S3C2440
2013-01-30 9:35 ` Alexey Galakhov
@ 2013-01-31 6:49 ` Mark Brown
0 siblings, 0 replies; 6+ messages in thread
From: Mark Brown @ 2013-01-31 6:49 UTC (permalink / raw)
To: Alexey Galakhov; +Cc: kgene.kim, linux-samsung-soc, padma.v, bkim73
[-- Attachment #1: Type: text/plain, Size: 302 bytes --]
On Wed, Jan 30, 2013 at 03:35:22PM +0600, Alexey Galakhov wrote:
> The commit a08485d8 ("ASoC: Samsung: Do not register samsung audio dma
> device as pdev") introduced compilation error.
Applied, thanks. Please use subject lines appropriate for the
subsystem and in general follow SubmittingPatches.
[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 836 bytes --]
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH] Fix compilation error on S3C2440
2013-01-30 2:18 ` Mark Brown
2013-01-30 9:35 ` Alexey Galakhov
@ 2013-01-30 9:48 ` Alexey Galakhov
1 sibling, 0 replies; 6+ messages in thread
From: Alexey Galakhov @ 2013-01-30 9:48 UTC (permalink / raw)
To: Mark Brown
Cc: Kukjin Kim, linux-samsung-soc, 'Padmavathi Venna',
'Sangbeom Kim'
On 01/30/2013 08:18 AM, Mark Brown wrote:
> Though I've got a horrible feeling this will conflict with Padma's
> work...
Looks like Padma changed the code for S3C2412 and blindly copy-pasted
the same change for all S3C24xx. However S3C24xx is for I2S-v1 and
S3C2412 is for I2S-v2. The extra stuff in s3c_i2sv2_register_dai() is
unrelated to v1.
After this patch the code works again just like v3.7 one. However the
v3.7 code was already broken (in fact, since v3.2) in the DMA
notification part so it doesn't play sound correctly thus I can't tell
that everything works just fine now :). I found the patch that
introduced the bug (344b4c4) and now I'm debugging it.
^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2013-01-31 6:49 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2013-01-28 17:07 [PATCH] Fix compilation error on S3C2440 Alexey Galakhov
2013-01-29 6:06 ` Kukjin Kim
2013-01-30 2:18 ` Mark Brown
2013-01-30 9:35 ` Alexey Galakhov
2013-01-31 6:49 ` Mark Brown
2013-01-30 9:48 ` Alexey Galakhov
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.