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

[alsa-devel] i think ac97 needs an is_surback_on() function
by John L. Utz III 28 Aug '08

28 Aug '08

ac97_patch.c provides two helper functions that wrap the channel_mode variable, but they only take you out to 5.1 Audio: static inline int is_surround_on(struct snd_ac97 *ac97) { return ac97->channel_mode >= 1; } static inline int is_clfe_on(struct snd_ac97 *ac97) { return ac97->channel_mode >= 2; } For 7.1 Audio, i think there needs to be a test for 'Surround Back' or 'Back Surround' static inline int is_surback_on(struct snd_ac97 *ac97) { return ac97->channel_mode >= 4; } Am i correct? or am i mistaken? agreement or corrections appreciated! I think that i need this function for implementing vt1618_update_jacks() because vt1618 is 7.1 Audio: static void vt1618_update_jacks(struct snd_ac97 *ac97) { unsigned short usSft = 0, usMsk = 0x0003; if(is_surround_on(ac97)) ac97_update_bits_page(ac97, 0x60, 0x000C, ucontrol->value.enumerated.item[0]<<2, 0); if(is_clfe_on(ac97)) ac97_update_bits_page(ac97, 0x60, 0x0030, ucontrol->value.enumerated.item[0]<<4, 0); if(is_surback_on(ac97)) { /* toggle surround rear dac power */ snd_ac97_update_bits(ac97, 0x5c, 0x0008, ucontrol->value.enumerated.item[0] << 3); /* toggle aux in surround rear out jack */ snd_ac97_update_bits(ac97, 0x76, 0x0008, ucontrol->value.enumerated.item[0] << 3); } }

2 2

[alsa-devel] [PATCH] ASoC: Convert wm8731 to a new-style i2c driver (v2, testers wanted)
by Jean Delvare 27 Aug '08

27 Aug '08

