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

Re: [alsa-devel] [alsa-cvslog] alsa-kernel: Official ALSA project GIT repository for Linux 2.6 branch, master now at v2.6.27-rc5-122-g1328f04
by Takashi Iwai 29 Aug '08

29 Aug '08

At Fri, 29 Aug 2008 11:35:25 +0200 (CEST), noreply-git(a)alsa-project.org wrote: > > commit 1328f04260822e45a2717b65a0e2bc0c9c1255be > Author: Jaroslav Kysela <perex(a)perex.cz> > AuthorDate: Fri Aug 29 11:29:39 2008 +0200 > Commit: Jaroslav Kysela <perex(a)perex.cz> > CommitDate: Fri Aug 29 11:29:39 2008 +0200 > > ALSA: intel8x0: implement ac97_clock whitelist > > The AC97 clock detection is not accurate in some cases. This patch adds > an initial whitelist for audio devices gathered from RedHat's bugzilla: > > https://bugzilla.redhat.com/show_bug.cgi?id=441087 > > As a side effect, white-listing might speedup kernel booting (AC97 clock > measuring code is not activated). > > Signed-off-by: Jaroslav Kysela <perex(a)perex.cz> (snip) > +struct intel8x0_clock_list { > + unsigned short subvendor; > + unsigned short subdevice; > + unsigned int rate; > +}; > + > +static struct intel8x0_clock_list intel8x0_clock_list[] __devinitdata = { > + { 0x1028, 0x00be, 44100 }, /* Analog Devices AD1885 */ > + { 0x1028, 0x0177, 48000 }, /* Analog Devices AD1980 */ > + { 0x1043, 0x80f3, 48000 }, /* Analog Devices AD1985 */ > + { 0x0000, 0x0000, 00000 } /* terminator */ > +}; > + > +static int __devinit intel8x0_in_clock_list(struct intel8x0 *chip) > +{ > + struct pci_dev *pci = chip->pci; > + struct intel8x0_clock_list *wl; > + > + for (wl = intel8x0_clock_list; wl->subvendor; wl++) { > + if (wl->subvendor == pci->subsystem_vendor && > + wl->subdevice == pci->subsystem_device) { > + printk(KERN_INFO "intel8x0: white list rate for %04x:%04x is %i\n", > + pci->subsystem_vendor, > + pci->subsystem_device, wl->rate); > + chip->ac97_bus->clock = wl->rate; > + return 1; > + } > + } > + return 0; > +} Use snd_pci_quirk_lookup() please. But, a better fix would be to fix the clock measurement. AFAIK, this seems to happen when the driver is built-in. Thus I guess it's rather a problem of time-keeping core side. Takashi

1 0

Re: [alsa-devel] [PATCH] HDA: patch-realtek: toshiba dynabook SS RX1 which use ALC262
by Takashi Iwai 28 Aug '08

28 Aug '08

