January 2012 - Alsa-devel - mailman.alsa-project.org

[alsa-devel] [PATCH] ALSA: Add #ifdef CONFIG_PCI guard for snd_pci_quirk_lookup* functions
by Axel Lin 30 Jan '12

30 Jan '12

This fixes below build warning when CONFIG_PCI is not set. CC sound/sound_core.o In file included from sound/sound_core.c:15: include/sound/core.h:454: warning: 'struct pci_dev' declared inside parameter list include/sound/core.h:454: warning: its scope is only this definition or declaration, which is probably not what you want Signed-off-by: Axel Lin <axel.lin(a)gmail.com> --- include/sound/core.h | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/include/sound/core.h b/include/sound/core.h index 5ab255f..fce4b6f 100644 --- a/include/sound/core.h +++ b/include/sound/core.h @@ -450,11 +450,13 @@ struct snd_pci_quirk { {_SND_PCI_QUIRK_ID_MASK(vend, 0, 0), .value = (val)} #endif +#ifdef CONFIG_PCI const struct snd_pci_quirk * snd_pci_quirk_lookup(struct pci_dev *pci, const struct snd_pci_quirk *list); const struct snd_pci_quirk * snd_pci_quirk_lookup_id(u16 vendor, u16 device, const struct snd_pci_quirk *list); +#endif #endif /* __SOUND_CORE_H */ -- 1.7.5.4

2 1

[alsa-devel] [PATCH] ALSA: Include linux/pci.h in sound/core.h
by Axel Lin 30 Jan '12

30 Jan '12

commit d1458279b "ALSA: Add snd_pci_quirk_lookup_id()" introduces below build waring: CC sound/sound_core.o In file included from sound/sound_core.c:15: include/sound/core.h:454: warning: 'struct pci_dev' declared inside parameter list include/sound/core.h:454: warning: its scope is only this definition or declaration, which is probably not what you want Include linux/pci.h to fix the build warning. Signed-off-by: Axel Lin <axel.lin(a)gmail.com> --- include/sound/core.h | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/include/sound/core.h b/include/sound/core.h index 5ab255f..4ea14f2 100644 --- a/include/sound/core.h +++ b/include/sound/core.h @@ -28,6 +28,7 @@ #include <linux/pm.h> /* pm_message_t */ #include <linux/device.h> #include <linux/stringify.h> +#include <linux/pci.h> /* number of supported soundcards */ #ifdef CONFIG_SND_DYNAMIC_MINORS -- 1.7.5.4

1 1

[alsa-devel] question application playback
by Ricardo Barbosa 30 Jan '12

30 Jan '12

Hi all. I am new to development using the alsa API and follow the link code http://equalarea.com/paul/alsa-audio.html insert the following code. FILE *fp; fp = fopen("file.mp3", "r"); fclose(fp); and changed variable buf by the variable fp, but by running the file file.mp3 he does not play according to the way it interferes with the function snd_pcm_writei ? someone could help me in developing this playback, I thank Regards.

7 8

[alsa-devel] kernel panic with gta02 sound driver
by Denis 'GNUtoo' Carikli 30 Jan '12

30 Jan '12

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.

1 1

[alsa-devel] [PATCH] Sound, SoC, WM9090: Remove unused variable 'wm9090' from wm9090_i2c_remove()
by Jesper Juhl 29 Jan '12

29 Jan '12

The variable 'wm9090' is assigned to but never used, so let's just remove it. Signed-off-by: Jesper Juhl <jj(a)chaosbits.net> --- sound/soc/codecs/wm9090.c | 3 --- 1 files changed, 0 insertions(+), 3 deletions(-) compile teste only diff --git a/sound/soc/codecs/wm9090.c b/sound/soc/codecs/wm9090.c index 41ebe0d..db1ba30 100644 --- a/sound/soc/codecs/wm9090.c +++ b/sound/soc/codecs/wm9090.c @@ -655,10 +655,7 @@ static int wm9090_i2c_probe(struct i2c_client *i2c, static int __devexit wm9090_i2c_remove(struct i2c_client *i2c) { - struct wm9090_priv *wm9090 = i2c_get_clientdata(i2c); - snd_soc_unregister_codec(&i2c->dev); - return 0; } -- 1.7.8.4 -- Jesper Juhl <jj(a)chaosbits.net> http://www.chaosbits.net/ Don't top-post http://www.catb.org/jargon/html/T/top-post.html Plain text mails only, please.

2 2

[alsa-devel] [PATCH v4 - resend 00/13] OMAP4: ASoC: Support for PandaBoard family
by Peter Ujfalusi 28 Jan '12

28 Jan '12

Hello, the following series will add ASoC support for PandaBoards. PandaBoards have different audio routings compared to SDP4430/Blaze boards, but the differences not that big to justify a new ASoC machine driver. The v3 series did not made it to 3.3 kernel. This set contains all the patches needed to enable the audio support on the PandaBoard family. The machine driver has been converted to a generic OMAP4 driver which can support wide range of machines using OMAP4 with twl6040 codec. I have remove the hardcoded MCLK clock frequency use in the machine driver (there can be devices with different MCLK configuration). This changed patch 04, 05, and 12. Since this does not affect the functionality I kept the acks for these patches. Patch 11 did not existed in the v3 series. Regards, Peter --- Peter Ujfalusi (13): ASoC: sdp4430: Correct author e-mail address ASoC: OMAP4: Rename the sdp4430 machine driver ASoC: omap-abe-twl6040: Correct internal prefix, Kconfig entry include: platform_data: Platform data header for OMAP4 ASoC audio OMAP4: 4430sdp: Register platform device for OMAP4 audio ASoC: omap-abe-twl6040: Convert to platform deriver ASoC: twl6040: Convert MICBIAS to SUPPLY widget ASoC: omap-abe-twl6040: Add complete DAPM routing ASoC: omap-abe-twl6040: DAI link selection based on platform data ASoC: omap-abe-twl6040: Configure card according to platform data ASoC: omap-abe-twl6040: Use provided MCLK frequency from pdata OMAP4: omap4panda: Enable audio support ASoC: Kconfig: OMAP4: Enable support for PandaBoards arch/arm/mach-omap2/board-4430sdp.c | 29 ++ arch/arm/mach-omap2/board-omap4panda.c | 60 ++++- include/linux/platform_data/omap-abe-twl6040.h | 49 ++++ sound/soc/codecs/twl6040.c | 16 +- sound/soc/omap/Kconfig | 13 +- sound/soc/omap/Makefile | 4 +- sound/soc/omap/omap-abe-twl6040.c | 349 ++++++++++++++++++++++++ sound/soc/omap/sdp4430.c | 279 ------------------- 8 files changed, 504 insertions(+), 295 deletions(-) create mode 100644 include/linux/platform_data/omap-abe-twl6040.h create mode 100644 sound/soc/omap/omap-abe-twl6040.c delete mode 100644 sound/soc/omap/sdp4430.c -- 1.7.8.3

4 23

[alsa-devel] [PATCH] ASoC: wm8962: Don't automatically enable and disable FLL
by Mark Brown 27 Jan '12

27 Jan '12

Only enable and disable the FLL when explicitly told to, supporting some additional use cases and making the driver behaviour more standard. Signed-off-by: Mark Brown <broonie(a)opensource.wolfsonmicro.com> --- sound/soc/codecs/wm8962.c | 72 ++++----------------------------------------- 1 files changed, 6 insertions(+), 66 deletions(-) diff --git a/sound/soc/codecs/wm8962.c b/sound/soc/codecs/wm8962.c index 58afbde..de74af7 100644 --- a/sound/soc/codecs/wm8962.c +++ b/sound/soc/codecs/wm8962.c @@ -1832,65 +1832,6 @@ SOC_SINGLE_TLV("SPKOUTR Mixer DACR Volume", WM8962_SPEAKER_MIXER_5, 4, 1, 0, inmix_tlv), }; -static int sysclk_event(struct snd_soc_dapm_widget *w, - struct snd_kcontrol *kcontrol, int event) -{ - struct snd_soc_codec *codec = w->codec; - struct wm8962_priv *wm8962 = snd_soc_codec_get_drvdata(codec); - unsigned long timeout; - int src; - int fll; - - /* Ignore attempts to run the event during startup */ - if (codec->dapm.bias_level == SND_SOC_BIAS_OFF) - return 0; - - src = snd_soc_read(codec, WM8962_CLOCKING2) & WM8962_SYSCLK_SRC_MASK; - - switch (src) { - case 0: /* MCLK */ - fll = 0; - break; - case 0x200: /* FLL */ - fll = 1; - break; - default: - dev_err(codec->dev, "Unknown SYSCLK source %x\n", src); - return -EINVAL; - } - - switch (event) { - case SND_SOC_DAPM_PRE_PMU: - if (fll) { - try_wait_for_completion(&wm8962->fll_lock); - - snd_soc_update_bits(codec, WM8962_FLL_CONTROL_1, - WM8962_FLL_ENA, WM8962_FLL_ENA); - - timeout = msecs_to_jiffies(5); - timeout = wait_for_completion_timeout(&wm8962->fll_lock, - timeout); - - if (wm8962->irq && timeout == 0) - dev_err(codec->dev, - "Timed out starting FLL\n"); - } - break; - - case SND_SOC_DAPM_POST_PMD: - if (fll) - snd_soc_update_bits(codec, WM8962_FLL_CONTROL_1, - WM8962_FLL_ENA, 0); - break; - - default: - BUG(); - return -EINVAL; - } - - return 0; -} - static int cp_event(struct snd_soc_dapm_widget *w, struct snd_kcontrol *kcontrol, int event) { @@ -2176,8 +2117,7 @@ SND_SOC_DAPM_INPUT("DMICDAT"), SND_SOC_DAPM_SUPPLY("MICBIAS", WM8962_PWR_MGMT_1, 1, 0, NULL, 0), SND_SOC_DAPM_SUPPLY("Class G", WM8962_CHARGE_PUMP_B, 0, 1, NULL, 0), -SND_SOC_DAPM_SUPPLY("SYSCLK", WM8962_CLOCKING2, 5, 0, sysclk_event, - SND_SOC_DAPM_PRE_PMU | SND_SOC_DAPM_POST_PMD), +SND_SOC_DAPM_SUPPLY("SYSCLK", WM8962_CLOCKING2, 5, 0, NULL, 0), SND_SOC_DAPM_SUPPLY("Charge Pump", WM8962_CHARGE_PUMP_1, 0, 0, cp_event, SND_SOC_DAPM_POST_PMU), SND_SOC_DAPM_SUPPLY("TOCLK", WM8962_ADDITIONAL_CONTROL_1, 0, 0, NULL, 0), @@ -2880,8 +2820,7 @@ static int wm8962_set_fll(struct snd_soc_codec *codec, int fll_id, int source, struct _fll_div fll_div; unsigned long timeout; int ret; - int fll1 = snd_soc_read(codec, WM8962_FLL_CONTROL_1) & WM8962_FLL_ENA; - int sysclk = snd_soc_read(codec, WM8962_CLOCKING2) & WM8962_SYSCLK_ENA; + int fll1 = 0; /* Any change? */ if (source == wm8962->fll_src && Fref == wm8962->fll_fref && @@ -2904,6 +2843,9 @@ static int wm8962_set_fll(struct snd_soc_codec *codec, int fll_id, int source, if (ret != 0) return ret; + /* Parameters good, disable so we can reprogram */ + snd_soc_update_bits(codec, WM8962_FLL_CONTROL_1, WM8962_FLL_ENA, 0); + switch (fll_id) { case WM8962_FLL_MCLK: case WM8962_FLL_BCLK: @@ -2942,12 +2884,10 @@ static int wm8962_set_fll(struct snd_soc_codec *codec, int fll_id, int source, try_wait_for_completion(&wm8962->fll_lock); - if (sysclk) - fll1 |= WM8962_FLL_ENA; snd_soc_update_bits(codec, WM8962_FLL_CONTROL_1, WM8962_FLL_FRAC | WM8962_FLL_REFCLK_SRC_MASK | - WM8962_FLL_ENA, fll1); + WM8962_FLL_ENA, fll1 | WM8962_FLL_ENA); dev_dbg(codec->dev, "FLL configured for %dHz->%dHz\n", Fref, Fout); -- 1.7.9.rc1

1 0

[alsa-devel] [PATCH] ASoC: wm8962: Enable idle_bias_off
by Mark Brown 27 Jan '12

27 Jan '12

The WM8962 has ground referenced and class D outputs so can happily go down to BIAS_OFF without a large startup time. Signed-off-by: Mark Brown <broonie(a)opensource.wolfsonmicro.com> --- sound/soc/codecs/wm8962.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/sound/soc/codecs/wm8962.c b/sound/soc/codecs/wm8962.c index 679af29..58afbde 100644 --- a/sound/soc/codecs/wm8962.c +++ b/sound/soc/codecs/wm8962.c @@ -3661,6 +3661,7 @@ static struct snd_soc_codec_driver soc_codec_dev_wm8962 = { .set_pll = wm8962_set_fll, .reg_cache_size = WM8962_MAX_REGISTER, .volatile_register = wm8962_soc_volatile, + .idle_bias_off = true, }; /* Improve power consumption for IN4 DC measurement mode */ -- 1.7.9.rc1

1 0

[alsa-devel] Why does snd_seq_drain_output() need lots of time to execute?
by Rafał Cieślak 27 Jan '12

27 Jan '12

Hello, I have a serious problem using the ALSA sequencer interface. I am writing an application that makes use of it's queues, and have got into troubles which I can't resolve at any cost. The main problem is that although the documentation states that snd_seq_drain_output() returns immediately, it turns out that it occasionally needs lots of time (even a second or two), and blocks my application, as I call it. According to my research, it looks like a possible bug in ALSA, but I'd rather ask you if it is indeed unintended. I won't post the code unless you ask me for it, as it is quite a complex application, and that would unnecessarily mess up this post. So let me describe what I've found about this problem. Most of time snd_seq_drain_output() works as it should. I call it from time to time after putting a bunch of MIDI events on a queue. I use it to schedule lots of notes, MIDI controller change messages, and several custom events. It seems I use it more or less appropriately, for the outputting data is scheduled as I wish it to be. I have followed tutorials and examples to learn how to use ALSA sequencer interface, for the documentation does not mention a word on how one should actually use these calls. However, I have compared my snd_seq_* calls to many other open-source MIDI applications, and it seems I got everything right. And, indeed, most of time the app works perfectly. Problems start when I schedule a big amount of events on the queue. There is no exact number that triggers the problem, but it's usually in between 900 and 1100. In that case snd_seq_drain_output() freezes for a very long time. The exact time depends on the tempo applied to the queue (which I find very weird), but is about 0,6 sec for tempo of 60bpm, and greater for slower tempos. I tried also scheduling notes using snd_seq_event_output_direct() to avoid calling snd_seq_drain_output(), but that caused snd_seq_event_output_direct() to lag similarly after such large amount of notes gets scheduled on the queue. And before you ask, I've set the output buffer to some huge amount, that is much lager then the amount of notes I am trying to schedule. It is likely that it's my fault, for I can't fully understand how these calls should be used. In this case could anyone please explain me in which cases snd_seq_drain_output() may block the calling app? I will check if my code might trigger this behaviour. Otherwise, is there any workaround for this lag? Or maybe I have missed something? I need help a lot, because this problem makes me completely unable to continue development of my application. Please let me know in case you need me to provide additional information. Regards, Rafał Cieślak

3 6

[alsa-devel] [PATCH 1/3] ARM: dt: tegra: Enable device tree audio on PAZ00 board.
by Leon Romanovsky 27 Jan '12

27 Jan '12

This patch adds initial device tree support of ALC5632 sound codec and machine driver for PAZ00 board. The implementation is based on the WM8903 codec. Signed-off-by: Marc Dietrich <marvin24(a)gmx.de> Signed-off-by: Leon Romanovsky <leon(a)leon.nu> --- .../devicetree/bindings/sound/alc5632.txt | 24 ++++++ .../bindings/sound/tegra-audio-alc5632.txt | 55 ++++++++++++++ arch/arm/boot/dts/tegra-paz00.dts | 29 ++++++-- sound/soc/tegra/tegra_alc5632.c | 78 ++++++++++++++++++-- 4 files changed, 173 insertions(+), 13 deletions(-) create mode 100644 Documentation/devicetree/bindings/sound/alc5632.txt create mode 100644 Documentation/devicetree/bindings/sound/tegra-audio-alc5632.txt diff --git a/Documentation/devicetree/bindings/sound/alc5632.txt b/Documentation/devicetree/bindings/sound/alc5632.txt new file mode 100644 index 0000000..8608f74 --- /dev/null +++ b/Documentation/devicetree/bindings/sound/alc5632.txt @@ -0,0 +1,24 @@ +ALC5632 audio CODEC + +This device supports I2C only. + +Required properties: + + - compatible : "realtek,alc5632" + + - reg : the I2C address of the device. + + - gpio-controller : Indicates this device is a GPIO controller. + + - #gpio-cells : Should be two. The first cell is the pin number and the + second cell is used to specify optional parameters (currently unused). + +Example: + +alc5632: alc5632@1e { + compatible = "realtek,alc5632"; + reg = <0x1a>; + + gpio-controller; + #gpio-cells = <2>; +}; diff --git a/Documentation/devicetree/bindings/sound/tegra-audio-alc5632.txt b/Documentation/devicetree/bindings/sound/tegra-audio-alc5632.txt new file mode 100644 index 0000000..315213f --- /dev/null +++ b/Documentation/devicetree/bindings/sound/tegra-audio-alc5632.txt @@ -0,0 +1,55 @@ +NVIDIA Tegra audio complex + +Required properties: +- compatible : "nvidia,tegra-audio-alc5632" +- nvidia,model : The user-visible name of this sound complex. +- nvidia,audio-routing : A list of the connections between audio components. + Each entry is a pair of strings, the first being the connection's sink, + the second being the connection's source. Valid names for sources and + sinks are the ALC5632's pins: + + ALC5632 pins: + + * SPKOUT + * SPKOUTN + * HPL + * HPR + * AUXOUT + * LINEINL + * LINEINR + * PHONEP + * PHONEP + * MIC1 + * MIC2 + * MICBIAS1 + * MICBIAS2 + + Board connectors: + + * Headset Stereophone + * Int Spk + * MIC1 + * MICBIAS1 + +- nvidia,i2s-controller : The phandle of the Tegra I2S controller +- nvidia,audio-codec : The phandle of the ALC5632 audio codec + +Example: + +sound { + compatible = "nvidia,tegra-audio-alc5632-paz00", + "nvidia,tegra-audio-alc5632"; + + nvidia,model = "Compal PAZ00"; + + nvidia,audio-routing = + "Int Spk", "SPKOUT", + "Int Spk", "SPKOUTN", + "MIC1", "MICBIAS1", + "MICBIAS1", "Headset Mic", + "Headset Stereophone", "HPR", + "Headset Stereophone", "HPL"; + + nvidia,i2s-controller = <&tegra_i2s1>; + nvidia,audio-codec = <&alc5632>; +}; diff --git a/arch/arm/boot/dts/tegra-paz00.dts b/arch/arm/boot/dts/tegra-paz00.dts index 4d1bcdc..692d20c 100644 --- a/arch/arm/boot/dts/tegra-paz00.dts +++ b/arch/arm/boot/dts/tegra-paz00.dts @@ -12,6 +12,13 @@ i2c@7000c000 { clock-frequency = <400000>; + + alc5632: alc5632@1e { + compatible = "realtek,alc5632"; + reg = <0x1e>; + gpio-controller; + #gpio-cells = <2>; + }; }; i2c@7000c400 { @@ -37,16 +44,26 @@ clock-frequency = <400000>; }; - i2s@70002800 { - status = "disable"; - }; - i2s@70002a00 { status = "disable"; }; - das@70000c00 { - status = "disable"; + sound { + compatible = "nvidia,tegra-audio-alc5632-paz00", + "nvidia,tegra-audio-alc5632"; + + nvidia,model = "Compal PAZ00"; + + nvidia,audio-routing = + "Int Spk", "SPKOUT", + "Int Spk", "SPKOUTN", + "MIC1", "MICBIAS1", + "MICBIAS1", "Headset Mic", + "Headset Stereophone", "HPR", + "Headset Stereophone", "HPL"; + + nvidia,audio-codec = <&alc5632>; + nvidia,i2s-controller = <&tegra_i2s1>; }; serial@70006000 { diff --git a/sound/soc/tegra/tegra_alc5632.c b/sound/soc/tegra/tegra_alc5632.c index 4a0e805..22348e8 100644 --- a/sound/soc/tegra/tegra_alc5632.c +++ b/sound/soc/tegra/tegra_alc5632.c @@ -36,6 +36,7 @@ struct tegra_alc5632 { struct tegra_asoc_utils_data util_data; + struct platform_device *pcm_dev; }; static int tegra_alc5632_asoc_hw_params(struct snd_pcm_substream *substream, @@ -163,26 +164,80 @@ static __devinit int tegra_alc5632_probe(struct platform_device *pdev) sizeof(struct tegra_alc5632), GFP_KERNEL); if (!alc5632) { dev_err(&pdev->dev, "Can't allocate tegra_alc5632\n"); - return -ENOMEM; + ret = -ENOMEM; + goto err; } - ret = tegra_asoc_utils_init(&alc5632->util_data, &pdev->dev); - if (ret) - return ret; - card->dev = &pdev->dev; platform_set_drvdata(pdev, card); snd_soc_card_set_drvdata(card, alc5632); + alc5632->pcm_dev = ERR_PTR(-EINVAL); + + if (!(pdev->dev.of_node)) { + dev_err(&pdev->dev, "No platform data supplied\n"); + ret = -EINVAL; + goto err; + } + + ret = snd_soc_of_parse_card_name(card, "nvidia,model"); + if (ret) + goto err; + + ret = snd_soc_of_parse_audio_routing(card, "nvidia,audio-routing"); + if (ret) + goto err; + + tegra_alc5632_dai.codec_name = NULL; + tegra_alc5632_dai.codec_of_node = of_parse_phandle( + pdev->dev.of_node, "nvidia,audio-codec", 0); + + if (!tegra_alc5632_dai.codec_of_node) { + dev_err(&pdev->dev, + "Property 'nvidia,audio-codec' missing or invalid\n"); + ret = -EINVAL; + goto err; + } + + tegra_alc5632_dai.cpu_dai_name = NULL; + tegra_alc5632_dai.cpu_dai_of_node = of_parse_phandle( + pdev->dev.of_node, "nvidia,i2s-controller", 0); + if (!tegra_alc5632_dai.cpu_dai_of_node) { + dev_err(&pdev->dev, + "Property 'nvidia,i2s-controller' missing or invalid\n"); + ret = -EINVAL; + goto err; + } + + alc5632->pcm_dev = platform_device_register_simple( + "tegra-pcm-audio", -1, NULL, 0); + if (IS_ERR(alc5632->pcm_dev)) { + dev_err(&pdev->dev, + "Can't instantiate tegra-pcm-audio\n"); + ret = PTR_ERR(alc5632->pcm_dev); + goto err; + } + + ret = tegra_asoc_utils_init(&alc5632->util_data, &pdev->dev); + if (ret) + goto err_unregister; + ret = snd_soc_register_card(card); if (ret) { dev_err(&pdev->dev, "snd_soc_register_card failed (%d)\n", ret); - tegra_asoc_utils_fini(&alc5632->util_data); - return ret; + goto err_fini_utils; } return 0; + +err_fini_utils: + tegra_asoc_utils_fini(&alc5632->util_data); +err_unregister: + if (!IS_ERR(alc5632->pcm_dev)) + platform_device_unregister(alc5632->pcm_dev); +err: + return ret; } static int __devexit tegra_alc5632_remove(struct platform_device *pdev) @@ -193,15 +248,23 @@ static int __devexit tegra_alc5632_remove(struct platform_device *pdev) snd_soc_unregister_card(card); tegra_asoc_utils_fini(&alc5632->util_data); + if (!IS_ERR(alc5632->pcm_dev)) + platform_device_unregister(alc5632->pcm_dev); return 0; } +static const struct of_device_id tegra_alc5632_of_match[] __devinitconst = { + { .compatible = "nvidia,tegra-audio-alc5632", }, + {}, +}; + static struct platform_driver tegra_alc5632_driver = { .driver = { .name = DRV_NAME, .owner = THIS_MODULE, .pm = &snd_soc_pm_ops, + .of_match_table = tegra_alc5632_of_match, }, .probe = tegra_alc5632_probe, .remove = __devexit_p(tegra_alc5632_remove), @@ -212,3 +275,4 @@ MODULE_AUTHOR("Leon Romanovsky <leon(a)leon.nu>"); MODULE_DESCRIPTION("Tegra+ALC5632 machine ASoC driver"); MODULE_LICENSE("GPL"); MODULE_ALIAS("platform:" DRV_NAME); +MODULE_DEVICE_TABLE(of, tegra_alc5632_of_match); -- 1.7.3.4

2 4