Convert the wm8731 codec driver to the new (standard) device driver binding model. Signed-off-by: Jean Delvare <khali(a)linux-fr.org> Acked-by: Mark Brown <broonie(a)opensource.wolfsonmicro.com> Tested-by: Manuel Lauss <mano(a)roarinelk.homelinux.net> --- This second version fixes a bug reported by Manuel Lauss where codec->control_data was used before being initialized. Warning: this assumes that the corgi, poodle and eti_b1 have their codec chips on I2C bus 0, which may or may not be the case. Someone with these machines please test and report. include/linux/i2c-id.h | 1 sound/soc/at91/eti_b1_wm8731.c | 1 sound/soc/codecs/wm8731.c | 108 +++++++++++++++++++--------------------- sound/soc/codecs/wm8731.h | 1 sound/soc/pxa/corgi.c | 1 sound/soc/pxa/poodle.c | 1 6 files changed, 57 insertions(+), 56 deletions(-) --- linux-2.6.27-rc4.orig/include/linux/i2c-id.h 2008-08-27 22:27:01.000000000 +0200 +++ linux-2.6.27-rc4/include/linux/i2c-id.h 2008-08-27 22:38:47.000000000 +0200 @@ -64,7 +64,6 @@ #define I2C_DRIVERID_SAA717X 80 /* saa717x video encoder */ #define I2C_DRIVERID_DS1672 81 /* Dallas/Maxim DS1672 RTC */ #define I2C_DRIVERID_TLV320AIC23B 87 /* TI TLV320AIC23B audio codec */ -#define I2C_DRIVERID_WM8731 89 /* Wolfson WM8731 audio codec */ #define I2C_DRIVERID_WM8753 91 /* Wolfson WM8753 audio codec */ #define I2C_DRIVERID_LM4857 92 /* LM4857 Audio Amplifier */ #define I2C_DRIVERID_VP27SMPX 93 /* Panasonic VP27s tuner internal MPX */ --- linux-2.6.27-rc4.orig/sound/soc/at91/eti_b1_wm8731.c 2008-08-27 22:27:01.000000000 +0200 +++ linux-2.6.27-rc4/sound/soc/at91/eti_b1_wm8731.c 2008-08-27 22:38:47.000000000 +0200 @@ -243,6 +243,7 @@ static struct snd_soc_machine snd_soc_ma }; static struct wm8731_setup_data eti_b1_wm8731_setup = { + .i2c_bus = 0, .i2c_address = 0x1a, }; --- linux-2.6.27-rc4.orig/sound/soc/codecs/wm8731.c 2008-08-27 22:27:01.000000000 +0200 +++ linux-2.6.27-rc4/sound/soc/codecs/wm8731.c 2008-08-27 22:45:15.000000000 +0200 @@ -570,86 +570,86 @@ static struct snd_soc_device *wm8731_soc * low = 0x1a * high = 0x1b */ -static unsigned short normal_i2c[] = { 0, I2C_CLIENT_END }; -/* Magic definition of all other variables and things */ -I2C_CLIENT_INSMOD; - -static struct i2c_driver wm8731_i2c_driver; -static struct i2c_client client_template; - -/* If the i2c layer weren't so broken, we could pass this kind of data - around */ - -static int wm8731_codec_probe(struct i2c_adapter *adap, int addr, int kind) +static int wm8731_i2c_probe(struct i2c_client *i2c, + const struct i2c_device_id *id) { struct snd_soc_device *socdev = wm8731_socdev; - struct wm8731_setup_data *setup = socdev->codec_data; struct snd_soc_codec *codec = socdev->codec; - struct i2c_client *i2c; int ret; - if (addr != setup->i2c_address) - return -ENODEV; - - client_template.adapter = adap; - client_template.addr = addr; - - i2c = kmemdup(&client_template, sizeof(client_template), GFP_KERNEL); - if (i2c == NULL) - return -ENOMEM; - i2c_set_clientdata(i2c, codec); codec->control_data = i2c; - ret = i2c_attach_client(i2c); - if (ret < 0) { - pr_err("failed to attach codec at addr %x\n", addr); - goto err; - } - ret = wm8731_init(socdev); - if (ret < 0) { + if (ret < 0) pr_err("failed to initialise WM8731\n"); - goto err; - } - return ret; -err: - kfree(i2c); return ret; } -static int wm8731_i2c_detach(struct i2c_client *client) +static int wm8731_i2c_remove(struct i2c_client *client) { struct snd_soc_codec *codec = i2c_get_clientdata(client); - i2c_detach_client(client); kfree(codec->reg_cache); - kfree(client); return 0; } -static int wm8731_i2c_attach(struct i2c_adapter *adap) -{ - return i2c_probe(adap, &addr_data, wm8731_codec_probe); -} +static const struct i2c_device_id wm8731_i2c_id[] = { + { "wm8731", 0 }, + { } +}; +MODULE_DEVICE_TABLE(i2c, wm8731_i2c_id); -/* corgi i2c codec control layer */ static struct i2c_driver wm8731_i2c_driver = { .driver = { .name = "WM8731 I2C Codec", .owner = THIS_MODULE, }, - .id = I2C_DRIVERID_WM8731, - .attach_adapter = wm8731_i2c_attach, - .detach_client = wm8731_i2c_detach, - .command = NULL, + .probe = wm8731_i2c_probe, + .remove = wm8731_i2c_remove, + .id_table = wm8731_i2c_id, }; -static struct i2c_client client_template = { - .name = "WM8731", - .driver = &wm8731_i2c_driver, -}; +static int wm8731_add_i2c_device(struct platform_device *pdev, + const struct wm8731_setup_data *setup) +{ + struct i2c_board_info info; + struct i2c_adapter *adapter; + struct i2c_client *client; + int ret; + + ret = i2c_add_driver(&wm8731_i2c_driver); + if (ret != 0) { + dev_err(&pdev->dev, "can't add i2c driver\n"); + return ret; + } + + memset(&info, 0, sizeof(struct i2c_board_info)); + info.addr = setup->i2c_address; + strlcpy(info.type, "wm8731", I2C_NAME_SIZE); + + adapter = i2c_get_adapter(setup->i2c_bus); + if (!adapter) { + dev_err(&pdev->dev, "can't get i2c adapter %d\n", + setup->i2c_bus); + goto err_driver; + } + + client = i2c_new_device(adapter, &info); + i2c_put_adapter(adapter); + if (!client) { + dev_err(&pdev->dev, "can't add i2c device at 0x%x\n", + (unsigned int)info.addr); + goto err_driver; + } + + return 0; + +err_driver: + i2c_del_driver(&wm8731_i2c_driver); + return -ENODEV; +} #endif static int wm8731_probe(struct platform_device *pdev) @@ -682,11 +682,8 @@ static int wm8731_probe(struct platform_ wm8731_socdev = socdev; #if defined(CONFIG_I2C) || defined(CONFIG_I2C_MODULE) if (setup->i2c_address) { - normal_i2c[0] = setup->i2c_address; codec->hw_write = (hw_write_t)i2c_master_send; - ret = i2c_add_driver(&wm8731_i2c_driver); - if (ret != 0) - printk(KERN_ERR "can't add i2c driver"); + ret = wm8731_add_i2c_device(pdev, setup); } #else /* Add other interfaces here */ @@ -711,6 +708,7 @@ static int wm8731_remove(struct platform snd_soc_free_pcms(socdev); snd_soc_dapm_free(socdev); #if defined(CONFIG_I2C) || defined(CONFIG_I2C_MODULE) + i2c_unregister_device(codec->control_data); i2c_del_driver(&wm8731_i2c_driver); #endif kfree(codec->private_data); --- linux-2.6.27-rc4.orig/sound/soc/codecs/wm8731.h 2008-08-27 22:27:01.000000000 +0200 +++ linux-2.6.27-rc4/sound/soc/codecs/wm8731.h 2008-08-27 22:38:47.000000000 +0200 @@ -35,6 +35,7 @@ #define WM8731_DAI 0 struct wm8731_setup_data { + int i2c_bus; unsigned short i2c_address; }; --- linux-2.6.27-rc4.orig/sound/soc/pxa/corgi.c 2008-08-27 22:27:01.000000000 +0200 +++ linux-2.6.27-rc4/sound/soc/pxa/corgi.c 2008-08-27 22:38:47.000000000 +0200 @@ -330,6 +330,7 @@ static struct snd_soc_machine snd_soc_ma /* corgi audio private data */ static struct wm8731_setup_data corgi_wm8731_setup = { + .i2c_bus = 0, .i2c_address = 0x1b, }; --- linux-2.6.27-rc4.orig/sound/soc/pxa/poodle.c 2008-08-27 22:27:01.000000000 +0200 +++ linux-2.6.27-rc4/sound/soc/pxa/poodle.c 2008-08-27 22:38:47.000000000 +0200 @@ -284,6 +284,7 @@ static struct snd_soc_machine snd_soc_ma /* poodle audio private data */ static struct wm8731_setup_data poodle_wm8731_setup = { + .i2c_bus = 0, .i2c_address = 0x1b, }; -- Jean Delvare

