[PATCH 1/2] ASoC: fix WM8753 initialization.

[PATCH 1/2] ASoC: fix WM8753 initialization.

[Denis 'GNUtoo' Carikli]

Without that fix the wm8753 SPI initialization fails, and then produces
  a kernel panic during boot with the following call trace:
    Unable to handle kernel paging request at virtual address 37386d9b
    [<c01ccafc>] (regmap_get_val_bytes+0x0/0x14) from [<c0243dfc>] (snd_soc_codec_set_cache_io+0x9c/0xcc)
    [<c0243dfc>] (snd_soc_codec_set_cache_io+0x9c/0xcc) from [<c0244a4c>] (wm8753_probe+0x5c/0x1c4)
    [<c0244a4c>] (wm8753_probe+0x5c/0x1c4) from [<c023bb24>] (soc_probe_codec+0x174/0x284)
    [<c023bb24>] (soc_probe_codec+0x174/0x284) from [<c023c2c0>] (snd_soc_instantiate_cards+0x68c/0xe28)
    [<c023c2c0>] (snd_soc_instantiate_cards+0x68c/0xe28) from [<c023d278>] (snd_soc_register_card+0x240/0x2d4)
    [<c023d278>] (snd_soc_register_card+0x240/0x2d4) from [<c023d330>] (soc_probe+0x24/0x40)
    [<c023d330>] (soc_probe+0x24/0x40) from [<c01c3900>] (platform_drv_probe+0x14/0x18)
    [...]

The commit d3398ff05907167f463e119421b053ce043741d1
 ( ASoC: Convert WM8753 to direct regmap API usage ) introduced
 the problem.

Thanks to Lars-Peter Clausen for helping me a bit during the debugging.

Signed-off-by: Denis 'GNUtoo' Carikli <GNUtoo@no-log.org>
---
 sound/soc/codecs/wm8753.c |    6 ++++++
 1 files changed, 6 insertions(+), 0 deletions(-)

diff --git a/sound/soc/codecs/wm8753.c b/sound/soc/codecs/wm8753.c
index 21ed75d..98fb921 100644
--- a/sound/soc/codecs/wm8753.c
+++ b/sound/soc/codecs/wm8753.c
@@ -1577,6 +1577,9 @@ static int __devinit wm8753_spi_probe(struct spi_device *spi)
 		dev_err(&spi->dev, "Failed to register CODEC: %d\n", ret);
 		goto err_regmap;
 	}
+
+	return 0;
+
 err_regmap:
 	regmap_exit(wm8753->regmap);
 err:
@@ -1632,6 +1635,9 @@ static __devinit int wm8753_i2c_probe(struct i2c_client *i2c,
 		dev_err(&i2c->dev, "Failed to register CODEC: %d\n", ret);
 		goto err_regmap;
 	}
+
+	return 0;
+
 err_regmap:
 	regmap_exit(wm8753->regmap);
 err:
-- 
1.7.4.1

[PATCH 2/2] ASOC: fix neo1973 wm8753 initialization

[Denis 'GNUtoo' Carikli]

The neo1973 wm8753 driver had wrong codec name
  which prevented the "sound card" from appearing.

Signed-off-by: Denis 'GNUtoo' Carikli <GNUtoo@no-log.org>
---
 sound/soc/samsung/neo1973_wm8753.c |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/sound/soc/samsung/neo1973_wm8753.c b/sound/soc/samsung/neo1973_wm8753.c
index 24bdb32..321d511 100644
--- a/sound/soc/samsung/neo1973_wm8753.c
+++ b/sound/soc/samsung/neo1973_wm8753.c
@@ -367,7 +367,7 @@ static struct snd_soc_dai_link neo1973_dai[] = {
 	.platform_name = "samsung-audio",
 	.cpu_dai_name = "s3c24xx-iis",
 	.codec_dai_name = "wm8753-hifi",
-	.codec_name = "wm8753-codec.0-001a",
+	.codec_name = "wm8753.0-001a",
 	.init = neo1973_wm8753_init,
 	.ops = &neo1973_hifi_ops,
 },
@@ -376,7 +376,7 @@ static struct snd_soc_dai_link neo1973_dai[] = {
 	.stream_name = "Voice",
 	.cpu_dai_name = "dfbmcs320-pcm",
 	.codec_dai_name = "wm8753-voice",
-	.codec_name = "wm8753-codec.0-001a",
+	.codec_name = "wm8753.0-001a",
 	.ops = &neo1973_voice_ops,
 },
 };
-- 
1.7.4.1

Re: [PATCH 2/2] ASOC: fix neo1973 wm8753 initialization

[Mark Brown]

