July 2011 - Alsa-devel - mailman.alsa-project.org

[alsa-devel] Problem trying to add ASoC ADAV801 support to my kernel
by Wayne Tams 27 Jul '11

27 Jul '11

Hi, I am trying to add support for the ADAV801 codec to my 2.6.35.3 kernel. I came across this patch http://article.gmane.org/gmane.linux.alsa.devel/86474 obviously I had to make some modifications so it would correctly patch my source. However when I come to build the kernel I'm getting a whole host of errors and I am little unsure on how to proceed, could anyone maybe provide some guidance on the possible causes of my errors or maybe there is a more update driver available. Many thanks W wa CC sound/soc/codecs/adav80x.o ^[sound/soc/codecs/adav80x.c: In function 'adav80x_set_sysclk': sound/soc/codecs/adav80x.c:556:27: error: 'struct snd_soc_codec' has no member named 'dapm' sound/soc/codecs/adav80x.c: In function 'adav80x_set_pll': sound/soc/codecs/adav80x.c:630:27: error: 'struct snd_soc_codec' has no member named 'dapm' sound/soc/codecs/adav80x.c: In function 'adav80x_set_bias_level': sound/soc/codecs/adav80x.c:654:7: error: 'struct snd_soc_codec' has no member named 'dapm' sound/soc/codecs/adav80x.c: At top level: sound/soc/codecs/adav80x.c:698:34: error: array type has incomplete element type sound/soc/codecs/adav80x.c:700:3: error: field name not in record or union initializer sound/soc/codecs/adav80x.c:700:3: error: (near initialization for 'adav80x_dais') sound/soc/codecs/adav80x.c:701:3: error: field name not in record or union initializer sound/soc/codecs/adav80x.c:701:3: error: (near initialization for 'adav80x_dais') sound/soc/codecs/adav80x.c:702:3: error: field name not in record or union initializer sound/soc/codecs/adav80x.c:702:3: error: (near initialization for 'adav80x_dais') sound/soc/codecs/adav80x.c:703:4: error: field name not in record or union initializer sound/soc/codecs/adav80x.c:703:4: error: (near initialization for 'adav80x_dais') sound/soc/codecs/adav80x.c:704:4: error: field name not in record or union initializer sound/soc/codecs/adav80x.c:704:4: error: (near initialization for 'adav80x_dais') sound/soc/codecs/adav80x.c:705:4: error: field name not in record or union initializer sound/soc/codecs/adav80x.c:705:4: error: (near initialization for 'adav80x_dais') sound/soc/codecs/adav80x.c:706:4: error: field name not in record or union initializer sound/soc/codecs/adav80x.c:706:4: error: (near initialization for 'adav80x_dais') sound/soc/codecs/adav80x.c:707:4: error: field name not in record or union initializer sound/soc/codecs/adav80x.c:707:4: error: (near initialization for 'adav80x_dais') sound/soc/codecs/adav80x.c:709:3: error: field name not in record or union initializer sound/soc/codecs/adav80x.c:709:3: error: (near initialization for 'adav80x_dais') sound/soc/codecs/adav80x.c:710:4: error: field name not in record or union initializer sound/soc/codecs/adav80x.c:710:4: error: (near initialization for 'adav80x_dais') sound/soc/codecs/adav80x.c:711:4: error: field name not in record or union initializer sound/soc/codecs/adav80x.c:711:4: error: (near initialization for 'adav80x_dais') sound/soc/codecs/adav80x.c:712:4: error: field name not in record or union initializer sound/soc/codecs/adav80x.c:712:4: error: (near initialization for 'adav80x_dais') sound/soc/codecs/adav80x.c:713:4: error: field name not in record or union initializer sound/soc/codecs/adav80x.c:713:4: error: (near initialization for 'adav80x_dais') sound/soc/codecs/adav80x.c:714:4: error: field name not in record or union initializer sound/soc/codecs/adav80x.c:714:4: error: (near initialization for 'adav80x_dais') sound/soc/codecs/adav80x.c:716:3: error: field name not in record or union initializer sound/soc/codecs/adav80x.c:716:3: error: (near initialization for 'adav80x_dais') sound/soc/codecs/adav80x.c:719:3: error: field name not in record or union initializer sound/soc/codecs/adav80x.c:719:3: error: (near initialization for 'adav80x_dais') sound/soc/codecs/adav80x.c:720:3: error: field name not in record or union initializer sound/soc/codecs/adav80x.c:720:3: error: (near initialization for 'adav80x_dais') sound/soc/codecs/adav80x.c:721:3: error: field name not in record or union initializer sound/soc/codecs/adav80x.c:721:3: error: (near initialization for 'adav80x_dais') sound/soc/codecs/adav80x.c:722:4: error: field name not in record or union initializer sound/soc/codecs/adav80x.c:722:4: error: (near initialization for 'adav80x_dais') sound/soc/codecs/adav80x.c:723:4: error: field name not in record or union initializer sound/soc/codecs/adav80x.c:723:4: error: (near initialization for 'adav80x_dais') sound/soc/codecs/adav80x.c:724:4: error: field name not in record or union initializer sound/soc/codecs/adav80x.c:724:4: error: (near initialization for 'adav80x_dais') sound/soc/codecs/adav80x.c:725:4: error: field name not in record or union initializer sound/soc/codecs/adav80x.c:725:4: error: (near initialization for 'adav80x_dais') sound/soc/codecs/adav80x.c:726:4: error: field name not in record or union initializer sound/soc/codecs/adav80x.c:726:4: error: (near initialization for 'adav80x_dais') sound/soc/codecs/adav80x.c:728:3: error: field name not in record or union initializer sound/soc/codecs/adav80x.c:728:3: error: (near initialization for 'adav80x_dais') sound/soc/codecs/adav80x.c:729:4: error: field name not in record or union initializer sound/soc/codecs/adav80x.c:729:4: error: (near initialization for 'adav80x_dais') sound/soc/codecs/adav80x.c:730:4: error: field name not in record or union initializer sound/soc/codecs/adav80x.c:730:4: error: (near initialization for 'adav80x_dais') sound/soc/codecs/adav80x.c:731:4: error: field name not in record or union initializer sound/soc/codecs/adav80x.c:731:4: error: (near initialization for 'adav80x_dais') sound/soc/codecs/adav80x.c:732:4: error: field name not in record or union initializer sound/soc/codecs/adav80x.c:732:4: error: (near initialization for 'adav80x_dais') sound/soc/codecs/adav80x.c:733:4: error: field name not in record or union initializer sound/soc/codecs/adav80x.c:733:4: error: (near initialization for 'adav80x_dais') sound/soc/codecs/adav80x.c:735:3: error: field name not in record or union initializer sound/soc/codecs/adav80x.c:735:3: error: (near initialization for 'adav80x_dais') sound/soc/codecs/adav80x.c: In function 'adav80x_resume': sound/soc/codecs/adav80x.c:767:2: error: implicit declaration of function 'snd_soc_cache_sync' sound/soc/codecs/adav80x.c: At top level: sound/soc/codecs/adav80x.c:777:15: error: variable 'adav80x_codec_driver' has initializer but incomplete type sound/soc/codecs/adav80x.c:778:2: error: unknown field 'probe' specified in initializer sound/soc/codecs/adav80x.c:778:2: warning: excess elements in struct initializer sound/soc/codecs/adav80x.c:778:2: warning: (near initialization for 'adav80x_codec_driver') sound/soc/codecs/adav80x.c:779:2: error: unknown field 'remove' specified in initializer sound/soc/codecs/adav80x.c:779:2: warning: excess elements in struct initializer sound/soc/codecs/adav80x.c:779:2: warning: (near initialization for 'adav80x_codec_driver') sound/soc/codecs/adav80x.c:780:2: error: unknown field 'suspend' specified in initializer sound/soc/codecs/adav80x.c:780:2: warning: excess elements in struct initializer sound/soc/codecs/adav80x.c:780:2: warning: (near initialization for 'adav80x_codec_driver') sound/soc/codecs/adav80x.c:781:2: error: unknown field 'resume' specified in initializer sound/soc/codecs/adav80x.c:781:2: warning: excess elements in struct initializer sound/soc/codecs/adav80x.c:781:2: warning: (near initialization for 'adav80x_codec_driver') sound/soc/codecs/adav80x.c:782:2: error: unknown field 'set_bias_level' specified in initializer sound/soc/codecs/adav80x.c:782:2: warning: excess elements in struct initializer sound/soc/codecs/adav80x.c:782:2: warning: (near initialization for 'adav80x_codec_driver') sound/soc/codecs/adav80x.c:784:2: error: unknown field 'set_pll' specified in initializer sound/soc/codecs/adav80x.c:784:2: warning: excess elements in struct initializer sound/soc/codecs/adav80x.c:784:2: warning: (near initialization for 'adav80x_codec_driver') sound/soc/codecs/adav80x.c:785:2: error: unknown field 'set_sysclk' specified in initializer sound/soc/codecs/adav80x.c:785:2: warning: excess elements in struct initializer sound/soc/codecs/adav80x.c:785:2: warning: (near initialization for 'adav80x_codec_driver') sound/soc/codecs/adav80x.c:787:2: error: unknown field 'reg_word_size' specified in initializer sound/soc/codecs/adav80x.c:787:2: warning: excess elements in struct initializer sound/soc/codecs/adav80x.c:787:2: warning: (near initialization for 'adav80x_codec_driver') sound/soc/codecs/adav80x.c:788:2: error: unknown field 'reg_cache_size' specified in initializer sound/soc/codecs/adav80x.c:788:103: warning: excess elements in struct initializer sound/soc/codecs/adav80x.c:788:103: warning: (near initialization for 'adav80x_codec_driver') sound/soc/codecs/adav80x.c:789:2: error: unknown field 'reg_cache_default' specified in initializer sound/soc/codecs/adav80x.c:789:2: warning: excess elements in struct initializer sound/soc/codecs/adav80x.c:789:2: warning: (near initialization for 'adav80x_codec_driver') sound/soc/codecs/adav80x.c:791:2: error: unknown field 'controls' specified in initializer sound/soc/codecs/adav80x.c:791:2: warning: excess elements in struct initializer sound/soc/codecs/adav80x.c:791:2: warning: (near initialization for 'adav80x_codec_driver') sound/soc/codecs/adav80x.c:792:2: error: unknown field 'num_controls' specified in initializer sound/soc/codecs/adav80x.c:792:93: warning: excess elements in struct initializer sound/soc/codecs/adav80x.c:792:93: warning: (near initialization for 'adav80x_codec_driver') sound/soc/codecs/adav80x.c:793:2: error: unknown field 'dapm_widgets' specified in initializer sound/soc/codecs/adav80x.c:793:2: warning: excess elements in struct initializer sound/soc/codecs/adav80x.c:793:2: warning: (near initialization for 'adav80x_codec_driver') sound/soc/codecs/adav80x.c:794:2: error: unknown field 'num_dapm_widgets' specified in initializer sound/soc/codecs/adav80x.c:794:105: warning: excess elements in struct initializer sound/soc/codecs/adav80x.c:794:105: warning: (near initialization for 'adav80x_codec_driver') sound/soc/codecs/adav80x.c:795:2: error: unknown field 'dapm_routes' specified in initializer sound/soc/codecs/adav80x.c:795:2: warning: excess elements in struct initializer sound/soc/codecs/adav80x.c:795:2: warning: (near initialization for 'adav80x_codec_driver') sound/soc/codecs/adav80x.c:796:2: error: unknown field 'num_dapm_routes' specified in initializer sound/soc/codecs/adav80x.c:796:102: warning: excess elements in struct initializer sound/soc/codecs/adav80x.c:796:102: warning: (near initialization for 'adav80x_codec_driver') sound/soc/codecs/adav80x.c: In function 'adav80x_bus_probe': sound/soc/codecs/adav80x.c:813:84: warning: type defaults to 'int' in type name sound/soc/codecs/adav80x.c:813:84: warning: type defaults to 'int' in type name sound/soc/codecs/adav80x.c:813:84: error: negative width in bit-field '<anonymous>' sound/soc/codecs/adav80x.c:813:84: warning: passing argument 1 of 'snd_soc_register_codec' from incompatible pointer type include/sound/soc.h:239:5: note: expected 'struct snd_soc_codec *' but argument is of type 'struct device *' sound/soc/codecs/adav80x.c:813:84: error: too many arguments to function 'snd_soc_register_codec' include/sound/soc.h:239:5: note: declared here sound/soc/codecs/adav80x.c: In function 'adav80x_bus_remove': sound/soc/codecs/adav80x.c:822:2: warning: passing argument 1 of 'snd_soc_unregister_codec' from incompatible pointer type include/sound/soc.h:240:6: note: expected 'struct snd_soc_codec *' but argument is of type 'struct device *' sound/soc/codecs/adav80x.c: At top level: sound/soc/codecs/adav80x.c:698:34: warning: 'adav80x_dais' defined but not used make[4]: *** [sound/soc/codecs/adav80x.o] Error 1 make[3]: *** [sound/soc/codecs] Error 2 make[2]: *** [sound/soc] Error 2 make[1]: *** [sound] Error 2 make[1]: Leaving directory `/home/wayne/sources/k/kernel/linux-2.6.35.3-imx' make: *** [/home/wayne/sources/k/kernel/linux-2.6.35.3-imx/.stamp_image_built] Error 2