1 0

[alsa-devel] [PATCH] ASoC: Convert wm8750 to a new-style i2c driver (v2, testers wanted)
by Jean Delvare 27 Aug '08

27 Aug '08

Convert the wm8750 codec driver to the new (standard) device driver binding model. Signed-off-by: Jean Delvare <khali(a)linux-fr.org> Acked-by: Mark Brown <broonie(a)opensource.wolfsonmicro.com> --- This second version fixes a bug reported by Manuel Lauss where codec->control_data was used before being initialized. Warning: this assumes that the spitz has its codec chip on I2C bus 0, which may or may not be the case. Someone with this machine please test and report. include/linux/i2c-id.h | 1 sound/soc/codecs/wm8750.c | 105 ++++++++++++++++++++++----------------------- sound/soc/codecs/wm8750.h | 1 sound/soc/pxa/spitz.c | 1 4 files changed, 55 insertions(+), 53 deletions(-) --- linux-2.6.27-rc4.orig/include/linux/i2c-id.h 2008-08-26 19:56:18.000000000 +0200 +++ linux-2.6.27-rc4/include/linux/i2c-id.h 2008-08-27 22:46:24.000000000 +0200 @@ -65,7 +65,6 @@ #define I2C_DRIVERID_DS1672 81 /* Dallas/Maxim DS1672 RTC */ #define I2C_DRIVERID_TLV320AIC23B 87 /* TI TLV320AIC23B audio codec */ #define I2C_DRIVERID_WM8731 89 /* Wolfson WM8731 audio codec */ -#define I2C_DRIVERID_WM8750 90 /* Wolfson WM8750 audio codec */ #define I2C_DRIVERID_WM8753 91 /* Wolfson WM8753 audio codec */ #define I2C_DRIVERID_LM4857 92 /* LM4857 Audio Amplifier */ #define I2C_DRIVERID_VP27SMPX 93 /* Panasonic VP27s tuner internal MPX */ --- linux-2.6.27-rc4.orig/sound/soc/codecs/wm8750.c 2008-08-26 19:56:18.000000000 +0200 +++ linux-2.6.27-rc4/sound/soc/codecs/wm8750.c 2008-08-27 22:45:24.000000000 +0200 @@ -846,83 +846,86 @@ static struct snd_soc_device *wm8750_soc * low = 0x1a * high = 0x1b */ -static unsigned short normal_i2c[] = { 0, I2C_CLIENT_END }; -/* Magic definition of all other variables and things */ -I2C_CLIENT_INSMOD; - -static struct i2c_driver wm8750_i2c_driver; -static struct i2c_client client_template; - -static int wm8750_codec_probe(struct i2c_adapter *adap, int addr, int kind) +static int wm8750_i2c_probe(struct i2c_client *i2c, + const struct i2c_device_id *id) { struct snd_soc_device *socdev = wm8750_socdev; - struct wm8750_setup_data *setup = socdev->codec_data; struct snd_soc_codec *codec = socdev->codec; - struct i2c_client *i2c; int ret; - if (addr != setup->i2c_address) - return -ENODEV; - - client_template.adapter = adap; - client_template.addr = addr; - - i2c = kmemdup(&client_template, sizeof(client_template), GFP_KERNEL); - if (i2c == NULL) - return -ENOMEM; - i2c_set_clientdata(i2c, codec); codec->control_data = i2c; - ret = i2c_attach_client(i2c); - if (ret < 0) { - pr_err("failed to attach codec at addr %x\n", addr); - goto err; - } - ret = wm8750_init(socdev); - if (ret < 0) { + if (ret < 0) pr_err("failed to initialise WM8750\n"); - goto err; - } - return ret; -err: - kfree(i2c); return ret; } -static int wm8750_i2c_detach(struct i2c_client *client) +static int wm8750_i2c_remove(struct i2c_client *client) { struct snd_soc_codec *codec = i2c_get_clientdata(client); - i2c_detach_client(client); kfree(codec->reg_cache); - kfree(client); return 0; } -static int wm8750_i2c_attach(struct i2c_adapter *adap) -{ - return i2c_probe(adap, &addr_data, wm8750_codec_probe); -} +static const struct i2c_device_id wm8750_i2c_id[] = { + { "wm8750", 0 }, + { } +}; +MODULE_DEVICE_TABLE(i2c, wm8750_i2c_id); -/* corgi i2c codec control layer */ static struct i2c_driver wm8750_i2c_driver = { .driver = { .name = "WM8750 I2C Codec", .owner = THIS_MODULE, }, - .id = I2C_DRIVERID_WM8750, - .attach_adapter = wm8750_i2c_attach, - .detach_client = wm8750_i2c_detach, - .command = NULL, + .probe = wm8750_i2c_probe, + .remove = wm8750_i2c_remove, + .id_table = wm8750_i2c_id, }; -static struct i2c_client client_template = { - .name = "WM8750", - .driver = &wm8750_i2c_driver, -}; +static int wm8750_add_i2c_device(struct platform_device *pdev, + const struct wm8750_setup_data *setup) +{ + struct i2c_board_info info; + struct i2c_adapter *adapter; + struct i2c_client *client; + int ret; + + ret = i2c_add_driver(&wm8750_i2c_driver); + if (ret != 0) { + dev_err(&pdev->dev, "can't add i2c driver\n"); + return ret; + } + + memset(&info, 0, sizeof(struct i2c_board_info)); + info.addr = setup->i2c_address; + strlcpy(info.type, "wm8750", I2C_NAME_SIZE); + + adapter = i2c_get_adapter(setup->i2c_bus); + if (!adapter) { + dev_err(&pdev->dev, "can't get i2c adapter %d\n", + setup->i2c_bus); + goto err_driver; + } + + client = i2c_new_device(adapter, &info); + i2c_put_adapter(adapter); + if (!client) { + dev_err(&pdev->dev, "can't add i2c device at 0x%x\n", + (unsigned int)info.addr); + goto err_driver; + } + + return 0; + +err_driver: + i2c_del_driver(&wm8750_i2c_driver); + return -ENODEV; +} #endif static int wm8750_probe(struct platform_device *pdev) @@ -954,11 +957,8 @@ static int wm8750_probe(struct platform_ #if defined(CONFIG_I2C) || defined(CONFIG_I2C_MODULE) if (setup->i2c_address) { - normal_i2c[0] = setup->i2c_address; codec->hw_write = (hw_write_t)i2c_master_send; - ret = i2c_add_driver(&wm8750_i2c_driver); - if (ret != 0) - printk(KERN_ERR "can't add i2c driver"); + ret = wm8750_add_i2c_device(pdev, setup); } #else /* Add other interfaces here */ @@ -1002,6 +1002,7 @@ static int wm8750_remove(struct platform snd_soc_free_pcms(socdev); snd_soc_dapm_free(socdev); #if defined(CONFIG_I2C) || defined(CONFIG_I2C_MODULE) + i2c_unregister_device(codec->control_data); i2c_del_driver(&wm8750_i2c_driver); #endif kfree(codec->private_data); --- linux-2.6.27-rc4.orig/sound/soc/codecs/wm8750.h 2008-08-26 19:56:18.000000000 +0200 +++ linux-2.6.27-rc4/sound/soc/codecs/wm8750.h 2008-08-26 21:33:59.000000000 +0200 @@ -58,6 +58,7 @@ #define WM8750_SYSCLK 0 struct wm8750_setup_data { + int i2c_bus; unsigned short i2c_address; }; --- linux-2.6.27-rc4.orig/sound/soc/pxa/spitz.c 2008-08-26 19:56:18.000000000 +0200 +++ linux-2.6.27-rc4/sound/soc/pxa/spitz.c 2008-08-26 21:33:59.000000000 +0200 @@ -337,6 +337,7 @@ static struct snd_soc_machine snd_soc_ma /* spitz audio private data */ static struct wm8750_setup_data spitz_wm8750_setup = { + .i2c_bus = 0, .i2c_address = 0x1b, }; -- Jean Delvare