At Thu, 28 Aug 2008 13:40:23 +0000, Hiroshi Miura wrote: > > Recent patch for toshiba dynabook SS RX1 against recent snapshot; Thanks. Now applied and pushed to my tree. Takashi > Hiroshi > > 2008/8/26 Takashi Iwai <tiwai(a)suse.de>: > > Hi Miura-san, > > > > At Tue, 26 Aug 2008 17:39:17 +0900, > > 三浦 SPS wrote: > >> > >> Hi Takashi, > >> > >> When I test with recent tree on the Toshiba laptop, Toshiba dynabook SS RX1, > >> some mixer items are not controlled by ALSA. > >> Some mixer items appears as an OSS mixer control. > >> Chipset is HDA intel with Realtek ALC262. > >> > >> I make this patch by using as many datas and functions in existent model. > >> > >> Toshiba hda-intel ALC262 should be controlled as same model as fujitsu. > >> There is an only difference in nid of head phone jack. > >> > >> A related bugtrack id is #3386 and I also post it there. > >> https://bugtrack.alsa-project.org/alsa-bug/view.php?id=3386 > > > > Thanks. The changes look OK, but your MUA broke the embedded patch. > > > > BTW, I merged other patches to add more support in patch_realtek.c, > > and one of them is the support for Toshiba S06. > > Could you check whether it's compatible with yours? > > It seems S06 uses the digital mic instead of analog mic, and this > > can be a difference. > > > > Signed-off-by: Hiroshi Miura <miurahr(a)acm.org> > --- > --- alsa-driver-unstable/alsa-kernel/pci/hda/patch_realtek.c.orig 2008-08-27 > 06:05:19.000000000 +0000 > +++ alsa-driver-unstable/alsa-kernel/pci/hda/patch_realtek.c 2008-08-27 > 11:28:04.000000000 +0000 > @@ -103,6 +103,7 @@ enum { > ALC262_LENOVO_3000, > ALC262_NEC, > ALC262_TOSHIBA_S06, > + ALC262_TOSHIBA_RX1, > ALC262_AUTO, > ALC262_MODEL_LAST /* last tag */ > }; > @@ -9705,6 +9706,25 @@ static struct snd_kcontrol_new alc262_le > { } /* end */ > }; > > +static struct snd_kcontrol_new alc262_toshiba_rx1_mixer[] = { > + HDA_BIND_VOL("Master Playback Volume", &alc262_fujitsu_bind_master_vol), > + { > + .iface = SNDRV_CTL_ELEM_IFACE_MIXER, > + .name = "Master Playback Switch", > + .info = snd_hda_mixer_amp_switch_info, > + .get = snd_hda_mixer_amp_switch_get, > + .put = alc262_sony_master_sw_put, > + .private_value = HDA_COMPOSE_AMP_VAL(0x15, 3, 0, HDA_OUTPUT), > + }, > + HDA_CODEC_VOLUME("Mic Playback Volume", 0x0b, 0x0, HDA_INPUT), > + HDA_CODEC_MUTE("Mic Playback Switch", 0x0b, 0x0, HDA_INPUT), > + HDA_CODEC_VOLUME("Mic Boost", 0x18, 0, HDA_INPUT), > + HDA_CODEC_VOLUME("Front Mic Playback Volume", 0x0b, 0x01, HDA_INPUT), > + HDA_CODEC_MUTE("Front Mic Playback Switch", 0x0b, 0x01, HDA_INPUT), > + HDA_CODEC_VOLUME("Front Mic Boost", 0x19, 0, HDA_INPUT), > + { } /* end */ > +}; > + > /* additional init verbs for Benq laptops */ > static struct hda_verb alc262_EAPD_verbs[] = { > {0x20, AC_VERB_SET_COEF_INDEX, 0x07}, > @@ -10169,6 +10189,24 @@ static struct hda_verb alc262_HP_BPC_Wil > { } > }; > > +static struct hda_verb alc262_toshiba_rx1_unsol_verbs[] = { > + > + {0x14, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_OUT }, /* Front Speaker */ > + {0x14, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_UNMUTE }, > + {0x14, AC_VERB_SET_CONNECT_SEL, 0x01}, > + > + {0x18, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_VREF80 }, /* MIC jack */ > + {0x19, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_VREF80 }, /* Front MIC */ > + {0x18, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(0) }, > + {0x19, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(0) }, > + > + {0x15, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_HP }, /* HP jack */ > + {0x15, AC_VERB_SET_CONNECT_SEL, 0x00}, > + {0x15, AC_VERB_SET_UNSOLICITED_ENABLE, AC_USRSP_EN | ALC880_HP_EVENT}, > + {} > +}; > + > + > #ifdef CONFIG_SND_HDA_POWER_SAVE > #define alc262_loopbacks alc880_loopbacks > #endif > @@ -10258,6 +10296,8 @@ static const char *alc262_models[ALC262_ > [ALC262_ULTRA] = "ultra", > [ALC262_LENOVO_3000] = "lenovo-3000", > [ALC262_NEC] = "nec", > + [ALC262_TOSHIBA_S06] = "toshiba-s06", > + [ALC262_TOSHIBA_RX1] = "toshiba-rx1", > [ALC262_AUTO] = "auto", > }; > > @@ -10292,7 +10332,7 @@ static struct snd_pci_quirk alc262_cfg_t > SND_PCI_QUIRK(0x104d, 0x900e, "Sony ASSAMD", ALC262_SONY_ASSAMD), > SND_PCI_QUIRK(0x104d, 0x9015, "Sony 0x9015", ALC262_SONY_ASSAMD), > SND_PCI_QUIRK(0x1179, 0x0001, "Toshiba dynabook SS RX1", > - ALC262_SONY_ASSAMD), > + ALC262_TOSHIBA_RX1), > SND_PCI_QUIRK(0x1179, 0x0268, "Toshiba S06", ALC262_TOSHIBA_S06), > SND_PCI_QUIRK(0x10cf, 0x1397, "Fujitsu", ALC262_FUJITSU), > SND_PCI_QUIRK(0x10cf, 0x142d, "Fujitsu Lifebook E8410", ALC262_FUJITSU), > @@ -10500,6 +10540,18 @@ static struct alc_config_preset alc262_p > .unsol_event = alc262_toshiba_s06_unsol_event, > .init_hook = alc262_toshiba_s06_init_hook, > }, > + [ALC262_TOSHIBA_RX1] = { > + .mixers = { alc262_toshiba_rx1_mixer }, > + .init_verbs = { alc262_init_verbs, alc262_toshiba_rx1_unsol_verbs }, > + .num_dacs = ARRAY_SIZE(alc262_dac_nids), > + .dac_nids = alc262_dac_nids, > + .hp_nid = 0x03, > + .num_channel_mode = ARRAY_SIZE(alc262_modes), > + .channel_mode = alc262_modes, > + .input_mux = &alc262_capture_source, > + .unsol_event = alc262_hippo_unsol_event, > + .init_hook = alc262_hippo_automute, > + }, > }; > > static int patch_alc262(struct hda_codec *codec) > > -- > HIroshi Miura > NTT DATA Corp. and IPA OSS center > （株）NTTデータ /（独）情報処理推進機構 > 三浦広志 >

