[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 --]