2 2

[alsa-devel] [patch] ALSA: asihpi - off by one in asihpi_hpi_ioctl()
by Dan Carpenter 27 Jul '11

27 Jul '11

"adapter" is used as an array index in the adapters[] array so the off by one would make us read past the end. Signed-off-by: Dan Carpenter <error27(a)gmail.com> --- 1c073b67979 "ALSA: asihpi - Remove spurious adapter index check" reverted Dan Rosenburg's check that would have prevented the overflow here. Also it moved the initialization of "pa" down a couple lines so I'm concerned there may be a bogus derereference here when we check pa->type. I don't have the hardware, so I can't test this. diff --git a/sound/pci/asihpi/hpioctl.c b/sound/pci/asihpi/hpioctl.c index 65fcf47..7ba7073 100644 --- a/sound/pci/asihpi/hpioctl.c +++ b/sound/pci/asihpi/hpioctl.c @@ -183,7 +183,7 @@ long asihpi_hpi_ioctl(struct file *file, unsigned int cmd, unsigned long arg) int wrflag = -1; u32 adapter = hm->h.adapter_index; - if ((adapter > HPI_MAX_ADAPTERS) || (!pa->type)) { + if ((adapter >= HPI_MAX_ADAPTERS) || (!pa->type)) { hpi_init_response(&hr->r0, HPI_OBJ_ADAPTER, HPI_ADAPTER_OPEN, HPI_ERROR_BAD_ADAPTER_NUMBER);

2 1

Re: [alsa-devel] [patch] ALSA: asihpi - off by one in asihpi_hpi_ioctl()
by Takashi Iwai 27 Jul '11

27 Jul '11

At Wed, 27 Jul 2011 09:02:13 -0400, Dan Rosenberg wrote: > > > > > Also it moved the initialization of "pa" down a couple lines so I'm > > > concerned there may be a bogus derereference here when we check > > > pa->type. I don't have the hardware, so I can't test this. > > > > > > > I agree. This code seems to make assumptions in more than one place > > that the adapters array is fully populated with non-NULL elements. At a > > glance, I can't see where such initialization occurs though. > > > > I hadn't read the updated code fully, so I missed what you meant. Yes, > this is definitely a NULL dereference, since "pa" is initialized to NULL > and not changed until after this dereference. NULL dereference was already fixed today in sound git tree by commit 767cd365b22820df07b962b49ce04b220b98e537. It'll be included in the pull request in the next days, maybe tomorrow. thanks, Takashi

1 0

Re: [alsa-devel] [PATCH 7/9] ASoC: Silence DEBUG_STRICT_USER_COPY_CHECKS=y warning
by Mark Brown 27 Jul '11

27 Jul '11

On Thu, May 12, 2011 at 04:50:10PM -0700, Stephen Boyd wrote: > Enabling DEBUG_STRICT_USER_COPY_CHECKS causes the following > warning: Applied, thanks.

1 0

[alsa-devel] [PATCH] ASoC: Ensure we delay long enough for WM8994 FLL to lock when starting
by Mark Brown 27 Jul '11

27 Jul '11

This delay is very conservative. Signed-off-by: Mark Brown <broonie(a)opensource.wolfsonmicro.com> --- sound/soc/codecs/wm8994.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/sound/soc/codecs/wm8994.c b/sound/soc/codecs/wm8994.c index 38abdff..2eb4594 100644 --- a/sound/soc/codecs/wm8994.c +++ b/sound/soc/codecs/wm8994.c @@ -1725,6 +1725,8 @@ static int _wm8994_set_fll(struct snd_soc_codec *codec, int id, int src, snd_soc_update_bits(codec, WM8994_FLL1_CONTROL_1 + reg_offset, WM8994_FLL1_ENA | WM8994_FLL1_FRAC, reg); + + msleep(5); } wm8994->fll[id].in = freq_in; -- 1.7.5.4

3 5

[alsa-devel] [PATCH] ASoC: dapm - Refactor widget IO functions in preparation for platform widgets.
by Liam Girdwood 27 Jul '11

27 Jul '11

Currently widget IO is tightly coupled to the CODEC drivers. Future platform DSP devices have mixer components that can alter power usage and hence require full DAPM support. This provides a generic widget IO operation wrapper in preparation for future patches that implement platform driver DAPM. Signed-off-by: Liam Girdwood <lrg(a)ti.com> --- sound/soc/soc-dapm.c | 55 ++++++++++++++++++++++++++++++++++++++++++++----- 1 files changed, 49 insertions(+), 6 deletions(-) diff --git a/sound/soc/soc-dapm.c b/sound/soc/soc-dapm.c index 34106bc..7b7af9f 100644 --- a/sound/soc/soc-dapm.c +++ b/sound/soc/soc-dapm.c @@ -124,6 +124,49 @@ static inline struct snd_soc_dapm_widget *dapm_cnew_widget( return kmemdup(_widget, sizeof(*_widget), GFP_KERNEL); } +static int soc_widget_read(struct snd_soc_dapm_widget *w, int reg) +{ + if (w->codec) + return snd_soc_read(w->codec, reg); + return 0; +} + +static int soc_widget_write(struct snd_soc_dapm_widget *w,int reg, int val) +{ + if (w->codec) + return snd_soc_write(w->codec, reg, val); + return 0; +} + +int soc_widget_update_bits(struct snd_soc_dapm_widget *w, unsigned short reg, + unsigned int mask, unsigned int value) +{ + int change; + unsigned int old, new; + + old = soc_widget_read(w, reg); + new = (old & ~mask) | value; + change = old != new; + if (change) + soc_widget_write(w, reg, new); + + return change; +} + +int soc_widget_test_bits(struct snd_soc_dapm_widget *w, unsigned short reg, + unsigned int mask, unsigned int value) +{ + int change; + unsigned int old, new; + + old = soc_widget_read(w, reg); + new = (old & ~mask) | value; + change = old != new; + + return change; +} + + /** * snd_soc_dapm_set_bias_level - set the bias level for the system * @dapm: DAPM context @@ -181,7 +224,7 @@ static void dapm_set_path_status(struct snd_soc_dapm_widget *w, unsigned int mask = (1 << fls(max)) - 1; unsigned int invert = mc->invert; - val = snd_soc_read(w->codec, reg); + val = soc_widget_read(w, reg); val = (val >> shift) & mask; if ((invert && !val) || (!invert && val)) @@ -197,7 +240,7 @@ static void dapm_set_path_status(struct snd_soc_dapm_widget *w, for (bitmask = 1; bitmask < e->max; bitmask <<= 1) ; - val = snd_soc_read(w->codec, e->reg); + val = soc_widget_read(w, e->reg); item = (val >> e->shift_l) & (bitmask - 1); p->connect = 0; @@ -227,7 +270,7 @@ static void dapm_set_path_status(struct snd_soc_dapm_widget *w, w->kcontrol_news[i].private_value; int val, item; - val = snd_soc_read(w->codec, e->reg); + val = soc_widget_read(w, e->reg); val = (val >> e->shift_l) & e->mask; for (item = 0; item < e->max; item++) { if (val == e->values[item]) @@ -669,7 +712,7 @@ int dapm_reg_event(struct snd_soc_dapm_widget *w, else val = w->off_val; - snd_soc_update_bits(w->codec, -(w->reg + 1), + soc_widget_update_bits(w, -(w->reg + 1), w->mask << w->shift, val << w->shift); return 0; @@ -877,7 +920,7 @@ static void dapm_seq_run_coalesced(struct snd_soc_dapm_context *dapm, "pop test : Applying 0x%x/0x%x to %x in %dms\n", value, mask, reg, card->pop_time); pop_wait(card->pop_time); - snd_soc_update_bits(dapm->codec, reg, mask, value); + soc_widget_update_bits(w, reg, mask, value); } list_for_each_entry(w, pending, power_list) { @@ -1878,7 +1921,7 @@ int snd_soc_dapm_new_widgets(struct snd_soc_dapm_context *dapm) /* Read the initial power state from the device */ if (w->reg >= 0) { - val = snd_soc_read(w->codec, w->reg); + val = soc_widget_read(w, w->reg); val &= 1 << w->shift; if (w->invert) val = !val; -- 1.7.4.1

3 4

[alsa-devel] Event or signal for microphone connect/disconnect
by Putinei Ionut 27 Jul '11

27 Jul '11

Hi, I have 2 microphones on my laptop: 1 pluggable on the mic port and 1 on the surface . Is there any way to receive events/signal that the microphone on the mic port is connected/disconnected. I want to implement this feature in a recording program. Thank you Ionut Putinei

2 1

[alsa-devel] Rename Tegra support to Tegra20?
by Stephen Warren 27 Jul '11

27 Jul '11

Mark, Liam, The existing ASoC Tegra support is specifically for Tegra20. It turns out that Tegra30 has pretty different hardware and requires different drivers. A couple questions: * The new drivers I've written use "tegra30" in Kconfig variable names, filenames, symbol names, etc. Do you think it's a good idea to rename the existing Tegra20 driver to basically s/tegra/tegra20/ everywhere so everything is versioned, or do you think that's just unnecessary churn? (My motivation is kinda like the device tree compatible properties always being versioned) * I assume there's little point my posting Tegra30 ASoC drivers for inclusion in mainline, since there's no Tegra30 CPU support at all there yet? Thanks. -- nvpublic

2 1

[alsa-devel] [PATCH] ASoC: Add device tree binding for WM8731
by Mark Brown 27 Jul '11

27 Jul '11

Tested with the famous "hey, look! this compiles" test plan. Signed-off-by: Mark Brown <broonie(a)opensource.wolfsonmicro.com> --- Documentation/devicetree/bindings/sound/wm8731.txt | 18 ++++++++++++++++++ sound/soc/codecs/wm8731.c | 12 ++++++++++++ 2 files changed, 30 insertions(+), 0 deletions(-) create mode 100644 Documentation/devicetree/bindings/sound/wm8731.txt diff --git a/Documentation/devicetree/bindings/sound/wm8731.txt b/Documentation/devicetree/bindings/sound/wm8731.txt new file mode 100644 index 0000000..15f7004 --- /dev/null +++ b/Documentation/devicetree/bindings/sound/wm8731.txt @@ -0,0 +1,18 @@ +WM8731 audio CODEC + +This device supports both I2C and SPI (configured with pin strapping +on the board). + +Required properties: + + - compatible : "wlf,wm8731" + + - reg : the I2C address of the device for I2C, the chip select + number for SPI. + +Example: + +codec: wm8731@1a { + compatible = "wlf,wm8731"; + reg = <0x1a>; +}; diff --git a/sound/soc/codecs/wm8731.c b/sound/soc/codecs/wm8731.c index 76b4361..5ecc05a 100644 --- a/sound/soc/codecs/wm8731.c +++ b/sound/soc/codecs/wm8731.c @@ -22,6 +22,7 @@ #include <linux/platform_device.h> #include <linux/regulator/consumer.h> #include <linux/spi/spi.h> +#include <linux/of_device.h> #include <sound/core.h> #include <sound/pcm.h> #include <sound/pcm_params.h> @@ -607,6 +608,11 @@ static struct snd_soc_codec_driver soc_codec_dev_wm8731 = { .num_dapm_routes = ARRAY_SIZE(wm8731_intercon), }; +static const struct of_device_id wm8731_of_match[] = { + { .compatible = "wlf,wm8731", }, + { } +}; + #if defined(CONFIG_SPI_MASTER) static int __devinit wm8731_spi_probe(struct spi_device *spi) { @@ -634,10 +640,13 @@ static int __devexit wm8731_spi_remove(struct spi_device *spi) return 0; } +MODULE_DEVICE_TABLE(spi, wm8731_of_match); + static struct spi_driver wm8731_spi_driver = { .driver = { .name = "wm8731", .owner = THIS_MODULE, + .of_match_table = wm8731_of_match, }, .probe = wm8731_spi_probe, .remove = __devexit_p(wm8731_spi_remove), @@ -678,10 +687,13 @@ static const struct i2c_device_id wm8731_i2c_id[] = { }; MODULE_DEVICE_TABLE(i2c, wm8731_i2c_id); +MODULE_DEVICE_TABLE(i2c, wm8731_of_match); + static struct i2c_driver wm8731_i2c_driver = { .driver = { .name = "wm8731", .owner = THIS_MODULE, + .of_match_table = wm8731_of_match, }, .probe = wm8731_i2c_probe, .remove = __devexit_p(wm8731_i2c_remove), -- 1.7.5.4

2 1

[alsa-devel] Supporting an unusual device
by Andrew Murray 27 Jul '11

27 Jul '11

Hello, I'm writing support for a slightly unusual device (which I intend to share later) and would like feedback on the best approach to take. The device is for a SOC which has two identical I2C connected codecs. Most codec drivers contain a snd_soc_dai structure - but as this contains instance specific data it would be necessary instead to produce (kmalloc) such structures for each instance (to ensure that both codecs can be treated and addressed independently). I.e. it seems that some codec drivers have been written with the assumption that there will only be one present on a system at any time. My view would be to implement such functionality (kmalloc'ing snd_soc_dai's) in one of the various platform specific directories as appropriate - e.g. atmel, blackfin, davinci, etc. Is this the best way forward? Are there any examples I've missed which do support multiple instances of the same codec? Also - is it recommended to expose these two codecs to the outside world as two snd_soc_card devices - or a single card with multiple dai_links? Thanks, Andrew Murray

2 2