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

[alsa-devel] [PATCH] ASoC: WM8804 does not support sample rates below 32kHz
by Mark Brown 08 Jun '11

08 Jun '11

Reported-by: Kieran O'Leary <Kieran.O'Leary(a)wolfsonmicro.com> Signed-off-by: Mark Brown <broonie(a)opensource.wolfsonmicro.com> --- sound/soc/codecs/wm8804.c | 9 +++++++-- 1 files changed, 7 insertions(+), 2 deletions(-) diff --git a/sound/soc/codecs/wm8804.c b/sound/soc/codecs/wm8804.c index 6785688..9a5e67c 100644 --- a/sound/soc/codecs/wm8804.c +++ b/sound/soc/codecs/wm8804.c @@ -680,20 +680,25 @@ static struct snd_soc_dai_ops wm8804_dai_ops = { #define WM8804_FORMATS (SNDRV_PCM_FMTBIT_S16_LE | SNDRV_PCM_FMTBIT_S20_3LE | \ SNDRV_PCM_FMTBIT_S24_LE) +#define WM8804_RATES (SNDRV_PCM_RATE_32000 | SNDRV_PCM_RATE_44100 | \ + SNDRV_PCM_RATE_48000 | SNDRV_PCM_RATE_64000 | \ + SNDRV_PCM_RATE_88200 | SNDRV_PCM_RATE_96000 | \ + SNDRV_PCM_RATE_176400 | SNDRV_PCM_RATE_192000) + static struct snd_soc_dai_driver wm8804_dai = { .name = "wm8804-spdif", .playback = { .stream_name = "Playback", .channels_min = 2, .channels_max = 2, - .rates = SNDRV_PCM_RATE_8000_192000, + .rates = WM8804_RATES, .formats = WM8804_FORMATS, }, .capture = { .stream_name = "Capture", .channels_min = 2, .channels_max = 2, - .rates = SNDRV_PCM_RATE_8000_192000, + .rates = WM8804_RATES, .formats = WM8804_FORMATS, }, .ops = &wm8804_dai_ops, -- 1.7.5.3

2 1

[alsa-devel] [PATCH] ASoC: Fix mismerge of Speyside set_bias_level_post()
by Mark Brown 08 Jun '11

08 Jun '11

Signed-off-by: Mark Brown <broonie(a)opensource.wolfsonmicro.com> --- sound/soc/samsung/speyside.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/sound/soc/samsung/speyside.c b/sound/soc/samsung/speyside.c index 2515dba..d6dee4d 100644 --- a/sound/soc/samsung/speyside.c +++ b/sound/soc/samsung/speyside.c @@ -301,6 +301,7 @@ static struct snd_soc_card speyside = { .num_configs = ARRAY_SIZE(speyside_codec_conf), .set_bias_level = speyside_set_bias_level, + .set_bias_level_post = speyside_set_bias_level_post, .controls = controls, .num_controls = ARRAY_SIZE(controls), -- 1.7.5.3

2 1

[alsa-devel] [PATCH] UCM: get: Implement 'exact' value retrieval
by Stephen Warren 08 Jun '11

08 Jun '11

[=]<NAME>[/[<modifier>|</device>][/<verb>]] - value identifier <NAME> - Search starts at given modifier or device if any, else at a verb - Search starts at given verb if any, else current verb - Searches modifier/device, then verb, then defaults - Specify a leading "=" to search only the exact device/modifier/verb specified, and not search through each object in turn. - Examples: "PlaybackPCM/Play Music" "CapturePCM/SPDIF" From ValueDefaults only: "=Variable" From current active verb: "=Variable//" From verb "Verb": "=Variable//Verb" From "Modifier" in current active verb: "=Variable/Modifier/" From "Modifier" in "Verb": "=Variable/Modifier/Verb" Signed-off-by: Stephen Warren <swarren(a)nvidia.com> --- include/use-case.h | 30 +++++++++++--- src/ucm/main.c | 110 +++++++++++++++++++++++++++++++++++++-------------- 2 files changed, 104 insertions(+), 36 deletions(-) diff --git a/include/use-case.h b/include/use-case.h index b346877..c37c842 100644 --- a/include/use-case.h +++ b/include/use-case.h @@ -230,12 +230,30 @@ int snd_use_case_get_list(snd_use_case_mgr_t *uc_mgr, * NULL - return current card * _verb - return current verb * - * <NAME>[/<modifier>|</device>] - * - value identifier <NAME> for - * given modifier or device - * - Examples: "PlaybackPCM/Play Music", - * "CapturePCM/SPDIF" - * + * [=]<NAME>[/[<modifier>|</device>][/<verb>]] + * - value identifier <NAME> + * - Search starts at given modifier or device if any, + * else at a verb + * - Search starts at given verb if any, + * else current verb + * - Searches modifier/device, then verb, then defaults + * - Specify a leading "=" to search only the exact + * device/modifier/verb specified, and not search + * through each object in turn. + * - Examples: + * "PlaybackPCM/Play Music" + * "CapturePCM/SPDIF" + * From ValueDefaults only: + * "=Variable" + * From current active verb: + * "=Variable//" + * From verb "Verb": + * "=Variable//Verb" + * From "Modifier" in current active verb: + * "=Variable/Modifier/" + * From "Modifier" in "Verb": + * "=Variable/Modifier/Verb" + * * Recommended names for values: * TQ - Tone Quality * PlaybackPCM - full PCM playback device name diff --git a/src/ucm/main.c b/src/ucm/main.c index 13ea1ed..8e9a85d 100644 --- a/src/ucm/main.c +++ b/src/ucm/main.c @@ -1174,35 +1174,60 @@ static int get_value3(const char **value, static int get_value(snd_use_case_mgr_t *uc_mgr, const char *identifier, const char **value, - const char *item) + const char *mod_dev_name, + const char *verb_name, + int exact) { + struct use_case_verb *verb; struct use_case_modifier *mod; struct use_case_device *dev; int err; - if (!uc_mgr->active_verb) - return -ENOENT; - - if (item != NULL) { - mod = find_modifier(uc_mgr, uc_mgr->active_verb, item, 0); - if (mod != NULL) { - err = get_value1(value, &mod->value_list, identifier); - if (err >= 0 || err != -ENOENT) - return err; + if (mod_dev_name || verb_name || !exact) { + if (verb_name && strlen(verb_name)) { + verb = find_verb(uc_mgr, verb_name); + } else { + verb = uc_mgr->active_verb; } - dev = find_device(uc_mgr, uc_mgr->active_verb, item, 0); - if (dev != NULL) { - err = get_value1(value, &dev->value_list, identifier); + if (verb) { + if (mod_dev_name) { + mod = find_modifier(uc_mgr, verb, + mod_dev_name, 0); + if (mod) { + err = get_value1(value, + &mod->value_list, + identifier); + if (err >= 0 || err != -ENOENT) + return err; + } + + dev = find_device(uc_mgr, verb, + mod_dev_name, 0); + if (dev) { + err = get_value1(value, + &dev->value_list, + identifier); + if (err >= 0 || err != -ENOENT) + return err; + } + + if (exact) + return -ENOENT; + } + + err = get_value1(value, &verb->value_list, identifier); if (err >= 0 || err != -ENOENT) return err; } + + if (exact) + return -ENOENT; } - err = get_value1(value, &uc_mgr->active_verb->value_list, identifier); - if (err >= 0 || err != -ENOENT) - return err; + err = get_value1(value, &uc_mgr->value_list, identifier); if (err >= 0 || err != -ENOENT) return err; + return -ENOENT; } @@ -1220,7 +1245,9 @@ int snd_use_case_get(snd_use_case_mgr_t *uc_mgr, const char *identifier, const char **value) { - char *str, *str1; + const char *slash1, *slash2, *mod_dev_after; + const char *ident, *mod_dev, *verb; + int exact = 0; int err; pthread_mutex_lock(&uc_mgr->mutex); @@ -1246,19 +1273,42 @@ int snd_use_case_get(snd_use_case_mgr_t *uc_mgr, err = -ENOENT; goto __end; } else { - str1 = strchr(identifier, '/'); - if (str1) { - str = strdup(str1 + 1); - if (str == NULL) { - err = -ENOMEM; - goto __end; - } - } else { - str = NULL; - } - err = get_value(uc_mgr, identifier, value, str); - if (str) - free(str); + if (identifier[0] == '=') { + exact = 1; + identifier++; + } + + slash1 = strchr(identifier, '/'); + if (slash1) { + ident = strndup(identifier, slash1 - identifier); + + slash2 = strchr(slash1 + 1, '/'); + if (slash2) { + mod_dev_after = slash2; + verb = slash2 + 1; + } + else { + mod_dev_after = slash1 + strlen(slash1); + verb = NULL; + } + + if (mod_dev_after == slash1 + 1) + mod_dev = NULL; + else + mod_dev = strndup(slash1 + 1, + mod_dev_after - (slash1 + 1)); + } + else { + ident = identifier; + mod_dev = NULL; + verb = NULL; + } + + err = get_value(uc_mgr, ident, value, mod_dev, verb, exact); + if (ident != identifier) + free((void *)ident); + if (mod_dev) + free((void *)mod_dev); } __end: pthread_mutex_unlock(&uc_mgr->mutex); -- 1.7.0.4

3 5

[alsa-devel] Headphone output doesn't work with 3.0.0-rc* anymore
by Michal Hocko 08 Jun '11

08 Jun '11

Hi, before 3.0.0-rc1, when I plugged anything into headphone output of my laptop, speakers were disabled and the sound has been routed to the headphone output. This doesn't seem to work anymore starting with 3.0.0-rc1. Speakers stay on even if I plug something to the headphone output. Is this a bug or a new behavior that userspace has to cope with? I am sorry for the lack of information but I have no idea what to provide. Let's add dmesg and config at least. Btw. I have noticed the following message which might be related: input: HDA Intel Headphone as /devices/pci0000:00/0000:00:1b.0/sound/card0/input11 I do not see anything like this in .39 kernel. I am using Intel HDA integrated soundcard: $ lspci -vv [...] 00:1b.0 Audio device: Intel Corporation N10/ICH 7 Family High Definition Audio Controller (rev 02) Subsystem: Fujitsu Limited. Device 1397 Control: I/O- Mem+ BusMaster+ SpecCycle- MemWINV- VGASnoop- ParErr- Stepping- SERR- FastB2B- DisINTx+ Status: Cap+ 66MHz- UDF- FastB2B- ParErr- DEVSEL=fast >TAbort- <TAbort- <MAbort- >SERR- <PERR- INTx- Latency: 0, Cache Line Size: 64 bytes Interrupt: pin A routed to IRQ 42 Region 0: Memory at f0640000 (64-bit, non-prefetchable) [size=16K] Capabilities: [50] Power Management version 2 Flags: PMEClk- DSI- D1- D2- AuxCurrent=55mA PME(D0+,D1-,D2-,D3hot+,D3cold+) Status: D0 NoSoftRst- PME-Enable- DSel=0 DScale=0 PME- Capabilities: [60] MSI: Enable+ Count=1/1 Maskable- 64bit+ Address: 00000000fee0300c Data: 4189 Capabilities: [70] Express (v1) Root Complex Integrated Endpoint, MSI 00 DevCap: MaxPayload 128 bytes, PhantFunc 0, Latency L0s <64ns, L1 <1us ExtTag- RBE- FLReset- DevCtl: Report errors: Correctable- Non-Fatal- Fatal- Unsupported- RlxdOrd- ExtTag- PhantFunc- AuxPwr- NoSnoop+ MaxPayload 128 bytes, MaxReadReq 128 bytes DevSta: CorrErr- UncorrErr- FatalErr- UnsuppReq- AuxPwr+ TransPend- LnkCap: Port #0, Speed unknown, Width x0, ASPM unknown, Latency L0 <64ns, L1 <1us ClockPM- Surprise- LLActRep- BwNot- LnkCtl: ASPM Disabled; Disabled- Retrain- CommClk- ExtSynch- ClockPM- AutWidDis- BWInt- AutBWInt- LnkSta: Speed unknown, Width x0, TrErr- Train- SlotClk- DLActive- BWMgmt- ABWMgmt- Capabilities: [100 v1] Virtual Channel Caps: LPEVC=0 RefClk=100ns PATEntryBits=1 Arb: Fixed- WRR32- WRR64- WRR128- Ctrl: ArbSelect=Fixed Status: InProgress- VC0: Caps: PATOffset=00 MaxTimeSlots=1 RejSnoopTrans- Arb: Fixed- WRR32- WRR64- WRR128- TWRR128- WRR256- Ctrl: Enable+ ID=0 ArbSelect=Fixed TC/VC=01 Status: NegoPending- InProgress- VC1: Caps: PATOffset=00 MaxTimeSlots=1 RejSnoopTrans- Arb: Fixed- WRR32- WRR64- WRR128- TWRR128- WRR256- Ctrl: Enable+ ID=1 ArbSelect=Fixed TC/VC=80 Status: NegoPending- InProgress- Capabilities: [130 v1] Root Complex Link Desc: PortNumber=0f ComponentID=02 EltType=Config Link0: Desc: TargetPort=00 TargetComponent=02 AssocRCRB- LinkType=MemMapped LinkValid+ Addr: 00000000fed1c000 Kernel driver in use: HDA Intel [...] $ lsmod | grep snd snd_hda_codec_realtek 236509 1 snd_hda_intel 23614 1 snd_hda_codec 66591 2 snd_hda_codec_realtek,snd_hda_intel snd_pcm_oss 36561 0 snd_mixer_oss 17908 1 snd_pcm_oss snd_pcm 64165 3 snd_hda_intel,snd_hda_codec,snd_pcm_oss snd_seq_oss 29025 0 snd_seq_midi_event 14076 1 snd_seq_oss snd_seq 42319 4 snd_seq_oss,snd_seq_midi_event snd_timer 23709 2 snd_pcm,snd_seq snd_seq_device 13797 2 snd_seq_oss,snd_seq snd 49969 12 snd_hda_codec_realtek,snd_hda_intel,snd_hda_codec,snd_pcm_oss,snd_mixer_oss,snd_pcm,snd_seq_oss,snd_seq,snd_timer,snd_seq_device snd_page_alloc 13709 2 snd_hda_intel,snd_pcm $ grep -I . /sys/devices/pci0000\:00/0000\:00\:1b.0/* /sys/devices/pci0000:00/0000:00:1b.0/broken_parity_status:0 /sys/devices/pci0000:00/0000:00:1b.0/class:0x040300 /sys/devices/pci0000:00/0000:00:1b.0/consistent_dma_mask_bits:64 /sys/devices/pci0000:00/0000:00:1b.0/device:0x27d8 /sys/devices/pci0000:00/0000:00:1b.0/dma_mask_bits:64 /sys/devices/pci0000:00/0000:00:1b.0/enable:1 /sys/devices/pci0000:00/0000:00:1b.0/irq:42 /sys/devices/pci0000:00/0000:00:1b.0/local_cpulist:0-7 /sys/devices/pci0000:00/0000:00:1b.0/local_cpus:ff /sys/devices/pci0000:00/0000:00:1b.0/modalias:pci:v00008086d000027D8sv000010CFsd00001397bc04sc03i00 /sys/devices/pci0000:00/0000:00:1b.0/resource:0x00000000f0640000 0x00000000f0643fff 0x0000000000140204 /sys/devices/pci0000:00/0000:00:1b.0/resource:0x0000000000000000 0x0000000000000000 0x0000000000000000 /sys/devices/pci0000:00/0000:00:1b.0/resource:0x0000000000000000 0x0000000000000000 0x0000000000000000 /sys/devices/pci0000:00/0000:00:1b.0/resource:0x0000000000000000 0x0000000000000000 0x0000000000000000 /sys/devices/pci0000:00/0000:00:1b.0/resource:0x0000000000000000 0x0000000000000000 0x0000000000000000 /sys/devices/pci0000:00/0000:00:1b.0/resource:0x0000000000000000 0x0000000000000000 0x0000000000000000 /sys/devices/pci0000:00/0000:00:1b.0/resource:0x0000000000000000 0x0000000000000000 0x0000000000000000 /sys/devices/pci0000:00/0000:00:1b.0/subsystem_device:0x1397 /sys/devices/pci0000:00/0000:00:1b.0/subsystem_vendor:0x10cf /sys/devices/pci0000:00/0000:00:1b.0/uevent:DRIVER=HDA Intel /sys/devices/pci0000:00/0000:00:1b.0/uevent:PCI_CLASS=40300 /sys/devices/pci0000:00/0000:00:1b.0/uevent:PCI_ID=8086:27D8 /sys/devices/pci0000:00/0000:00:1b.0/uevent:PCI_SUBSYS_ID=10CF:1397 /sys/devices/pci0000:00/0000:00:1b.0/uevent:PCI_SLOT_NAME=0000:00:1b.0 /sys/devices/pci0000:00/0000:00:1b.0/uevent:MODALIAS=pci:v00008086d000027D8sv000010CFsd00001397bc04sc03i00 /sys/devices/pci0000:00/0000:00:1b.0/vendor:0x8086 Let me know if you need any further information. -- Michal Hocko SUSE Labs SUSE LINUX s.r.o. Lihovarska 1060/12 190 00 Praha 9 Czech Republic

2 1

[alsa-devel] [PATCH 1/6] ASoC: Fix WM8962 headphone volume update for use of advanced caches
by Mark Brown 08 Jun '11

08 Jun '11

Signed-off-by: Mark Brown <broonie(a)opensource.wolfsonmicro.com> --- sound/soc/codecs/wm8962.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/sound/soc/codecs/wm8962.c b/sound/soc/codecs/wm8962.c index f90ae42..5e05eed 100644 --- a/sound/soc/codecs/wm8962.c +++ b/sound/soc/codecs/wm8962.c @@ -1999,12 +1999,12 @@ static int wm8962_put_hp_sw(struct snd_kcontrol *kcontrol, return 0; /* If the left PGA is enabled hit that VU bit... */ - if (reg_cache[WM8962_PWR_MGMT_2] & WM8962_HPOUTL_PGA_ENA) + if (snd_soc_read(codec, WM8962_PWR_MGMT_2) & WM8962_HPOUTL_PGA_ENA) return snd_soc_write(codec, WM8962_HPOUTL_VOLUME, reg_cache[WM8962_HPOUTL_VOLUME]); /* ...otherwise the right. The VU is stereo. */ - if (reg_cache[WM8962_PWR_MGMT_2] & WM8962_HPOUTR_PGA_ENA) + if (snd_soc_read(codec, WM8962_PWR_MGMT_2) & WM8962_HPOUTR_PGA_ENA) return snd_soc_write(codec, WM8962_HPOUTR_VOLUME, reg_cache[WM8962_HPOUTR_VOLUME]); -- 1.7.5.3

2 6

[alsa-devel] Something broke in snd_soc_pcm_stream
by Timur Tabi 08 Jun '11

08 Jun '11

Mark, I'm testing your for-3.1 branch on the P1022DS, and I'm getting a kernel panic because a pointer is NULL where I don't expect it to be. In fsl_dma_new(), I have this code: if (dai->driver->capture.channels_min) { ret = snd_dma_alloc_pages(SNDRV_DMA_TYPE_DEV, card->dev, fsl_dma_hardware.buffer_bytes_max, &pcm->streams[1].substream->dma_buffer); if (ret) { dev_err(card->dev, "can't alloc capture dma buffer\n"); snd_dma_free_pages(&pcm->streams[0].substream->dma_buffer); return ret; } } I test for channels_min because the playback stream is registered separately from the capture stream, so I expect fsl_dma_new() to be called twice: once to initialize playback, and again to initialize capture. In the past, if dai->driver->capture.channels_min was equal to some non-zero value, then pcm->streams[1].substream was also non-NULL. This appears no longer to be true. Now it appears that playback.channels_min and capture.channels_min are both set to 2 before fsl_dma_new() is called the first time. I can change my code to do this: if (pcm->streams[1].substream) { ret = snd_dma_alloc_pages(SNDRV_DMA_TYPE_DEV, card->dev, fsl_dma_hardware.buffer_bytes_max, &pcm->streams[1].substream->dma_buffer); if (ret) { dev_err(card->dev, "can't alloc capture dma buffer\n"); snd_dma_free_pages(&pcm->streams[0].substream->dma_buffer); return ret; } } But before I do that, I'd like to know if this is a bug in ASoC, or just a new behavior that I need to handle. -- Timur Tabi Linux kernel developer at Freescale

2 3

[alsa-devel] [PATCH V4 0/5] Adding ASoC drivers for SPEAr13XX platform
by Rajeev Kumar 08 Jun '11

08 Jun '11

This patchset contains five patches which add support for ASoC sound drivers on ST's SPEAr13XX platform. Details of the SPEAr13XX platforms can be seen here: http://www.st.com/internet/mcu/product/250658.jsp The ARCH and PLATFORM specific code for SPEAr13XX are already under review in Russell King's ARM mailing list(Linux-kernel-version 2.6.38-rc4). This patchset has been tested for linux-kernel-version 2.6.38-rc4 and on ARM platform. Please review the same and consider for mainline inclusion. Changes in machine driver code since V3 1.Use of snd_soc_register_card() rather than using the soc-audio device. Changes in codec code since V3: 1. use standard cache sync implementation i.e. snd_soc_cache_sync() Changes in spear Kconfig and Makefile since V2: 1.giving all the the modules snd-soc- prefixes to their names Changes in codec code since V2: 1. use SOC_DOUBLE for volume control 2. remove default configuration for codec .offer them as runtime controls. 3. restore the register cache in resume changes in platform code since V1: 1. Spilt machine driver from platform driver. 2. Updated rate supported. 3. Moved clock specific part from "spear13xx_i2s_set_dai_sysclk". function to platform code. This function is removed now. 4. Function "spear13xx_i2s_startup" removed. 5. Function "spear13xx_i2s_shutdown" removed. Changes in codec code since V1: 1. Removed sta529 version number. 2. Removed "sta529_read_reg_cache". 3. Removed function "sta529_write_reg_cache". 4. Removed function "sta529_write". 5. Moved sta529.h file contents to sta529.c file. 6. Move clock specific part from "spear_sta_set_dai_sysclk". function to platform code. This function is removed now. 7. Renamed function names from spear_sta_* to sta_*. 8. Modified probe() function to avoid rewriting default chip values to hardware. Rajeev Kumar (5): sound: asoc: Adding support for STA529 Audio Codec sound: asoc: Adding support for SPEAr13XX ASoC platform driver sound: asoc: Adding support for SPEAr13XX ASoC machine driver sound: asoc: Adding Kconfig and Makefile to support SPEAr13XX ASoC driver sound: asoc: Adding support for SPEAr13XX in soc sound/soc/Kconfig | 1 + sound/soc/Makefile | 1 + sound/soc/codecs/Kconfig | 5 + sound/soc/codecs/Makefile | 2 + sound/soc/codecs/sta529.c | 374 ++++++++++++++++++++++++++++ sound/soc/spear/Kconfig | 19 ++ sound/soc/spear/Makefile | 12 + sound/soc/spear/evb_sta529.c | 121 +++++++++ sound/soc/spear/spear13xx-i2s.c | 524 +++++++++++++++++++++++++++++++++++++++ sound/soc/spear/spear13xx-i2s.h | 19 ++ sound/soc/spear/spear13xx-pcm.c | 500 +++++++++++++++++++++++++++++++++++++ sound/soc/spear/spear13xx-pcm.h | 50 ++++ 12 files changed, 1628 insertions(+), 0 deletions(-) create mode 100644 sound/soc/codecs/sta529.c create mode 100644 sound/soc/spear/Kconfig create mode 100644 sound/soc/spear/Makefile create mode 100644 sound/soc/spear/evb_sta529.c create mode 100644 sound/soc/spear/spear13xx-i2s.c create mode 100644 sound/soc/spear/spear13xx-i2s.h create mode 100644 sound/soc/spear/spear13xx-pcm.c create mode 100644 sound/soc/spear/spear13xx-pcm.h

5 16

[alsa-devel] [PATCH v2 00/12] MFD/ASoC/Input: TWL4030/TWL60X0 changes
by Peter Ujfalusi 08 Jun '11

08 Jun '11

Hello, The second version gowned a bit since v1... Changes since v1: - Common pmic related configuration moved out from board files - Rest of the series has been rebased on top of this change Not changed since v1: - TWL6040 MFD driver has not been converted to i2c driver I have looked at this, and while it can be done, I feel that the changes needed in twl-core will be not accepted, since IMHO the twl-core need to be cleaned first. The solution, which can be done with the current code might look a bit hackish. Updated intro message from the v1 series: The series will do four major things, and they are in one series, because they pretty much depending on each other, so it is easier to handle them together. 0. Move the common pmic related configurations out from the board files. New pmic-common.c/h file has been created for this purpose. OMAP3 board files received two patches (pdata, and regualtor changes), OMAP4 board files has been changed with one patch. 1. Rename the twl4030-codec MFD driver to twl4030-audio Since the ASoC multicomponent introduction (2.6.37) the twl4030-codec MFD dirver had been using twl4030-audio to register (twl4030-codec is the ASoC codec driver). The documentation refers to this part of twl as audio block, so it is better to rename the driver as well to avoid confusion. 2. Introduction of MFD driver for twl6040. The TWL6040 audio IC has codec and vibra functionality. Convert the existing ASoC codec driver to use the new MFD driver's interface. 3. Vibrator driver for TWL6040 (Input/ForceFeedback driver) The driver itself, and support for the vibrators in SDP4430 board. The series has been tested on top of merged omap-next, asoc-next, and mfd-next. It applies on top of linux-next as well. Regards, Peter --- Misael Lopez Cruz (3): mfd: twl6040: Add initial support ASoC: twl6040: Convert into TWL6040 MFD child input: Add initial support for TWL6040 vibrator Peter Ujfalusi (9): OMAP: New pmic-common for common TWL configuration OMAP4: Move common twl6030 configuration to pmic-common OMAP3: Move common pmic configuration to pmic-common OMAP3: Move common regulator configuration to pmic-common MFD: twl4030-codec: Rename internals from codec to audio MFD: twl4030-codec -> twl4030-audio: Rename the driver MFD: twl4030-audio: Rename platform data MFD: twl6040: Change platform data for soc codec driver OMAP4: SDP4430: Add twl6040 vibrator platform support arch/arm/mach-omap2/Makefile | 2 +- arch/arm/mach-omap2/board-3430sdp.c | 89 +---- arch/arm/mach-omap2/board-4430sdp.c | 183 +++------ arch/arm/mach-omap2/board-cm-t35.c | 48 +-- arch/arm/mach-omap2/board-devkit8000.c | 37 +-- arch/arm/mach-omap2/board-igep0020.c | 44 +-- arch/arm/mach-omap2/board-ldp.c | 15 +- arch/arm/mach-omap2/board-omap3beagle.c | 60 +--- arch/arm/mach-omap2/board-omap3evm.c | 67 +--- arch/arm/mach-omap2/board-omap3pandora.c | 59 +--- arch/arm/mach-omap2/board-omap3stalker.c | 70 +--- arch/arm/mach-omap2/board-omap3touchbook.c | 57 +--- arch/arm/mach-omap2/board-omap4panda.c | 149 +------ arch/arm/mach-omap2/board-overo.c | 59 +--- arch/arm/mach-omap2/board-rm680.c | 8 +- arch/arm/mach-omap2/board-rx51-peripherals.c | 44 +-- arch/arm/mach-omap2/board-zoom-peripherals.c | 88 +---- arch/arm/mach-omap2/common-board-devices.c | 21 - arch/arm/mach-omap2/common-board-devices.h | 26 +- arch/arm/mach-omap2/pmic-common.c | 304 +++++++++++++ arch/arm/mach-omap2/pmic-common.h | 59 +++ arch/arm/plat-omap/include/plat/irqs.h | 12 +- drivers/input/misc/Kconfig | 13 +- drivers/input/misc/Makefile | 1 + drivers/input/misc/twl4030-vibra.c | 12 +- drivers/input/misc/twl6040-vibra.c | 428 +++++++++++++++++++ drivers/mfd/Kconfig | 8 +- drivers/mfd/Makefile | 3 +- drivers/mfd/twl-core.c | 13 +- drivers/mfd/twl4030-audio.c | 278 ++++++++++++ drivers/mfd/twl4030-codec.c | 277 ------------ drivers/mfd/twl6040-core.c | 588 ++++++++++++++++++++++++++ drivers/mfd/twl6040-irq.c | 205 +++++++++ include/linux/i2c/twl.h | 21 +- include/linux/mfd/twl4030-audio.h | 272 ++++++++++++ include/linux/mfd/twl4030-codec.h | 272 ------------ include/linux/mfd/twl6040.h | 260 ++++++++++++ sound/soc/codecs/Kconfig | 3 +- sound/soc/codecs/twl4030.c | 22 +- sound/soc/codecs/twl6040.c | 426 ++++--------------- sound/soc/codecs/twl6040.h | 118 ----- sound/soc/omap/sdp3430.c | 2 +- sound/soc/omap/sdp4430.c | 2 + sound/soc/omap/zoom2.c | 2 +- 44 files changed, 2716 insertions(+), 2011 deletions(-) create mode 100644 arch/arm/mach-omap2/pmic-common.c create mode 100644 arch/arm/mach-omap2/pmic-common.h create mode 100644 drivers/input/misc/twl6040-vibra.c create mode 100644 drivers/mfd/twl4030-audio.c delete mode 100644 drivers/mfd/twl4030-codec.c create mode 100644 drivers/mfd/twl6040-core.c create mode 100644 drivers/mfd/twl6040-irq.c create mode 100644 include/linux/mfd/twl4030-audio.h delete mode 100644 include/linux/mfd/twl4030-codec.h create mode 100644 include/linux/mfd/twl6040.h -- 1.7.5.3

2 14

[alsa-devel] [PATCH 0/6] HDMI: Implement pcm-per-pin
by Stephen Warren 08 Jun '11

08 Jun '11

This patchset implements a PCM-per-pin-widget model for all HDMI codecs that use the generic codec support. For most existing codecs, there is 1 pin and 1 converter per codec, so this change should have no functional impact. For some codecs (e.g. GeForce 520, Intel Ibex Peak) there are fewer converters than pins, and the default routing is for all pins to be mux'd from a single codec, so this patch allows: a) Multiple PCMs to be used at once (1 per converter). Previously, only 1 PCM was created due to the default muxing. b) A direct mapping from PCM device to pin, and hence to ELD data and connected monitor. This should enable simpler/better decisions re: which audio formats are supported for that PCM, since only 1 ELD has to be considered (previously, I think the ELDs other than from the first pin were simply ignored) The very first change in the series is actually somewhat unrelated, but I noticed it while working on this, and I believe it's a correct change. Stephen Warren (6): ALSA: hda: Gate ELD usage only by whether ELD is valid ALSA: hda: Allow multple SPDIF controls per codec ALSA: hda: Virtualize SPDIF out controls ALSA: hda: Separate generic and non-generic implementations ALSA: hda: hdmi_eld_update_pcm_info: update a stream in place ALSA: hda: HDMI: Support codecs with fewer cvts than pins sound/pci/hda/hda_codec.c | 139 ++++++--- sound/pci/hda/hda_codec.h | 16 +- sound/pci/hda/hda_eld.c | 46 ++-- sound/pci/hda/hda_intel.c | 5 +- sound/pci/hda/hda_local.h | 8 +- sound/pci/hda/patch_analog.c | 4 +- sound/pci/hda/patch_ca0110.c | 3 +- sound/pci/hda/patch_cirrus.c | 3 +- sound/pci/hda/patch_cmedia.c | 4 +- sound/pci/hda/patch_conexant.c | 1 + sound/pci/hda/patch_hdmi.c | 704 ++++++++++++++++++++++++---------------- sound/pci/hda/patch_realtek.c | 1 + sound/pci/hda/patch_sigmatel.c | 4 +- sound/pci/hda/patch_via.c | 13 +- 14 files changed, 594 insertions(+), 357 deletions(-)

3 10

Re: [alsa-devel] alsa-driver build problem : no lola dir
by Takashi Iwai 08 Jun '11

08 Jun '11

At Tue, 07 Jun 2011 11:26:50 +1200, Eliot Blennerhassett wrote: > > Trying to build alsa-driver git fails: > > make[2]: Leaving directory > `/home/eliot/src/alsagit/alsa-driver/pci/korg1212' > make: Entering an unknown directory > make: *** lola: No such file or directory. Stop. > make: Leaving an unknown directory > make[1]: *** [prepare] Error 1 > make[1]: Leaving directory `/home/eliot/src/alsagit/alsa-driver/pci' > make: *** [dep] Error 1 > ~/src/alsagit/alsa-driver$ > > my alsa-kernel links point to a current sound-2.6 git tree. Always use my alsa-driver-build.git if you are using sound-2.6 git or the latest kernel: git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/alsa-driver-build.git The repos in alsa-project.org are still based on old versions. thanks, Takashi

2 2