1 0

Re: [alsa-devel] Swissonic TS22PCI / Teratec Phase 22 / driver problems with ice1724
by Takashi Iwai 27 Aug '08

27 Aug '08

At Thu, 14 Aug 2008 16:07:13 +0200, Manuel Schneider wrote: > > Takashi Iwai schrieb, Am 14.08.2008 16:03: > > > At Thu, 14 Aug 2008 15:59:06 +0200, > > Manuel Schneider wrote: > >> Takashi Iwai schrieb, Am 14.08.2008 15:47: > >> > >>> Pass model=phase22 module option to snd-ice1724 driver. Then it > >>> handles the card as if it's phase22. > >> Thanks for this hin. Unfortunately it changes nothing - still kernel > >> error message, still no usable sound device. > > > > Are you sure? With the proper model name, at least you won't get > > EEPROM version error any more. > > > yes, pretty sure. I just reverted my patch and recompiled the driver to > check it out: > > ice1712: cannot initialize pro ac97, skipped > ice1724: No matching model found for ID 0x3b157b11 This means that you didn't pass the model option properly. > ice1724: Invalid EEPROM version 0 > AC'97 0 does not respond - RESET > AC'97 0 access is not valid [0xffffffff], removing mixer. > ice1712: cannot initialize pro ac97, skipped > > > >> I also tried the following kernel patch, which gives me an accessible > >> sound device and usable mixer (and no kernel error), but recording does > >> not work (just noise). > > > > Likely an incompatible hardware design for the recording... > > I guess it's another firmware... The board has no firmware to load. > I can't test playback as I only have > remote access to the server and it is only used for recording > (streaming) but I assume it does also not work. > I admit that this patch was just a hack to try it out. First you should check whether the exactly same codec chip, AK4524, on it. Takashi

2 5

Re: [alsa-devel] [PATCH RESEND] sound: make OSS sound core optional
by Takashi Iwai 27 Aug '08

27 Aug '08