1 0

[alsa-devel] [PATCH] ASoC: Convert DAPM pop time configuration to debugfs
by Mark Brown 28 Aug '08

28 Aug '08

Pop time configuration is a debugging feature which shouldn't be used in normal operation so move it to debugfs where it is clearer. This also simplifies the code since debugfs provides standard facilities for exposing simple integer values to user space. Signed-off-by: Mark Brown <broonie(a)opensource.wolfsonmicro.com> --- It would be nice to apply this to 2.6.27 since the sysfs file was only added in the 2.6.27 cycle but it's not critical either way. sound/soc/soc-dapm.c | 53 ++++++++++++++++++------------------------------- 1 files changed, 20 insertions(+), 33 deletions(-) diff --git a/sound/soc/soc-dapm.c b/sound/soc/soc-dapm.c index 7a88f76..c016426 100644 --- a/sound/soc/soc-dapm.c +++ b/sound/soc/soc-dapm.c @@ -38,6 +38,7 @@ #include <linux/bitops.h> #include <linux/platform_device.h> #include <linux/jiffies.h> +#include <linux/debugfs.h> #include <sound/core.h> #include <sound/pcm.h> #include <sound/pcm_params.h> @@ -67,7 +68,9 @@ static int dapm_status = 1; module_param(dapm_status, int, 0); MODULE_PARM_DESC(dapm_status, "enable DPM sysfs entries"); -static unsigned int pop_time; +static struct dentry *asoc_debugfs; + +static u32 pop_time; static void pop_wait(void) { @@ -817,51 +820,35 @@ static ssize_t dapm_widget_show(struct device *dev, static DEVICE_ATTR(dapm_widget, 0444, dapm_widget_show, NULL); -/* pop/click delay times */ -static ssize_t dapm_pop_time_show(struct device *dev, - struct device_attribute *attr, char *buf) -{ - return sprintf(buf, "%d\n", pop_time); -} - -static ssize_t dapm_pop_time_store(struct device *dev, - struct device_attribute *attr, - const char *buf, size_t count) - -{ - unsigned long val; - - if (strict_strtoul(buf, 10, &val) >= 0) - pop_time = val; - else - printk(KERN_ERR "Unable to parse pop_time setting\n"); - - return count; -} - -static DEVICE_ATTR(dapm_pop_time, 0744, dapm_pop_time_show, - dapm_pop_time_store); - int snd_soc_dapm_sys_add(struct device *dev) { int ret = 0; - if (dapm_status) { - ret = device_create_file(dev, &dev_attr_dapm_widget); + if (!dapm_status) + return 0; - if (ret == 0) - ret = device_create_file(dev, &dev_attr_dapm_pop_time); - } + ret = device_create_file(dev, &dev_attr_dapm_widget); + if (ret != 0) + return ret; - return ret; + asoc_debugfs = debugfs_create_dir("asoc", NULL); + if (!IS_ERR(asoc_debugfs)) + debugfs_create_u32("dapm_pop_time", 0744, asoc_debugfs, + &pop_time); + else + asoc_debugfs = NULL; + + return 0; } static void snd_soc_dapm_sys_remove(struct device *dev) { if (dapm_status) { - device_remove_file(dev, &dev_attr_dapm_pop_time); device_remove_file(dev, &dev_attr_dapm_widget); } + + if (asoc_debugfs) + debugfs_remove_recursive(asoc_debugfs); } /* free all dapm widgets and resources */ -- 1.5.6.5

3 3

[alsa-devel] modifying VIA8237.conf - does it currently work correctly for somebody?
by John L. Utz III 28 Aug '08

28 Aug '08

Hi; I am sorry for the vagueness of the questions, but now that i have some understanding of how these files are supposed to work i want to get this right! to support 4.0/5.1/7.1 for the vt1618 codec i have to change a different set of twiddlers than what is called out in the current version of the conf file. worse yet, the twiddlers called out in the current file dont even *exist* on the vt1618: { name "Surround Down Mix" preserve true value off lock true optional true } { name "Center/LFE Down Mix" preserve true value off lock true optional true } How do i add new stuff without breaking old stuff? is there a sub-identity that i could use? tnx! johnu

2 1

[alsa-devel] Report of partially supported STAC92HD73* onboard a DELL Studio/Inspiron 1535
by Travis Place 28 Aug '08

28 Aug '08

Current status: Internal speakers: Working Internal microphone: Not working External microphone: Not working Headphones: Not working Card Information (alsa-info): http://www.alsa-project.org/db/?f=166dedf1effd5c5ba0ee91075a0f0ca4da65f3b4 Notes: i had the user upgrade to 1.0.17 of alsa-driver, but didnt suggest git code, as i couldnt find any immediate difference for his card in the later code. Thanks, Travis Place (wishie)

2 2

[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