[-- Attachment #1.1: Type: text/plain, Size: 192 bytes --]

On Sun, Feb 26, 2012 at 07:21:54PM +0100, Denis 'GNUtoo' Carikli wrote:
> The neo1973 wm8753 driver had wrong codec name
>   which prevented the "sound card" from appearing.

Applied, thanks.

[-- Attachment #1.2: Digital signature --]
[-- Type: application/pgp-signature, Size: 836 bytes --]

[-- Attachment #2: Type: text/plain, Size: 0 bytes --]

Re: [PATCH 1/2] ASoC: fix WM8753 initialization.

[Mark Brown]

On Sun, Feb 26, 2012 at 07:21:53PM +0100, Denis 'GNUtoo' Carikli wrote:
> Without that fix the wm8753 SPI initialization fails, and then produces

Please *ALWAYS* CC maintainers on mails as covered in SubmittingPatches.

Re: [PATCH 1/2] ASoC: fix WM8753 initialization.

[Denis 'GNUtoo' Carikli]

>Please ALWAYS CC maintainers on mails as covered in SubmittingPatches.
I'm so sorry, I wasn't very awake when I sent the patches and must have 
forgetten to go trough the ./scripts/get_maintainer.pl step.

Denis.

Re: [PATCH 1/2] ASoC: fix WM8753 initialization.

[Mark Brown]

[-- Attachment #1.1: Type: text/plain, Size: 164 bytes --]

On Sun, Feb 26, 2012 at 07:21:53PM +0100, Denis 'GNUtoo' Carikli wrote:
> Without that fix the wm8753 SPI initialization fails, and then produces

Applied, thanks.

[-- Attachment #1.2: Digital signature --]
[-- Type: application/pgp-signature, Size: 836 bytes --]

[-- Attachment #2: Type: text/plain, Size: 0 bytes --]

kernel panic with gta02 sound driver

[Denis 'GNUtoo' Carikli]

hi,

The patch contained in that mail fixes the dai link of
  the gta02 machine, it worked (better) on a 3.2.1 kernel
  (it didn't made the card work but only permitted the dai link
  to happen).

but with linux-next it produces a kernel panic:
[    0.985000] Alignment trap: not handling swp instruction
[    0.985000] Alignment trap: not handling instruction e1003092 at [<c03b0244>]
[    0.990000] Unhandled fault: alignment exception (0x803) at 0x37386d77
[    0.995000] Internal error: : 803 [#1]
[    0.995000] CPU: 0    Not tainted  (3.3.0-rc1-next-20120127+ #55)
[    0.995000] PC is at mutex_lock+0x8/0x14
[    0.995000] LR is at regmap_write+0x14/0x38
[    0.995000] pc : [<c03b0248>]    lr : [<c01bf7ac>]    psr: 60000013
[    0.995000] sp : c7821e28  ip : 00000000  fp : 00000000
[    0.995000] r10: c79a59c0  r9 : 00000001  r8 : c052fd5c
[    0.995000] r7 : 00000001  r6 : 0000001f  r5 : 00000000  r4 : 37386d77
[    0.995000] r3 : 00000000  r2 : 00000000  r1 : 0000001f  r0 : 37386d77
[    0.995000] Flags: nZCv  IRQs on  FIQs on  Mode SVC_32  ISA ARM  Segment kernel
[    0.995000] Control: c000717f  Table: 30004000  DAC: 00000017
[    0.995000] Process swapper (pid: 1, stack limit = 0xc7820270)
[    0.995000] Stack: (0xc7821e28 to 0xc7822000)
[    0.995000] 1e20:                   c79bfa00 00000000 c79a5a40 c024e408 000000c0 c0257838
[    0.995000] 1e40: c79bfa00 c052fb80 c052efb8 c024e7e4 c041e348 c0013658 c052fb80 c79bf800
[    0.995000] 1e60: c79bfa00 00000000 c79bee60 00000000 c7894240 c024efb4 c052fb90 3ab5e842
[    0.995000] 1e80: c79bec80 00000000 c052ed50 c052fce8 c052fc3c c052fba0 c052fc54 c052fc34
[    0.995000] 1ea0: c052fc64 c052ebe8 00000000 c052fb80 c052fb98 c052eb60 00000000 c052ebe8
[    0.995000] 1ec0: 00000000 00000000 00000000 c0250484 c79bfc08 c79bfc08 00000000 00000000
[    0.995000] 1ee0: c052eb8c c025053c c052eb8c c79bfc08 c05842d4 c01b5edc c01b5ec8 c01b4c70
[    0.995000] 1f00: c79bfc08 c01b4e10 00000000 00000000 c05842b0 c01b3bc0 c7840c1c c79a60f4
[    0.995000] 1f20: c79bfc08 c79bfc3c c79bfc08 c01b4ee0 c79bfc08 c0527a98 c79bfc08 c01b3db4
[    0.995000] 1f40: c79bfc08 c79bfc10 c0527958 c01b26d0 c79bfc10 00000000 00000021 c0165884
[    0.995000] 1f60: c7821f88 c79bfc00 c79bfc08 c79bfc00 c79bfc08 00000000 00000013 00000000
[    0.995000] 1f80: 00000000 00000000 00000000 c01b646c c79bec20 c052fb80 00000000 c05854f8
[    0.995000] 1fa0: 00000013 c04efdb8 c05023b0 00000000 c04efd5c c04da800 c0009850 60000013
[    0.995000] 1fc0: 00000000 c0501f28 c050269c c05023b0 c050269c c0009850 00000013 00000000
[    0.995000] 1fe0: 00000000 c04da960 00000000 00000000 c04da8d0 c0009850 00000000 00000000
[    0.995000] [<c03b0248>] (mutex_lock+0x8/0x14) from [<c01bf7ac>] (regmap_write+0x14/0x38)
[    0.995000] [<c01bf7ac>] (regmap_write+0x14/0x38) from [<c024e408>] (snd_soc_write+0xc/0x10)
[    0.995000] [<c024e408>] (snd_soc_write+0xc/0x10) from [<c0257838>] (wm8753_probe+0x74/0x1c4)
[    0.995000] [<c0257838>] (wm8753_probe+0x74/0x1c4) from [<c024e7e4>] (soc_probe_codec+0x124/0x208)
[    0.995000] [<c024e7e4>] (soc_probe_codec+0x124/0x208) from [<c024efb4>] (snd_soc_instantiate_cards+0x664/0xd5c)
[    0.995000] [<c024efb4>] (snd_soc_instantiate_cards+0x664/0xd5c) from [<c0250484>] (snd_soc_register_card+0x240/0x2d4)
[    0.995000] [<c0250484>] (snd_soc_register_card+0x240/0x2d4) from [<c025053c>] (soc_probe+0x24/0x40)
[    0.995000] [<c025053c>] (soc_probe+0x24/0x40) from [<c01b5edc>] (platform_drv_probe+0x14/0x18)
[    0.995000] [<c01b5edc>] (platform_drv_probe+0x14/0x18) from [<c01b4c70>] (driver_probe_device+0xa0/0x1b0)
[    0.995000] [<c01b4c70>] (driver_probe_device+0xa0/0x1b0) from [<c01b3bc0>] (bus_for_each_drv+0x64/0x8c)
[    0.995000] [<c01b3bc0>] (bus_for_each_drv+0x64/0x8c) from [<c01b4ee0>] (device_attach+0x8c/0xa4)
[    0.995000] [<c01b4ee0>] (device_attach+0x8c/0xa4) from [<c01b3db4>] (bus_probe_device+0x88/0xac)
[    0.995000] [<c01b3db4>] (bus_probe_device+0x88/0xac) from [<c01b26d0>] (device_add+0x4a0/0x570)
[    0.995000] [<c01b26d0>] (device_add+0x4a0/0x570) from [<c01b646c>] (platform_device_add+0xf0/0x18c)
[    0.995000] [<c01b646c>] (platform_device_add+0xf0/0x18c) from [<c04efdb8>] (neo1973_init+0x5c/0x9c)
[    0.995000] [<c04efdb8>] (neo1973_init+0x5c/0x9c) from [<c04da800>] (do_one_initcall+0xa4/0x174)
[    0.995000] [<c04da800>] (do_one_initcall+0xa4/0x174) from [<c04da960>] (kernel_init+0x90/0x128)
[    0.995000] [<c04da960>] (kernel_init+0x90/0x128) from [<c0009850>] (kernel_thread_exit+0x0/0x8)
[    0.995000] Code: e28dd010 e8bd81f0 e3a02000 e1003092 (e3530001) 
[    1.000000] ---[ end trace 81e43b55a6684d02 ]---

What could be the cause? (the CPU is an armv4).

Denis.

[PATCH 2/2] ASOC: fix neo1973 wm8753 initialization

[Denis 'GNUtoo' Carikli]

The neo1973 wm8753 driver had wrong codec name
  which prevented the "sound card" from appearing.

Signed-off-by: Denis 'GNUtoo' Carikli <GNUtoo@no-log.org>
---
 sound/soc/samsung/neo1973_wm8753.c |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/sound/soc/samsung/neo1973_wm8753.c b/sound/soc/samsung/neo1973_wm8753.c
index c6012ff..d23b19a 100644
--- a/sound/soc/samsung/neo1973_wm8753.c
+++ b/sound/soc/samsung/neo1973_wm8753.c
@@ -367,7 +367,7 @@ static struct snd_soc_dai_link neo1973_dai[] = {
 	.platform_name = "samsung-audio",
 	.cpu_dai_name = "s3c24xx-iis",
 	.codec_dai_name = "wm8753-hifi",
-	.codec_name = "wm8753-codec.0-001a",
+	.codec_name = "wm8753.0-001a",
 	.init = neo1973_wm8753_init,
 	.ops = &neo1973_hifi_ops,
 },
@@ -376,7 +376,7 @@ static struct snd_soc_dai_link neo1973_dai[] = {
 	.stream_name = "Voice",
 	.cpu_dai_name = "dfbmcs320-pcm",
 	.codec_dai_name = "wm8753-voice",
-	.codec_name = "wm8753-codec.0-001a",
+	.codec_name = "wm8753.0-001a",
 	.ops = &neo1973_voice_ops,
 },
 };
-- 
1.7.4.1