At Wed, 27 Aug 2008 11:57:06 +0200, Tejun Heo wrote: > > Takashi Iwai wrote: > >> SOUND_OSS_CORE should be turned on if ALSA OSS emul is turned on or > >> arch-um hostsound is turned on, both of which can be enabled regardless > >> of SOUND_PRIME, no? > > > > Yes, sorry, I didn't cite clearly. I meant only the last line. > > sound/oss/dmasound/Kconfig is included and evaluated outside the block > > "if SOUND_PRIME". Thus, CONFIG_SOUND_OSS_CORE won't be enabled for > > drivers in sound/oss/dmasound. > > Ah.. okay, dmasound also requires SOUND_OSS_CORE but not in > SOUND_PRIME. I see. > > > My suggestion is to move that line source sound/oss/dmasound/Kconfig > > into the "if SOUND_PRIME" block first, then apply your patch. > > That would pull in sound_firmware. Most likely no big deal but > still... Ouch, another pain. sound_firmware.c should be removed and the relevant code should use request_firmware()... > How about just adding select SOUND_OSS_CORE to DMASOUND for > now? Looks good to me. Acked-by: Takashi Iwai <tiwai(a)suse.de> If no objection comes up, I'll merge it to sound tree later. thanks, Takashi > Thanks. > > Subject: [PATCH] sound: make OSS sound core optional > > sound/sound_core.c implements soundcore.ko and contains two parts - > sound_class which is shared by both ALSA and OSS and device > redirection support for OSS. It's always compiled when any sound > support is enabled although it's necessary only when OSS (the actual > one or emulation) is enabled. This is slightly wasteful and as device > redirection always registers character device region for major 14, it > prevents alternative implementation. > > This patch introduces a new config SOUND_OSS_CORE which is selected > iff OSS support is actually necessary and build the OSS core part > conditionally. > > If OSS is disabled, soundcore merely contains sound_class but leaving > it that way seems to be the simplest approach as otherwise sound_class > should be in ALSA core file if OSS is disabled but should be in > soundcore if OSS is enabled. Also, there's also the user confusion > factor. > > Signed-off-by: Tejun Heo <tj(a)kernel.org> > --- > arch/um/Kconfig.char | 4 ++ > sound/Kconfig | 5 ++ > sound/core/Kconfig | 1 > sound/oss/dmasound/Kconfig | 1 > sound/sound_core.c | 79 ++++++++++++++++++++++++++++++++++----------- > 5 files changed, 71 insertions(+), 19 deletions(-) > > Index: work/sound/Kconfig > =================================================================== > --- work.orig/sound/Kconfig > +++ work/sound/Kconfig > @@ -28,6 +28,10 @@ menuconfig SOUND > > if SOUND > > +config SOUND_OSS_CORE > + bool > + default n > + > source "sound/oss/dmasound/Kconfig" > > if !M68K > @@ -80,6 +84,7 @@ endif # SND > > menuconfig SOUND_PRIME > tristate "Open Sound System (DEPRECATED)" > + select SOUND_OSS_CORE > help > Say 'Y' or 'M' to enable Open Sound System drivers. > > Index: work/sound/core/Kconfig > =================================================================== > --- work.orig/sound/core/Kconfig > +++ work/sound/core/Kconfig > @@ -38,6 +38,7 @@ config SND_SEQ_DUMMY > will be called snd-seq-dummy. > > config SND_OSSEMUL > + select SOUND_OSS_CORE > bool > > config SND_MIXER_OSS > Index: work/sound/sound_core.c > =================================================================== > --- work.orig/sound/sound_core.c > +++ work/sound/sound_core.c > @@ -1,5 +1,61 @@ > /* > - * Sound core handling. Breaks out sound functions to submodules > + * Sound core. This file is composed of two parts. sound_class > + * which is common to both OSS and ALSA and OSS sound core which > + * is used OSS or emulation of it. > + */ > + > +/* > + * First, the common part. > + */ > +#include <linux/module.h> > +#include <linux/device.h> > +#include <linux/err.h> > + > +#ifdef CONFIG_SOUND_OSS_CORE > +static int __init init_oss_soundcore(void); > +static void __exit cleanup_oss_soundcore(void); > +#else > +static inline int init_oss_soundcore(void) { return 0; } > +static inline void cleanup_oss_soundcore(void) { } > +#endif > + > +struct class *sound_class; > +EXPORT_SYMBOL(sound_class); > + > +MODULE_DESCRIPTION("Core sound module"); > +MODULE_AUTHOR("Alan Cox"); > +MODULE_LICENSE("GPL"); > + > +static int __init init_soundcore(void) > +{ > + int rc; > + > + rc = init_oss_soundcore(); > + if (rc) > + return rc; > + > + sound_class = class_create(THIS_MODULE, "sound"); > + if (IS_ERR(sound_class)) { > + cleanup_oss_soundcore(); > + return PTR_ERR(sound_class); > + } > + > + return 0; > +} > + > +static void __exit cleanup_soundcore(void) > +{ > + cleanup_oss_soundcore(); > + class_destroy(sound_class); > +} > + > +module_init(init_soundcore); > +module_exit(cleanup_soundcore); > + > + > +#ifdef CONFIG_SOUND_OSS_CORE > +/* > + * OSS sound core handling. Breaks out sound functions to submodules > * > * Author: Alan Cox <alan.cox(a)linux.org> > * > @@ -34,21 +90,17 @@ > * locking at some point in 2.3.x. > */ > > -#include <linux/module.h> > #include <linux/init.h> > #include <linux/slab.h> > #include <linux/smp_lock.h> > #include <linux/types.h> > #include <linux/kernel.h> > -#include <linux/fs.h> > #include <linux/sound.h> > #include <linux/major.h> > #include <linux/kmod.h> > -#include <linux/device.h> > > #define SOUND_STEP 16 > > - > struct sound_unit > { > int unit_minor; > @@ -64,9 +116,6 @@ extern int msnd_classic_init(void); > extern int msnd_pinnacle_init(void); > #endif > > -struct class *sound_class; > -EXPORT_SYMBOL(sound_class); > - > /* > * Low level list operator. Scan the ordered list, find a hole and > * join into it. Called with the lock asserted > @@ -523,31 +572,23 @@ int soundcore_open(struct inode *inode, > return -ENODEV; > } > > -MODULE_DESCRIPTION("Core sound module"); > -MODULE_AUTHOR("Alan Cox"); > -MODULE_LICENSE("GPL"); > MODULE_ALIAS_CHARDEV_MAJOR(SOUND_MAJOR); > > -static void __exit cleanup_soundcore(void) > +static void __exit cleanup_oss_soundcore(void) > { > /* We have nothing to really do here - we know the lists must be > empty */ > unregister_chrdev(SOUND_MAJOR, "sound"); > - class_destroy(sound_class); > } > > -static int __init init_soundcore(void) > +static int __init init_oss_soundcore(void) > { > if (register_chrdev(SOUND_MAJOR, "sound", &soundcore_fops)==-1) { > printk(KERN_ERR "soundcore: sound device already in use.\n"); > return -EBUSY; > } > - sound_class = class_create(THIS_MODULE, "sound"); > - if (IS_ERR(sound_class)) > - return PTR_ERR(sound_class); > > return 0; > } > > -module_init(init_soundcore); > -module_exit(cleanup_soundcore); > +#endif /* CONFIG_SOUND_OSS_CORE */ > Index: work/arch/um/Kconfig.char > =================================================================== > --- work.orig/arch/um/Kconfig.char > +++ work/arch/um/Kconfig.char > @@ -203,6 +203,10 @@ config SOUND > tristate > default UML_SOUND > > +config SOUND_OSS_CORE > + bool > + default UML_SOUND > + > config HOSTAUDIO > tristate > default UML_SOUND > Index: work/sound/oss/dmasound/Kconfig > =================================================================== > --- work.orig/sound/oss/dmasound/Kconfig > +++ work/sound/oss/dmasound/Kconfig > @@ -42,3 +42,4 @@ config DMASOUND_Q40 > > config DMASOUND > tristate > + select SOUND_OSS_CORE >

1 0

Re: [alsa-devel] [PATCH RESEND] sound: make OSS sound core optional
by Takashi Iwai 27 Aug '08

27 Aug '08

At Wed, 27 Aug 2008 11:37:44 +0200, Tejun Heo wrote: > > Hello, > > Takashi Iwai wrote: > >> +config SOUND_OSS_CORE > >> + bool > >> + default n > >> + > >> source "sound/oss/dmasound/Kconfig" > > > > This seems missing from the scope. > > But, I think this should be rather in the block "if SOUND_PRIME" below. > > SOUND_OSS_CORE should be turned on if ALSA OSS emul is turned on or > arch-um hostsound is turned on, both of which can be enabled regardless > of SOUND_PRIME, no? Yes, sorry, I didn't cite clearly. I meant only the last line. sound/oss/dmasound/Kconfig is included and evaluated outside the block "if SOUND_PRIME". Thus, CONFIG_SOUND_OSS_CORE won't be enabled for drivers in sound/oss/dmasound. My suggestion is to move that line source sound/oss/dmasound/Kconfig into the "if SOUND_PRIME" block first, then apply your patch. Anyway, there are some other minor issues in sound/Kconfig, for example, why "if !M68K" is there. We can clean up a bit more. thanks, Takashi

1 0

Re: [alsa-devel] [PATCH RESEND] sound: make OSS sound core optional
by Takashi Iwai 27 Aug '08

27 Aug '08

At Wed, 27 Aug 2008 10:19:35 +0200, Tejun Heo wrote: > > sound/sound_core.c implements soundcore.ko contains two parts - > sound_class which is shared by both ALSA and OSS and device > redirection support for OSS. It's always compiled when any sound > support is enabled although it's necessary only when OSS (the actual > one or emulation) is enabled. This is slightly wasteful and as device > redirection always registers character device region for major 14, it > prevents alternative implementation. > > This patch introduces a new config SOUND_OSS_CORE which is selected > iff OSS support is actually necessary and build the OSS core part > conditionally. > > If OSS is disabled, soundcore merely contains sound_class but leaving > it that way seems to be the simplest approach as otherwise sound_class > should be in ALSA core file if OSS is disabled but should be in > soundcore if OSS is enabled and there's also the user confusion > factor. > > Signed-off-by: Tejun Heo <tj(a)kernel.org> Thanks for the patch. I like the idea. > +config SOUND_OSS_CORE > + bool > + default n > + > source "sound/oss/dmasound/Kconfig" This seems missing from the scope. But, I think this should be rather in the block "if SOUND_PRIME" below. > --- work.orig/sound/sound_core.c > +++ work/sound/sound_core.c (snip) > +MODULE_ALIAS_CHARDEV_MAJOR(SOUND_MAJOR); This alias should be in #ifdef CONFIG_SOUND_OSS_CORE. The module doesn't provide that major without CONFIG_SOUND_OSS_CORE. Takashi

1 0

Re: [alsa-devel] [ALSA PATCH] alsa-git merge request
by Takashi Iwai 27 Aug '08

27 Aug '08

At Tue, 26 Aug 2008 23:10:55 +0200, Guillaume Chazarain wrote: > > On Tue, Aug 26, 2008 at 7:59 AM, Takashi Iwai <tiwai(a)suse.de> wrote: > > Are you sure both are the same kernel but just one commit reverted? > > I retested, yes. Thanks for confirmation! > With or without the revert, model=auto disables sound completely, and > I get this in dmesg: > > HDA Intel 0000:00:1b.0: PCI INT A disabled > HDA Intel 0000:00:1b.0: PCI INT A -> GSI 20 (level, low) -> IRQ 20 > HDA Intel 0000:00:1b.0: setting latency timer to 64 > ALSA /home/g/linux-2.6/sound/pci/hda/hda_codec.c:2325: hda_codec: > model 'auto' is selected > ALSA /home/g/linux-2.6/sound/pci/hda/hda_codec.c:3021: autoconfig: > line_outs=1 (0x14/0x0/0x0/0x0/0x0) > ALSA /home/g/linux-2.6/sound/pci/hda/hda_codec.c:3025: > speaker_outs=0 (0x0/0x0/0x0/0x0/0x0) > ALSA /home/g/linux-2.6/sound/pci/hda/hda_codec.c:3029: hp_outs=1 > (0x15/0x0/0x0/0x0/0x0) > ALSA /home/g/linux-2.6/sound/pci/hda/hda_codec.c:3030: mono: mono_out=0x0 > ALSA /home/g/linux-2.6/sound/pci/hda/hda_codec.c:3038: inputs: > mic=0x18, fmic=0x0, line=0x1a, fline=0x0, cd=0x0, aux=0x0 > > I played with model=intel-mac-auto and model=intel-mac-v3 but it had > no effect, i.e. same as without the model= parameter. > > So, without model=auto the problem is that I get the output on both > the internal speakers and the headphones, and this is fixed by > reverting the commit. Then this is really a PCI SSID conflict, and reverting the patch is the right fix (and possibly addition of check of codec SID). I fixed it now on my tree, and will include it in the next pull request. thanks, Takashi

1 0

[alsa-devel] [PATCH] ASoC: Convert wm8750 to a new-style i2c driver (testers wanted)
by Jean Delvare 26 Aug '08

26 Aug '08

Convert the wm8750 codec driver to the new (standard) device driver binding model. Signed-off-by: Jean Delvare <khali(a)linux-fr.org> Cc: Mark Brown <broonie(a)opensource.wolfsonmicro.com> --- Warning: this assumes that the spitz has its codec chip on I2C bus 0, which may or may not be the case. Someone with this machine please test and report. Note that you can safely ignore patch failures in i2c-id.h. include/linux/i2c-id.h | 1 sound/soc/codecs/wm8750.c | 108 ++++++++++++++++++++++----------------------- sound/soc/codecs/wm8750.h | 1 sound/soc/pxa/spitz.c | 1 4 files changed, 57 insertions(+), 54 deletions(-) --- linux-2.6.27-rc4.orig/include/linux/i2c-id.h 2008-08-26 16:40:44.000000000 +0200 +++ linux-2.6.27-rc4/include/linux/i2c-id.h 2008-08-26 16:41:12.000000000 +0200 @@ -65,7 +65,6 @@ #define I2C_DRIVERID_DS1672 81 /* Dallas/Maxim DS1672 RTC */ #define I2C_DRIVERID_TLV320AIC23B 87 /* TI TLV320AIC23B audio codec */ #define I2C_DRIVERID_WM8731 89 /* Wolfson WM8731 audio codec */ -#define I2C_DRIVERID_WM8750 90 /* Wolfson WM8750 audio codec */ #define I2C_DRIVERID_WM8753 91 /* Wolfson WM8753 audio codec */ #define I2C_DRIVERID_LM4857 92 /* LM4857 Audio Amplifier */ #define I2C_DRIVERID_VP27SMPX 93 /* Panasonic VP27s tuner internal MPX */ --- linux-2.6.27-rc4.orig/sound/soc/codecs/wm8750.c 2008-08-26 15:39:54.000000000 +0200 +++ linux-2.6.27-rc4/sound/soc/codecs/wm8750.c 2008-08-26 16:01:06.000000000 +0200 @@ -846,83 +846,87 @@ static struct snd_soc_device *wm8750_soc * low = 0x1a * high = 0x1b */ -static unsigned short normal_i2c[] = { 0, I2C_CLIENT_END }; -/* Magic definition of all other variables and things */ -I2C_CLIENT_INSMOD; - -static struct i2c_driver wm8750_i2c_driver; -static struct i2c_client client_template; - -static int wm8750_codec_probe(struct i2c_adapter *adap, int addr, int kind) +static int wm8750_i2c_probe(struct i2c_client *i2c, + const struct i2c_device_id *id) { struct snd_soc_device *socdev = wm8750_socdev; - struct wm8750_setup_data *setup = socdev->codec_data; struct snd_soc_codec *codec = socdev->codec; - struct i2c_client *i2c; int ret; - if (addr != setup->i2c_address) - return -ENODEV; - - client_template.adapter = adap; - client_template.addr = addr; - - i2c = kmemdup(&client_template, sizeof(client_template), GFP_KERNEL); - if (i2c == NULL) - return -ENOMEM; - i2c_set_clientdata(i2c, codec); - codec->control_data = i2c; - - ret = i2c_attach_client(i2c); - if (ret < 0) { - pr_err("failed to attach codec at addr %x\n", addr); - goto err; - } ret = wm8750_init(socdev); - if (ret < 0) { + if (ret < 0) pr_err("failed to initialise WM8750\n"); - goto err; - } - return ret; -err: - kfree(i2c); return ret; } -static int wm8750_i2c_detach(struct i2c_client *client) +static int wm8750_i2c_remove(struct i2c_client *client) { struct snd_soc_codec *codec = i2c_get_clientdata(client); - i2c_detach_client(client); kfree(codec->reg_cache); - kfree(client); return 0; } -static int wm8750_i2c_attach(struct i2c_adapter *adap) -{ - return i2c_probe(adap, &addr_data, wm8750_codec_probe); -} +static const struct i2c_device_id wm8750_i2c_id[] = { + { "wm8750", 0 }, + { } +}; +MODULE_DEVICE_TABLE(i2c, wm8750_i2c_id); -/* corgi i2c codec control layer */ static struct i2c_driver wm8750_i2c_driver = { .driver = { .name = "WM8750 I2C Codec", .owner = THIS_MODULE, }, - .id = I2C_DRIVERID_WM8750, - .attach_adapter = wm8750_i2c_attach, - .detach_client = wm8750_i2c_detach, - .command = NULL, + .probe = wm8750_i2c_probe, + .remove = wm8750_i2c_remove, + .id_table = wm8750_i2c_id, }; -static struct i2c_client client_template = { - .name = "WM8750", - .driver = &wm8750_i2c_driver, -}; +static int wm8750_add_i2c_device(struct platform_device *pdev, + const struct wm8750_setup_data *setup) +{ + struct snd_soc_device *socdev = platform_get_drvdata(pdev); + struct i2c_board_info info; + struct i2c_adapter *adapter; + struct i2c_client *client; + int ret; + + ret = i2c_add_driver(&wm8750_i2c_driver); + if (ret != 0) { + dev_err(&pdev->dev, "can't add i2c driver\n"); + return ret; + } + + memset(&info, 0, sizeof(struct i2c_board_info)); + info.addr = setup->i2c_address; + strlcpy(info.type, "wm8750", I2C_NAME_SIZE); + + adapter = i2c_get_adapter(setup->i2c_bus); + if (!adapter) { + dev_err(&pdev->dev, "can't get i2c adapter %d\n", + setup->i2c_bus); + goto err_driver; + } + + client = i2c_new_device(adapter, &info); + i2c_put_adapter(adapter); + if (!client) { + dev_err(&pdev->dev, "can't add i2c device at 0x%x\n", + (unsigned int)info.addr); + goto err_driver; + } + socdev->codec->control_data = client; + + return 0; + +err_driver: + i2c_del_driver(&wm8750_i2c_driver); + return -ENODEV; +} #endif static int wm8750_probe(struct platform_device *pdev) @@ -954,11 +958,8 @@ static int wm8750_probe(struct platform_ #if defined(CONFIG_I2C) || defined(CONFIG_I2C_MODULE) if (setup->i2c_address) { - normal_i2c[0] = setup->i2c_address; codec->hw_write = (hw_write_t)i2c_master_send; - ret = i2c_add_driver(&wm8750_i2c_driver); - if (ret != 0) - printk(KERN_ERR "can't add i2c driver"); + ret = wm8750_add_i2c_device(pdev, setup); } #else /* Add other interfaces here */ @@ -1002,6 +1003,7 @@ static int wm8750_remove(struct platform snd_soc_free_pcms(socdev); snd_soc_dapm_free(socdev); #if defined(CONFIG_I2C) || defined(CONFIG_I2C_MODULE) + i2c_unregister_device(codec->control_data); i2c_del_driver(&wm8750_i2c_driver); #endif kfree(codec->private_data); --- linux-2.6.27-rc4.orig/sound/soc/codecs/wm8750.h 2008-08-26 15:39:54.000000000 +0200 +++ linux-2.6.27-rc4/sound/soc/codecs/wm8750.h 2008-08-26 15:48:15.000000000 +0200 @@ -58,6 +58,7 @@ #define WM8750_SYSCLK 0 struct wm8750_setup_data { + int i2c_bus; unsigned short i2c_address; }; --- linux-2.6.27-rc4.orig/sound/soc/pxa/spitz.c 2008-08-26 15:39:54.000000000 +0200 +++ linux-2.6.27-rc4/sound/soc/pxa/spitz.c 2008-08-26 15:48:15.000000000 +0200 @@ -337,6 +337,7 @@ static struct snd_soc_machine snd_soc_ma /* spitz audio private data */ static struct wm8750_setup_data spitz_wm8750_setup = { + .i2c_bus = 0, .i2c_address = 0x1b, }; -- Jean Delvare

2 2

[alsa-devel] alsa regression: snd_bt87x mute (not mixer related)
by Jorge Peixoto de Morais Neto 26 Aug '08

26 Aug '08

Hi. Under kernel 2.6.23, I could get sound from the alsa device created by the module snd_bt87x. In kernel 2.6.24, there is no sound. And yes, I have checked in alsamixer that the device is not muted. Also, in kernel 2.6.23 the device would only appear if I modprobed the module with the option load_all=1. In kernel 2.6.24, the option load_all=1 is unnecessary for the device to appear. This is probably because I have in 2007 sent an email to this list (http://mailman.alsa-project.org/pipermail/alsa-devel/2007-August/002617.html) with information about my board, and it was responded by Takashi. I have tried the latest linux-2.6.27-rc4 hoping the problem could have been fixed. No improvement. Could you please look at this? It is an important regression. I have included extensive information about my system (under both linux-2.6.23, where my card works, and linux-2.6.27-rc4) in the tarball attached. If you need any other information please ask me. Regards, Jorge Peixoto de Morais Neto

1 0