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

Re: [alsa-devel] Testers wanted: New SB X-Fi driver
by Christian Esken 18 Nov '09

18 Nov '09

Am Sonntag 12 Juli 2009 10:24:35 schrieb Christian Esken: > Am Montag 06 Juli 2009 08:26:11 schrieb Takashi Iwai: > > At Sun, 5 Jul 2009 13:29:48 +0200, > > > > Christian Esken wrote: > > > Am Sonntag 05 Juli 2009 09:44:33 schrieb Takashi Iwai: > > > > At Sun, 5 Jul 2009 00:19:55 +0200, > > > > > > > > Christian Esken wrote: > > > > > Am Samstag 27 Juni 2009 14:05:45 schrieb Christian Esken: > > > > > > Hello, > > > > > > > > > > > > unfortunately I cannot playback anything (PCM) with the new SB > > > > > > X-Fi driver. Driver: > > > > > > ftp://ftp.kernel.org/pub/linux/kernel/people/tiwai/snapshot/alsa- > > > > > > driver-snapshot.tar.bz2 > > > > > > Distribution: openSuSE 11.1 > > > > > > Kernel: 2.6.27.23-0.1-xen > > > > > > > > > > > > My card is a "X-Fi Titanium" (PCI device code: 1102:000b). The > > > > > > card is recognized by the driver, and any mixer (alsamixer, kmix) > > > > > > also recognizes the card. > > > > > > > > > > > > But playing back isn't possible. I tried speaker-test, audacity, > > > > > > amarok and aplay. Most applications hang, some also produce an > > > > > > error in the /var/log/messages (see > > > > > > below). > > > > > > > > > > > > I then used "./configure --with-debug=full --with-cards=ctxfi" > > > > > > due to the possible hd-audio conflict, but it didn't make a > > > > > > difference. > > > > > > > > > > > > Is there anything else I could try? > > > > > > > > > > I tested the same openSuSE version with a non-Xen 64 bit kernel, > > > > > and it doesn't work either. > > > > > > > > > > And I tried with this: > > > > > Driver: alsa-driver-20090704.tar.bz2 > > > > > Distribution: Kubuntu Karmic Alpha-2 > > > > > Kernel: 2.6.30 (32 Bit) > > > > > > > > > > Under the latter setup the X-Fi Titanium works (Simple 2 channel > > > > > test with speaker-test, audacity, amarok). :-)) > > > > > > > > How many RAM do you have? > > > > Could you boot with the limited memory size? > > > > > > It is just 2GB. So I am not limited by the 32 bit barrier. > > > > > > So booting with "limited" memory size doesn't make sense, right? > > > > Supposedly. Is it emu20k1 or emu20k2? > > I checked it again: It is a 20k2 chip. > > /var/log/boot.msg says: > <7>ALSA /home/chris/Desktop/alsa-driver/pci/ctxfi/ctatc.c:1268: ctxfi: chip > 20K2 model SB0880 (1102:0041) is found > > > http://pci-ids.ucw.cz/mods/PC/1102/000b shows 1102:0041 as "X-Fi Titanium > series [EMU20k2]". I did now test it with a different 64 Bit Linux distribution, and it works correctly: Driver: alsa-driver-20090712.tar.bz2 Distribution: Kubuntu Karmic Alpha-2 Kernel: 2.6.30 (64 Bit) All in all, I can produce a working environment with recent 32 and 64 bit kernels. This is good news. :-) Below is the summary on the tested distributions. Christian So we got this: Kubuntu Karmic Alpha-2 32 Bit, 2.0.30 (works) Kubuntu Karmic Alpha-2 64 Bit, 2.0.30 (works) SuSE 11.1 64 Bit, 2.0.27 (does not work) SuSE 11.1 64 Bit, 2.0.27 XEN (does not work) SuSE 11.2 Milestone3 64Bit, 2.0.30 (test canceled, due to unrelated problems) => I'll see whether I can redo the SuSE11.2 tests, after doing a bugreport at openSuSE.

3 6

[alsa-devel] [PATCH 00/11] Intel HDMI fixes
by Wu Fengguang 18 Nov '09

18 Nov '09

Hi Takashi, Here is some Intel HDMI fixes, most of them are inspired/written by David Härdeman (Big thanks!). - fix audio infoframe size - sticky infoframe/stream id/channel count to - not disturb (David's) fragile devices - avoid the first 0.5s audio samples be losted - avoid losing presence info during - module reloading (by querying the pin sense status) - power off (by disabling it) Thanks, Fengguang

2 13

[alsa-devel] There is no sound from speaker on Toshiba NB200
by Bin Gao 18 Nov '09

18 Nov '09

[re-send because the previous one is not plain text format) The quirk "SND_PCI_QUIRK(0x1179, 0xff6e, "Toshiba NB200", ALC663_ASUS_MODE4)" works on Toshiba NB200 but for playback, I only get sound from HP and never from SPK. As observed by hda-verb, the HP pipeline is DAC (nid 0x03) --> Mux (nid 0x0D) --> pin HP-OUT (nid 0x21) and it works fine. I noted that unsol event(HP plugged and unplugged) can be detected by the codec ALC272. According to the ALC272 datasheet, the SPK pin seems either 0x14 or 0x15, but there was still no sound from SPK even I manually set up the pipeline(DAC 0x03 --> Mux 0x0D --> pin 0x14 or 0x15) by hda-verb. For ALC663_ASUS_MODE4, dacs are defined as static hda_nid_t alc662_dac_nids[4] = { /* front, rear, clfe, rear_surr */ 0x02, 0x03, 0x04 }; and hp_nid is defined as 0x03. So as I understand, one HDA stream(from HDA controller) is copied to both DAC 0x02 and 0x03. Then I manually set up another pipeline (DAC 0x02 --> Mux 0x0C --> pin 0x14 or 0x15) , still no sound. I checked the init verbs of ALC663_ASUS_MODE4 from patch_realteck.c and didn't find any missing settings. Any ideas? Thanks, Bin

1 1

[alsa-devel] There is no sound from speaker on Toshiba NB200
by Bin Gao 18 Nov '09

18 Nov '09

The quirk "SND_PCI_QUIRK(0x1179, 0xff6e, "Toshiba NB200", ALC663_ASUS_MODE4)" works on Toshiba NB200 but for playback, I only get sound from HP and never from SPK. As observed by hda-verb, the HP pipeline is DAC (nid 0x03) --> Mux (nid 0x0D) --> pin HP-OUT (nid 0x21) and it works fine. I noted that unsol event(HP plugged and unplugged) can be detected by the codec ALC272. According to the ALC272 datasheet, the SPK pin seems either 0x14 or 0x15, but there was still no sound from SPK even I manually set up the pipeline(DAC 0x03 --> Mux 0x0D --> pin 0x14 or 0x15) by hda-verb. For ALC663_ASUS_MODE4, dacs are defined as static hda_nid_t alc662_dac_nids[4] = { /* front, rear, clfe, rear_surr */ 0x02, 0x03, 0x04 }; and hp_nid is defined as 0x03. So as I understand, one HDA stream(from HDA controller) is copied to both DAC 0x02 and 0x03. Then I manually set up another pipeline (DAC 0x02 --> Mux 0x0C --> pin 0x14 or 0x15) , still no sound. I checked the init verbs of ALC663_ASUS_MODE4 from patch_realteck.c and didn't find any missing settings. Any ideas? Thanks, Bin

1 0

[alsa-devel] [PATCHv2 2/7] S3C AUDIO: Rename 's3c24xx-pcm' driver to 's3c-dma'
by Jassi Brar 18 Nov '09

18 Nov '09

Making room for namespace for the PCM Controller driver the platform driver(s3c24xx-pcm) has been renamed to SoC agnostic name 's3c-dma'. Signed-off-by: Jassi Brar <jassi.brar(a)samsung.com> --- sound/soc/s3c24xx/Makefile | 2 +- sound/soc/s3c24xx/jive_wm8750.c | 2 +- sound/soc/s3c24xx/ln2440sbc_alc650.c | 2 +- sound/soc/s3c24xx/neo1973_gta02_wm8753.c | 2 +- sound/soc/s3c24xx/neo1973_wm8753.c | 2 +- sound/soc/s3c24xx/s3c-dma.c | 480 ++++++++++++++++++++++++ sound/soc/s3c24xx/s3c-dma.h | 31 ++ sound/soc/s3c24xx/s3c-i2s-v2.c | 2 +- sound/soc/s3c24xx/s3c2412-i2s.c | 2 +- sound/soc/s3c24xx/s3c2443-ac97.c | 2 +- sound/soc/s3c24xx/s3c24xx-i2s.c | 2 +- sound/soc/s3c24xx/s3c24xx-pcm.c | 480 ------------------------ sound/soc/s3c24xx/s3c24xx-pcm.h | 31 -- sound/soc/s3c24xx/s3c24xx_simtec.c | 2 +- sound/soc/s3c24xx/s3c24xx_simtec_hermes.c | 2 +- sound/soc/s3c24xx/s3c24xx_simtec_tlv320aic23.c | 2 +- sound/soc/s3c24xx/s3c24xx_uda134x.c | 2 +- sound/soc/s3c24xx/s3c64xx-i2s.c | 2 +- sound/soc/s3c24xx/smdk2443_wm9710.c | 2 +- sound/soc/s3c24xx/smdk64xx_wm8580.c | 2 +- 20 files changed, 527 insertions(+), 527 deletions(-) create mode 100644 sound/soc/s3c24xx/s3c-dma.c create mode 100644 sound/soc/s3c24xx/s3c-dma.h delete mode 100644 sound/soc/s3c24xx/s3c24xx-pcm.c delete mode 100644 sound/soc/s3c24xx/s3c24xx-pcm.h diff --git a/sound/soc/s3c24xx/Makefile b/sound/soc/s3c24xx/Makefile index 7790406..3bdb74d 100644 --- a/sound/soc/s3c24xx/Makefile +++ b/sound/soc/s3c24xx/Makefile @@ -1,5 +1,5 @@ # S3c24XX Platform Support -snd-soc-s3c24xx-objs := s3c24xx-pcm.o +snd-soc-s3c24xx-objs := s3c-dma.o snd-soc-s3c24xx-i2s-objs := s3c24xx-i2s.o snd-soc-s3c2412-i2s-objs := s3c2412-i2s.o snd-soc-s3c64xx-i2s-objs := s3c64xx-i2s.o diff --git a/sound/soc/s3c24xx/jive_wm8750.c b/sound/soc/s3c24xx/jive_wm8750.c index 93e6c87..ac3a709 100644 --- a/sound/soc/s3c24xx/jive_wm8750.c +++ b/sound/soc/s3c24xx/jive_wm8750.c @@ -25,7 +25,7 @@ #include <asm/mach-types.h> -#include "s3c24xx-pcm.h" +#include "s3c-dma.h" #include "s3c2412-i2s.h" #include "../codecs/wm8750.h" diff --git a/sound/soc/s3c24xx/ln2440sbc_alc650.c b/sound/soc/s3c24xx/ln2440sbc_alc650.c index 12c7148..3896e52 100644 --- a/sound/soc/s3c24xx/ln2440sbc_alc650.c +++ b/sound/soc/s3c24xx/ln2440sbc_alc650.c @@ -24,7 +24,7 @@ #include <sound/soc-dapm.h> #include "../codecs/ac97.h" -#include "s3c24xx-pcm.h" +#include "s3c-dma.h" #include "s3c24xx-ac97.h" static struct snd_soc_card ln2440sbc; diff --git a/sound/soc/s3c24xx/neo1973_gta02_wm8753.c b/sound/soc/s3c24xx/neo1973_gta02_wm8753.c index 26409a9..1d05137 100644 --- a/sound/soc/s3c24xx/neo1973_gta02_wm8753.c +++ b/sound/soc/s3c24xx/neo1973_gta02_wm8753.c @@ -32,7 +32,7 @@ #include <asm/io.h> #include <mach/gta02.h> #include "../codecs/wm8753.h" -#include "s3c24xx-pcm.h" +#include "s3c-dma.h" #include "s3c24xx-i2s.h" static struct snd_soc_card neo1973_gta02; diff --git a/sound/soc/s3c24xx/neo1973_wm8753.c b/sound/soc/s3c24xx/neo1973_wm8753.c index 77de6c5..9183166 100644 --- a/sound/soc/s3c24xx/neo1973_wm8753.c +++ b/sound/soc/s3c24xx/neo1973_wm8753.c @@ -36,7 +36,7 @@ #include "../codecs/wm8753.h" #include "lm4857.h" -#include "s3c24xx-pcm.h" +#include "s3c-dma.h" #include "s3c24xx-i2s.h" /* define the scenarios */ diff --git a/sound/soc/s3c24xx/s3c-dma.c b/sound/soc/s3c24xx/s3c-dma.c new file mode 100644 index 0000000..cb49400 --- /dev/null +++ b/sound/soc/s3c24xx/s3c-dma.c @@ -0,0 +1,481 @@ +/* + * s3c-dma.c -- ALSA Soc Audio Layer + * + * (c) 2006 Wolfson Microelectronics PLC. + * Graeme Gregory graeme.gregory(a)wolfsonmicro.com or linux(a)wolfsonmicro.com + * + * Copyright 2004-2005 Simtec Electronics + * http://armlinux.simtec.co.uk/ + * Ben Dooks <ben(a)simtec.co.uk> + * + * This program is free software; you can redistribute it and/or modify it + * under the terms of the GNU General Public License as published by the + * Free Software Foundation; either version 2 of the License, or (at your + * option) any later version. + */ + +#include <linux/module.h> +#include <linux/init.h> +#include <linux/io.h> +#include <linux/platform_device.h> +#include <linux/slab.h> +#include <linux/dma-mapping.h> + +#include <sound/core.h> +#include <sound/pcm.h> +#include <sound/pcm_params.h> +#include <sound/soc.h> + +#include <asm/dma.h> +#include <mach/hardware.h> +#include <mach/dma.h> + +#include "s3c-dma.h" + +static const struct snd_pcm_hardware s3c_dma_hardware = { + .info = SNDRV_PCM_INFO_INTERLEAVED | + SNDRV_PCM_INFO_BLOCK_TRANSFER | + SNDRV_PCM_INFO_MMAP | + SNDRV_PCM_INFO_MMAP_VALID | + SNDRV_PCM_INFO_PAUSE | + SNDRV_PCM_INFO_RESUME, + .formats = SNDRV_PCM_FMTBIT_S16_LE | + SNDRV_PCM_FMTBIT_U16_LE | + SNDRV_PCM_FMTBIT_U8 | + SNDRV_PCM_FMTBIT_S8, + .channels_min = 2, + .channels_max = 2, + .buffer_bytes_max = 128*1024, + .period_bytes_min = PAGE_SIZE, + .period_bytes_max = PAGE_SIZE*2, + .periods_min = 2, + .periods_max = 128, + .fifo_size = 32, +}; + +struct s3c24xx_runtime_data { + spinlock_t lock; + int state; + unsigned int dma_loaded; + unsigned int dma_limit; + unsigned int dma_period; + dma_addr_t dma_start; + dma_addr_t dma_pos; + dma_addr_t dma_end; + struct s3c_dma_params *params; +}; + +/* s3c_dma_enqueue + * + * place a dma buffer onto the queue for the dma system + * to handle. +*/ +static void s3c_dma_enqueue(struct snd_pcm_substream *substream) +{ + struct s3c24xx_runtime_data *prtd = substream->runtime->private_data; + dma_addr_t pos = prtd->dma_pos; + unsigned int limit; + int ret; + + pr_debug("Entered %s\n", __func__); + + if (s3c_dma_has_circular()) + limit = (prtd->dma_end - prtd->dma_start) / prtd->dma_period; + else + limit = prtd->dma_limit; + + pr_debug("%s: loaded %d, limit %d\n", + __func__, prtd->dma_loaded, limit); + + while (prtd->dma_loaded < limit) { + unsigned long len = prtd->dma_period; + + pr_debug("dma_loaded: %d\n", prtd->dma_loaded); + + if ((pos + len) > prtd->dma_end) { + len = prtd->dma_end - pos; + pr_debug(KERN_DEBUG "%s: corrected dma len %ld\n", + __func__, len); + } + + ret = s3c2410_dma_enqueue(prtd->params->channel, + substream, pos, len); + + if (ret == 0) { + prtd->dma_loaded++; + pos += prtd->dma_period; + if (pos >= prtd->dma_end) + pos = prtd->dma_start; + } else + break; + } + + prtd->dma_pos = pos; +} + +static void s3c24xx_audio_buffdone(struct s3c2410_dma_chan *channel, + void *dev_id, int size, + enum s3c2410_dma_buffresult result) +{ + struct snd_pcm_substream *substream = dev_id; + struct s3c24xx_runtime_data *prtd; + + pr_debug("Entered %s\n", __func__); + + if (result == S3C2410_RES_ABORT || result == S3C2410_RES_ERR) + return; + + prtd = substream->runtime->private_data; + + if (substream) + snd_pcm_period_elapsed(substream); + + spin_lock(&prtd->lock); + if (prtd->state & ST_RUNNING && !s3c_dma_has_circular()) { + prtd->dma_loaded--; + s3c_dma_enqueue(substream); + } + + spin_unlock(&prtd->lock); +} + +static int s3c_dma_hw_params(struct snd_pcm_substream *substream, + struct snd_pcm_hw_params *params) +{ + struct snd_pcm_runtime *runtime = substream->runtime; + struct s3c24xx_runtime_data *prtd = runtime->private_data; + struct snd_soc_pcm_runtime *rtd = substream->private_data; + struct s3c_dma_params *dma = rtd->dai->cpu_dai->dma_data; + unsigned long totbytes = params_buffer_bytes(params); + int ret = 0; + + pr_debug("Entered %s\n", __func__); + + /* return if this is a bufferless transfer e.g. + * codec <--> BT codec or GSM modem -- lg FIXME */ + if (!dma) + return 0; + + /* this may get called several times by oss emulation + * with different params -HW */ + if (prtd->params == NULL) { + /* prepare DMA */ + prtd->params = dma; + + pr_debug("params %p, client %p, channel %d\n", prtd->params, + prtd->params->client, prtd->params->channel); + + ret = s3c2410_dma_request(prtd->params->channel, + prtd->params->client, NULL); + + if (ret < 0) { + printk(KERN_ERR "failed to get dma channel\n"); + return ret; + } + + /* use the circular buffering if we have it available. */ + if (s3c_dma_has_circular()) + s3c2410_dma_setflags(prtd->params->channel, + S3C2410_DMAF_CIRCULAR); + } + + s3c2410_dma_set_buffdone_fn(prtd->params->channel, + s3c24xx_audio_buffdone); + + snd_pcm_set_runtime_buffer(substream, &substream->dma_buffer); + + runtime->dma_bytes = totbytes; + + spin_lock_irq(&prtd->lock); + prtd->dma_loaded = 0; + prtd->dma_limit = runtime->hw.periods_min; + prtd->dma_period = params_period_bytes(params); + prtd->dma_start = runtime->dma_addr; + prtd->dma_pos = prtd->dma_start; + prtd->dma_end = prtd->dma_start + totbytes; + spin_unlock_irq(&prtd->lock); + + return 0; +} + +static int s3c_dma_hw_free(struct snd_pcm_substream *substream) +{ + struct s3c24xx_runtime_data *prtd = substream->runtime->private_data; + + pr_debug("Entered %s\n", __func__); + + /* TODO - do we need to ensure DMA flushed */ + snd_pcm_set_runtime_buffer(substream, NULL); + + if (prtd->params) { + s3c2410_dma_free(prtd->params->channel, prtd->params->client); + prtd->params = NULL; + } + + return 0; +} + +static int s3c_dma_prepare(struct snd_pcm_substream *substream) +{ + struct s3c24xx_runtime_data *prtd = substream->runtime->private_data; + int ret = 0; + + pr_debug("Entered %s\n", __func__); + + /* return if this is a bufferless transfer e.g. + * codec <--> BT codec or GSM modem -- lg FIXME */ + if (!prtd->params) + return 0; + + /* channel needs configuring for mem=>device, increment memory addr, + * sync to pclk, half-word transfers to the IIS-FIFO. */ + if (substream->stream == SNDRV_PCM_STREAM_PLAYBACK) { + s3c2410_dma_devconfig(prtd->params->channel, + S3C2410_DMASRC_MEM, + prtd->params->dma_addr); + } else { + s3c2410_dma_devconfig(prtd->params->channel, + S3C2410_DMASRC_HW, + prtd->params->dma_addr); + } + + s3c2410_dma_config(prtd->params->channel, + prtd->params->dma_size); + + /* flush the DMA channel */ + s3c2410_dma_ctrl(prtd->params->channel, S3C2410_DMAOP_FLUSH); + prtd->dma_loaded = 0; + prtd->dma_pos = prtd->dma_start; + + /* enqueue dma buffers */ + s3c_dma_enqueue(substream); + + return ret; +} + +static int s3c_dma_trigger(struct snd_pcm_substream *substream, int cmd) +{ + struct s3c24xx_runtime_data *prtd = substream->runtime->private_data; + int ret = 0; + + pr_debug("Entered %s\n", __func__); + + spin_lock(&prtd->lock); + + switch (cmd) { + case SNDRV_PCM_TRIGGER_START: + case SNDRV_PCM_TRIGGER_RESUME: + case SNDRV_PCM_TRIGGER_PAUSE_RELEASE: + prtd->state |= ST_RUNNING; + s3c2410_dma_ctrl(prtd->params->channel, S3C2410_DMAOP_START); + break; + + case SNDRV_PCM_TRIGGER_STOP: + case SNDRV_PCM_TRIGGER_SUSPEND: + case SNDRV_PCM_TRIGGER_PAUSE_PUSH: + prtd->state &= ~ST_RUNNING; + s3c2410_dma_ctrl(prtd->params->channel, S3C2410_DMAOP_STOP); + break; + + default: + ret = -EINVAL; + break; + } + + spin_unlock(&prtd->lock); + + return ret; +} + +static snd_pcm_uframes_t +s3c_dma_pointer(struct snd_pcm_substream *substream) +{ + struct snd_pcm_runtime *runtime = substream->runtime; + struct s3c24xx_runtime_data *prtd = runtime->private_data; + unsigned long res; + dma_addr_t src, dst; + + pr_debug("Entered %s\n", __func__); + + spin_lock(&prtd->lock); + s3c2410_dma_getposition(prtd->params->channel, &src, &dst); + + if (substream->stream == SNDRV_PCM_STREAM_CAPTURE) + res = dst - prtd->dma_start; + else + res = src - prtd->dma_start; + + spin_unlock(&prtd->lock); + + pr_debug("Pointer %x %x\n", src, dst); + + /* we seem to be getting the odd error from the pcm library due + * to out-of-bounds pointers. this is maybe due to the dma engine + * not having loaded the new values for the channel before being + * callled... (todo - fix ) + */ + + if (res >= snd_pcm_lib_buffer_bytes(substream)) { + if (res == snd_pcm_lib_buffer_bytes(substream)) + res = 0; + } + + return bytes_to_frames(substream->runtime, res); +} + +static int s3c_dma_open(struct snd_pcm_substream *substream) +{ + struct snd_pcm_runtime *runtime = substream->runtime; + struct s3c24xx_runtime_data *prtd; + + pr_debug("Entered %s\n", __func__); + + snd_pcm_hw_constraint_integer(runtime, SNDRV_PCM_HW_PARAM_PERIODS); + snd_soc_set_runtime_hwparams(substream, &s3c_dma_hardware); + + prtd = kzalloc(sizeof(struct s3c24xx_runtime_data), GFP_KERNEL); + if (prtd == NULL) + return -ENOMEM; + + spin_lock_init(&prtd->lock); + + runtime->private_data = prtd; + return 0; +} + +static int s3c_dma_close(struct snd_pcm_substream *substream) +{ + struct snd_pcm_runtime *runtime = substream->runtime; + struct s3c24xx_runtime_data *prtd = runtime->private_data; + + pr_debug("Entered %s\n", __func__); + + if (!prtd) + pr_debug("s3c_dma_close called with prtd == NULL\n"); + + kfree(prtd); + + return 0; +} + +static int s3c_dma_mmap(struct snd_pcm_substream *substream, + struct vm_area_struct *vma) +{ + struct snd_pcm_runtime *runtime = substream->runtime; + + pr_debug("Entered %s\n", __func__); + + return dma_mmap_writecombine(substream->pcm->card->dev, vma, + runtime->dma_area, + runtime->dma_addr, + runtime->dma_bytes); +} + +static struct snd_pcm_ops s3c_dma_ops = { + .open = s3c_dma_open, + .close = s3c_dma_close, + .ioctl = snd_pcm_lib_ioctl, + .hw_params = s3c_dma_hw_params, + .hw_free = s3c_dma_hw_free, + .prepare = s3c_dma_prepare, + .trigger = s3c_dma_trigger, + .pointer = s3c_dma_pointer, + .mmap = s3c_dma_mmap, +}; + +static int s3c_preallocate_dma_buffer(struct snd_pcm *pcm, int stream) +{ + struct snd_pcm_substream *substream = pcm->streams[stream].substream; + struct snd_dma_buffer *buf = &substream->dma_buffer; + size_t size = s3c_dma_hardware.buffer_bytes_max; + + pr_debug("Entered %s\n", __func__); + + buf->dev.type = SNDRV_DMA_TYPE_DEV; + buf->dev.dev = pcm->card->dev; + buf->private_data = NULL; + buf->area = dma_alloc_writecombine(pcm->card->dev, size, + &buf->addr, GFP_KERNEL); + if (!buf->area) + return -ENOMEM; + buf->bytes = size; + return 0; +} + +static void s3c_dma_free_dma_buffers(struct snd_pcm *pcm) +{ + struct snd_pcm_substream *substream; + struct snd_dma_buffer *buf; + int stream; + + pr_debug("Entered %s\n", __func__); + + for (stream = 0; stream < 2; stream++) { + substream = pcm->streams[stream].substream; + if (!substream) + continue; + + buf = &substream->dma_buffer; + if (!buf->area) + continue; + + dma_free_writecombine(pcm->card->dev, buf->bytes, + buf->area, buf->addr); + buf->area = NULL; + } +} + +static u64 s3c_dma_mask = DMA_BIT_MASK(32); + +static int s3c_dma_new(struct snd_card *card, + struct snd_soc_dai *dai, struct snd_pcm *pcm) +{ + int ret = 0; + + pr_debug("Entered %s\n", __func__); + + if (!card->dev->dma_mask) + card->dev->dma_mask = &s3c_dma_mask; + if (!card->dev->coherent_dma_mask) + card->dev->coherent_dma_mask = 0xffffffff; + + if (dai->playback.channels_min) { + ret = s3c_preallocate_dma_buffer(pcm, + SNDRV_PCM_STREAM_PLAYBACK); + if (ret) + goto out; + } + + if (dai->capture.channels_min) { + ret = s3c_preallocate_dma_buffer(pcm, + SNDRV_PCM_STREAM_CAPTURE); + if (ret) + goto out; + } + out: + return ret; +} + +struct snd_soc_platform s3c24xx_soc_platform = { + .name = "s3c24xx-audio", + .pcm_ops = &s3c_dma_ops, + .pcm_new = s3c_dma_new, + .pcm_free = s3c_dma_free_dma_buffers, +}; +EXPORT_SYMBOL_GPL(s3c24xx_soc_platform); + +static int __init s3c24xx_soc_platform_init(void) +{ + return snd_soc_register_platform(&s3c24xx_soc_platform); +} +module_init(s3c24xx_soc_platform_init); + +static void __exit s3c24xx_soc_platform_exit(void) +{ + snd_soc_unregister_platform(&s3c24xx_soc_platform); +} +module_exit(s3c24xx_soc_platform_exit); + +MODULE_AUTHOR("Ben Dooks, <ben(a)simtec.co.uk>"); +MODULE_DESCRIPTION("Samsung S3C Audio DMA module"); +MODULE_LICENSE("GPL"); diff --git a/sound/soc/s3c24xx/s3c-dma.h b/sound/soc/s3c24xx/s3c-dma.h new file mode 100644 index 0000000..8cbc071 --- /dev/null +++ b/sound/soc/s3c24xx/s3c-dma.h @@ -0,0 +1,31 @@ +/* + * s3c-dma.h -- + * + * This program is free software; you can redistribute it and/or modify it + * under the terms of the GNU General Public License as published by the + * Free Software Foundation; either version 2 of the License, or (at your + * option) any later version. + * + * ALSA PCM interface for the Samsung S3C24xx CPU + */ + +#ifndef _S3C_AUDIO_H +#define _S3C_AUDIO_H + +#define ST_RUNNING (1<<0) +#define ST_OPENED (1<<1) + +struct s3c_dma_params { + struct s3c2410_dma_client *client; /* stream identifier */ + int channel; /* Channel ID */ + dma_addr_t dma_addr; + int dma_size; /* Size of the DMA transfer */ +}; + +#define S3C24XX_DAI_I2S 0 + +/* platform data */ +extern struct snd_soc_platform s3c24xx_soc_platform; +extern struct snd_ac97_bus_ops s3c24xx_ac97_ops; + +#endif diff --git a/sound/soc/s3c24xx/s3c-i2s-v2.c b/sound/soc/s3c24xx/s3c-i2s-v2.c index 5a442aa..13c99ab 100644 --- a/sound/soc/s3c24xx/s3c-i2s-v2.c +++ b/sound/soc/s3c24xx/s3c-i2s-v2.c @@ -35,7 +35,7 @@ #include <mach/dma.h> #include "s3c-i2s-v2.h" -#include "s3c24xx-pcm.h" +#include "s3c-dma.h" #undef S3C_IIS_V2_SUPPORTED diff --git a/sound/soc/s3c24xx/s3c2412-i2s.c b/sound/soc/s3c24xx/s3c2412-i2s.c index 23718ea..553c480 100644 --- a/sound/soc/s3c24xx/s3c2412-i2s.c +++ b/sound/soc/s3c24xx/s3c2412-i2s.c @@ -37,7 +37,7 @@ #include <mach/regs-gpio.h> #include <mach/dma.h> -#include "s3c24xx-pcm.h" +#include "s3c-dma.h" #include "s3c2412-i2s.h" #define S3C2412_I2S_DEBUG 0 diff --git a/sound/soc/s3c24xx/s3c2443-ac97.c b/sound/soc/s3c24xx/s3c2443-ac97.c index 678b176..000dc79 100644 --- a/sound/soc/s3c24xx/s3c2443-ac97.c +++ b/sound/soc/s3c24xx/s3c2443-ac97.c @@ -35,7 +35,7 @@ #include <asm/dma.h> #include <mach/dma.h> -#include "s3c24xx-pcm.h" +#include "s3c-dma.h" #include "s3c24xx-ac97.h" struct s3c24xx_ac97_info { diff --git a/sound/soc/s3c24xx/s3c24xx-i2s.c b/sound/soc/s3c24xx/s3c24xx-i2s.c index afb4bc9..ed83747 100644 --- a/sound/soc/s3c24xx/s3c24xx-i2s.c +++ b/sound/soc/s3c24xx/s3c24xx-i2s.c @@ -38,7 +38,7 @@ #include <plat/regs-iis.h> -#include "s3c24xx-pcm.h" +#include "s3c-dma.h" #include "s3c24xx-i2s.h" static struct s3c2410_dma_client s3c24xx_dma_client_out = { diff --git a/sound/soc/s3c24xx/s3c24xx-pcm.c b/sound/soc/s3c24xx/s3c24xx-pcm.c deleted file mode 100644 index cb49400..0000000 --- a/sound/soc/s3c24xx/s3c24xx-pcm.c +++ /dev/null @@ -1,480 +0,0 @@ -/* - * s3c24xx-pcm.c -- ALSA Soc Audio Layer - * - * (c) 2006 Wolfson Microelectronics PLC. - * Graeme Gregory graeme.gregory(a)wolfsonmicro.com or linux(a)wolfsonmicro.com - * - * Copyright 2004-2005 Simtec Electronics - * http://armlinux.simtec.co.uk/ - * Ben Dooks <ben(a)simtec.co.uk> - * - * This program is free software; you can redistribute it and/or modify it - * under the terms of the GNU General Public License as published by the - * Free Software Foundation; either version 2 of the License, or (at your - * option) any later version. - */ - -#include <linux/module.h> -#include <linux/init.h> -#include <linux/io.h> -#include <linux/platform_device.h> -#include <linux/slab.h> -#include <linux/dma-mapping.h> - -#include <sound/core.h> -#include <sound/pcm.h> -#include <sound/pcm_params.h> -#include <sound/soc.h> - -#include <asm/dma.h> -#include <mach/hardware.h> -#include <mach/dma.h> - -#include "s3c24xx-pcm.h" - -static const struct snd_pcm_hardware s3c_dma_hardware = { - .info = SNDRV_PCM_INFO_INTERLEAVED | - SNDRV_PCM_INFO_BLOCK_TRANSFER | - SNDRV_PCM_INFO_MMAP | - SNDRV_PCM_INFO_MMAP_VALID | - SNDRV_PCM_INFO_PAUSE | - SNDRV_PCM_INFO_RESUME, - .formats = SNDRV_PCM_FMTBIT_S16_LE | - SNDRV_PCM_FMTBIT_U16_LE | - SNDRV_PCM_FMTBIT_U8 | - SNDRV_PCM_FMTBIT_S8, - .channels_min = 2, - .channels_max = 2, - .buffer_bytes_max = 128*1024, - .period_bytes_min = PAGE_SIZE, - .period_bytes_max = PAGE_SIZE*2, - .periods_min = 2, - .periods_max = 128, - .fifo_size = 32, -}; - -struct s3c24xx_runtime_data { - spinlock_t lock; - int state; - unsigned int dma_loaded; - unsigned int dma_limit; - unsigned int dma_period; - dma_addr_t dma_start; - dma_addr_t dma_pos; - dma_addr_t dma_end; - struct s3c_dma_params *params; -}; - -/* s3c_dma_enqueue - * - * place a dma buffer onto the queue for the dma system - * to handle. -*/ -static void s3c_dma_enqueue(struct snd_pcm_substream *substream) -{ - struct s3c24xx_runtime_data *prtd = substream->runtime->private_data; - dma_addr_t pos = prtd->dma_pos; - unsigned int limit; - int ret; - - pr_debug("Entered %s\n", __func__); - - if (s3c_dma_has_circular()) { - limit = (prtd->dma_end - prtd->dma_start) / prtd->dma_period; - } else - limit = prtd->dma_limit; - - pr_debug("%s: loaded %d, limit %d\n", __func__, prtd->dma_loaded, limit); - - while (prtd->dma_loaded < limit) { - unsigned long len = prtd->dma_period; - - pr_debug("dma_loaded: %d\n", prtd->dma_loaded); - - if ((pos + len) > prtd->dma_end) { - len = prtd->dma_end - pos; - pr_debug(KERN_DEBUG "%s: corrected dma len %ld\n", - __func__, len); - } - - ret = s3c2410_dma_enqueue(prtd->params->channel, - substream, pos, len); - - if (ret == 0) { - prtd->dma_loaded++; - pos += prtd->dma_period; - if (pos >= prtd->dma_end) - pos = prtd->dma_start; - } else - break; - } - - prtd->dma_pos = pos; -} - -static void s3c24xx_audio_buffdone(struct s3c2410_dma_chan *channel, - void *dev_id, int size, - enum s3c2410_dma_buffresult result) -{ - struct snd_pcm_substream *substream = dev_id; - struct s3c24xx_runtime_data *prtd; - - pr_debug("Entered %s\n", __func__); - - if (result == S3C2410_RES_ABORT || result == S3C2410_RES_ERR) - return; - - prtd = substream->runtime->private_data; - - if (substream) - snd_pcm_period_elapsed(substream); - - spin_lock(&prtd->lock); - if (prtd->state & ST_RUNNING && !s3c_dma_has_circular()) { - prtd->dma_loaded--; - s3c_dma_enqueue(substream); - } - - spin_unlock(&prtd->lock); -} - -static int s3c_dma_hw_params(struct snd_pcm_substream *substream, - struct snd_pcm_hw_params *params) -{ - struct snd_pcm_runtime *runtime = substream->runtime; - struct s3c24xx_runtime_data *prtd = runtime->private_data; - struct snd_soc_pcm_runtime *rtd = substream->private_data; - struct s3c_dma_params *dma = rtd->dai->cpu_dai->dma_data; - unsigned long totbytes = params_buffer_bytes(params); - int ret = 0; - - pr_debug("Entered %s\n", __func__); - - /* return if this is a bufferless transfer e.g. - * codec <--> BT codec or GSM modem -- lg FIXME */ - if (!dma) - return 0; - - /* this may get called several times by oss emulation - * with different params -HW */ - if (prtd->params == NULL) { - /* prepare DMA */ - prtd->params = dma; - - pr_debug("params %p, client %p, channel %d\n", prtd->params, - prtd->params->client, prtd->params->channel); - - ret = s3c2410_dma_request(prtd->params->channel, - prtd->params->client, NULL); - - if (ret < 0) { - printk(KERN_ERR "failed to get dma channel\n"); - return ret; - } - - /* use the circular buffering if we have it available. */ - if (s3c_dma_has_circular()) - s3c2410_dma_setflags(prtd->params->channel, - S3C2410_DMAF_CIRCULAR); - } - - s3c2410_dma_set_buffdone_fn(prtd->params->channel, - s3c24xx_audio_buffdone); - - snd_pcm_set_runtime_buffer(substream, &substream->dma_buffer); - - runtime->dma_bytes = totbytes; - - spin_lock_irq(&prtd->lock); - prtd->dma_loaded = 0; - prtd->dma_limit = runtime->hw.periods_min; - prtd->dma_period = params_period_bytes(params); - prtd->dma_start = runtime->dma_addr; - prtd->dma_pos = prtd->dma_start; - prtd->dma_end = prtd->dma_start + totbytes; - spin_unlock_irq(&prtd->lock); - - return 0; -} - -static int s3c_dma_hw_free(struct snd_pcm_substream *substream) -{ - struct s3c24xx_runtime_data *prtd = substream->runtime->private_data; - - pr_debug("Entered %s\n", __func__); - - /* TODO - do we need to ensure DMA flushed */ - snd_pcm_set_runtime_buffer(substream, NULL); - - if (prtd->params) { - s3c2410_dma_free(prtd->params->channel, prtd->params->client); - prtd->params = NULL; - } - - return 0; -} - -static int s3c_dma_prepare(struct snd_pcm_substream *substream) -{ - struct s3c24xx_runtime_data *prtd = substream->runtime->private_data; - int ret = 0; - - pr_debug("Entered %s\n", __func__); - - /* return if this is a bufferless transfer e.g. - * codec <--> BT codec or GSM modem -- lg FIXME */ - if (!prtd->params) - return 0; - - /* channel needs configuring for mem=>device, increment memory addr, - * sync to pclk, half-word transfers to the IIS-FIFO. */ - if (substream->stream == SNDRV_PCM_STREAM_PLAYBACK) { - s3c2410_dma_devconfig(prtd->params->channel, - S3C2410_DMASRC_MEM, - prtd->params->dma_addr); - } else { - s3c2410_dma_devconfig(prtd->params->channel, - S3C2410_DMASRC_HW, - prtd->params->dma_addr); - } - - s3c2410_dma_config(prtd->params->channel, - prtd->params->dma_size); - - /* flush the DMA channel */ - s3c2410_dma_ctrl(prtd->params->channel, S3C2410_DMAOP_FLUSH); - prtd->dma_loaded = 0; - prtd->dma_pos = prtd->dma_start; - - /* enqueue dma buffers */ - s3c_dma_enqueue(substream); - - return ret; -} - -static int s3c_dma_trigger(struct snd_pcm_substream *substream, int cmd) -{ - struct s3c24xx_runtime_data *prtd = substream->runtime->private_data; - int ret = 0; - - pr_debug("Entered %s\n", __func__); - - spin_lock(&prtd->lock); - - switch (cmd) { - case SNDRV_PCM_TRIGGER_START: - case SNDRV_PCM_TRIGGER_RESUME: - case SNDRV_PCM_TRIGGER_PAUSE_RELEASE: - prtd->state |= ST_RUNNING; - s3c2410_dma_ctrl(prtd->params->channel, S3C2410_DMAOP_START); - break; - - case SNDRV_PCM_TRIGGER_STOP: - case SNDRV_PCM_TRIGGER_SUSPEND: - case SNDRV_PCM_TRIGGER_PAUSE_PUSH: - prtd->state &= ~ST_RUNNING; - s3c2410_dma_ctrl(prtd->params->channel, S3C2410_DMAOP_STOP); - break; - - default: - ret = -EINVAL; - break; - } - - spin_unlock(&prtd->lock); - - return ret; -} - -static snd_pcm_uframes_t -s3c_dma_pointer(struct snd_pcm_substream *substream) -{ - struct snd_pcm_runtime *runtime = substream->runtime; - struct s3c24xx_runtime_data *prtd = runtime->private_data; - unsigned long res; - dma_addr_t src, dst; - - pr_debug("Entered %s\n", __func__); - - spin_lock(&prtd->lock); - s3c2410_dma_getposition(prtd->params->channel, &src, &dst); - - if (substream->stream == SNDRV_PCM_STREAM_CAPTURE) - res = dst - prtd->dma_start; - else - res = src - prtd->dma_start; - - spin_unlock(&prtd->lock); - - pr_debug("Pointer %x %x\n", src, dst); - - /* we seem to be getting the odd error from the pcm library due - * to out-of-bounds pointers. this is maybe due to the dma engine - * not having loaded the new values for the channel before being - * callled... (todo - fix ) - */ - - if (res >= snd_pcm_lib_buffer_bytes(substream)) { - if (res == snd_pcm_lib_buffer_bytes(substream)) - res = 0; - } - - return bytes_to_frames(substream->runtime, res); -} - -static int s3c_dma_open(struct snd_pcm_substream *substream) -{ - struct snd_pcm_runtime *runtime = substream->runtime; - struct s3c24xx_runtime_data *prtd; - - pr_debug("Entered %s\n", __func__); - - snd_pcm_hw_constraint_integer(runtime, SNDRV_PCM_HW_PARAM_PERIODS); - snd_soc_set_runtime_hwparams(substream, &s3c_dma_hardware); - - prtd = kzalloc(sizeof(struct s3c24xx_runtime_data), GFP_KERNEL); - if (prtd == NULL) - return -ENOMEM; - - spin_lock_init(&prtd->lock); - - runtime->private_data = prtd; - return 0; -} - -static int s3c_dma_close(struct snd_pcm_substream *substream) -{ - struct snd_pcm_runtime *runtime = substream->runtime; - struct s3c24xx_runtime_data *prtd = runtime->private_data; - - pr_debug("Entered %s\n", __func__); - - if (!prtd) - pr_debug("s3c_dma_close called with prtd == NULL\n"); - - kfree(prtd); - - return 0; -} - -static int s3c_dma_mmap(struct snd_pcm_substream *substream, - struct vm_area_struct *vma) -{ - struct snd_pcm_runtime *runtime = substream->runtime; - - pr_debug("Entered %s\n", __func__); - - return dma_mmap_writecombine(substream->pcm->card->dev, vma, - runtime->dma_area, - runtime->dma_addr, - runtime->dma_bytes); -} - -static struct snd_pcm_ops s3c_dma_ops = { - .open = s3c_dma_open, - .close = s3c_dma_close, - .ioctl = snd_pcm_lib_ioctl, - .hw_params = s3c_dma_hw_params, - .hw_free = s3c_dma_hw_free, - .prepare = s3c_dma_prepare, - .trigger = s3c_dma_trigger, - .pointer = s3c_dma_pointer, - .mmap = s3c_dma_mmap, -}; - -static int s3c_preallocate_dma_buffer(struct snd_pcm *pcm, int stream) -{ - struct snd_pcm_substream *substream = pcm->streams[stream].substream; - struct snd_dma_buffer *buf = &substream->dma_buffer; - size_t size = s3c_dma_hardware.buffer_bytes_max; - - pr_debug("Entered %s\n", __func__); - - buf->dev.type = SNDRV_DMA_TYPE_DEV; - buf->dev.dev = pcm->card->dev; - buf->private_data = NULL; - buf->area = dma_alloc_writecombine(pcm->card->dev, size, - &buf->addr, GFP_KERNEL); - if (!buf->area) - return -ENOMEM; - buf->bytes = size; - return 0; -} - -static void s3c_dma_free_dma_buffers(struct snd_pcm *pcm) -{ - struct snd_pcm_substream *substream; - struct snd_dma_buffer *buf; - int stream; - - pr_debug("Entered %s\n", __func__); - - for (stream = 0; stream < 2; stream++) { - substream = pcm->streams[stream].substream; - if (!substream) - continue; - - buf = &substream->dma_buffer; - if (!buf->area) - continue; - - dma_free_writecombine(pcm->card->dev, buf->bytes, - buf->area, buf->addr); - buf->area = NULL; - } -} - -static u64 s3c_dma_mask = DMA_BIT_MASK(32); - -static int s3c_dma_new(struct snd_card *card, - struct snd_soc_dai *dai, struct snd_pcm *pcm) -{ - int ret = 0; - - pr_debug("Entered %s\n", __func__); - - if (!card->dev->dma_mask) - card->dev->dma_mask = &s3c_dma_mask; - if (!card->dev->coherent_dma_mask) - card->dev->coherent_dma_mask = 0xffffffff; - - if (dai->playback.channels_min) { - ret = s3c_preallocate_dma_buffer(pcm, - SNDRV_PCM_STREAM_PLAYBACK); - if (ret) - goto out; - } - - if (dai->capture.channels_min) { - ret = s3c_preallocate_dma_buffer(pcm, - SNDRV_PCM_STREAM_CAPTURE); - if (ret) - goto out; - } - out: - return ret; -} - -struct snd_soc_platform s3c24xx_soc_platform = { - .name = "s3c24xx-audio", - .pcm_ops = &s3c_dma_ops, - .pcm_new = s3c_dma_new, - .pcm_free = s3c_dma_free_dma_buffers, -}; -EXPORT_SYMBOL_GPL(s3c24xx_soc_platform); - -static int __init s3c24xx_soc_platform_init(void) -{ - return snd_soc_register_platform(&s3c24xx_soc_platform); -} -module_init(s3c24xx_soc_platform_init); - -static void __exit s3c24xx_soc_platform_exit(void) -{ - snd_soc_unregister_platform(&s3c24xx_soc_platform); -} -module_exit(s3c24xx_soc_platform_exit); - -MODULE_AUTHOR("Ben Dooks, <ben(a)simtec.co.uk>"); -MODULE_DESCRIPTION("Samsung S3C Audio DMA module"); -MODULE_LICENSE("GPL"); diff --git a/sound/soc/s3c24xx/s3c24xx-pcm.h b/sound/soc/s3c24xx/s3c24xx-pcm.h deleted file mode 100644 index 8cbc071..0000000 --- a/sound/soc/s3c24xx/s3c24xx-pcm.h +++ /dev/null @@ -1,31 +0,0 @@ -/* - * s3c24xx-pcm.h -- - * - * This program is free software; you can redistribute it and/or modify it - * under the terms of the GNU General Public License as published by the - * Free Software Foundation; either version 2 of the License, or (at your - * option) any later version. - * - * ALSA PCM interface for the Samsung S3C24xx CPU - */ - -#ifndef _S3C_AUDIO_H -#define _S3C_AUDIO_H - -#define ST_RUNNING (1<<0) -#define ST_OPENED (1<<1) - -struct s3c_dma_params { - struct s3c2410_dma_client *client; /* stream identifier */ - int channel; /* Channel ID */ - dma_addr_t dma_addr; - int dma_size; /* Size of the DMA transfer */ -}; - -#define S3C24XX_DAI_I2S 0 - -/* platform data */ -extern struct snd_soc_platform s3c24xx_soc_platform; -extern struct snd_ac97_bus_ops s3c24xx_ac97_ops; - -#endif diff --git a/sound/soc/s3c24xx/s3c24xx_simtec.c b/sound/soc/s3c24xx/s3c24xx_simtec.c index 1966e0d..ef75416 100644 --- a/sound/soc/s3c24xx/s3c24xx_simtec.c +++ b/sound/soc/s3c24xx/s3c24xx_simtec.c @@ -21,7 +21,7 @@ #include <plat/audio-simtec.h> -#include "s3c24xx-pcm.h" +#include "s3c-dma.h" #include "s3c24xx-i2s.h" #include "s3c24xx_simtec.h" diff --git a/sound/soc/s3c24xx/s3c24xx_simtec_hermes.c b/sound/soc/s3c24xx/s3c24xx_simtec_hermes.c index 8346bd9..61166a5 100644 --- a/sound/soc/s3c24xx/s3c24xx_simtec_hermes.c +++ b/sound/soc/s3c24xx/s3c24xx_simtec_hermes.c @@ -18,7 +18,7 @@ #include <plat/audio-simtec.h> -#include "s3c24xx-pcm.h" +#include "s3c-dma.h" #include "s3c24xx-i2s.h" #include "s3c24xx_simtec.h" diff --git a/sound/soc/s3c24xx/s3c24xx_simtec_tlv320aic23.c b/sound/soc/s3c24xx/s3c24xx_simtec_tlv320aic23.c index 25797e0..af0bf57 100644 --- a/sound/soc/s3c24xx/s3c24xx_simtec_tlv320aic23.c +++ b/sound/soc/s3c24xx/s3c24xx_simtec_tlv320aic23.c @@ -18,7 +18,7 @@ #include <plat/audio-simtec.h> -#include "s3c24xx-pcm.h" +#include "s3c-dma.h" #include "s3c24xx-i2s.h" #include "s3c24xx_simtec.h" diff --git a/sound/soc/s3c24xx/s3c24xx_uda134x.c b/sound/soc/s3c24xx/s3c24xx_uda134x.c index c215d32..e8d6cc2 100644 --- a/sound/soc/s3c24xx/s3c24xx_uda134x.c +++ b/sound/soc/s3c24xx/s3c24xx_uda134x.c @@ -24,7 +24,7 @@ #include <plat/regs-iis.h> -#include "s3c24xx-pcm.h" +#include "s3c-dma.h" #include "s3c24xx-i2s.h" #include "../codecs/uda134x.h" diff --git a/sound/soc/s3c24xx/s3c64xx-i2s.c b/sound/soc/s3c24xx/s3c64xx-i2s.c index 719d63c..64c034b 100644 --- a/sound/soc/s3c24xx/s3c64xx-i2s.c +++ b/sound/soc/s3c24xx/s3c64xx-i2s.c @@ -35,7 +35,7 @@ #include <mach/map.h> #include <mach/dma.h> -#include "s3c24xx-pcm.h" +#include "s3c-dma.h" #include "s3c64xx-i2s.h" static struct s3c2410_dma_client s3c64xx_dma_client_out = { diff --git a/sound/soc/s3c24xx/smdk2443_wm9710.c b/sound/soc/s3c24xx/smdk2443_wm9710.c index a2a4f53..106c72d 100644 --- a/sound/soc/s3c24xx/smdk2443_wm9710.c +++ b/sound/soc/s3c24xx/smdk2443_wm9710.c @@ -20,7 +20,7 @@ #include <sound/soc-dapm.h> #include "../codecs/ac97.h" -#include "s3c24xx-pcm.h" +#include "s3c-dma.h" #include "s3c24xx-ac97.h" static struct snd_soc_card smdk2443; diff --git a/sound/soc/s3c24xx/smdk64xx_wm8580.c b/sound/soc/s3c24xx/smdk64xx_wm8580.c index cb8a916..7956a9c 100644 --- a/sound/soc/s3c24xx/smdk64xx_wm8580.c +++ b/sound/soc/s3c24xx/smdk64xx_wm8580.c @@ -19,7 +19,7 @@ #include <sound/soc-dapm.h> #include "../codecs/wm8580.h" -#include "s3c24xx-pcm.h" +#include "s3c-dma.h" #include "s3c64xx-i2s.h" #define S3C64XX_I2S_V4 2 -- 1.6.2.5

2 1

[alsa-devel] [PATCHv2 1/7] S3C AUDIO: Rename s3c24xx_pcm prefix to s3c_dma
by Jassi Brar 18 Nov '09

18 Nov '09

The s3c24xx_pcm prefix for the soc_platform is inappropriate when some Samsung SoCs have PCM controllers which will eventually have drivers and hence namespace ambiguities. To resolve naming ambiguities in future the following have been renamed in order 1) s3c24xx_pcm_dma_params -> s3c_dma_params 2) s3c24xx_pcm_preallocate_dma_buffer -> s3c_preallocate_dma_buffer 3) s3c24xx_pcm_dmamask -> s3c_dma_mask 4) s3c24xx_pcm_XXX -> s3c_dma_XXX Signed-off-by: Jassi Brar <jassi.brar(a)samsung.com> --- sound/soc/s3c24xx/s3c-i2s-v2.c | 2 +- sound/soc/s3c24xx/s3c-i2s-v2.h | 4 +- sound/soc/s3c24xx/s3c2412-i2s.c | 4 +- sound/soc/s3c24xx/s3c2443-ac97.c | 10 ++-- sound/soc/s3c24xx/s3c24xx-i2s.c | 10 ++-- sound/soc/s3c24xx/s3c24xx-pcm.c | 76 +++++++++++++++++++------------------- sound/soc/s3c24xx/s3c24xx-pcm.h | 6 +- sound/soc/s3c24xx/s3c64xx-i2s.c | 4 +- 8 files changed, 58 insertions(+), 58 deletions(-) diff --git a/sound/soc/s3c24xx/s3c-i2s-v2.c b/sound/soc/s3c24xx/s3c-i2s-v2.c index 28b0ab2..5a442aa 100644 --- a/sound/soc/s3c24xx/s3c-i2s-v2.c +++ b/sound/soc/s3c24xx/s3c-i2s-v2.c @@ -394,7 +394,7 @@ static int s3c2412_i2s_trigger(struct snd_pcm_substream *substream, int cmd, int capture = (substream->stream == SNDRV_PCM_STREAM_CAPTURE); unsigned long irqs; int ret = 0; - int channel = ((struct s3c24xx_pcm_dma_params *) + int channel = ((struct s3c_dma_params *) rtd->dai->cpu_dai->dma_data)->channel; pr_debug("Entered %s\n", __func__); diff --git a/sound/soc/s3c24xx/s3c-i2s-v2.h b/sound/soc/s3c24xx/s3c-i2s-v2.h index f66854a..ecf8eaa 100644 --- a/sound/soc/s3c24xx/s3c-i2s-v2.h +++ b/sound/soc/s3c24xx/s3c-i2s-v2.h @@ -49,8 +49,8 @@ struct s3c_i2sv2_info { unsigned char master; - struct s3c24xx_pcm_dma_params *dma_playback; - struct s3c24xx_pcm_dma_params *dma_capture; + struct s3c_dma_params *dma_playback; + struct s3c_dma_params *dma_capture; u32 suspend_iismod; u32 suspend_iiscon; diff --git a/sound/soc/s3c24xx/s3c2412-i2s.c b/sound/soc/s3c24xx/s3c2412-i2s.c index ac5e47b..23718ea 100644 --- a/sound/soc/s3c24xx/s3c2412-i2s.c +++ b/sound/soc/s3c24xx/s3c2412-i2s.c @@ -50,14 +50,14 @@ static struct s3c2410_dma_client s3c2412_dma_client_in = { .name = "I2S PCM Stereo in" }; -static struct s3c24xx_pcm_dma_params s3c2412_i2s_pcm_stereo_out = { +static struct s3c_dma_params s3c2412_i2s_pcm_stereo_out = { .client = &s3c2412_dma_client_out, .channel = DMACH_I2S_OUT, .dma_addr = S3C2410_PA_IIS + S3C2412_IISTXD, .dma_size = 4, }; -static struct s3c24xx_pcm_dma_params s3c2412_i2s_pcm_stereo_in = { +static struct s3c_dma_params s3c2412_i2s_pcm_stereo_in = { .client = &s3c2412_dma_client_in, .channel = DMACH_I2S_IN, .dma_addr = S3C2410_PA_IIS + S3C2412_IISRXD, diff --git a/sound/soc/s3c24xx/s3c2443-ac97.c b/sound/soc/s3c24xx/s3c2443-ac97.c index b25e9f9..678b176 100644 --- a/sound/soc/s3c24xx/s3c2443-ac97.c +++ b/sound/soc/s3c24xx/s3c2443-ac97.c @@ -188,21 +188,21 @@ static struct s3c2410_dma_client s3c2443_dma_client_micin = { .name = "AC97 Mic Mono in" }; -static struct s3c24xx_pcm_dma_params s3c2443_ac97_pcm_stereo_out = { +static struct s3c_dma_params s3c2443_ac97_pcm_stereo_out = { .client = &s3c2443_dma_client_out, .channel = DMACH_PCM_OUT, .dma_addr = S3C2440_PA_AC97 + S3C_AC97_PCM_DATA, .dma_size = 4, }; -static struct s3c24xx_pcm_dma_params s3c2443_ac97_pcm_stereo_in = { +static struct s3c_dma_params s3c2443_ac97_pcm_stereo_in = { .client = &s3c2443_dma_client_in, .channel = DMACH_PCM_IN, .dma_addr = S3C2440_PA_AC97 + S3C_AC97_PCM_DATA, .dma_size = 4, }; -static struct s3c24xx_pcm_dma_params s3c2443_ac97_mic_mono_in = { +static struct s3c_dma_params s3c2443_ac97_mic_mono_in = { .client = &s3c2443_dma_client_micin, .channel = DMACH_MIC_IN, .dma_addr = S3C2440_PA_AC97 + S3C_AC97_MIC_DATA, @@ -290,7 +290,7 @@ static int s3c2443_ac97_trigger(struct snd_pcm_substream *substream, int cmd, { u32 ac_glbctrl; struct snd_soc_pcm_runtime *rtd = substream->private_data; - int channel = ((struct s3c24xx_pcm_dma_params *) + int channel = ((struct s3c_dma_params *) rtd->dai->cpu_dai->dma_data)->channel; ac_glbctrl = readl(s3c24xx_ac97.regs + S3C_AC97_GLBCTRL); @@ -339,7 +339,7 @@ static int s3c2443_ac97_mic_trigger(struct snd_pcm_substream *substream, { u32 ac_glbctrl; struct snd_soc_pcm_runtime *rtd = substream->private_data; - int channel = ((struct s3c24xx_pcm_dma_params *) + int channel = ((struct s3c_dma_params *) rtd->dai->cpu_dai->dma_data)->channel; ac_glbctrl = readl(s3c24xx_ac97.regs + S3C_AC97_GLBCTRL); diff --git a/sound/soc/s3c24xx/s3c24xx-i2s.c b/sound/soc/s3c24xx/s3c24xx-i2s.c index c76b8bb..afb4bc9 100644 --- a/sound/soc/s3c24xx/s3c24xx-i2s.c +++ b/sound/soc/s3c24xx/s3c24xx-i2s.c @@ -49,14 +49,14 @@ static struct s3c2410_dma_client s3c24xx_dma_client_in = { .name = "I2S PCM Stereo in" }; -static struct s3c24xx_pcm_dma_params s3c24xx_i2s_pcm_stereo_out = { +static struct s3c_dma_params s3c24xx_i2s_pcm_stereo_out = { .client = &s3c24xx_dma_client_out, .channel = DMACH_I2S_OUT, .dma_addr = S3C2410_PA_IIS + S3C2410_IISFIFO, .dma_size = 2, }; -static struct s3c24xx_pcm_dma_params s3c24xx_i2s_pcm_stereo_in = { +static struct s3c_dma_params s3c24xx_i2s_pcm_stereo_in = { .client = &s3c24xx_dma_client_in, .channel = DMACH_I2S_IN, .dma_addr = S3C2410_PA_IIS + S3C2410_IISFIFO, @@ -258,12 +258,12 @@ static int s3c24xx_i2s_hw_params(struct snd_pcm_substream *substream, switch (params_format(params)) { case SNDRV_PCM_FORMAT_S8: iismod &= ~S3C2410_IISMOD_16BIT; - ((struct s3c24xx_pcm_dma_params *) + ((struct s3c_dma_params *) rtd->dai->cpu_dai->dma_data)->dma_size = 1; break; case SNDRV_PCM_FORMAT_S16_LE: iismod |= S3C2410_IISMOD_16BIT; - ((struct s3c24xx_pcm_dma_params *) + ((struct s3c_dma_params *) rtd->dai->cpu_dai->dma_data)->dma_size = 2; break; default: @@ -280,7 +280,7 @@ static int s3c24xx_i2s_trigger(struct snd_pcm_substream *substream, int cmd, { int ret = 0; struct snd_soc_pcm_runtime *rtd = substream->private_data; - int channel = ((struct s3c24xx_pcm_dma_params *) + int channel = ((struct s3c_dma_params *) rtd->dai->cpu_dai->dma_data)->channel; pr_debug("Entered %s\n", __func__); diff --git a/sound/soc/s3c24xx/s3c24xx-pcm.c b/sound/soc/s3c24xx/s3c24xx-pcm.c index 151a694..cb49400 100644 --- a/sound/soc/s3c24xx/s3c24xx-pcm.c +++ b/sound/soc/s3c24xx/s3c24xx-pcm.c @@ -32,7 +32,7 @@ #include "s3c24xx-pcm.h" -static const struct snd_pcm_hardware s3c24xx_pcm_hardware = { +static const struct snd_pcm_hardware s3c_dma_hardware = { .info = SNDRV_PCM_INFO_INTERLEAVED | SNDRV_PCM_INFO_BLOCK_TRANSFER | SNDRV_PCM_INFO_MMAP | @@ -62,15 +62,15 @@ struct s3c24xx_runtime_data { dma_addr_t dma_start; dma_addr_t dma_pos; dma_addr_t dma_end; - struct s3c24xx_pcm_dma_params *params; + struct s3c_dma_params *params; }; -/* s3c24xx_pcm_enqueue +/* s3c_dma_enqueue * * place a dma buffer onto the queue for the dma system * to handle. */ -static void s3c24xx_pcm_enqueue(struct snd_pcm_substream *substream) +static void s3c_dma_enqueue(struct snd_pcm_substream *substream) { struct s3c24xx_runtime_data *prtd = substream->runtime->private_data; dma_addr_t pos = prtd->dma_pos; @@ -132,19 +132,19 @@ static void s3c24xx_audio_buffdone(struct s3c2410_dma_chan *channel, spin_lock(&prtd->lock); if (prtd->state & ST_RUNNING && !s3c_dma_has_circular()) { prtd->dma_loaded--; - s3c24xx_pcm_enqueue(substream); + s3c_dma_enqueue(substream); } spin_unlock(&prtd->lock); } -static int s3c24xx_pcm_hw_params(struct snd_pcm_substream *substream, +static int s3c_dma_hw_params(struct snd_pcm_substream *substream, struct snd_pcm_hw_params *params) { struct snd_pcm_runtime *runtime = substream->runtime; struct s3c24xx_runtime_data *prtd = runtime->private_data; struct snd_soc_pcm_runtime *rtd = substream->private_data; - struct s3c24xx_pcm_dma_params *dma = rtd->dai->cpu_dai->dma_data; + struct s3c_dma_params *dma = rtd->dai->cpu_dai->dma_data; unsigned long totbytes = params_buffer_bytes(params); int ret = 0; @@ -197,7 +197,7 @@ static int s3c24xx_pcm_hw_params(struct snd_pcm_substream *substream, return 0; } -static int s3c24xx_pcm_hw_free(struct snd_pcm_substream *substream) +static int s3c_dma_hw_free(struct snd_pcm_substream *substream) { struct s3c24xx_runtime_data *prtd = substream->runtime->private_data; @@ -214,7 +214,7 @@ static int s3c24xx_pcm_hw_free(struct snd_pcm_substream *substream) return 0; } -static int s3c24xx_pcm_prepare(struct snd_pcm_substream *substream) +static int s3c_dma_prepare(struct snd_pcm_substream *substream) { struct s3c24xx_runtime_data *prtd = substream->runtime->private_data; int ret = 0; @@ -247,12 +247,12 @@ static int s3c24xx_pcm_prepare(struct snd_pcm_substream *substream) prtd->dma_pos = prtd->dma_start; /* enqueue dma buffers */ - s3c24xx_pcm_enqueue(substream); + s3c_dma_enqueue(substream); return ret; } -static int s3c24xx_pcm_trigger(struct snd_pcm_substream *substream, int cmd) +static int s3c_dma_trigger(struct snd_pcm_substream *substream, int cmd) { struct s3c24xx_runtime_data *prtd = substream->runtime->private_data; int ret = 0; @@ -287,7 +287,7 @@ static int s3c24xx_pcm_trigger(struct snd_pcm_substream *substream, int cmd) } static snd_pcm_uframes_t -s3c24xx_pcm_pointer(struct snd_pcm_substream *substream) +s3c_dma_pointer(struct snd_pcm_substream *substream) { struct snd_pcm_runtime *runtime = substream->runtime; struct s3c24xx_runtime_data *prtd = runtime->private_data; @@ -322,7 +322,7 @@ s3c24xx_pcm_pointer(struct snd_pcm_substream *substream) return bytes_to_frames(substream->runtime, res); } -static int s3c24xx_pcm_open(struct snd_pcm_substream *substream) +static int s3c_dma_open(struct snd_pcm_substream *substream) { struct snd_pcm_runtime *runtime = substream->runtime; struct s3c24xx_runtime_data *prtd; @@ -330,7 +330,7 @@ static int s3c24xx_pcm_open(struct snd_pcm_substream *substream) pr_debug("Entered %s\n", __func__); snd_pcm_hw_constraint_integer(runtime, SNDRV_PCM_HW_PARAM_PERIODS); - snd_soc_set_runtime_hwparams(substream, &s3c24xx_pcm_hardware); + snd_soc_set_runtime_hwparams(substream, &s3c_dma_hardware); prtd = kzalloc(sizeof(struct s3c24xx_runtime_data), GFP_KERNEL); if (prtd == NULL) @@ -342,7 +342,7 @@ static int s3c24xx_pcm_open(struct snd_pcm_substream *substream) return 0; } -static int s3c24xx_pcm_close(struct snd_pcm_substream *substream) +static int s3c_dma_close(struct snd_pcm_substream *substream) { struct snd_pcm_runtime *runtime = substream->runtime; struct s3c24xx_runtime_data *prtd = runtime->private_data; @@ -350,14 +350,14 @@ static int s3c24xx_pcm_close(struct snd_pcm_substream *substream) pr_debug("Entered %s\n", __func__); if (!prtd) - pr_debug("s3c24xx_pcm_close called with prtd == NULL\n"); + pr_debug("s3c_dma_close called with prtd == NULL\n"); kfree(prtd); return 0; } -static int s3c24xx_pcm_mmap(struct snd_pcm_substream *substream, +static int s3c_dma_mmap(struct snd_pcm_substream *substream, struct vm_area_struct *vma) { struct snd_pcm_runtime *runtime = substream->runtime; @@ -370,23 +370,23 @@ static int s3c24xx_pcm_mmap(struct snd_pcm_substream *substream, runtime->dma_bytes); } -static struct snd_pcm_ops s3c24xx_pcm_ops = { - .open = s3c24xx_pcm_open, - .close = s3c24xx_pcm_close, +static struct snd_pcm_ops s3c_dma_ops = { + .open = s3c_dma_open, + .close = s3c_dma_close, .ioctl = snd_pcm_lib_ioctl, - .hw_params = s3c24xx_pcm_hw_params, - .hw_free = s3c24xx_pcm_hw_free, - .prepare = s3c24xx_pcm_prepare, - .trigger = s3c24xx_pcm_trigger, - .pointer = s3c24xx_pcm_pointer, - .mmap = s3c24xx_pcm_mmap, + .hw_params = s3c_dma_hw_params, + .hw_free = s3c_dma_hw_free, + .prepare = s3c_dma_prepare, + .trigger = s3c_dma_trigger, + .pointer = s3c_dma_pointer, + .mmap = s3c_dma_mmap, }; -static int s3c24xx_pcm_preallocate_dma_buffer(struct snd_pcm *pcm, int stream) +static int s3c_preallocate_dma_buffer(struct snd_pcm *pcm, int stream) { struct snd_pcm_substream *substream = pcm->streams[stream].substream; struct snd_dma_buffer *buf = &substream->dma_buffer; - size_t size = s3c24xx_pcm_hardware.buffer_bytes_max; + size_t size = s3c_dma_hardware.buffer_bytes_max; pr_debug("Entered %s\n", __func__); @@ -401,7 +401,7 @@ static int s3c24xx_pcm_preallocate_dma_buffer(struct snd_pcm *pcm, int stream) return 0; } -static void s3c24xx_pcm_free_dma_buffers(struct snd_pcm *pcm) +static void s3c_dma_free_dma_buffers(struct snd_pcm *pcm) { struct snd_pcm_substream *substream; struct snd_dma_buffer *buf; @@ -424,9 +424,9 @@ static void s3c24xx_pcm_free_dma_buffers(struct snd_pcm *pcm) } } -static u64 s3c24xx_pcm_dmamask = DMA_BIT_MASK(32); +static u64 s3c_dma_mask = DMA_BIT_MASK(32); -static int s3c24xx_pcm_new(struct snd_card *card, +static int s3c_dma_new(struct snd_card *card, struct snd_soc_dai *dai, struct snd_pcm *pcm) { int ret = 0; @@ -434,19 +434,19 @@ static int s3c24xx_pcm_new(struct snd_card *card, pr_debug("Entered %s\n", __func__); if (!card->dev->dma_mask) - card->dev->dma_mask = &s3c24xx_pcm_dmamask; + card->dev->dma_mask = &s3c_dma_mask; if (!card->dev->coherent_dma_mask) card->dev->coherent_dma_mask = 0xffffffff; if (dai->playback.channels_min) { - ret = s3c24xx_pcm_preallocate_dma_buffer(pcm, + ret = s3c_preallocate_dma_buffer(pcm, SNDRV_PCM_STREAM_PLAYBACK); if (ret) goto out; } if (dai->capture.channels_min) { - ret = s3c24xx_pcm_preallocate_dma_buffer(pcm, + ret = s3c_preallocate_dma_buffer(pcm, SNDRV_PCM_STREAM_CAPTURE); if (ret) goto out; @@ -457,9 +457,9 @@ static int s3c24xx_pcm_new(struct snd_card *card, struct snd_soc_platform s3c24xx_soc_platform = { .name = "s3c24xx-audio", - .pcm_ops = &s3c24xx_pcm_ops, - .pcm_new = s3c24xx_pcm_new, - .pcm_free = s3c24xx_pcm_free_dma_buffers, + .pcm_ops = &s3c_dma_ops, + .pcm_new = s3c_dma_new, + .pcm_free = s3c_dma_free_dma_buffers, }; EXPORT_SYMBOL_GPL(s3c24xx_soc_platform); @@ -476,5 +476,5 @@ static void __exit s3c24xx_soc_platform_exit(void) module_exit(s3c24xx_soc_platform_exit); MODULE_AUTHOR("Ben Dooks, <ben(a)simtec.co.uk>"); -MODULE_DESCRIPTION("Samsung S3C24XX PCM DMA module"); +MODULE_DESCRIPTION("Samsung S3C Audio DMA module"); MODULE_LICENSE("GPL"); diff --git a/sound/soc/s3c24xx/s3c24xx-pcm.h b/sound/soc/s3c24xx/s3c24xx-pcm.h index 0088c79..8cbc071 100644 --- a/sound/soc/s3c24xx/s3c24xx-pcm.h +++ b/sound/soc/s3c24xx/s3c24xx-pcm.h @@ -9,13 +9,13 @@ * ALSA PCM interface for the Samsung S3C24xx CPU */ -#ifndef _S3C24XX_PCM_H -#define _S3C24XX_PCM_H +#ifndef _S3C_AUDIO_H +#define _S3C_AUDIO_H #define ST_RUNNING (1<<0) #define ST_OPENED (1<<1) -struct s3c24xx_pcm_dma_params { +struct s3c_dma_params { struct s3c2410_dma_client *client; /* stream identifier */ int channel; /* Channel ID */ dma_addr_t dma_addr; diff --git a/sound/soc/s3c24xx/s3c64xx-i2s.c b/sound/soc/s3c24xx/s3c64xx-i2s.c index d68cae1..719d63c 100644 --- a/sound/soc/s3c24xx/s3c64xx-i2s.c +++ b/sound/soc/s3c24xx/s3c64xx-i2s.c @@ -46,7 +46,7 @@ static struct s3c2410_dma_client s3c64xx_dma_client_in = { .name = "I2S PCM Stereo in" }; -static struct s3c24xx_pcm_dma_params s3c64xx_i2s_pcm_stereo_out[2] = { +static struct s3c_dma_params s3c64xx_i2s_pcm_stereo_out[2] = { [0] = { .channel = DMACH_I2S0_OUT, .client = &s3c64xx_dma_client_out, @@ -61,7 +61,7 @@ static struct s3c24xx_pcm_dma_params s3c64xx_i2s_pcm_stereo_out[2] = { }, }; -static struct s3c24xx_pcm_dma_params s3c64xx_i2s_pcm_stereo_in[2] = { +static struct s3c_dma_params s3c64xx_i2s_pcm_stereo_in[2] = { [0] = { .channel = DMACH_I2S0_IN, .client = &s3c64xx_dma_client_in, -- 1.6.2.5

2 1

[alsa-devel] [PATCHv2 5/7] S3C AUDIO: Added platform data header
by Jassi Brar 18 Nov '09

18 Nov '09

Many SoCs have their I2S pins MUXed with other functions. So we need to pass a callback for driver to configure the pins appropriately. Hence, the need of platform data and this header. As and when needed new callbacks and structure pointers maybe added to this header. Signed-off-by: Jassi Brar <jassi.brar(a)samsung.com> --- arch/arm/plat-s3c/include/plat/audio.h | 17 +++++++++++++++++ 1 files changed, 17 insertions(+), 0 deletions(-) create mode 100644 arch/arm/plat-s3c/include/plat/audio.h diff --git a/arch/arm/plat-s3c/include/plat/audio.h b/arch/arm/plat-s3c/include/plat/audio.h new file mode 100644 index 0000000..f22d23b --- /dev/null +++ b/arch/arm/plat-s3c/include/plat/audio.h @@ -0,0 +1,17 @@ +/* arch/arm/plat-s3c/include/plat/audio.h + * + * Copyright (c) 2009 Samsung Electronics Co. Ltd + * Author: Jaswinder Singh <jassi.brar(a)samsung.com> + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License version 2 as + * published by the Free Software Foundation. + */ + +/** + * struct s3c_audio_pdata - common platform data for audio device drivers + * @cfg_gpio: Callback function to setup mux'ed pins in I2S/PCM/AC97 mode + */ +struct s3c_audio_pdata { + int (*cfg_gpio)(struct platform_device *); +}; -- 1.6.2.5

2 1

[alsa-devel] Quirk to disable master volume control in PCM2702
by Javier Kohen 17 Nov '09

17 Nov '09

[Alan Stern on BCC] Hi ALSA developers, I've written the attached patch to disable the master volume control in this chipset. The datasheet [1] documents two independent channel volume controls, one master mute control and one master volume control. However, at least on my device (a Fubar USB DAC), the master volume control always returns USB stalls when queried for any of its parameters (min/max/res/cur). All other controls work as expected, both at the protocol and at the application levels. Read on for the gory details. Otherwise please take the patch at face value. I'm ready to make changes if necessary to make it more fitting to the rest of the code. It would be very appreciated if this can go into 2.6.32, or in a stable patch shortly after. Normally I wouldn't give this problem a second thought, since in the worst case a non-functional control appears in the mixer. Only that Alan Stern submitted a patch to the USB subsystem during the development of kernel 2.6.31 that enables the sending of the Clear-TT-Buffer request to USB hubs on stalls from devices. For some reason upon receiving the Clear-TT-Buffer the audio goes mute, even though the kernel keeps sending the audio stream to the device. There is an ongoing thread on the linux-usb ML where Alan argues that sending the request is the correct behavior and it shouldn't have the effect I'm seeing. Since I lack any knowledge of the USB protocol, I take his word. However, it seems that either the USB specs are wrong, or my USB hub or the card are buggy. In the meantime I'm trying to get another hub to compare. Unfortunately I have to rely on the hub, because the PCM2702 and my motherboard don't interact well. After a while the sound is degraded, first into a hiss, then into pure noise. Other users have complained on different forums; one of the wrote to alsa-user a month ago. I haven't been able to make any progress to track this issue with usbmon and ALSA verbose debug messages, to nobody's surprise, since I'm a complete layman in that area. Any help with this would be appreciated as well. [1] http://focus.ti.com/docs/prod/folders/print/pcm2702.html

3 5

[alsa-devel] [PATCHv2 4/7] S3C64XX PCM: Added PCLK clock source for the PCM controllers
by Jassi Brar 17 Nov '09

17 Nov '09

Signed-off-by: Jassi Brar <jassi.brar(a)samsung.com> --- arch/arm/plat-s3c64xx/clock.c | 12 ++++++++++++ 1 files changed, 12 insertions(+), 0 deletions(-) diff --git a/arch/arm/plat-s3c64xx/clock.c b/arch/arm/plat-s3c64xx/clock.c index 7a36e89..3ab564e 100644 --- a/arch/arm/plat-s3c64xx/clock.c +++ b/arch/arm/plat-s3c64xx/clock.c @@ -129,6 +129,18 @@ static struct clk init_clocks_disable[] = { .enable = s3c64xx_pclk_ctrl, .ctrlbit = S3C_CLKCON_PCLK_IIS1, }, { + .name = "pcm", + .id = 0, + .parent = &clk_p, + .enable = s3c64xx_pclk_ctrl, + .ctrlbit = S3C_CLKCON_PCLK_PCM0, + }, { + .name = "pcm", + .id = 1, + .parent = &clk_p, + .enable = s3c64xx_pclk_ctrl, + .ctrlbit = S3C_CLKCON_PCLK_PCM1, + }, { .name = "spi", .id = 0, .parent = &clk_p, -- 1.6.2.5

3 3

[alsa-devel] [PATCHv2 6/7] S3C64XX PCM: Defined PCM controller platform devices
by Jassi Brar 17 Nov '09

17 Nov '09

Signed-off-by: Jassi Brar <jassi.brar(a)samsung.com> --- arch/arm/plat-s3c/include/plat/devs.h | 3 + arch/arm/plat-s3c64xx/dev-audio.c | 101 ++++++++++++++++++++++++++++++++- 2 files changed, 103 insertions(+), 1 deletions(-) diff --git a/arch/arm/plat-s3c/include/plat/devs.h b/arch/arm/plat-s3c/include/plat/devs.h index 0f540ea..932cbbb 100644 --- a/arch/arm/plat-s3c/include/plat/devs.h +++ b/arch/arm/plat-s3c/include/plat/devs.h @@ -28,6 +28,9 @@ extern struct platform_device s3c64xx_device_iis0; extern struct platform_device s3c64xx_device_iis1; extern struct platform_device s3c64xx_device_iisv4; +extern struct platform_device s3c64xx_device_pcm0; +extern struct platform_device s3c64xx_device_pcm1; + extern struct platform_device s3c_device_fb; extern struct platform_device s3c_device_usb; extern struct platform_device s3c_device_lcd; diff --git a/arch/arm/plat-s3c64xx/dev-audio.c b/arch/arm/plat-s3c64xx/dev-audio.c index 1322beb..9e07344 100644 --- a/arch/arm/plat-s3c64xx/dev-audio.c +++ b/arch/arm/plat-s3c64xx/dev-audio.c @@ -15,9 +15,14 @@ #include <mach/irqs.h> #include <mach/map.h> +#include <mach/dma.h> +#include <mach/gpio.h> #include <plat/devs.h> - +#include <plat/audio.h> +#include <plat/gpio-bank-d.h> +#include <plat/gpio-bank-e.h> +#include <plat/gpio-cfg.h> static struct resource s3c64xx_iis0_resource[] = { [0] = { @@ -66,3 +71,97 @@ struct platform_device s3c64xx_device_iisv4 = { .resource = s3c64xx_iisv4_resource, }; EXPORT_SYMBOL(s3c64xx_device_iisv4); + + +/* PCM Controller platform_devices */ + +static int s3c64xx_pcm_cfg_gpio(struct platform_device *pdev) +{ + switch (pdev->id) { + case 0: + s3c_gpio_cfgpin(S3C64XX_GPD(0), S3C64XX_GPD0_PCM0_SCLK); + s3c_gpio_cfgpin(S3C64XX_GPD(1), S3C64XX_GPD1_PCM0_EXTCLK); + s3c_gpio_cfgpin(S3C64XX_GPD(2), S3C64XX_GPD2_PCM0_FSYNC); + s3c_gpio_cfgpin(S3C64XX_GPD(3), S3C64XX_GPD3_PCM0_SIN); + s3c_gpio_cfgpin(S3C64XX_GPD(4), S3C64XX_GPD4_PCM0_SOUT); + break; + case 1: + s3c_gpio_cfgpin(S3C64XX_GPE(0), S3C64XX_GPE0_PCM1_SCLK); + s3c_gpio_cfgpin(S3C64XX_GPE(1), S3C64XX_GPE1_PCM1_EXTCLK); + s3c_gpio_cfgpin(S3C64XX_GPE(2), S3C64XX_GPE2_PCM1_FSYNC); + s3c_gpio_cfgpin(S3C64XX_GPE(3), S3C64XX_GPE3_PCM1_SIN); + s3c_gpio_cfgpin(S3C64XX_GPE(4), S3C64XX_GPE4_PCM1_SOUT); + break; + default: + printk(KERN_DEBUG "Invalid PCM Controller number!"); + return -EINVAL; + } + + return 0; +} + +static struct resource s3c64xx_pcm0_resource[] = { + [0] = { + .start = S3C64XX_PA_PCM0, + .end = S3C64XX_PA_PCM0 + 0x100 - 1, + .flags = IORESOURCE_MEM, + }, + [1] = { + .start = DMACH_PCM0_TX, + .end = DMACH_PCM0_TX, + .flags = IORESOURCE_DMA, + }, + [2] = { + .start = DMACH_PCM0_RX, + .end = DMACH_PCM0_RX, + .flags = IORESOURCE_DMA, + }, +}; + +struct s3c_audio_pdata s3c_pcm0_pdata = { + .cfg_gpio = s3c64xx_pcm_cfg_gpio, +}; + +struct platform_device s3c64xx_device_pcm0 = { + .name = "samsung-pcm", + .id = 0, + .num_resources = ARRAY_SIZE(s3c64xx_pcm0_resource), + .resource = s3c64xx_pcm0_resource, + .dev = { + .platform_data = &s3c_pcm0_pdata, + }, +}; +EXPORT_SYMBOL(s3c64xx_device_pcm0); + +static struct resource s3c64xx_pcm1_resource[] = { + [0] = { + .start = S3C64XX_PA_PCM1, + .end = S3C64XX_PA_PCM1 + 0x100 - 1, + .flags = IORESOURCE_MEM, + }, + [1] = { + .start = DMACH_PCM1_TX, + .end = DMACH_PCM1_TX, + .flags = IORESOURCE_DMA, + }, + [2] = { + .start = DMACH_PCM1_RX, + .end = DMACH_PCM1_RX, + .flags = IORESOURCE_DMA, + }, +}; + +struct s3c_audio_pdata s3c_pcm1_pdata = { + .cfg_gpio = s3c64xx_pcm_cfg_gpio, +}; + +struct platform_device s3c64xx_device_pcm1 = { + .name = "samsung-pcm", + .id = 1, + .num_resources = ARRAY_SIZE(s3c64xx_pcm1_resource), + .resource = s3c64xx_pcm1_resource, + .dev = { + .platform_data = &s3c_pcm1_pdata, + }, +}; +EXPORT_SYMBOL(s3c64xx_device_pcm1); -- 1.6.2.5

3 2

[alsa-devel] HDA Intel IDT 92HD71B7X - HP Pavilion DV7-1299EF - Only the left speaker is working
by Wael Nasreddine (a.k.a eMxyzptlk) 17 Nov '09

17 Nov '09

On Wed, Jul 29, 2009 at 8:55 AM, Takashi Iwai<tiwai at suse.de> wrote: > At Tue, 28 Jul 2009 20:07:29 +0200, > Wael Nasreddine (a.k.a eMxyzptlk) wrote: >> >> On Mon, Jul 27, 2009 at 3:15 PM, Takashi Iwai <tiwai at suse.de> wrote: >> >> At Sat, 25 Jul 2009 21:44:46 +0200, >> Wael Nasreddine (a.k.a eMxyzptlk) wrote: >> > >> > I still got no solution for this problem, >> >> Which problem? >> It'd be helpful if you give a problem summary and what you've done >> until now (and don't do top-posting)... >> >> thanks, >> >> Takashi >> >> Hi Takashi, >> >> I'm sorry I didn't notice that the problem wasn't quoted in my last message, >> anyway the whole topic is included in the forwarded message below, I tried >> using hda-verb and hda-analyzer, like you suggested in one of your emails, but >> since I don't even know what I'm looking for nor what to try, I did not got >> too far! >> >> What else do you suggest? Are you aware of anyone having a similar issue I can >> query to help me figure it out ? > > First off, try the very latest alsa-driver snapshot. > ftp://ftp.kernel.org/pub/linux/kernel/people/tiwai/snapshot/alsa-driver-sna… > > The problem is that BIOS sets only one stereo speaker in the pin > configuration, so the driver cannot know what to do with another > speaker. In short, it's a BIOS bug. > > To overcome that, you need to figure out which pin corresponds to the > speaker. The rest available (analog) output pins are 0x0f and 0x14. > Set these as output pins, and connect to DAC. For example, > > # hda-verb /dev/snd/hwC0D0 0x0f SET_PIN_WID 0x40 > # hda-verb /dev/snd/hwC0D0 0x0f SET_CONN 0 > > which enables the output of the pin 0x0f, then connects to the first > DAC (= 0x10). Similarly, > > # hda-verb /dev/snd/hwC0D0 0x14 SET_PIN_WID 0x40 > # hda-verb /dev/snd/hwC0D0 0x15 SET_CONN 0 > > which enables the output of the pin 0x14, then changes the connection > of its mux (0x15) to the first DAC (0x10). > > If these don't help, it's possible that some GPIO bits play any role. > Play with GPIO bits, which can be also changed via hda-verb. > > > Takashi > Hey Takashi, I tried what you have suggested above, and I also tried to upgrade the BIOS (it's F.2C now) but I still have the same problem with my sound, here's an updated alsa-info output http://www.alsa-project.org/db/?f=2cdfc5aa67bc0baf98d38c13806739afb6f5163f I also tried to play a bit with GPIO bits but I don't know much about that topic either, I tried hda-verb /dev/snd/hwC0D0 0x01 SET_GPIO_MASK 0x0f hda-verb /dev/snd/hwC0D0 0x01 SET_GPIO_DATA 0x0f and hda-verb /dev/snd/hwC0D0 0x01 SET_GPIO_DIR 0x0f hda-verb /dev/snd/hwC0D0 0x01 SET_GPIO_DATA 0x0f But that did not affect anything, the output is only from one speaker (left one), what do you suggest? Thanks -- Wael Nasreddine Weem Chief-Development Officer - http://www.weem.com Blog : http://wael.nasreddine.com E-mail : wael.nasreddine(a)weem.com gTalk : wael.nasreddine(a)gmail.com Tel : +33.6.32.94.70.13 Skype : eMxyzptlk Twitter : @eMxyzptlk PGP: 1024D/C8DD18A2 06F6 1622 4BC8 4CEB D724 DE12 5565 3945 C8DD 18A2 .: An infinite number of monkeys typing into GNU emacs, would never make a good program. (L. Torvalds 1995) :.

2 25

[alsa-devel] [PATCH] cs423x: update control names
by Krzysztof Helt 17 Nov '09

17 Nov '09

From: Krzysztof Helt <krzysztof.h1(a)wp.pl> Update control names to be more closer to their meaning. Change the "Mono" name to the "Beep" as this line is usually used to forward the PC beeper signal to sound card's output. Update names for both cs423x and wss. Clean up cs4235 controls according to the cs4235 doc. Also, delete one misnamed cs4231 register define. Signed-off-by: Krzysztof Helt <krzysztof.h1(a)wp.pl> --- I don't know what is requirement for the "Master Playabck Volume" control. Does it need to control inputs looped to output? E.g. The cs4236 has a DAC control which can attenuate all playback sources (PCM/FM/Wavetable/ADC loop) but it does not control analog inputs (mic/line in/cd) which are mixed through analog mixer just after the DAC output and the DAC control. It matters for the OSS layer, which does map the "Master Playback Volume" as a "Volume" control, but the "Master DAC Volume" is recognized by the OSS layer. Regards, Krzysztof include/sound/cs4231-regs.h | 1 - sound/isa/cs423x/cs4236_lib.c | 53 +++++++++++++++++----------------------- sound/isa/wss/wss_lib.c | 8 +++--- 3 files changed, 27 insertions(+), 35 deletions(-) diff --git a/include/sound/cs4231-regs.h b/include/sound/cs4231-regs.h index 9264753..66d28c2 100644 --- a/include/sound/cs4231-regs.h +++ b/include/sound/cs4231-regs.h @@ -70,7 +70,6 @@ #define AD1845_PWR_DOWN 0x1b /* power down control */ #define CS4235_LEFT_MASTER 0x1b /* left master output control */ #define CS4231_REC_FORMAT 0x1c /* clock and data format - record - bits 7-0 MCE */ -#define CS4231_PLY_VAR_FREQ 0x1d /* playback variable frequency */ #define AD1845_CLOCK 0x1d /* crystal clock select and total power down */ #define CS4235_RIGHT_MASTER 0x1d /* right master output control */ #define CS4231_REC_UPR_CNT 0x1e /* record upper count */ diff --git a/sound/isa/cs423x/cs4236_lib.c b/sound/isa/cs423x/cs4236_lib.c index 1b1ad1c..9ca473a 100644 --- a/sound/isa/cs423x/cs4236_lib.c +++ b/sound/isa/cs423x/cs4236_lib.c @@ -734,11 +734,11 @@ static int snd_cs4235_put_output_accu(struct snd_kcontrol *kcontrol, struct snd_ static struct snd_kcontrol_new snd_cs4236_controls[] = { -CS4236_DOUBLE("Master Digital Playback Switch", 0, +CS4236_DOUBLE("Master DAC Playback Switch", 0, CS4236_LEFT_MASTER, CS4236_RIGHT_MASTER, 7, 7, 1, 1), -CS4236_DOUBLE("Master Digital Capture Switch", 0, +CS4236_DOUBLE("Master DAC Capture Switch", 0, CS4236_DAC_MUTE, CS4236_DAC_MUTE, 7, 6, 1, 1), -CS4236_MASTER_DIGITAL("Master Digital Volume", 0), +CS4236_MASTER_DIGITAL("Master DAC Volume", 0), CS4236_DOUBLE("Capture Boost Volume", 0, CS4236_LEFT_MIX_CTRL, CS4236_RIGHT_MIX_CTRL, 5, 5, 3, 1), @@ -798,10 +798,10 @@ WSS_DOUBLE("CD Capture Switch", 0, CS4236_DOUBLE1("Mono Output Playback Switch", 0, CS4231_MONO_CTRL, CS4236_RIGHT_MIX_CTRL, 6, 7, 1, 1), -CS4236_DOUBLE1("Mono Playback Switch", 0, +CS4236_DOUBLE1("Beep Playback Switch", 0, CS4231_MONO_CTRL, CS4236_LEFT_MIX_CTRL, 7, 7, 1, 1), -WSS_SINGLE("Mono Playback Volume", 0, CS4231_MONO_CTRL, 0, 15, 1), -WSS_SINGLE("Mono Playback Bypass", 0, CS4231_MONO_CTRL, 5, 1, 0), +WSS_SINGLE("Beep Playback Volume", 0, CS4231_MONO_CTRL, 0, 15, 1), +WSS_SINGLE("Beep Bypass Playback Switch", 0, CS4231_MONO_CTRL, 5, 1, 0), WSS_DOUBLE("Capture Volume", 0, CS4231_LEFT_INPUT, CS4231_RIGHT_INPUT, 0, 0, 15, 0), @@ -815,31 +815,27 @@ CS4236_DOUBLE1("Digital Loopback Playback Volume", 0, static struct snd_kcontrol_new snd_cs4235_controls[] = { -WSS_DOUBLE("Master Switch", 0, +WSS_DOUBLE("Master Playback Switch", 0, CS4235_LEFT_MASTER, CS4235_RIGHT_MASTER, 7, 7, 1, 1), -WSS_DOUBLE("Master Volume", 0, +WSS_DOUBLE("Master Playback Volume", 0, CS4235_LEFT_MASTER, CS4235_RIGHT_MASTER, 0, 0, 31, 1), CS4235_OUTPUT_ACCU("Playback Volume", 0), -CS4236_DOUBLE("Master Digital Playback Switch", 0, - CS4236_LEFT_MASTER, CS4236_RIGHT_MASTER, 7, 7, 1, 1), -CS4236_DOUBLE("Master Digital Capture Switch", 0, - CS4236_DAC_MUTE, CS4236_DAC_MUTE, 7, 6, 1, 1), -CS4236_MASTER_DIGITAL("Master Digital Volume", 0), - -WSS_DOUBLE("Master Digital Playback Switch", 1, +WSS_DOUBLE("Synth Playback Switch", 1, CS4231_LEFT_LINE_IN, CS4231_RIGHT_LINE_IN, 7, 7, 1, 1), -WSS_DOUBLE("Master Digital Capture Switch", 1, +WSS_DOUBLE("Synth Capture Switch", 1, CS4231_LEFT_LINE_IN, CS4231_RIGHT_LINE_IN, 6, 6, 1, 1), -WSS_DOUBLE("Master Digital Volume", 1, +WSS_DOUBLE("Synth Volume", 1, CS4231_LEFT_LINE_IN, CS4231_RIGHT_LINE_IN, 0, 0, 31, 1), CS4236_DOUBLE("Capture Volume", 0, CS4236_LEFT_MIX_CTRL, CS4236_RIGHT_MIX_CTRL, 5, 5, 3, 1), -WSS_DOUBLE("PCM Switch", 0, +WSS_DOUBLE("PCM Playback Switch", 0, CS4231_LEFT_OUTPUT, CS4231_RIGHT_OUTPUT, 7, 7, 1, 1), +WSS_DOUBLE("PCM Capture Switch", 0, + CS4236_DAC_MUTE, CS4236_DAC_MUTE, 7, 6, 1, 1), WSS_DOUBLE("PCM Volume", 0, CS4231_LEFT_OUTPUT, CS4231_RIGHT_OUTPUT, 0, 0, 63, 1), @@ -855,28 +851,25 @@ CS4236_DOUBLE("Mic Capture Switch", 0, CS4236_DOUBLE("Mic Playback Switch", 0, CS4236_LEFT_MIC, CS4236_RIGHT_MIC, 6, 6, 1, 1), CS4236_SINGLE("Mic Volume", 0, CS4236_LEFT_MIC, 0, 31, 1), -CS4236_SINGLE("Mic Playback Boost", 0, CS4236_LEFT_MIC, 5, 1, 0), +CS4236_SINGLE("Mic Boost (+20db)", 0, CS4236_LEFT_MIC, 5, 1, 0), -WSS_DOUBLE("Aux Playback Switch", 0, +WSS_DOUBLE("Line Playback Switch", 0, CS4231_AUX1_LEFT_INPUT, CS4231_AUX1_RIGHT_INPUT, 7, 7, 1, 1), -WSS_DOUBLE("Aux Capture Switch", 0, +WSS_DOUBLE("Line Capture Switch", 0, CS4231_AUX1_LEFT_INPUT, CS4231_AUX1_RIGHT_INPUT, 6, 6, 1, 1), -WSS_DOUBLE("Aux Volume", 0, +WSS_DOUBLE("Line Volume", 0, CS4231_AUX1_LEFT_INPUT, CS4231_AUX1_RIGHT_INPUT, 0, 0, 31, 1), -WSS_DOUBLE("Aux Playback Switch", 1, +WSS_DOUBLE("CD Playback Switch", 1, CS4231_AUX2_LEFT_INPUT, CS4231_AUX2_RIGHT_INPUT, 7, 7, 1, 1), -WSS_DOUBLE("Aux Capture Switch", 1, +WSS_DOUBLE("CD Capture Switch", 1, CS4231_AUX2_LEFT_INPUT, CS4231_AUX2_RIGHT_INPUT, 6, 6, 1, 1), -WSS_DOUBLE("Aux Volume", 1, +WSS_DOUBLE("CD Volume", 1, CS4231_AUX2_LEFT_INPUT, CS4231_AUX2_RIGHT_INPUT, 0, 0, 31, 1), -CS4236_DOUBLE1("Master Mono Switch", 0, - CS4231_MONO_CTRL, CS4236_RIGHT_MIX_CTRL, 6, 7, 1, 1), - -CS4236_DOUBLE1("Mono Switch", 0, +CS4236_DOUBLE1("Beep Playback Switch", 0, CS4231_MONO_CTRL, CS4236_LEFT_MIX_CTRL, 7, 7, 1, 1), -WSS_SINGLE("Mono Volume", 0, CS4231_MONO_CTRL, 0, 15, 1), +WSS_SINGLE("Beep Playback Volume", 0, CS4231_MONO_CTRL, 0, 15, 1), WSS_DOUBLE("Analog Loopback Switch", 0, CS4231_LEFT_INPUT, CS4231_RIGHT_INPUT, 7, 7, 1, 0), diff --git a/sound/isa/wss/wss_lib.c b/sound/isa/wss/wss_lib.c index 705db09..d09366e 100644 --- a/sound/isa/wss/wss_lib.c +++ b/sound/isa/wss/wss_lib.c @@ -2224,7 +2224,7 @@ WSS_DOUBLE_TLV("Capture Volume", 0, CS4231_LEFT_INPUT, CS4231_RIGHT_INPUT, .get = snd_wss_get_mux, .put = snd_wss_put_mux, }, -WSS_DOUBLE("Mic Boost", 0, +WSS_DOUBLE("Mic Boost (+20db)", 0, CS4231_LEFT_INPUT, CS4231_RIGHT_INPUT, 5, 5, 1, 0), WSS_SINGLE("Loopback Capture Switch", 0, CS4231_LOOPBACK, 0, 1, 0), @@ -2235,14 +2235,14 @@ WSS_DOUBLE("Line Playback Switch", 0, WSS_DOUBLE_TLV("Line Playback Volume", 0, CS4231_LEFT_LINE_IN, CS4231_RIGHT_LINE_IN, 0, 0, 31, 1, db_scale_5bit_12db_max), -WSS_SINGLE("Mono Playback Switch", 0, +WSS_SINGLE("Beep Playback Switch", 0, CS4231_MONO_CTRL, 7, 1, 1), -WSS_SINGLE_TLV("Mono Playback Volume", 0, +WSS_SINGLE_TLV("Beep Playback Volume", 0, CS4231_MONO_CTRL, 0, 15, 1, db_scale_4bit), WSS_SINGLE("Mono Output Playback Switch", 0, CS4231_MONO_CTRL, 6, 1, 1), -WSS_SINGLE("Mono Output Playback Bypass", 0, +WSS_SINGLE("Beep Bypass Playback Switch", 0, CS4231_MONO_CTRL, 5, 1, 0), }; -- 1.6.4 ---------------------------------------------------------------------- Audi kilka tysiecy zlotych taniej? Przebieraj wsrod tysiecy ogloszen! Kliknij >>> http://link.interia.pl/f2424

2 3

[alsa-devel] [PATCHv2 7/7] S3C PCM: Added the CPU driver for PCM controllers
by Jassi Brar 17 Nov '09

17 Nov '09

Signed-off-by: Jassi Brar <jassi.brar(a)samsung.com> --- sound/soc/s3c24xx/Kconfig | 3 + sound/soc/s3c24xx/Makefile | 2 + sound/soc/s3c24xx/s3c-pcm.c | 552 +++++++++++++++++++++++++++++++++++++++++++ sound/soc/s3c24xx/s3c-pcm.h | 123 ++++++++++ 4 files changed, 680 insertions(+), 0 deletions(-) create mode 100644 sound/soc/s3c24xx/s3c-pcm.c create mode 100644 sound/soc/s3c24xx/s3c-pcm.h diff --git a/sound/soc/s3c24xx/Kconfig b/sound/soc/s3c24xx/Kconfig index d7912f1..b489f1a 100644 --- a/sound/soc/s3c24xx/Kconfig +++ b/sound/soc/s3c24xx/Kconfig @@ -24,6 +24,9 @@ config SND_S3C64XX_SOC_I2S select SND_S3C_I2SV2_SOC select S3C64XX_DMA +config SND_S3C_SOC_PCM + tristate + config SND_S3C2443_SOC_AC97 tristate select S3C2410_DMA diff --git a/sound/soc/s3c24xx/Makefile b/sound/soc/s3c24xx/Makefile index 3bdb74d..8835d59 100644 --- a/sound/soc/s3c24xx/Makefile +++ b/sound/soc/s3c24xx/Makefile @@ -5,6 +5,7 @@ snd-soc-s3c2412-i2s-objs := s3c2412-i2s.o snd-soc-s3c64xx-i2s-objs := s3c64xx-i2s.o snd-soc-s3c2443-ac97-objs := s3c2443-ac97.o snd-soc-s3c-i2s-v2-objs := s3c-i2s-v2.o +snd-soc-s3c-pcm-objs := s3c-pcm.o obj-$(CONFIG_SND_S3C24XX_SOC) += snd-soc-s3c24xx.o obj-$(CONFIG_SND_S3C24XX_SOC_I2S) += snd-soc-s3c24xx-i2s.o @@ -12,6 +13,7 @@ obj-$(CONFIG_SND_S3C2443_SOC_AC97) += snd-soc-s3c2443-ac97.o obj-$(CONFIG_SND_S3C2412_SOC_I2S) += snd-soc-s3c2412-i2s.o obj-$(CONFIG_SND_S3C64XX_SOC_I2S) += snd-soc-s3c64xx-i2s.o obj-$(CONFIG_SND_S3C_I2SV2_SOC) += snd-soc-s3c-i2s-v2.o +obj-$(CONFIG_SND_S3C_SOC_PCM) += snd-soc-s3c-pcm.o # S3C24XX Machine Support snd-soc-jive-wm8750-objs := jive_wm8750.o diff --git a/sound/soc/s3c24xx/s3c-pcm.c b/sound/soc/s3c24xx/s3c-pcm.c new file mode 100644 index 0000000..7fbf88c --- /dev/null +++ b/sound/soc/s3c24xx/s3c-pcm.c @@ -0,0 +1,552 @@ +/* sound/soc/s3c24xx/s3c-pcm.c + * + * ALSA SoC Audio Layer - S3C PCM-Controller driver + * + * Copyright (c) 2009 Samsung Electronics Co. Ltd + * Author: Jaswinder Singh <jassi.brar(a)samsung.com> + * based upon I2S drivers by Ben Dooks. + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License version 2 as + * published by the Free Software Foundation. + */ + +#include <linux/init.h> +#include <linux/module.h> +#include <linux/device.h> +#include <linux/delay.h> +#include <linux/clk.h> +#include <linux/kernel.h> +#include <linux/gpio.h> +#include <linux/io.h> + +#include <sound/core.h> +#include <sound/pcm.h> +#include <sound/pcm_params.h> +#include <sound/initval.h> +#include <sound/soc.h> + +#include <plat/audio.h> +#include <plat/dma.h> + +#include "s3c-dma.h" +#include "s3c-pcm.h" + +static struct s3c2410_dma_client s3c_pcm_dma_client_out = { + .name = "PCM Stereo out" +}; + +static struct s3c2410_dma_client s3c_pcm_dma_client_in = { + .name = "PCM Stereo in" +}; + +static struct s3c_dma_params s3c_pcm_stereo_out[] = { + [0] = { + .client = &s3c_pcm_dma_client_out, + .dma_size = 4, + }, + [1] = { + .client = &s3c_pcm_dma_client_out, + .dma_size = 4, + }, +}; + +static struct s3c_dma_params s3c_pcm_stereo_in[] = { + [0] = { + .client = &s3c_pcm_dma_client_in, + .dma_size = 4, + }, + [1] = { + .client = &s3c_pcm_dma_client_in, + .dma_size = 4, + }, +}; + +static struct s3c_pcm_info s3c_pcm[2]; + +static inline struct s3c_pcm_info *to_info(struct snd_soc_dai *cpu_dai) +{ + return cpu_dai->private_data; +} + +static void s3c_pcm_snd_txctrl(struct s3c_pcm_info *pcm, int on) +{ + void __iomem *regs = pcm->regs; + u32 ctl, clkctl; + + clkctl = readl(regs + S3C_PCM_CLKCTL); + ctl = readl(regs + S3C_PCM_CTL); + ctl &= ~(S3C_PCM_CTL_TXDIPSTICK_MASK + << S3C_PCM_CTL_TXDIPSTICK_SHIFT); + + if (on) { + ctl |= S3C_PCM_CTL_TXDMA_EN; + ctl |= S3C_PCM_CTL_TXFIFO_EN; + ctl |= S3C_PCM_CTL_ENABLE; + ctl |= (0x20<<S3C_PCM_CTL_TXDIPSTICK_SHIFT); + clkctl |= S3C_PCM_CLKCTL_SERCLK_EN; + } else { + ctl &= ~S3C_PCM_CTL_TXDMA_EN; + ctl &= ~S3C_PCM_CTL_TXFIFO_EN; + + if (!(ctl & S3C_PCM_CTL_RXFIFO_EN)) { + ctl &= ~S3C_PCM_CTL_ENABLE; + if (!pcm->idleclk) + clkctl |= S3C_PCM_CLKCTL_SERCLK_EN; + } + } + + writel(clkctl, regs + S3C_PCM_CLKCTL); + writel(ctl, regs + S3C_PCM_CTL); +} + +static void s3c_pcm_snd_rxctrl(struct s3c_pcm_info *pcm, int on) +{ + void __iomem *regs = pcm->regs; + u32 ctl, clkctl; + + ctl = readl(regs + S3C_PCM_CTL); + clkctl = readl(regs + S3C_PCM_CLKCTL); + + if (on) { + ctl |= S3C_PCM_CTL_RXDMA_EN; + ctl |= S3C_PCM_CTL_RXFIFO_EN; + ctl |= S3C_PCM_CTL_ENABLE; + clkctl |= S3C_PCM_CLKCTL_SERCLK_EN; + } else { + ctl &= ~S3C_PCM_CTL_RXDMA_EN; + ctl &= ~S3C_PCM_CTL_RXFIFO_EN; + + if (!(ctl & S3C_PCM_CTL_TXFIFO_EN)) { + ctl &= ~S3C_PCM_CTL_ENABLE; + if (!pcm->idleclk) + clkctl |= S3C_PCM_CLKCTL_SERCLK_EN; + } + } + + writel(clkctl, regs + S3C_PCM_CLKCTL); + writel(ctl, regs + S3C_PCM_CTL); +} + +static int s3c_pcm_trigger(struct snd_pcm_substream *substream, int cmd, + struct snd_soc_dai *dai) +{ + struct snd_soc_pcm_runtime *rtd = substream->private_data; + struct s3c_pcm_info *pcm = to_info(rtd->dai->cpu_dai); + unsigned long flags; + + dev_dbg(pcm->dev, "Entered %s\n", __func__); + + switch (cmd) { + case SNDRV_PCM_TRIGGER_START: + case SNDRV_PCM_TRIGGER_RESUME: + case SNDRV_PCM_TRIGGER_PAUSE_RELEASE: + spin_lock_irqsave(&pcm->lock, flags); + + if (substream->stream == SNDRV_PCM_STREAM_CAPTURE) + s3c_pcm_snd_rxctrl(pcm, 1); + else + s3c_pcm_snd_txctrl(pcm, 1); + + spin_unlock_irqrestore(&pcm->lock, flags); + break; + + case SNDRV_PCM_TRIGGER_STOP: + case SNDRV_PCM_TRIGGER_SUSPEND: + case SNDRV_PCM_TRIGGER_PAUSE_PUSH: + spin_lock_irqsave(&pcm->lock, flags); + + if (substream->stream == SNDRV_PCM_STREAM_CAPTURE) + s3c_pcm_snd_rxctrl(pcm, 0); + else + s3c_pcm_snd_txctrl(pcm, 0); + + spin_unlock_irqrestore(&pcm->lock, flags); + break; + + default: + return -EINVAL; + } + + return 0; +} + +static int s3c_pcm_hw_params(struct snd_pcm_substream *substream, + struct snd_pcm_hw_params *params, + struct snd_soc_dai *socdai) +{ + struct snd_soc_pcm_runtime *rtd = substream->private_data; + struct snd_soc_dai_link *dai = rtd->dai; + struct s3c_pcm_info *pcm = to_info(dai->cpu_dai); + void __iomem *regs = pcm->regs; + struct clk *clk; + int sclk_div, sync_div; + unsigned long flags; + u32 clkctl; + + dev_dbg(pcm->dev, "Entered %s\n", __func__); + + if (substream->stream == SNDRV_PCM_STREAM_PLAYBACK) + dai->cpu_dai->dma_data = pcm->dma_playback; + else + dai->cpu_dai->dma_data = pcm->dma_capture; + + /* Strictly check for sample size */ + switch (params_format(params)) { + case SNDRV_PCM_FORMAT_S16_LE: + break; + default: + return -EINVAL; + } + + spin_lock_irqsave(&pcm->lock, flags); + + /* Get hold of the PCMSOURCE_CLK */ + clkctl = readl(regs + S3C_PCM_CLKCTL); + if (clkctl & S3C_PCM_CLKCTL_SERCLKSEL_PCLK) + clk = pcm->pclk; + else + clk = pcm->cclk; + + /* Set the SCLK divider */ + sclk_div = clk_get_rate(clk) / pcm->sclk_per_fs / + params_rate(params) / 2 - 1; + + clkctl &= ~(S3C_PCM_CLKCTL_SCLKDIV_MASK + << S3C_PCM_CLKCTL_SCLKDIV_SHIFT); + clkctl |= ((sclk_div & S3C_PCM_CLKCTL_SCLKDIV_MASK) + << S3C_PCM_CLKCTL_SCLKDIV_SHIFT); + + /* Set the SYNC divider */ + sync_div = pcm->sclk_per_fs - 1; + + clkctl &= ~(S3C_PCM_CLKCTL_SYNCDIV_MASK + << S3C_PCM_CLKCTL_SYNCDIV_SHIFT); + clkctl |= ((sync_div & S3C_PCM_CLKCTL_SYNCDIV_MASK) + << S3C_PCM_CLKCTL_SYNCDIV_SHIFT); + + writel(clkctl, regs + S3C_PCM_CLKCTL); + + spin_unlock_irqrestore(&pcm->lock, flags); + + dev_dbg(pcm->dev, "PCMSOURCE_CLK-%lu SCLK=%ufs \ + SCLK_DIV=%d SYNC_DIV=%d\n", + clk_get_rate(clk), pcm->sclk_per_fs, + sclk_div, sync_div); + + return 0; +} + +static int s3c_pcm_set_fmt(struct snd_soc_dai *cpu_dai, + unsigned int fmt) +{ + struct s3c_pcm_info *pcm = to_info(cpu_dai); + void __iomem *regs = pcm->regs; + unsigned long flags; + int ret = 0; + u32 ctl; + + dev_dbg(pcm->dev, "Entered %s\n", __func__); + + spin_lock_irqsave(&pcm->lock, flags); + + ctl = readl(regs + S3C_PCM_CTL); + + switch (fmt & SND_SOC_DAIFMT_INV_MASK) { + case SND_SOC_DAIFMT_NB_NF: + /* Nothing to do, NB_NF by default */ + break; + default: + dev_err(pcm->dev, "Unsupported clock inversion!\n"); + ret = -EINVAL; + goto exit; + } + + switch (fmt & SND_SOC_DAIFMT_MASTER_MASK) { + case SND_SOC_DAIFMT_CBS_CFS: + /* Nothing to do, Master by default */ + break; + default: + dev_err(pcm->dev, "Unsupported master/slave format!\n"); + ret = -EINVAL; + goto exit; + } + + switch (fmt & SND_SOC_DAIFMT_CLOCK_MASK) { + case SND_SOC_DAIFMT_CONT: + pcm->idleclk = 1; + break; + case SND_SOC_DAIFMT_GATED: + pcm->idleclk = 0; + break; + default: + dev_err(pcm->dev, "Invalid Clock gating request!\n"); + ret = -EINVAL; + goto exit; + } + + switch (fmt & SND_SOC_DAIFMT_FORMAT_MASK) { + case SND_SOC_DAIFMT_DSP_A: + ctl |= S3C_PCM_CTL_TXMSB_AFTER_FSYNC; + ctl |= S3C_PCM_CTL_RXMSB_AFTER_FSYNC; + break; + case SND_SOC_DAIFMT_DSP_B: + ctl &= ~S3C_PCM_CTL_TXMSB_AFTER_FSYNC; + ctl &= ~S3C_PCM_CTL_RXMSB_AFTER_FSYNC; + break; + default: + dev_err(pcm->dev, "Unsupported data format!\n"); + ret = -EINVAL; + goto exit; + } + + writel(ctl, regs + S3C_PCM_CTL); + +exit: + spin_unlock_irqrestore(&pcm->lock, flags); + + return ret; +} + +static int s3c_pcm_set_clkdiv(struct snd_soc_dai *cpu_dai, + int div_id, int div) +{ + struct s3c_pcm_info *pcm = to_info(cpu_dai); + + switch (div_id) { + case S3C_PCM_SCLK_PER_FS: + pcm->sclk_per_fs = div; + break; + + default: + return -EINVAL; + } + + return 0; +} + +static int s3c_pcm_set_sysclk(struct snd_soc_dai *cpu_dai, + int clk_id, unsigned int freq, int dir) +{ + struct s3c_pcm_info *pcm = to_info(cpu_dai); + void __iomem *regs = pcm->regs; + u32 clkctl = readl(regs + S3C_PCM_CLKCTL); + + switch (clk_id) { + case S3C_PCM_CLKSRC_PCLK: + clkctl |= S3C_PCM_CLKCTL_SERCLKSEL_PCLK; + break; + + case S3C_PCM_CLKSRC_MUX: + clkctl &= ~S3C_PCM_CLKCTL_SERCLKSEL_PCLK; + + if (clk_get_rate(pcm->cclk) != freq) + clk_set_rate(pcm->cclk, freq); + + break; + + default: + return -EINVAL; + } + + writel(clkctl, regs + S3C_PCM_CLKCTL); + + return 0; +} + +static struct snd_soc_dai_ops s3c_pcm_dai_ops = { + .set_sysclk = s3c_pcm_set_sysclk, + .set_clkdiv = s3c_pcm_set_clkdiv, + .trigger = s3c_pcm_trigger, + .hw_params = s3c_pcm_hw_params, + .set_fmt = s3c_pcm_set_fmt, +}; + +#define S3C_PCM_RATES SNDRV_PCM_RATE_8000_96000 + +#define S3C_PCM_DECLARE(n) \ +{ \ + .name = "samsung-pcm", \ + .id = (n), \ + .symmetric_rates = 1, \ + .ops = &s3c_pcm_dai_ops, \ + .playback = { \ + .channels_min = 2, \ + .channels_max = 2, \ + .rates = S3C_PCM_RATES, \ + .formats = SNDRV_PCM_FMTBIT_S16_LE, \ + }, \ + .capture = { \ + .channels_min = 2, \ + .channels_max = 2, \ + .rates = S3C_PCM_RATES, \ + .formats = SNDRV_PCM_FMTBIT_S16_LE, \ + }, \ +} + +struct snd_soc_dai s3c_pcm_dai[] = { + S3C_PCM_DECLARE(0), + S3C_PCM_DECLARE(1), +}; +EXPORT_SYMBOL_GPL(s3c_pcm_dai); + +static __devinit int s3c_pcm_dev_probe(struct platform_device *pdev) +{ + struct s3c_pcm_info *pcm; + struct snd_soc_dai *dai; + struct resource *mem_res, *dmatx_res, *dmarx_res; + struct s3c_audio_pdata *pcm_pdata; + int ret; + + /* Check for valid device index */ + if ((pdev->id < 0) || pdev->id >= ARRAY_SIZE(s3c_pcm)) { + dev_err(&pdev->dev, "id %d out of range\n", pdev->id); + return -EINVAL; + } + + pcm_pdata = pdev->dev.platform_data; + + /* Check for availability of necessary resource */ + dmatx_res = platform_get_resource(pdev, IORESOURCE_DMA, 0); + if (!dmatx_res) { + dev_err(&pdev->dev, "Unable to get PCM-TX dma resource\n"); + return -ENXIO; + } + + dmarx_res = platform_get_resource(pdev, IORESOURCE_DMA, 1); + if (!dmarx_res) { + dev_err(&pdev->dev, "Unable to get PCM-RX dma resource\n"); + return -ENXIO; + } + + mem_res = platform_get_resource(pdev, IORESOURCE_MEM, 0); + if (!mem_res) { + dev_err(&pdev->dev, "Unable to get register resource\n"); + return -ENXIO; + } + + if (pcm_pdata && pcm_pdata->cfg_gpio && pcm_pdata->cfg_gpio(pdev)) { + dev_err(&pdev->dev, "Unable to configure gpio\n"); + return -EINVAL; + } + + pcm = &s3c_pcm[pdev->id]; + pcm->dev = &pdev->dev; + + spin_lock_init(&pcm->lock); + + dai = &s3c_pcm_dai[pdev->id]; + dai->dev = &pdev->dev; + + /* Default is 128fs */ + pcm->sclk_per_fs = 128; + + pcm->cclk = clk_get(&pdev->dev, "audio-bus"); + if (IS_ERR(pcm->cclk)) { + dev_err(&pdev->dev, "failed to get audio-bus\n"); + ret = PTR_ERR(pcm->cclk); + goto err1; + } + clk_enable(pcm->cclk); + + /* record our pcm structure for later use in the callbacks */ + dai->private_data = pcm; + + if (!request_mem_region(mem_res->start, + resource_size(mem_res), "samsung-pcm")) { + dev_err(&pdev->dev, "Unable to request register region\n"); + ret = -EBUSY; + goto err2; + } + + pcm->regs = ioremap(mem_res->start, 0x100); + if (pcm->regs == NULL) { + dev_err(&pdev->dev, "cannot ioremap registers\n"); + ret = -ENXIO; + goto err3; + } + + pcm->pclk = clk_get(&pdev->dev, "pcm"); + if (IS_ERR(pcm->pclk)) { + dev_err(&pdev->dev, "failed to get pcm_clock\n"); + ret = -ENOENT; + goto err4; + } + clk_enable(pcm->pclk); + + ret = snd_soc_register_dai(dai); + if (ret != 0) { + dev_err(&pdev->dev, "failed to get pcm_clock\n"); + goto err5; + } + + s3c_pcm_stereo_in[pdev->id].dma_addr = mem_res->start + + S3C_PCM_RXFIFO; + s3c_pcm_stereo_out[pdev->id].dma_addr = mem_res->start + + S3C_PCM_TXFIFO; + + s3c_pcm_stereo_in[pdev->id].channel = dmarx_res->start; + s3c_pcm_stereo_out[pdev->id].channel = dmatx_res->start; + + pcm->dma_capture = &s3c_pcm_stereo_in[pdev->id]; + pcm->dma_playback = &s3c_pcm_stereo_out[pdev->id]; + + return 0; + +err5: + clk_disable(pcm->pclk); + clk_put(pcm->pclk); +err4: + iounmap(pcm->regs); +err3: + release_mem_region(mem_res->start, resource_size(mem_res)); +err2: + clk_disable(pcm->cclk); + clk_put(pcm->cclk); +err1: + return ret; +} + +static __devexit int s3c_pcm_dev_remove(struct platform_device *pdev) +{ + struct s3c_pcm_info *pcm = &s3c_pcm[pdev->id]; + struct resource *mem_res; + + iounmap(pcm->regs); + + mem_res = platform_get_resource(pdev, IORESOURCE_MEM, 0); + release_mem_region(mem_res->start, resource_size(mem_res)); + + clk_disable(pcm->cclk); + clk_disable(pcm->pclk); + clk_put(pcm->pclk); + clk_put(pcm->cclk); + + return 0; +} + +static struct platform_driver s3c_pcm_driver = { + .probe = s3c_pcm_dev_probe, + .remove = s3c_pcm_dev_remove, + .driver = { + .name = "samsung-pcm", + .owner = THIS_MODULE, + }, +}; + +static int __init s3c_pcm_init(void) +{ + return platform_driver_register(&s3c_pcm_driver); +} +module_init(s3c_pcm_init); + +static void __exit s3c_pcm_exit(void) +{ + platform_driver_unregister(&s3c_pcm_driver); +} +module_exit(s3c_pcm_exit); + +/* Module information */ +MODULE_AUTHOR("Jaswinder Singh, <jassi.brar(a)samsung.com>"); +MODULE_DESCRIPTION("S3C PCM Controller Driver"); +MODULE_LICENSE("GPL"); diff --git a/sound/soc/s3c24xx/s3c-pcm.h b/sound/soc/s3c24xx/s3c-pcm.h new file mode 100644 index 0000000..69ff997 --- /dev/null +++ b/sound/soc/s3c24xx/s3c-pcm.h @@ -0,0 +1,123 @@ +/* sound/soc/s3c24xx/s3c-pcm.h + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License version 2 as + * published by the Free Software Foundation. + * + */ + +#ifndef __S3C_PCM_H +#define __S3C_PCM_H __FILE__ + +/*Register Offsets */ +#define S3C_PCM_CTL (0x00) +#define S3C_PCM_CLKCTL (0x04) +#define S3C_PCM_TXFIFO (0x08) +#define S3C_PCM_RXFIFO (0x0C) +#define S3C_PCM_IRQCTL (0x10) +#define S3C_PCM_IRQSTAT (0x14) +#define S3C_PCM_FIFOSTAT (0x18) +#define S3C_PCM_CLRINT (0x20) + +/* PCM_CTL Bit-Fields */ +#define S3C_PCM_CTL_TXDIPSTICK_MASK (0x3f) +#define S3C_PCM_CTL_TXDIPSTICK_SHIFT (13) +#define S3C_PCM_CTL_RXDIPSTICK_MSK (0x3f<<7) +#define S3C_PCM_CTL_TXDMA_EN (0x1<<6) +#define S3C_PCM_CTL_RXDMA_EN (0x1<<5) +#define S3C_PCM_CTL_TXMSB_AFTER_FSYNC (0x1<<4) +#define S3C_PCM_CTL_RXMSB_AFTER_FSYNC (0x1<<3) +#define S3C_PCM_CTL_TXFIFO_EN (0x1<<2) +#define S3C_PCM_CTL_RXFIFO_EN (0x1<<1) +#define S3C_PCM_CTL_ENABLE (0x1<<0) + +/* PCM_CLKCTL Bit-Fields */ +#define S3C_PCM_CLKCTL_SERCLK_EN (0x1<<19) +#define S3C_PCM_CLKCTL_SERCLKSEL_PCLK (0x1<<18) +#define S3C_PCM_CLKCTL_SCLKDIV_MASK (0x1ff) +#define S3C_PCM_CLKCTL_SYNCDIV_MASK (0x1ff) +#define S3C_PCM_CLKCTL_SCLKDIV_SHIFT (9) +#define S3C_PCM_CLKCTL_SYNCDIV_SHIFT (0) + +/* PCM_TXFIFO Bit-Fields */ +#define S3C_PCM_TXFIFO_DVALID (0x1<<16) +#define S3C_PCM_TXFIFO_DATA_MSK (0xffff<<0) + +/* PCM_RXFIFO Bit-Fields */ +#define S3C_PCM_RXFIFO_DVALID (0x1<<16) +#define S3C_PCM_RXFIFO_DATA_MSK (0xffff<<0) + +/* PCM_IRQCTL Bit-Fields */ +#define S3C_PCM_IRQCTL_IRQEN (0x1<<14) +#define S3C_PCM_IRQCTL_WRDEN (0x1<<12) +#define S3C_PCM_IRQCTL_TXEMPTYEN (0x1<<11) +#define S3C_PCM_IRQCTL_TXALMSTEMPTYEN (0x1<<10) +#define S3C_PCM_IRQCTL_TXFULLEN (0x1<<9) +#define S3C_PCM_IRQCTL_TXALMSTFULLEN (0x1<<8) +#define S3C_PCM_IRQCTL_TXSTARVEN (0x1<<7) +#define S3C_PCM_IRQCTL_TXERROVRFLEN (0x1<<6) +#define S3C_PCM_IRQCTL_RXEMPTEN (0x1<<5) +#define S3C_PCM_IRQCTL_RXALMSTEMPTEN (0x1<<4) +#define S3C_PCM_IRQCTL_RXFULLEN (0x1<<3) +#define S3C_PCM_IRQCTL_RXALMSTFULLEN (0x1<<2) +#define S3C_PCM_IRQCTL_RXSTARVEN (0x1<<1) +#define S3C_PCM_IRQCTL_RXERROVRFLEN (0x1<<0) + +/* PCM_IRQSTAT Bit-Fields */ +#define S3C_PCM_IRQSTAT_IRQPND (0x1<<13) +#define S3C_PCM_IRQSTAT_WRD_XFER (0x1<<12) +#define S3C_PCM_IRQSTAT_TXEMPTY (0x1<<11) +#define S3C_PCM_IRQSTAT_TXALMSTEMPTY (0x1<<10) +#define S3C_PCM_IRQSTAT_TXFULL (0x1<<9) +#define S3C_PCM_IRQSTAT_TXALMSTFULL (0x1<<8) +#define S3C_PCM_IRQSTAT_TXSTARV (0x1<<7) +#define S3C_PCM_IRQSTAT_TXERROVRFL (0x1<<6) +#define S3C_PCM_IRQSTAT_RXEMPT (0x1<<5) +#define S3C_PCM_IRQSTAT_RXALMSTEMPT (0x1<<4) +#define S3C_PCM_IRQSTAT_RXFULL (0x1<<3) +#define S3C_PCM_IRQSTAT_RXALMSTFULL (0x1<<2) +#define S3C_PCM_IRQSTAT_RXSTARV (0x1<<1) +#define S3C_PCM_IRQSTAT_RXERROVRFL (0x1<<0) + +/* PCM_FIFOSTAT Bit-Fields */ +#define S3C_PCM_FIFOSTAT_TXCNT_MSK (0x3f<<14) +#define S3C_PCM_FIFOSTAT_TXFIFOEMPTY (0x1<<13) +#define S3C_PCM_FIFOSTAT_TXFIFOALMSTEMPTY (0x1<<12) +#define S3C_PCM_FIFOSTAT_TXFIFOFULL (0x1<<11) +#define S3C_PCM_FIFOSTAT_TXFIFOALMSTFULL (0x1<<10) +#define S3C_PCM_FIFOSTAT_RXCNT_MSK (0x3f<<4) +#define S3C_PCM_FIFOSTAT_RXFIFOEMPTY (0x1<<3) +#define S3C_PCM_FIFOSTAT_RXFIFOALMSTEMPTY (0x1<<2) +#define S3C_PCM_FIFOSTAT_RXFIFOFULL (0x1<<1) +#define S3C_PCM_FIFOSTAT_RXFIFOALMSTFULL (0x1<<0) + +#define S3C_PCM_CLKSRC_PCLK 0 +#define S3C_PCM_CLKSRC_MUX 1 + +#define S3C_PCM_SCLK_PER_FS 0 + +/** + * struct s3c_pcm_info - S3C PCM Controller information + * @dev: The parent device passed to use from the probe. + * @regs: The pointer to the device register block. + * @dma_playback: DMA information for playback channel. + * @dma_capture: DMA information for capture channel. + */ +struct s3c_pcm_info { + spinlock_t lock; + struct device *dev; + void __iomem *regs; + + unsigned int sclk_per_fs; + + /* Whether to keep PCMSCLK enabled even when idle(no active xfer) */ + unsigned int idleclk; + + struct clk *pclk; + struct clk *cclk; + + struct s3c_dma_params *dma_playback; + struct s3c_dma_params *dma_capture; +}; + +#endif /* __S3C_PCM_H */ -- 1.6.2.5

1 0

[alsa-devel] [PATCHv2 3/7] S3C64XX PCM: Define PCM Controller base registers
by Jassi Brar 17 Nov '09

17 Nov '09

Signed-off-by: Jassi Brar <jassi.brar(a)samsung.com> --- arch/arm/mach-s3c6400/include/mach/map.h | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/arch/arm/mach-s3c6400/include/mach/map.h b/arch/arm/mach-s3c6400/include/mach/map.h index fc8b223..866be31 100644 --- a/arch/arm/mach-s3c6400/include/mach/map.h +++ b/arch/arm/mach-s3c6400/include/mach/map.h @@ -48,6 +48,8 @@ #define S3C64XX_PA_IIS1 (0x7F003000) #define S3C64XX_PA_TIMER (0x7F006000) #define S3C64XX_PA_IIC0 (0x7F004000) +#define S3C64XX_PA_PCM0 (0x7F009000) +#define S3C64XX_PA_PCM1 (0x7F00A000) #define S3C64XX_PA_IISV4 (0x7F00D000) #define S3C64XX_PA_IIC1 (0x7F00F000) -- 1.6.2.5

1 0

[alsa-devel] Delays with PulseAudio (normal)?
by Tom Watson 17 Nov '09

17 Nov '09

I just did an fresh install of a Fedora 11, and it went well for the most part. Then I tried some audio stuff, and it seems that pulseaudio (groan!) has a closing delay. In my case I want to issue a "beep" then make a recording. This involves the equivalent of: $ aplay beep.wav $ arecord -d recordit.wav This used to work in a kernel of a few years ago, but in F11 there is a NOTICABLE delay from the end of the beep to the start of the recording. It can even be seen if one does a simple aplay and waits for the shell prompt. I was wondering if there was an option in a configuration file, or a hammer I can take to pulseaudio to solve this problem. An added bit of information: The beep.wav file is about 0.1 second long (if that matters, which I believe it shouldn't). Any clues would be appreciated, Thanks. -- Tom Watson

2 1

Re: [alsa-devel] Doubts around SoC audio on omap3
by Aggarwal, Anuj 17 Nov '09

17 Nov '09

> -----Original Message----- > From: linux-omap-owner(a)vger.kernel.org [mailto:linux-omap- > owner(a)vger.kernel.org] On Behalf Of Enric Balletbò i Serra > Sent: Monday, November 16, 2009 11:06 PM > To: linux-omap(a)vger.kernel.org > Subject: Doubts around SoC audio on omap3 > > Hi all, > > I would like to add support for SoC audio on the IGEP v2 board but I > have some doubts about how to do. As I have seen in the source code, > the SoC driver for IGEP should be the same as omap3evm, overo and > cm-t35. > > So, is better to use the solution adopted by the board CM-T35 or add a > specific file for the board IGEP like omap3evm board ? > > Is there any difference between the omap3evm driver and the overo driver ? Including alsa-devel list too... There could be changes in the machine drivers for different OMAP3 based platforms like omap3evm and overo. It depends on exactly what is present (I/Ps, O/Ps) on you EVM and how do you want to configure it, and in that case, it makes sense to create a new machine specific file for your board. > > Thanks in advance, > > Enric > -- > To unsubscribe from this list: send the line "unsubscribe linux-omap" in > the body of a message to majordomo(a)vger.kernel.org > More majordomo info at http://vger.kernel.org/majordomo-info.html

1 0

[alsa-devel] alsa-driver-1.0.21.30.g5ed31.345.g7c525 Not compiling
by Sébastien Lavoie 17 Nov '09

17 Nov '09

I can't manage to compile alsa-driver from the repository (nor 1.0.19) See logs attached Sébastien Lavoie sebastien(a)cslavoie.com 514.928.5214 Entrepreneur en développement Web et hébergement © Créations Sébastien Lavoie

1 0

[alsa-devel] [PATCH] ASoC: OMAP: enable Overo driver for CM-T35
by Mike Rapoport 16 Nov '09

16 Nov '09

Signed-off-by: Mike Rapoport <mike(a)compulab.co.il> --- sound/soc/omap/Kconfig | 7 ++++--- sound/soc/omap/overo.c | 2 +- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/sound/soc/omap/Kconfig b/sound/soc/omap/Kconfig index 653a362..bb42681 100644 --- a/sound/soc/omap/Kconfig +++ b/sound/soc/omap/Kconfig @@ -43,12 +43,13 @@ config SND_OMAP_SOC_OSK5912 Say Y if you want to add support for SoC audio on osk5912. config SND_OMAP_SOC_OVERO - tristate "SoC Audio support for Gumstix Overo" - depends on TWL4030_CORE && SND_OMAP_SOC && MACH_OVERO + tristate "SoC Audio support for Gumstix Overo and CompuLab CM-T35" + depends on TWL4030_CORE && SND_OMAP_SOC && (MACH_OVERO || MACH_CM_T35) select SND_OMAP_SOC_MCBSP select SND_SOC_TWL4030 help - Say Y if you want to add support for SoC audio on the Gumstix Overo. + Say Y if you want to add support for SoC audio on the + Gumstix Overo or CompuLab CM-T35 config SND_OMAP_SOC_OMAP2EVM tristate "SoC Audio support for OMAP2EVM board" diff --git a/sound/soc/omap/overo.c b/sound/soc/omap/overo.c index 624f40e..1bf440b 100644 --- a/sound/soc/omap/overo.c +++ b/sound/soc/omap/overo.c @@ -107,7 +107,7 @@ static int __init overo_soc_init(void) { int ret; - if (!machine_is_overo()) { + if (!(machine_is_overo() || machine_is_cm_t35())) { pr_debug("Not Overo!\n"); return -ENODEV; } -- 1.6.4.4

5 7

[alsa-devel] [PATCH] soc-core: let suspend/resume not called if the card is not instantiated
by Barry Song 16 Nov '09

16 Nov '09

It doesn't make sense to call suspend/resume of all cpu/codec dais even they are not initialized and registered. This will cause many problems foraudio PM. The condition card is not instantiated covers codec is null, so delete the check that codec is null. Signed-off-by: Barry Song <21cnbao(a)gmail.com> --- sound/soc/soc-core.c | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/sound/soc/soc-core.c b/sound/soc/soc-core.c index e2b6d75..097f3b9 100644 --- a/sound/soc/soc-core.c +++ b/sound/soc/soc-core.c @@ -796,10 +796,7 @@ static int soc_suspend(struct device *dev) struct snd_soc_codec *codec = card->codec; int i; - /* If the initialization of this soc device failed, there is no codec - * associated with it. Just bail out in this case. - */ - if (!codec) + if (!card->instantiated) return 0; /* Due to the resume being scheduled into a workqueue we could @@ -940,6 +937,9 @@ static int soc_resume(struct device *dev) struct snd_soc_card *card = socdev->card; struct snd_soc_dai *cpu_dai = card->dai_link[0].cpu_dai; + if (!card->instantiated) + return 0; + /* AC97 devices might have other drivers hanging off them so * need to resume immediately. Other drivers don't have that * problem and may take a substantial amount of time to resume -- 1.5.6.3

2 7

[alsa-devel] [PATCH] OSS: keep index within bounds of midi_devs[]
by Roel Kluin 16 Nov '09

16 Nov '09

When the {orig,midi}_dev equals num_midis, that's one too large already. Signed-off-by: Roel Kluin <roel.kluin(a)gmail.com> --- In MIDIbuf_open() sound/oss/midibuf.c:166 if (num_midis > MAX_MIDI_DEV) { printk(KERN_ERR "midi: Too many midi interfaces\n"); num_midis = MAX_MIDI_DEV; } num_midis is at most MAX_MIDI_DEV. `git grep -n MAX_MIDI_DEV' and note that when the index equals num_midis this causes reads/writes outside array bounds for midi_devs, midi2synth, dev_conf and others (below check in patch). sound/oss/midi_synth.c | 2 +- sound/oss/mpu401.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/sound/oss/midi_synth.c b/sound/oss/midi_synth.c index 9e45098..3bc7104 100644 --- a/sound/oss/midi_synth.c +++ b/sound/oss/midi_synth.c @@ -426,7 +426,7 @@ midi_synth_open(int dev, int mode) int err; struct midi_input_info *inc; - if (orig_dev < 0 || orig_dev > num_midis || midi_devs[orig_dev] == NULL) + if (orig_dev < 0 || orig_dev >= num_midis || midi_devs[orig_dev] == NULL) return -ENXIO; midi2synth[orig_dev] = dev; diff --git a/sound/oss/mpu401.c b/sound/oss/mpu401.c index 734b8f9..0af9d24 100644 --- a/sound/oss/mpu401.c +++ b/sound/oss/mpu401.c @@ -770,7 +770,7 @@ static int mpu_synth_ioctl(int dev, unsigned int cmd, void __user *arg) midi_dev = synth_devs[dev]->midi_dev; - if (midi_dev < 0 || midi_dev > num_midis || midi_devs[midi_dev] == NULL) + if (midi_dev < 0 || midi_dev >= num_midis || midi_devs[midi_dev] == NULL) return -ENXIO; devc = &dev_conf[midi_dev];

2 1

Re: [alsa-devel] [alsa-cvslog] alsa-kmirror: ALSA kernel mirror repository branch, master now at v1.0.21-334-g6739046
by Takashi Iwai 16 Nov '09

16 Nov '09

At Thu, 12 Nov 2009 10:54:02 +0100 (CET), noreply-git(a)alsa-project.org wrote: > > commit 6739046df36c7adf80c961bcba4870270e66dbf6 > Author: Jaroslav Kysela <perex(a)perex.cz> > AuthorDate: Thu Nov 12 10:15:48 2009 +0100 > Commit: Jaroslav Kysela <perex(a)perex.cz> > CommitDate: Thu Nov 12 10:51:48 2009 +0100 > > ALSA: hda - proc - add support for dynamic controls to mixer<->NID mapping > > This patch adds support for dynamically created controls to proc codec file > (Control: lines). > > Signed-off-by: Jaroslav Kysela <perex(a)perex.cz> > > commit c45b73bf328cd8ace53cf39994328cf9d6548c4f > Author: Jaroslav Kysela <perex(a)perex.cz> > AuthorDate: Wed Nov 11 13:43:01 2009 +0100 > Commit: Jaroslav Kysela <perex(a)perex.cz> > CommitDate: Thu Nov 12 10:51:16 2009 +0100 > > ALSA: hda - proc - introduce Control: lines to show mixer<->NID assignment > > This is an initial patch to show universal control<->NID assigment in > proc codec file. The change helps to debug codec related problems. > > Signed-off-by: Jaroslav Kysela <perex(a)perex.cz> I find the second one is the nice hack, but the first (newer) one isn't good since it abuses the subdevice field of the ctl id. It is a part of API/ABI, and if we do any changes the semantics, we should define the changed behavior *beforehand* publicly. Also, both commits give many warnings via checkpatch.pl... So I postpone the merge so far. thanks, Takashi

2 9

[alsa-devel] [PATCH 5/7] S3C AUDIO: Add header to pass platform data to device drivers
by Jassi Brar 16 Nov '09

16 Nov '09

Signed-off-by: Jassi Brar <jassi.brar(a)samsung.com> --- arch/arm/plat-s3c/include/plat/audio.h | 17 +++++++++++++++++ 1 files changed, 17 insertions(+), 0 deletions(-) create mode 100644 arch/arm/plat-s3c/include/plat/audio.h diff --git a/arch/arm/plat-s3c/include/plat/audio.h b/arch/arm/plat-s3c/include/plat/audio.h new file mode 100644 index 0000000..f22d23b --- /dev/null +++ b/arch/arm/plat-s3c/include/plat/audio.h @@ -0,0 +1,17 @@ +/* arch/arm/plat-s3c/include/plat/audio.h + * + * Copyright (c) 2009 Samsung Electronics Co. Ltd + * Author: Jaswinder Singh <jassi.brar(a)samsung.com> + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License version 2 as + * published by the Free Software Foundation. + */ + +/** + * struct s3c_audio_pdata - common platform data for audio device drivers + * @cfg_gpio: Callback function to setup mux'ed pins in I2S/PCM/AC97 mode + */ +struct s3c_audio_pdata { + int (*cfg_gpio)(struct platform_device *); +}; -- 1.6.2.5

3 2

[alsa-devel] [PATCH 2/7] S3C AUDIO: Rename 's3c24xx-pcm' driver to 's3c_audio'
by Jassi Brar 16 Nov '09

16 Nov '09

Making room for namespace for the PCM Controller driver the platform driver(s3c24xx-pcm) has been renamed to SoC agnostic name 's3c-audio'. Signed-off-by: Jassi Brar <jassi.brar(a)samsung.com> --- sound/soc/s3c24xx/Makefile | 2 +- sound/soc/s3c24xx/jive_wm8750.c | 2 +- sound/soc/s3c24xx/ln2440sbc_alc650.c | 2 +- sound/soc/s3c24xx/neo1973_gta02_wm8753.c | 2 +- sound/soc/s3c24xx/neo1973_wm8753.c | 2 +- sound/soc/s3c24xx/s3c-audio.c | 480 ++++++++++++++++++++++++ sound/soc/s3c24xx/s3c-audio.h | 31 ++ sound/soc/s3c24xx/s3c-i2s-v2.c | 2 +- sound/soc/s3c24xx/s3c2412-i2s.c | 2 +- sound/soc/s3c24xx/s3c2443-ac97.c | 2 +- sound/soc/s3c24xx/s3c24xx-i2s.c | 2 +- sound/soc/s3c24xx/s3c24xx-pcm.c | 480 ------------------------ sound/soc/s3c24xx/s3c24xx-pcm.h | 31 -- sound/soc/s3c24xx/s3c24xx_simtec.c | 2 +- sound/soc/s3c24xx/s3c24xx_simtec_hermes.c | 2 +- sound/soc/s3c24xx/s3c24xx_simtec_tlv320aic23.c | 2 +- sound/soc/s3c24xx/s3c24xx_uda134x.c | 2 +- sound/soc/s3c24xx/s3c64xx-i2s.c | 2 +- sound/soc/s3c24xx/smdk2443_wm9710.c | 2 +- sound/soc/s3c24xx/smdk64xx_wm8580.c | 2 +- 20 files changed, 527 insertions(+), 527 deletions(-) create mode 100644 sound/soc/s3c24xx/s3c-audio.c create mode 100644 sound/soc/s3c24xx/s3c-audio.h delete mode 100644 sound/soc/s3c24xx/s3c24xx-pcm.c delete mode 100644 sound/soc/s3c24xx/s3c24xx-pcm.h diff --git a/sound/soc/s3c24xx/Makefile b/sound/soc/s3c24xx/Makefile index 7790406..3bdb74d 100644 --- a/sound/soc/s3c24xx/Makefile +++ b/sound/soc/s3c24xx/Makefile @@ -1,5 +1,5 @@ # S3c24XX Platform Support -snd-soc-s3c24xx-objs := s3c24xx-pcm.o +snd-soc-s3c24xx-objs := s3c-audio.o snd-soc-s3c24xx-i2s-objs := s3c24xx-i2s.o snd-soc-s3c2412-i2s-objs := s3c2412-i2s.o snd-soc-s3c64xx-i2s-objs := s3c64xx-i2s.o diff --git a/sound/soc/s3c24xx/jive_wm8750.c b/sound/soc/s3c24xx/jive_wm8750.c index 93e6c87..ac3a709 100644 --- a/sound/soc/s3c24xx/jive_wm8750.c +++ b/sound/soc/s3c24xx/jive_wm8750.c @@ -25,7 +25,7 @@ #include <asm/mach-types.h> -#include "s3c24xx-pcm.h" +#include "s3c-audio.h" #include "s3c2412-i2s.h" #include "../codecs/wm8750.h" diff --git a/sound/soc/s3c24xx/ln2440sbc_alc650.c b/sound/soc/s3c24xx/ln2440sbc_alc650.c index 12c7148..3896e52 100644 --- a/sound/soc/s3c24xx/ln2440sbc_alc650.c +++ b/sound/soc/s3c24xx/ln2440sbc_alc650.c @@ -24,7 +24,7 @@ #include <sound/soc-dapm.h> #include "../codecs/ac97.h" -#include "s3c24xx-pcm.h" +#include "s3c-audio.h" #include "s3c24xx-ac97.h" static struct snd_soc_card ln2440sbc; diff --git a/sound/soc/s3c24xx/neo1973_gta02_wm8753.c b/sound/soc/s3c24xx/neo1973_gta02_wm8753.c index 26409a9..1d05137 100644 --- a/sound/soc/s3c24xx/neo1973_gta02_wm8753.c +++ b/sound/soc/s3c24xx/neo1973_gta02_wm8753.c @@ -32,7 +32,7 @@ #include <asm/io.h> #include <mach/gta02.h> #include "../codecs/wm8753.h" -#include "s3c24xx-pcm.h" +#include "s3c-audio.h" #include "s3c24xx-i2s.h" static struct snd_soc_card neo1973_gta02; diff --git a/sound/soc/s3c24xx/neo1973_wm8753.c b/sound/soc/s3c24xx/neo1973_wm8753.c index 77de6c5..9183166 100644 --- a/sound/soc/s3c24xx/neo1973_wm8753.c +++ b/sound/soc/s3c24xx/neo1973_wm8753.c @@ -36,7 +36,7 @@ #include "../codecs/wm8753.h" #include "lm4857.h" -#include "s3c24xx-pcm.h" +#include "s3c-audio.h" #include "s3c24xx-i2s.h" /* define the scenarios */ diff --git a/sound/soc/s3c24xx/s3c-audio.c b/sound/soc/s3c24xx/s3c-audio.c new file mode 100644 index 0000000..cb49400 --- /dev/null +++ b/sound/soc/s3c24xx/s3c-audio.c @@ -0,0 +1,481 @@ +/* + * s3c-audio.c -- ALSA Soc Audio Layer + * + * (c) 2006 Wolfson Microelectronics PLC. + * Graeme Gregory graeme.gregory(a)wolfsonmicro.com or linux(a)wolfsonmicro.com + * + * Copyright 2004-2005 Simtec Electronics + * http://armlinux.simtec.co.uk/ + * Ben Dooks <ben(a)simtec.co.uk> + * + * This program is free software; you can redistribute it and/or modify it + * under the terms of the GNU General Public License as published by the + * Free Software Foundation; either version 2 of the License, or (at your + * option) any later version. + */ + +#include <linux/module.h> +#include <linux/init.h> +#include <linux/io.h> +#include <linux/platform_device.h> +#include <linux/slab.h> +#include <linux/dma-mapping.h> + +#include <sound/core.h> +#include <sound/pcm.h> +#include <sound/pcm_params.h> +#include <sound/soc.h> + +#include <asm/dma.h> +#include <mach/hardware.h> +#include <mach/dma.h> + +#include "s3c-audio.h" + +static const struct snd_pcm_hardware s3c_dma_hardware = { + .info = SNDRV_PCM_INFO_INTERLEAVED | + SNDRV_PCM_INFO_BLOCK_TRANSFER | + SNDRV_PCM_INFO_MMAP | + SNDRV_PCM_INFO_MMAP_VALID | + SNDRV_PCM_INFO_PAUSE | + SNDRV_PCM_INFO_RESUME, + .formats = SNDRV_PCM_FMTBIT_S16_LE | + SNDRV_PCM_FMTBIT_U16_LE | + SNDRV_PCM_FMTBIT_U8 | + SNDRV_PCM_FMTBIT_S8, + .channels_min = 2, + .channels_max = 2, + .buffer_bytes_max = 128*1024, + .period_bytes_min = PAGE_SIZE, + .period_bytes_max = PAGE_SIZE*2, + .periods_min = 2, + .periods_max = 128, + .fifo_size = 32, +}; + +struct s3c24xx_runtime_data { + spinlock_t lock; + int state; + unsigned int dma_loaded; + unsigned int dma_limit; + unsigned int dma_period; + dma_addr_t dma_start; + dma_addr_t dma_pos; + dma_addr_t dma_end; + struct s3c_dma_params *params; +}; + +/* s3c_dma_enqueue + * + * place a dma buffer onto the queue for the dma system + * to handle. +*/ +static void s3c_dma_enqueue(struct snd_pcm_substream *substream) +{ + struct s3c24xx_runtime_data *prtd = substream->runtime->private_data; + dma_addr_t pos = prtd->dma_pos; + unsigned int limit; + int ret; + + pr_debug("Entered %s\n", __func__); + + if (s3c_dma_has_circular()) + limit = (prtd->dma_end - prtd->dma_start) / prtd->dma_period; + else + limit = prtd->dma_limit; + + pr_debug("%s: loaded %d, limit %d\n", + __func__, prtd->dma_loaded, limit); + + while (prtd->dma_loaded < limit) { + unsigned long len = prtd->dma_period; + + pr_debug("dma_loaded: %d\n", prtd->dma_loaded); + + if ((pos + len) > prtd->dma_end) { + len = prtd->dma_end - pos; + pr_debug(KERN_DEBUG "%s: corrected dma len %ld\n", + __func__, len); + } + + ret = s3c2410_dma_enqueue(prtd->params->channel, + substream, pos, len); + + if (ret == 0) { + prtd->dma_loaded++; + pos += prtd->dma_period; + if (pos >= prtd->dma_end) + pos = prtd->dma_start; + } else + break; + } + + prtd->dma_pos = pos; +} + +static void s3c24xx_audio_buffdone(struct s3c2410_dma_chan *channel, + void *dev_id, int size, + enum s3c2410_dma_buffresult result) +{ + struct snd_pcm_substream *substream = dev_id; + struct s3c24xx_runtime_data *prtd; + + pr_debug("Entered %s\n", __func__); + + if (result == S3C2410_RES_ABORT || result == S3C2410_RES_ERR) + return; + + prtd = substream->runtime->private_data; + + if (substream) + snd_pcm_period_elapsed(substream); + + spin_lock(&prtd->lock); + if (prtd->state & ST_RUNNING && !s3c_dma_has_circular()) { + prtd->dma_loaded--; + s3c_dma_enqueue(substream); + } + + spin_unlock(&prtd->lock); +} + +static int s3c_dma_hw_params(struct snd_pcm_substream *substream, + struct snd_pcm_hw_params *params) +{ + struct snd_pcm_runtime *runtime = substream->runtime; + struct s3c24xx_runtime_data *prtd = runtime->private_data; + struct snd_soc_pcm_runtime *rtd = substream->private_data; + struct s3c_dma_params *dma = rtd->dai->cpu_dai->dma_data; + unsigned long totbytes = params_buffer_bytes(params); + int ret = 0; + + pr_debug("Entered %s\n", __func__); + + /* return if this is a bufferless transfer e.g. + * codec <--> BT codec or GSM modem -- lg FIXME */ + if (!dma) + return 0; + + /* this may get called several times by oss emulation + * with different params -HW */ + if (prtd->params == NULL) { + /* prepare DMA */ + prtd->params = dma; + + pr_debug("params %p, client %p, channel %d\n", prtd->params, + prtd->params->client, prtd->params->channel); + + ret = s3c2410_dma_request(prtd->params->channel, + prtd->params->client, NULL); + + if (ret < 0) { + printk(KERN_ERR "failed to get dma channel\n"); + return ret; + } + + /* use the circular buffering if we have it available. */ + if (s3c_dma_has_circular()) + s3c2410_dma_setflags(prtd->params->channel, + S3C2410_DMAF_CIRCULAR); + } + + s3c2410_dma_set_buffdone_fn(prtd->params->channel, + s3c24xx_audio_buffdone); + + snd_pcm_set_runtime_buffer(substream, &substream->dma_buffer); + + runtime->dma_bytes = totbytes; + + spin_lock_irq(&prtd->lock); + prtd->dma_loaded = 0; + prtd->dma_limit = runtime->hw.periods_min; + prtd->dma_period = params_period_bytes(params); + prtd->dma_start = runtime->dma_addr; + prtd->dma_pos = prtd->dma_start; + prtd->dma_end = prtd->dma_start + totbytes; + spin_unlock_irq(&prtd->lock); + + return 0; +} + +static int s3c_dma_hw_free(struct snd_pcm_substream *substream) +{ + struct s3c24xx_runtime_data *prtd = substream->runtime->private_data; + + pr_debug("Entered %s\n", __func__); + + /* TODO - do we need to ensure DMA flushed */ + snd_pcm_set_runtime_buffer(substream, NULL); + + if (prtd->params) { + s3c2410_dma_free(prtd->params->channel, prtd->params->client); + prtd->params = NULL; + } + + return 0; +} + +static int s3c_dma_prepare(struct snd_pcm_substream *substream) +{ + struct s3c24xx_runtime_data *prtd = substream->runtime->private_data; + int ret = 0; + + pr_debug("Entered %s\n", __func__); + + /* return if this is a bufferless transfer e.g. + * codec <--> BT codec or GSM modem -- lg FIXME */ + if (!prtd->params) + return 0; + + /* channel needs configuring for mem=>device, increment memory addr, + * sync to pclk, half-word transfers to the IIS-FIFO. */ + if (substream->stream == SNDRV_PCM_STREAM_PLAYBACK) { + s3c2410_dma_devconfig(prtd->params->channel, + S3C2410_DMASRC_MEM, + prtd->params->dma_addr); + } else { + s3c2410_dma_devconfig(prtd->params->channel, + S3C2410_DMASRC_HW, + prtd->params->dma_addr); + } + + s3c2410_dma_config(prtd->params->channel, + prtd->params->dma_size); + + /* flush the DMA channel */ + s3c2410_dma_ctrl(prtd->params->channel, S3C2410_DMAOP_FLUSH); + prtd->dma_loaded = 0; + prtd->dma_pos = prtd->dma_start; + + /* enqueue dma buffers */ + s3c_dma_enqueue(substream); + + return ret; +} + +static int s3c_dma_trigger(struct snd_pcm_substream *substream, int cmd) +{ + struct s3c24xx_runtime_data *prtd = substream->runtime->private_data; + int ret = 0; + + pr_debug("Entered %s\n", __func__); + + spin_lock(&prtd->lock); + + switch (cmd) { + case SNDRV_PCM_TRIGGER_START: + case SNDRV_PCM_TRIGGER_RESUME: + case SNDRV_PCM_TRIGGER_PAUSE_RELEASE: + prtd->state |= ST_RUNNING; + s3c2410_dma_ctrl(prtd->params->channel, S3C2410_DMAOP_START); + break; + + case SNDRV_PCM_TRIGGER_STOP: + case SNDRV_PCM_TRIGGER_SUSPEND: + case SNDRV_PCM_TRIGGER_PAUSE_PUSH: + prtd->state &= ~ST_RUNNING; + s3c2410_dma_ctrl(prtd->params->channel, S3C2410_DMAOP_STOP); + break; + + default: + ret = -EINVAL; + break; + } + + spin_unlock(&prtd->lock); + + return ret; +} + +static snd_pcm_uframes_t +s3c_dma_pointer(struct snd_pcm_substream *substream) +{ + struct snd_pcm_runtime *runtime = substream->runtime; + struct s3c24xx_runtime_data *prtd = runtime->private_data; + unsigned long res; + dma_addr_t src, dst; + + pr_debug("Entered %s\n", __func__); + + spin_lock(&prtd->lock); + s3c2410_dma_getposition(prtd->params->channel, &src, &dst); + + if (substream->stream == SNDRV_PCM_STREAM_CAPTURE) + res = dst - prtd->dma_start; + else + res = src - prtd->dma_start; + + spin_unlock(&prtd->lock); + + pr_debug("Pointer %x %x\n", src, dst); + + /* we seem to be getting the odd error from the pcm library due + * to out-of-bounds pointers. this is maybe due to the dma engine + * not having loaded the new values for the channel before being + * callled... (todo - fix ) + */ + + if (res >= snd_pcm_lib_buffer_bytes(substream)) { + if (res == snd_pcm_lib_buffer_bytes(substream)) + res = 0; + } + + return bytes_to_frames(substream->runtime, res); +} + +static int s3c_dma_open(struct snd_pcm_substream *substream) +{ + struct snd_pcm_runtime *runtime = substream->runtime; + struct s3c24xx_runtime_data *prtd; + + pr_debug("Entered %s\n", __func__); + + snd_pcm_hw_constraint_integer(runtime, SNDRV_PCM_HW_PARAM_PERIODS); + snd_soc_set_runtime_hwparams(substream, &s3c_dma_hardware); + + prtd = kzalloc(sizeof(struct s3c24xx_runtime_data), GFP_KERNEL); + if (prtd == NULL) + return -ENOMEM; + + spin_lock_init(&prtd->lock); + + runtime->private_data = prtd; + return 0; +} + +static int s3c_dma_close(struct snd_pcm_substream *substream) +{ + struct snd_pcm_runtime *runtime = substream->runtime; + struct s3c24xx_runtime_data *prtd = runtime->private_data; + + pr_debug("Entered %s\n", __func__); + + if (!prtd) + pr_debug("s3c_dma_close called with prtd == NULL\n"); + + kfree(prtd); + + return 0; +} + +static int s3c_dma_mmap(struct snd_pcm_substream *substream, + struct vm_area_struct *vma) +{ + struct snd_pcm_runtime *runtime = substream->runtime; + + pr_debug("Entered %s\n", __func__); + + return dma_mmap_writecombine(substream->pcm->card->dev, vma, + runtime->dma_area, + runtime->dma_addr, + runtime->dma_bytes); +} + +static struct snd_pcm_ops s3c_dma_ops = { + .open = s3c_dma_open, + .close = s3c_dma_close, + .ioctl = snd_pcm_lib_ioctl, + .hw_params = s3c_dma_hw_params, + .hw_free = s3c_dma_hw_free, + .prepare = s3c_dma_prepare, + .trigger = s3c_dma_trigger, + .pointer = s3c_dma_pointer, + .mmap = s3c_dma_mmap, +}; + +static int s3c_preallocate_dma_buffer(struct snd_pcm *pcm, int stream) +{ + struct snd_pcm_substream *substream = pcm->streams[stream].substream; + struct snd_dma_buffer *buf = &substream->dma_buffer; + size_t size = s3c_dma_hardware.buffer_bytes_max; + + pr_debug("Entered %s\n", __func__); + + buf->dev.type = SNDRV_DMA_TYPE_DEV; + buf->dev.dev = pcm->card->dev; + buf->private_data = NULL; + buf->area = dma_alloc_writecombine(pcm->card->dev, size, + &buf->addr, GFP_KERNEL); + if (!buf->area) + return -ENOMEM; + buf->bytes = size; + return 0; +} + +static void s3c_dma_free_dma_buffers(struct snd_pcm *pcm) +{ + struct snd_pcm_substream *substream; + struct snd_dma_buffer *buf; + int stream; + + pr_debug("Entered %s\n", __func__); + + for (stream = 0; stream < 2; stream++) { + substream = pcm->streams[stream].substream; + if (!substream) + continue; + + buf = &substream->dma_buffer; + if (!buf->area) + continue; + + dma_free_writecombine(pcm->card->dev, buf->bytes, + buf->area, buf->addr); + buf->area = NULL; + } +} + +static u64 s3c_dma_mask = DMA_BIT_MASK(32); + +static int s3c_dma_new(struct snd_card *card, + struct snd_soc_dai *dai, struct snd_pcm *pcm) +{ + int ret = 0; + + pr_debug("Entered %s\n", __func__); + + if (!card->dev->dma_mask) + card->dev->dma_mask = &s3c_dma_mask; + if (!card->dev->coherent_dma_mask) + card->dev->coherent_dma_mask = 0xffffffff; + + if (dai->playback.channels_min) { + ret = s3c_preallocate_dma_buffer(pcm, + SNDRV_PCM_STREAM_PLAYBACK); + if (ret) + goto out; + } + + if (dai->capture.channels_min) { + ret = s3c_preallocate_dma_buffer(pcm, + SNDRV_PCM_STREAM_CAPTURE); + if (ret) + goto out; + } + out: + return ret; +} + +struct snd_soc_platform s3c24xx_soc_platform = { + .name = "s3c24xx-audio", + .pcm_ops = &s3c_dma_ops, + .pcm_new = s3c_dma_new, + .pcm_free = s3c_dma_free_dma_buffers, +}; +EXPORT_SYMBOL_GPL(s3c24xx_soc_platform); + +static int __init s3c24xx_soc_platform_init(void) +{ + return snd_soc_register_platform(&s3c24xx_soc_platform); +} +module_init(s3c24xx_soc_platform_init); + +static void __exit s3c24xx_soc_platform_exit(void) +{ + snd_soc_unregister_platform(&s3c24xx_soc_platform); +} +module_exit(s3c24xx_soc_platform_exit); + +MODULE_AUTHOR("Ben Dooks, <ben(a)simtec.co.uk>"); +MODULE_DESCRIPTION("Samsung S3C Audio DMA module"); +MODULE_LICENSE("GPL"); diff --git a/sound/soc/s3c24xx/s3c-audio.h b/sound/soc/s3c24xx/s3c-audio.h new file mode 100644 index 0000000..8cbc071 --- /dev/null +++ b/sound/soc/s3c24xx/s3c-audio.h @@ -0,0 +1,31 @@ +/* + * s3c-audio.h -- + * + * This program is free software; you can redistribute it and/or modify it + * under the terms of the GNU General Public License as published by the + * Free Software Foundation; either version 2 of the License, or (at your + * option) any later version. + * + * ALSA PCM interface for the Samsung S3C24xx CPU + */ + +#ifndef _S3C_AUDIO_H +#define _S3C_AUDIO_H + +#define ST_RUNNING (1<<0) +#define ST_OPENED (1<<1) + +struct s3c_dma_params { + struct s3c2410_dma_client *client; /* stream identifier */ + int channel; /* Channel ID */ + dma_addr_t dma_addr; + int dma_size; /* Size of the DMA transfer */ +}; + +#define S3C24XX_DAI_I2S 0 + +/* platform data */ +extern struct snd_soc_platform s3c24xx_soc_platform; +extern struct snd_ac97_bus_ops s3c24xx_ac97_ops; + +#endif diff --git a/sound/soc/s3c24xx/s3c-i2s-v2.c b/sound/soc/s3c24xx/s3c-i2s-v2.c index 5a442aa..13c99ab 100644 --- a/sound/soc/s3c24xx/s3c-i2s-v2.c +++ b/sound/soc/s3c24xx/s3c-i2s-v2.c @@ -35,7 +35,7 @@ #include <mach/dma.h> #include "s3c-i2s-v2.h" -#include "s3c24xx-pcm.h" +#include "s3c-audio.h" #undef S3C_IIS_V2_SUPPORTED diff --git a/sound/soc/s3c24xx/s3c2412-i2s.c b/sound/soc/s3c24xx/s3c2412-i2s.c index 23718ea..553c480 100644 --- a/sound/soc/s3c24xx/s3c2412-i2s.c +++ b/sound/soc/s3c24xx/s3c2412-i2s.c @@ -37,7 +37,7 @@ #include <mach/regs-gpio.h> #include <mach/dma.h> -#include "s3c24xx-pcm.h" +#include "s3c-audio.h" #include "s3c2412-i2s.h" #define S3C2412_I2S_DEBUG 0 diff --git a/sound/soc/s3c24xx/s3c2443-ac97.c b/sound/soc/s3c24xx/s3c2443-ac97.c index 678b176..000dc79 100644 --- a/sound/soc/s3c24xx/s3c2443-ac97.c +++ b/sound/soc/s3c24xx/s3c2443-ac97.c @@ -35,7 +35,7 @@ #include <asm/dma.h> #include <mach/dma.h> -#include "s3c24xx-pcm.h" +#include "s3c-audio.h" #include "s3c24xx-ac97.h" struct s3c24xx_ac97_info { diff --git a/sound/soc/s3c24xx/s3c24xx-i2s.c b/sound/soc/s3c24xx/s3c24xx-i2s.c index afb4bc9..ed83747 100644 --- a/sound/soc/s3c24xx/s3c24xx-i2s.c +++ b/sound/soc/s3c24xx/s3c24xx-i2s.c @@ -38,7 +38,7 @@ #include <plat/regs-iis.h> -#include "s3c24xx-pcm.h" +#include "s3c-audio.h" #include "s3c24xx-i2s.h" static struct s3c2410_dma_client s3c24xx_dma_client_out = { diff --git a/sound/soc/s3c24xx/s3c24xx-pcm.c b/sound/soc/s3c24xx/s3c24xx-pcm.c deleted file mode 100644 index cb49400..0000000 --- a/sound/soc/s3c24xx/s3c24xx-pcm.c +++ /dev/null @@ -1,480 +0,0 @@ -/* - * s3c24xx-pcm.c -- ALSA Soc Audio Layer - * - * (c) 2006 Wolfson Microelectronics PLC. - * Graeme Gregory graeme.gregory(a)wolfsonmicro.com or linux(a)wolfsonmicro.com - * - * Copyright 2004-2005 Simtec Electronics - * http://armlinux.simtec.co.uk/ - * Ben Dooks <ben(a)simtec.co.uk> - * - * This program is free software; you can redistribute it and/or modify it - * under the terms of the GNU General Public License as published by the - * Free Software Foundation; either version 2 of the License, or (at your - * option) any later version. - */ - -#include <linux/module.h> -#include <linux/init.h> -#include <linux/io.h> -#include <linux/platform_device.h> -#include <linux/slab.h> -#include <linux/dma-mapping.h> - -#include <sound/core.h> -#include <sound/pcm.h> -#include <sound/pcm_params.h> -#include <sound/soc.h> - -#include <asm/dma.h> -#include <mach/hardware.h> -#include <mach/dma.h> - -#include "s3c24xx-pcm.h" - -static const struct snd_pcm_hardware s3c_dma_hardware = { - .info = SNDRV_PCM_INFO_INTERLEAVED | - SNDRV_PCM_INFO_BLOCK_TRANSFER | - SNDRV_PCM_INFO_MMAP | - SNDRV_PCM_INFO_MMAP_VALID | - SNDRV_PCM_INFO_PAUSE | - SNDRV_PCM_INFO_RESUME, - .formats = SNDRV_PCM_FMTBIT_S16_LE | - SNDRV_PCM_FMTBIT_U16_LE | - SNDRV_PCM_FMTBIT_U8 | - SNDRV_PCM_FMTBIT_S8, - .channels_min = 2, - .channels_max = 2, - .buffer_bytes_max = 128*1024, - .period_bytes_min = PAGE_SIZE, - .period_bytes_max = PAGE_SIZE*2, - .periods_min = 2, - .periods_max = 128, - .fifo_size = 32, -}; - -struct s3c24xx_runtime_data { - spinlock_t lock; - int state; - unsigned int dma_loaded; - unsigned int dma_limit; - unsigned int dma_period; - dma_addr_t dma_start; - dma_addr_t dma_pos; - dma_addr_t dma_end; - struct s3c_dma_params *params; -}; - -/* s3c_dma_enqueue - * - * place a dma buffer onto the queue for the dma system - * to handle. -*/ -static void s3c_dma_enqueue(struct snd_pcm_substream *substream) -{ - struct s3c24xx_runtime_data *prtd = substream->runtime->private_data; - dma_addr_t pos = prtd->dma_pos; - unsigned int limit; - int ret; - - pr_debug("Entered %s\n", __func__); - - if (s3c_dma_has_circular()) { - limit = (prtd->dma_end - prtd->dma_start) / prtd->dma_period; - } else - limit = prtd->dma_limit; - - pr_debug("%s: loaded %d, limit %d\n", __func__, prtd->dma_loaded, limit); - - while (prtd->dma_loaded < limit) { - unsigned long len = prtd->dma_period; - - pr_debug("dma_loaded: %d\n", prtd->dma_loaded); - - if ((pos + len) > prtd->dma_end) { - len = prtd->dma_end - pos; - pr_debug(KERN_DEBUG "%s: corrected dma len %ld\n", - __func__, len); - } - - ret = s3c2410_dma_enqueue(prtd->params->channel, - substream, pos, len); - - if (ret == 0) { - prtd->dma_loaded++; - pos += prtd->dma_period; - if (pos >= prtd->dma_end) - pos = prtd->dma_start; - } else - break; - } - - prtd->dma_pos = pos; -} - -static void s3c24xx_audio_buffdone(struct s3c2410_dma_chan *channel, - void *dev_id, int size, - enum s3c2410_dma_buffresult result) -{ - struct snd_pcm_substream *substream = dev_id; - struct s3c24xx_runtime_data *prtd; - - pr_debug("Entered %s\n", __func__); - - if (result == S3C2410_RES_ABORT || result == S3C2410_RES_ERR) - return; - - prtd = substream->runtime->private_data; - - if (substream) - snd_pcm_period_elapsed(substream); - - spin_lock(&prtd->lock); - if (prtd->state & ST_RUNNING && !s3c_dma_has_circular()) { - prtd->dma_loaded--; - s3c_dma_enqueue(substream); - } - - spin_unlock(&prtd->lock); -} - -static int s3c_dma_hw_params(struct snd_pcm_substream *substream, - struct snd_pcm_hw_params *params) -{ - struct snd_pcm_runtime *runtime = substream->runtime; - struct s3c24xx_runtime_data *prtd = runtime->private_data; - struct snd_soc_pcm_runtime *rtd = substream->private_data; - struct s3c_dma_params *dma = rtd->dai->cpu_dai->dma_data; - unsigned long totbytes = params_buffer_bytes(params); - int ret = 0; - - pr_debug("Entered %s\n", __func__); - - /* return if this is a bufferless transfer e.g. - * codec <--> BT codec or GSM modem -- lg FIXME */ - if (!dma) - return 0; - - /* this may get called several times by oss emulation - * with different params -HW */ - if (prtd->params == NULL) { - /* prepare DMA */ - prtd->params = dma; - - pr_debug("params %p, client %p, channel %d\n", prtd->params, - prtd->params->client, prtd->params->channel); - - ret = s3c2410_dma_request(prtd->params->channel, - prtd->params->client, NULL); - - if (ret < 0) { - printk(KERN_ERR "failed to get dma channel\n"); - return ret; - } - - /* use the circular buffering if we have it available. */ - if (s3c_dma_has_circular()) - s3c2410_dma_setflags(prtd->params->channel, - S3C2410_DMAF_CIRCULAR); - } - - s3c2410_dma_set_buffdone_fn(prtd->params->channel, - s3c24xx_audio_buffdone); - - snd_pcm_set_runtime_buffer(substream, &substream->dma_buffer); - - runtime->dma_bytes = totbytes; - - spin_lock_irq(&prtd->lock); - prtd->dma_loaded = 0; - prtd->dma_limit = runtime->hw.periods_min; - prtd->dma_period = params_period_bytes(params); - prtd->dma_start = runtime->dma_addr; - prtd->dma_pos = prtd->dma_start; - prtd->dma_end = prtd->dma_start + totbytes; - spin_unlock_irq(&prtd->lock); - - return 0; -} - -static int s3c_dma_hw_free(struct snd_pcm_substream *substream) -{ - struct s3c24xx_runtime_data *prtd = substream->runtime->private_data; - - pr_debug("Entered %s\n", __func__); - - /* TODO - do we need to ensure DMA flushed */ - snd_pcm_set_runtime_buffer(substream, NULL); - - if (prtd->params) { - s3c2410_dma_free(prtd->params->channel, prtd->params->client); - prtd->params = NULL; - } - - return 0; -} - -static int s3c_dma_prepare(struct snd_pcm_substream *substream) -{ - struct s3c24xx_runtime_data *prtd = substream->runtime->private_data; - int ret = 0; - - pr_debug("Entered %s\n", __func__); - - /* return if this is a bufferless transfer e.g. - * codec <--> BT codec or GSM modem -- lg FIXME */ - if (!prtd->params) - return 0; - - /* channel needs configuring for mem=>device, increment memory addr, - * sync to pclk, half-word transfers to the IIS-FIFO. */ - if (substream->stream == SNDRV_PCM_STREAM_PLAYBACK) { - s3c2410_dma_devconfig(prtd->params->channel, - S3C2410_DMASRC_MEM, - prtd->params->dma_addr); - } else { - s3c2410_dma_devconfig(prtd->params->channel, - S3C2410_DMASRC_HW, - prtd->params->dma_addr); - } - - s3c2410_dma_config(prtd->params->channel, - prtd->params->dma_size); - - /* flush the DMA channel */ - s3c2410_dma_ctrl(prtd->params->channel, S3C2410_DMAOP_FLUSH); - prtd->dma_loaded = 0; - prtd->dma_pos = prtd->dma_start; - - /* enqueue dma buffers */ - s3c_dma_enqueue(substream); - - return ret; -} - -static int s3c_dma_trigger(struct snd_pcm_substream *substream, int cmd) -{ - struct s3c24xx_runtime_data *prtd = substream->runtime->private_data; - int ret = 0; - - pr_debug("Entered %s\n", __func__); - - spin_lock(&prtd->lock); - - switch (cmd) { - case SNDRV_PCM_TRIGGER_START: - case SNDRV_PCM_TRIGGER_RESUME: - case SNDRV_PCM_TRIGGER_PAUSE_RELEASE: - prtd->state |= ST_RUNNING; - s3c2410_dma_ctrl(prtd->params->channel, S3C2410_DMAOP_START); - break; - - case SNDRV_PCM_TRIGGER_STOP: - case SNDRV_PCM_TRIGGER_SUSPEND: - case SNDRV_PCM_TRIGGER_PAUSE_PUSH: - prtd->state &= ~ST_RUNNING; - s3c2410_dma_ctrl(prtd->params->channel, S3C2410_DMAOP_STOP); - break; - - default: - ret = -EINVAL; - break; - } - - spin_unlock(&prtd->lock); - - return ret; -} - -static snd_pcm_uframes_t -s3c_dma_pointer(struct snd_pcm_substream *substream) -{ - struct snd_pcm_runtime *runtime = substream->runtime; - struct s3c24xx_runtime_data *prtd = runtime->private_data; - unsigned long res; - dma_addr_t src, dst; - - pr_debug("Entered %s\n", __func__); - - spin_lock(&prtd->lock); - s3c2410_dma_getposition(prtd->params->channel, &src, &dst); - - if (substream->stream == SNDRV_PCM_STREAM_CAPTURE) - res = dst - prtd->dma_start; - else - res = src - prtd->dma_start; - - spin_unlock(&prtd->lock); - - pr_debug("Pointer %x %x\n", src, dst); - - /* we seem to be getting the odd error from the pcm library due - * to out-of-bounds pointers. this is maybe due to the dma engine - * not having loaded the new values for the channel before being - * callled... (todo - fix ) - */ - - if (res >= snd_pcm_lib_buffer_bytes(substream)) { - if (res == snd_pcm_lib_buffer_bytes(substream)) - res = 0; - } - - return bytes_to_frames(substream->runtime, res); -} - -static int s3c_dma_open(struct snd_pcm_substream *substream) -{ - struct snd_pcm_runtime *runtime = substream->runtime; - struct s3c24xx_runtime_data *prtd; - - pr_debug("Entered %s\n", __func__); - - snd_pcm_hw_constraint_integer(runtime, SNDRV_PCM_HW_PARAM_PERIODS); - snd_soc_set_runtime_hwparams(substream, &s3c_dma_hardware); - - prtd = kzalloc(sizeof(struct s3c24xx_runtime_data), GFP_KERNEL); - if (prtd == NULL) - return -ENOMEM; - - spin_lock_init(&prtd->lock); - - runtime->private_data = prtd; - return 0; -} - -static int s3c_dma_close(struct snd_pcm_substream *substream) -{ - struct snd_pcm_runtime *runtime = substream->runtime; - struct s3c24xx_runtime_data *prtd = runtime->private_data; - - pr_debug("Entered %s\n", __func__); - - if (!prtd) - pr_debug("s3c_dma_close called with prtd == NULL\n"); - - kfree(prtd); - - return 0; -} - -static int s3c_dma_mmap(struct snd_pcm_substream *substream, - struct vm_area_struct *vma) -{ - struct snd_pcm_runtime *runtime = substream->runtime; - - pr_debug("Entered %s\n", __func__); - - return dma_mmap_writecombine(substream->pcm->card->dev, vma, - runtime->dma_area, - runtime->dma_addr, - runtime->dma_bytes); -} - -static struct snd_pcm_ops s3c_dma_ops = { - .open = s3c_dma_open, - .close = s3c_dma_close, - .ioctl = snd_pcm_lib_ioctl, - .hw_params = s3c_dma_hw_params, - .hw_free = s3c_dma_hw_free, - .prepare = s3c_dma_prepare, - .trigger = s3c_dma_trigger, - .pointer = s3c_dma_pointer, - .mmap = s3c_dma_mmap, -}; - -static int s3c_preallocate_dma_buffer(struct snd_pcm *pcm, int stream) -{ - struct snd_pcm_substream *substream = pcm->streams[stream].substream; - struct snd_dma_buffer *buf = &substream->dma_buffer; - size_t size = s3c_dma_hardware.buffer_bytes_max; - - pr_debug("Entered %s\n", __func__); - - buf->dev.type = SNDRV_DMA_TYPE_DEV; - buf->dev.dev = pcm->card->dev; - buf->private_data = NULL; - buf->area = dma_alloc_writecombine(pcm->card->dev, size, - &buf->addr, GFP_KERNEL); - if (!buf->area) - return -ENOMEM; - buf->bytes = size; - return 0; -} - -static void s3c_dma_free_dma_buffers(struct snd_pcm *pcm) -{ - struct snd_pcm_substream *substream; - struct snd_dma_buffer *buf; - int stream; - - pr_debug("Entered %s\n", __func__); - - for (stream = 0; stream < 2; stream++) { - substream = pcm->streams[stream].substream; - if (!substream) - continue; - - buf = &substream->dma_buffer; - if (!buf->area) - continue; - - dma_free_writecombine(pcm->card->dev, buf->bytes, - buf->area, buf->addr); - buf->area = NULL; - } -} - -static u64 s3c_dma_mask = DMA_BIT_MASK(32); - -static int s3c_dma_new(struct snd_card *card, - struct snd_soc_dai *dai, struct snd_pcm *pcm) -{ - int ret = 0; - - pr_debug("Entered %s\n", __func__); - - if (!card->dev->dma_mask) - card->dev->dma_mask = &s3c_dma_mask; - if (!card->dev->coherent_dma_mask) - card->dev->coherent_dma_mask = 0xffffffff; - - if (dai->playback.channels_min) { - ret = s3c_preallocate_dma_buffer(pcm, - SNDRV_PCM_STREAM_PLAYBACK); - if (ret) - goto out; - } - - if (dai->capture.channels_min) { - ret = s3c_preallocate_dma_buffer(pcm, - SNDRV_PCM_STREAM_CAPTURE); - if (ret) - goto out; - } - out: - return ret; -} - -struct snd_soc_platform s3c24xx_soc_platform = { - .name = "s3c24xx-audio", - .pcm_ops = &s3c_dma_ops, - .pcm_new = s3c_dma_new, - .pcm_free = s3c_dma_free_dma_buffers, -}; -EXPORT_SYMBOL_GPL(s3c24xx_soc_platform); - -static int __init s3c24xx_soc_platform_init(void) -{ - return snd_soc_register_platform(&s3c24xx_soc_platform); -} -module_init(s3c24xx_soc_platform_init); - -static void __exit s3c24xx_soc_platform_exit(void) -{ - snd_soc_unregister_platform(&s3c24xx_soc_platform); -} -module_exit(s3c24xx_soc_platform_exit); - -MODULE_AUTHOR("Ben Dooks, <ben(a)simtec.co.uk>"); -MODULE_DESCRIPTION("Samsung S3C Audio DMA module"); -MODULE_LICENSE("GPL"); diff --git a/sound/soc/s3c24xx/s3c24xx-pcm.h b/sound/soc/s3c24xx/s3c24xx-pcm.h deleted file mode 100644 index 8cbc071..0000000 --- a/sound/soc/s3c24xx/s3c24xx-pcm.h +++ /dev/null @@ -1,31 +0,0 @@ -/* - * s3c24xx-pcm.h -- - * - * This program is free software; you can redistribute it and/or modify it - * under the terms of the GNU General Public License as published by the - * Free Software Foundation; either version 2 of the License, or (at your - * option) any later version. - * - * ALSA PCM interface for the Samsung S3C24xx CPU - */ - -#ifndef _S3C_AUDIO_H -#define _S3C_AUDIO_H - -#define ST_RUNNING (1<<0) -#define ST_OPENED (1<<1) - -struct s3c_dma_params { - struct s3c2410_dma_client *client; /* stream identifier */ - int channel; /* Channel ID */ - dma_addr_t dma_addr; - int dma_size; /* Size of the DMA transfer */ -}; - -#define S3C24XX_DAI_I2S 0 - -/* platform data */ -extern struct snd_soc_platform s3c24xx_soc_platform; -extern struct snd_ac97_bus_ops s3c24xx_ac97_ops; - -#endif diff --git a/sound/soc/s3c24xx/s3c24xx_simtec.c b/sound/soc/s3c24xx/s3c24xx_simtec.c index 1966e0d..ef75416 100644 --- a/sound/soc/s3c24xx/s3c24xx_simtec.c +++ b/sound/soc/s3c24xx/s3c24xx_simtec.c @@ -21,7 +21,7 @@ #include <plat/audio-simtec.h> -#include "s3c24xx-pcm.h" +#include "s3c-audio.h" #include "s3c24xx-i2s.h" #include "s3c24xx_simtec.h" diff --git a/sound/soc/s3c24xx/s3c24xx_simtec_hermes.c b/sound/soc/s3c24xx/s3c24xx_simtec_hermes.c index 8346bd9..61166a5 100644 --- a/sound/soc/s3c24xx/s3c24xx_simtec_hermes.c +++ b/sound/soc/s3c24xx/s3c24xx_simtec_hermes.c @@ -18,7 +18,7 @@ #include <plat/audio-simtec.h> -#include "s3c24xx-pcm.h" +#include "s3c-audio.h" #include "s3c24xx-i2s.h" #include "s3c24xx_simtec.h" diff --git a/sound/soc/s3c24xx/s3c24xx_simtec_tlv320aic23.c b/sound/soc/s3c24xx/s3c24xx_simtec_tlv320aic23.c index 25797e0..af0bf57 100644 --- a/sound/soc/s3c24xx/s3c24xx_simtec_tlv320aic23.c +++ b/sound/soc/s3c24xx/s3c24xx_simtec_tlv320aic23.c @@ -18,7 +18,7 @@ #include <plat/audio-simtec.h> -#include "s3c24xx-pcm.h" +#include "s3c-audio.h" #include "s3c24xx-i2s.h" #include "s3c24xx_simtec.h" diff --git a/sound/soc/s3c24xx/s3c24xx_uda134x.c b/sound/soc/s3c24xx/s3c24xx_uda134x.c index c215d32..e8d6cc2 100644 --- a/sound/soc/s3c24xx/s3c24xx_uda134x.c +++ b/sound/soc/s3c24xx/s3c24xx_uda134x.c @@ -24,7 +24,7 @@ #include <plat/regs-iis.h> -#include "s3c24xx-pcm.h" +#include "s3c-audio.h" #include "s3c24xx-i2s.h" #include "../codecs/uda134x.h" diff --git a/sound/soc/s3c24xx/s3c64xx-i2s.c b/sound/soc/s3c24xx/s3c64xx-i2s.c index 719d63c..64c034b 100644 --- a/sound/soc/s3c24xx/s3c64xx-i2s.c +++ b/sound/soc/s3c24xx/s3c64xx-i2s.c @@ -35,7 +35,7 @@ #include <mach/map.h> #include <mach/dma.h> -#include "s3c24xx-pcm.h" +#include "s3c-audio.h" #include "s3c64xx-i2s.h" static struct s3c2410_dma_client s3c64xx_dma_client_out = { diff --git a/sound/soc/s3c24xx/smdk2443_wm9710.c b/sound/soc/s3c24xx/smdk2443_wm9710.c index a2a4f53..106c72d 100644 --- a/sound/soc/s3c24xx/smdk2443_wm9710.c +++ b/sound/soc/s3c24xx/smdk2443_wm9710.c @@ -20,7 +20,7 @@ #include <sound/soc-dapm.h> #include "../codecs/ac97.h" -#include "s3c24xx-pcm.h" +#include "s3c-audio.h" #include "s3c24xx-ac97.h" static struct snd_soc_card smdk2443; diff --git a/sound/soc/s3c24xx/smdk64xx_wm8580.c b/sound/soc/s3c24xx/smdk64xx_wm8580.c index cb8a916..7956a9c 100644 --- a/sound/soc/s3c24xx/smdk64xx_wm8580.c +++ b/sound/soc/s3c24xx/smdk64xx_wm8580.c @@ -19,7 +19,7 @@ #include <sound/soc-dapm.h> #include "../codecs/wm8580.h" -#include "s3c24xx-pcm.h" +#include "s3c-audio.h" #include "s3c64xx-i2s.h" #define S3C64XX_I2S_V4 2 -- 1.6.2.5

3 3

[alsa-devel] [PATCH 4/7] S3C64XX PCM: Added PCLK clock source for the PCM controllers
by Jassi Brar 16 Nov '09

16 Nov '09

Signed-off-by: Jassi Brar <jassi.brar(a)samsung.com> --- arch/arm/plat-s3c64xx/clock.c | 12 ++++++++++++ 1 files changed, 12 insertions(+), 0 deletions(-) diff --git a/arch/arm/plat-s3c64xx/clock.c b/arch/arm/plat-s3c64xx/clock.c index 7a36e89..3ab564e 100644 --- a/arch/arm/plat-s3c64xx/clock.c +++ b/arch/arm/plat-s3c64xx/clock.c @@ -129,6 +129,18 @@ static struct clk init_clocks_disable[] = { .enable = s3c64xx_pclk_ctrl, .ctrlbit = S3C_CLKCON_PCLK_IIS1, }, { + .name = "pcm", + .id = 0, + .parent = &clk_p, + .enable = s3c64xx_pclk_ctrl, + .ctrlbit = S3C_CLKCON_PCLK_PCM0, + }, { + .name = "pcm", + .id = 1, + .parent = &clk_p, + .enable = s3c64xx_pclk_ctrl, + .ctrlbit = S3C_CLKCON_PCLK_PCM1, + }, { .name = "spi", .id = 0, .parent = &clk_p, -- 1.6.2.5

3 2

[alsa-devel] [PATCH 3/7] S3C64XX PCM: Define PCM Controller base registers
by Jassi Brar 16 Nov '09

16 Nov '09

Signed-off-by: Jassi Brar <jassi.brar(a)samsung.com> --- arch/arm/mach-s3c6400/include/mach/map.h | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/arch/arm/mach-s3c6400/include/mach/map.h b/arch/arm/mach-s3c6400/include/mach/map.h index fc8b223..866be31 100644 --- a/arch/arm/mach-s3c6400/include/mach/map.h +++ b/arch/arm/mach-s3c6400/include/mach/map.h @@ -48,6 +48,8 @@ #define S3C64XX_PA_IIS1 (0x7F003000) #define S3C64XX_PA_TIMER (0x7F006000) #define S3C64XX_PA_IIC0 (0x7F004000) +#define S3C64XX_PA_PCM0 (0x7F009000) +#define S3C64XX_PA_PCM1 (0x7F00A000) #define S3C64XX_PA_IISV4 (0x7F00D000) #define S3C64XX_PA_IIC1 (0x7F00F000) -- 1.6.2.5

3 2

[alsa-devel] PC Beep or PC Speaker or just Beep? and HDA Beep code...
by Jaroslav Kysela 16 Nov '09

16 Nov '09

Hi, I'm changing the behaviour of Beep / PC Beep controls for HDA drivers (comments?): http://git.alsa-project.org/?p=alsa-kernel.git;a=commitdiff;h=d605dbeed1b10… I would like to introduce uniform naming for these controls to not confuse users. HDA driver: Beep, PC Beep AC97: PC Speaker, Beep, PC Beep etc.. I think that the original purpose of PC Speaker is a beep generator. Also, many SoC platforms use AC97 codecs, so removing abbreviation PC might make sense. It would be probably best to change all control names in drivers to 'Beep'. Comments? Jaroslav ----- Jaroslav Kysela <perex(a)perex.cz> Linux Kernel Sound Maintainer ALSA Project, Red Hat, Inc.

2 18

[alsa-devel] [PATCH 0/2] fix softfloat handling
by Marc Kleine-Budde 16 Nov '09

16 Nov '09

Hello, this series of two patches fixes the softfloat handling within the alsa-lib. Please review and consider to apply. cheers, Marc

2 4

[alsa-devel] [patch] make some bitfields unsigned
by Dan Carpenter 16 Nov '09

16 Nov '09

This is a clean up and doesn't change the behavior. Bit fields should always be unsigned. Otherwise pm_suspend_enabled will be -1 when you want it to be 1. The other bad thing is that the sparse checker will complain 36 times if they aren't unsigned. The other bitfields in that struct are unsigned already. regards, dan carpenter Signed-off-by: Dan Carpenter <error27(a)gmail.com> --- orig/sound/pci/ice1712/ice1712.h 2009-11-14 12:09:26.000000000 +0200 +++ devel/sound/pci/ice1712/ice1712.h 2009-11-14 12:10:01.000000000 +0200 @@ -382,8 +382,8 @@ #ifdef CONFIG_PM int (*pm_suspend)(struct snd_ice1712 *); int (*pm_resume)(struct snd_ice1712 *); - int pm_suspend_enabled:1; - int pm_saved_is_spdif_master:1; + unsigned int pm_suspend_enabled:1; + unsigned int pm_saved_is_spdif_master:1; unsigned int pm_saved_spdif_ctrl; unsigned char pm_saved_spdif_cfg; unsigned int pm_saved_route;

2 1

[alsa-devel] [PATCH - Full support for Toshiba NB200 1/1] Support for Toshiba NB200
by cjg＠cruxppc.org 16 Nov '09

16 Nov '09

From: Giuseppe Coviello <cjg(a)cruxppc.org> Signed-off-by: Giuseppe Coviello <cjg(a)cruxppc.org> --- sound/pci/hda/patch_realtek.c | 86 ++++++++++++++++++++++++++++++++++++++++- 1 files changed, 85 insertions(+), 1 deletions(-) diff --git a/sound/pci/hda/patch_realtek.c b/sound/pci/hda/patch_realtek.c index c0a98e7..69484b8 100644 --- a/sound/pci/hda/patch_realtek.c +++ b/sound/pci/hda/patch_realtek.c @@ -191,6 +191,7 @@ enum { ALC272_DELL, ALC272_DELL_ZM1, ALC272_SAMSUNG_NC10, + ALC272_TOSHIBA_NB200, ALC662_AUTO, ALC662_MODEL_LAST, }; @@ -16355,6 +16356,40 @@ static struct hda_verb alc272_dell_init_verbs[] = { {} }; +static struct snd_kcontrol_new alc272_toshiba_mixer[] = { + HDA_CODEC_VOLUME("Front Mic Boost", 0x19, 0, HDA_INPUT), + + HDA_CODEC_VOLUME("i-Mic Playback Volume", 0x0b, 0x1, HDA_INPUT), + HDA_CODEC_MUTE("i-Mic Playback Switch", 0x0b, 0x1, HDA_INPUT), + HDA_CODEC_VOLUME("Line Playback Volume", 0x0b, 0x02, HDA_INPUT), + HDA_CODEC_MUTE("Line Playback Switch", 0x0b, 0x02, HDA_INPUT), + { } /* end */ +}; + +static struct hda_verb alc272_toshiba_init_verbs[] = { + /* Front Pin: output 0 (0x0c) */ + {0x17, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_OUT}, /* 0x14 */ + {0x17, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_UNMUTE}, /* 0x14 */ + /* Front Mic pin: input vref at 80% */ + {0x14, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_VREF80}, /* 0x19 */ + {0x14, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_MUTE}, /* 0x19 */ + {0x17, AC_VERB_SET_EAPD_BTLENABLE, 2}, /* 0x14 */ + {0x19, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_IN}, /* originally 0x12 */ + {0x19, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_VREF80}, + {0x13, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_IN}, + {0x15, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_IN}, + {0x16, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_IN}, + {0x21, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_HP}, + {0x21, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_UNMUTE}, + {0x21, AC_VERB_SET_CONNECT_SEL, 0x01}, /* Headphone */ + {0x23, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(0)}, + {0x23, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(9)}, + {0x18, AC_VERB_SET_UNSOLICITED_ENABLE, AC_USRSP_EN | ALC880_MIC_EVENT}, + {0x21, AC_VERB_SET_UNSOLICITED_ENABLE, AC_USRSP_EN | ALC880_HP_EVENT}, + {} +}; + + static struct snd_kcontrol_new alc662_auto_capture_mixer[] = { HDA_CODEC_VOLUME("Capture Volume", 0x09, 0x0, HDA_INPUT), HDA_CODEC_MUTE("Capture Switch", 0x09, 0x0, HDA_INPUT), @@ -16579,6 +16614,40 @@ static void alc663_m51va_inithook(struct hda_codec *codec) alc_mic_automute(codec); } +static void alc272_toshiba_speaker_automute(struct hda_codec *codec) +{ + unsigned int present; + unsigned char bits; + + present = snd_hda_codec_read(codec, 0x21, 0, + AC_VERB_GET_PIN_SENSE, 0) + & AC_PINSENSE_PRESENCE; + bits = present ? HDA_AMP_MUTE : 0; + snd_hda_codec_amp_stereo(codec, 0x17, HDA_OUTPUT, 0, + AMP_OUT_MUTE, bits); + snd_hda_codec_amp_stereo(codec, 0x17, HDA_OUTPUT, 1, + AMP_OUT_MUTE, bits); +} + +static void alc272_toshiba_unsol_event(struct hda_codec *codec, + unsigned int res) +{ + switch (res >> 26) { + case ALC880_HP_EVENT: + alc272_toshiba_speaker_automute(codec); + break; + case ALC880_MIC_EVENT: + alc_mic_automute(codec); + break; + } +} + +static void alc272_toshiba_inithook(struct hda_codec *codec) +{ + alc272_toshiba_speaker_automute(codec); + alc_mic_automute(codec); +} + /* ***************** Mode1 ******************************/ #define alc663_mode1_unsol_event alc663_m51va_unsol_event #define alc663_mode1_setup alc663_m51va_setup @@ -16830,6 +16899,7 @@ static const char *alc662_models[ALC662_MODEL_LAST] = { [ALC663_ASUS_MODE6] = "asus-mode6", [ALC272_DELL] = "dell", [ALC272_DELL_ZM1] = "dell-zm1", + [ALC272_TOSHIBA_NB200] = "toshiba-nb200", [ALC272_SAMSUNG_NC10] = "samsung-nc10", [ALC662_AUTO] = "auto", }; @@ -16838,6 +16908,7 @@ static struct snd_pci_quirk alc662_cfg_tbl[] = { SND_PCI_QUIRK(0x1019, 0x9087, "ECS", ALC662_ECS), SND_PCI_QUIRK(0x1028, 0x02d6, "DELL", ALC272_DELL), SND_PCI_QUIRK(0x1028, 0x02f4, "DELL ZM1", ALC272_DELL_ZM1), + SND_PCI_QUIRK(0x1179, 0xff6e, "Toshiba NB200", ALC272_TOSHIBA_NB200), SND_PCI_QUIRK(0x1043, 0x1000, "ASUS N50Vm", ALC663_ASUS_MODE1), SND_PCI_QUIRK(0x1043, 0x1092, "ASUS NB", ALC663_ASUS_MODE3), SND_PCI_QUIRK(0x1043, 0x11c3, "ASUS M70V", ALC663_ASUS_MODE3), @@ -16888,7 +16959,6 @@ static struct snd_pci_quirk alc662_cfg_tbl[] = { SND_PCI_QUIRK(0x105b, 0x0cd6, "Foxconn", ALC662_ECS), SND_PCI_QUIRK(0x105b, 0x0d47, "Foxconn 45CMX/45GMX/45CMX-K", ALC662_3ST_6ch_DIG), - SND_PCI_QUIRK(0x1179, 0xff6e, "Toshiba NB200", ALC663_ASUS_MODE4), SND_PCI_QUIRK(0x144d, 0xca00, "Samsung NC10", ALC272_SAMSUNG_NC10), SND_PCI_QUIRK(0x1458, 0xa002, "Gigabyte 945GCM-S2L", ALC662_3ST_6ch_DIG), @@ -17175,6 +17245,20 @@ static struct alc_config_preset alc662_presets[] = { .setup = alc663_mode4_setup, .init_hook = alc663_mode4_inithook, }, + [ALC272_TOSHIBA_NB200] = { + .mixers = { alc663_m51va_mixer, alc272_toshiba_mixer }, + .init_verbs = { alc662_init_verbs, alc272_toshiba_init_verbs }, + .num_dacs = ARRAY_SIZE(alc662_dac_nids), + .dac_nids = alc662_dac_nids, + .num_channel_mode = ARRAY_SIZE(alc662_3ST_2ch_modes), + .adc_nids = alc662_adc_nids, + .num_adc_nids = ARRAY_SIZE(alc662_adc_nids), + .capsrc_nids = alc662_capsrc_nids, + .channel_mode = alc662_3ST_2ch_modes, + .input_mux = &alc663_capture_source, + .unsol_event = alc272_toshiba_unsol_event, + .init_hook = alc272_toshiba_inithook, + }, }; -- 1.6.4.2

2 1

Re: [alsa-devel] need support for insatllation of pci sound card.
by Raymond Yau 16 Nov '09

16 Nov '09

2009/11/15 Kunal Narkhede <kunal.narkhede(a)gmail.com> > Hi Raymond, > > With my sound card i got a cd of drivers which has some drivers for linux i > guess but the installaltion steps given in readme file are very tough for me > to follow as the paths given in that file seems to be diffrent in my ubuntu > linux. eg /usr/src/driver/sound this path is not exixting in ubuntu also > after as stated in readme file the option which i should get after executing > the "make config" command for sound card are diffrent and even if i enter > the option given in readme file the forth coming options are diffrent and > take defult value and final result is failure of installation of drivers as > the module that is requires to be installed is not created. > > I am attaching the readme file and the drivers for your kind > reference.Kindly please help me solve this issue..Its been 3 4 months that > this issue is bugging me please. > > > > On Sun, Nov 15, 2009 at 5:47 AM, Raymond Yau <superquad.vortex2(a)gmail.com>wrote: > >> 2009/11/13 Kunal Narkhede <kunal.narkhede(a)gmail.com> >> >> > hi, >> > >> > Please help me install my sound card drivers.As told in forum i updated >> my >> > alsa drivers with the provided one.My card seems to getting recognize >> but >> > no >> > sound is heard here is >> > *output of "aplay -l" command >> > * >> > **** List of PLAYBACK Hardware Devices **** >> > card 0: AudioPCI [Ensoniq AudioPCI], device 0: ES1371/1 [ES1371 >> DAC2/ADC] >> > Subdevices: 1/1 >> > Subdevice #0: subdevice #0 >> > card 0: AudioPCI [Ensoniq AudioPCI], device 1: ES1371/2 [ES1371 DAC1] >> > Subdevices: 1/1 >> > Subdevice #0: subdevice #0 >> > >> > >> > I have also *attached the logfile obtained from alsainfo.sh* provided on >> > the >> > thread of alsa upgrade script. >> > >> > Please help me install my sound card have been searching for drivers >> since >> > 7 >> > months and its getting frustating now. >> > >> > Mine is PCI sound card on-board sound card has been disabled from bios.. >> > >> > I am usung* ubuntu 9.04 with 2.6.28-16-generic kerne*l installed through >> > updates using update manager. >> > >> > -- >> > With Regards >> > Kunal >> > 9860384968 >> > >> > >> This is known bug of EV1938 , it seem that EV1938 no longer read ac97 >> codec >> registers correctly at the time of alsa-driver 1.0.8 >> >> https://bugtrack.alsa-project.org/alsa-bug/view.php?id=1389 >> https://bugtrack.alsa-project.org/alsa-bug/view.php?id=1023 >> >> Symptoms are >> >> 1) Unable to identify Sigmatec AC97 codec 9705 >> >> 0-0/0: 0x76058384 FÕS >> >> 0:7c = 0000 >> 0:7e = 8384 >> >> >> 2) The value of reset register are wrong >> >> 0:00 = 0000 >> >> Flags: 0 >> Capabilities : -dedicated MIC PCM IN channel- -bass & treble- >> DAC resolution : 16-bit >> ADC resolution : 20-bit >> 3D enhancement : Reserved 29 >> >> >> 3) The value of other registers and mixer controls are wrong >> >> >> 0:02 = 0140 >> 0:04 = 8e0e >> 0:06 = 8000 >> 0:08 = 800e >> 0:0a = 0000 >> 0:0c = 1f0f >> 0:0e = 801f >> 0:10 = 801f >> 0:12 = 9f1f >> 0:14 = 8808 >> 0:16 = 9f1f >> 0:18 = 8808 >> 0:1a = 8808 >> 0:1c = 8808 >> 0:1e = 0808 >> 0:20 = 0000 >> 0:22 = 0000 >> 0:24 = 0000 >> 0:26 = 0000 >> > > With Regards > Kunal > 9860384968 > What is the model of your motherboard ? The driver on your CD is OSS cmpci driver for Kernel 2.2 or 2.4 But the PCI info only has EV1938 04:01.0 Multimedia audio controller: Creative Labs Ectiva EV1938 04:01.0 0401: 1102:8938 Subsystem: 1102:5938 !!Linux Distribution !!------------------ Ubuntu 9.04 \n \l DISTRIB_ID=Ubuntu DISTRIB_DESCRIPTION="Ubuntu 9.04" !!DMI Information !!--------------- Manufacturer: Product Name: !!Kernel Information !!------------------ Kernel release: 2.6.28-16-generic Operating System: GNU/Linux Architecture: i686 Processor: unknown SMP Enabled: Yes !!Soundcards recognised by ALSA !!----------------------------- 0 [AudioPCI ]: ENS1371 - Ensoniq AudioPCI Ensoniq AudioPCI ENS1371 at 0xd000, irq 16 !!PCI Soundcards installed in the system !!-------------------------------------- 04:01.0 Multimedia audio controller: Creative Labs Ectiva EV1938 !!Advanced information - PCI Vendor/Device/Susbsystem ID's !!-------------------------------------------------------- 04:01.0 0401: 1102:8938 Subsystem: 1102:5938 !!Modprobe options (Sound related) !!-------------------------------- snd-atiixp-modem: index=-2 snd-intel8x0m: index=-2 snd-via82xx-modem: index=-2 snd-usb-audio: index=-2 snd-usb-us122l: index=-2 snd-usb-usx2y: index=-2 snd-usb-caiaq: index=-2 snd-cmipci: mpu_port=0x330 fm_port=0x388 snd-pcsp: index=-2

1 0

[alsa-devel] possible regression in creative x-fi expresscard
by Susan Cragin 15 Nov '09

15 Nov '09

Recently my Creative X-fi expresscard has stopped working properly. It may be an alsa problem but it may also be some sort of bus problem, and I thought I'd let you decide. I filed Ubuntu bug 462843, which describes it in detail, but basically here's what happens. Sound usually works when I start the computer. But when I close and re-open my application, sound has gone. At the same time, alsamixer shows the card properly. The settings are fine. Asoundconf shows that the card is still there and registered as the default. sudo modprobe snd-hda-codec sudo modprobe snd-hda-codec-ca0110 shows that either the modules are loaded correctly or are able to be re-loaded, but still no sound. I fix by removing and re-inserting the card, and then re-booting the computer. This is for incoming (recorded) sound. I haven't checked the outgoing sound. I have the current Ubuntu version of the drivers, and have not tinkered with them at all. I re-installed the whole system recently. I updated to Lucid hoping to get better updates but that did not help. Here's everything interesting from dmesg|tail. [ 4.088837] sdhci-pci 0000:09:01.1: SDHCI controller found [1180:0822] (rev 22) [ 4.088853] sdhci-pci 0000:09:01.1: PCI INT B -> GSI 17 (level, low) -> IRQ 17 [ 4.099720] mmc0: SDHCI controller on PCI [0000:09:01.1] using PIO [ 4.233046] HDA Intel 0000:00:1b.0: PCI INT A -> GSI 22 (level, low) -> IRQ 22 [ 4.235589] HDA Intel 0000:00:1b.0: setting latency timer to 64 [ 4.352945] HDA Intel 0000:05:00.0: PCI INT A -> GSI 18 (level, low) -> IRQ 18 [ 4.500172] hda-intel: spurious response 0x0:0x0, last cmd=0x000000 [ 5.503012] hda-intel: azx_get_response timeout, switching to polling mode: last cmd=0x101f0012 [ 6.505012] hda_intel: azx_get_response timeout, switching to single_cmd mode: last cmd=0x101f0012

2 1

[alsa-devel] need support for insatllation of pci sound card.
by Kunal Narkhede 15 Nov '09

15 Nov '09

hi, Please help me install my sound card drivers.As told in forum i updated my alsa drivers with the provided one.My card seems to getting recognize but no sound is heard here is *output of "aplay -l" command * **** List of PLAYBACK Hardware Devices **** card 0: AudioPCI [Ensoniq AudioPCI], device 0: ES1371/1 [ES1371 DAC2/ADC] Subdevices: 1/1 Subdevice #0: subdevice #0 card 0: AudioPCI [Ensoniq AudioPCI], device 1: ES1371/2 [ES1371 DAC1] Subdevices: 1/1 Subdevice #0: subdevice #0 *Output of "aplay -L"* default:CARD=AudioPCI Ensoniq AudioPCI, ES1371 DAC2/ADC Default Audio Device front:CARD=AudioPCI,DEV=0 Ensoniq AudioPCI, ES1371 DAC2/ADC Front speakers rear:CARD=AudioPCI,DEV=0 Ensoniq AudioPCI, ES1371 DAC1 Rear speakers surround40:CARD=AudioPCI,DEV=0 Ensoniq AudioPCI, ES1371 DAC2/ADC 4.0 Surround output to Front and Rear speakers iec958:CARD=AudioPCI,DEV=0 Ensoniq AudioPCI, ES1371 DAC2/ADC IEC958 (S/PDIF) Digital Audio Output null Discard all samples (playback) or generate zero samples (capture) I have also *attached the logfile obtained from alsainfo.sh* provided on the thread of alsa upgrade script. Please help me install my sound card have been searching for drivers since 7 months and its getting frustating now. Mine is PCI sound card on-board sound card has been disabled from bios.. I am usung* ubuntu 9.04 with 2.6.28-16-generic kerne*l installed through updates using update manager. -- With Regards Kunal 9860384968

3 5

[alsa-devel] no sound when using TV-OUT - fixed
by Reiner 14 Nov '09

14 Nov '09

Hello, I think I have fixed it in the /dev directory I have done the following: chmod ugo+rw dsp Now it works! Sorry for the 3 e,ails but zo be honest: I dont't understand it, because it's the same user ! Reiner

2 2

[alsa-devel] [PATCH - juli.c 1/1] ALSA: juli - Patch for suspend/resume for ESI Juli@
by alexey.kv＠gmail.com 14 Nov '09

14 Nov '09

From: Aleksey Kunitskiy <alexey.kv(a)gmail.com> Add proper suspend/resume code for Juli@ cards. Based on ice1724 suspend/resume work of Igor Chernyshev. Fixes bug https://bugtrack.alsa-project.org/alsa-bug/view.php?id=4413 Tested on linux-2.6.31.6 Signed-off-by: Aleksey Kunitskiy <alexey.kv(a)gmail.com> --- pci/ice1712/juli.c | 32 ++++++++++++++++++++++++++++++++ 1 files changed, 32 insertions(+), 0 deletions(-) diff --git a/pci/ice1712/juli.c b/pci/ice1712/juli.c index 4bed963..0c9413d 100644 --- a/pci/ice1712/juli.c +++ b/pci/ice1712/juli.c @@ -483,6 +483,31 @@ static int __devinit juli_add_controls(struct snd_ice1712 *ice) } /* + * suspend/resume + * */ + +#ifdef CONFIG_PM +static int juli_resume(struct snd_ice1712 *ice) +{ + struct snd_akm4xxx *ak = ice->akm; + struct juli_spec *spec = ice->spec; + /* akm4358 un-reset, un-mute */ + snd_akm4xxx_reset(ak, 0); + /* reinit ak4114 */ + snd_ak4114_reinit(spec->ak4114); + return 0; +} + +static int juli_suspend(struct snd_ice1712 *ice) +{ + struct snd_akm4xxx *ak = ice->akm; + /* akm4358 reset and soft-mute */ + snd_akm4xxx_reset(ak, 1); + return 0; +} +#endif + +/* * initialize the chip */ @@ -626,6 +651,13 @@ static int __devinit juli_init(struct snd_ice1712 *ice) ice->set_spdif_clock = juli_set_spdif_clock; ice->spdif.ops.open = juli_spdif_in_open; + +#ifdef CONFIG_PM + ice->pm_resume = juli_resume; + ice->pm_suspend = juli_suspend; + ice->pm_suspend_enabled = 1; +#endif + return 0; } -- 1.6.4.4

2 1

[alsa-devel] handling of underrunning snd_pcm_writei
by Mads Kiilerich 14 Nov '09

14 Nov '09

Hi, I AM trying to convert an internal app from oss to alsa and is trying to grok the alsa API and the examples I can find. I would like to ask some questions to avoid guessing and making wrong assumptions. Feel free to redirect me to where I should have found the answer myself. http://www.alsa-project.org/alsa-doc/alsa-lib/group___p_c_m.html#gf13067c0e… says about snd_pcm_writei: > Returns: a positive number of frames actually written otherwise a negative error code > ... > Return values: > ... > -EPIPE an underrun occurred > ... > The count of bytes can be less only if a signal or underrun occurred. So what is returned in case of underrun? Error code or count of bytes? Should snd_pcm_recover always be used to get the byte count after -EPIPE? snd_pcm_recover is neither mentioned in the link above nor in http://www.alsa-project.org/alsa-doc/alsa-lib/pcm.html , so I don't feel confident about that. And is it measured in "positive number of frames actually written" or "count of bytes"? It surprises me that snd_pcm_writei shows non-blocking behaviour in case of underruns and don't use all the offered data. I would guess that it either blocked and enjoyed the data it finally got, or that it gave an error and didn't take any data at all. But if this is how it is, then ... that is how it is ;-) /Mads using alsa-lib-1.0.21-3.fc11.i586 alsa-plugins-pulseaudio-1.0.21-2.fc11.i586

2 5

[alsa-devel] Revised Patches for Samsung SoC PCM Controller driver
by Jassi Brar 14 Nov '09

14 Nov '09

Hello, (I have made a few modifications suggested for previous set of patches) Samsung SoCs S3C2450, S3C64XX and later versions have got PCM controllers which drive what the ALSA stack terms DSP_A/DSP_B formats. Since the S3C ALSA platform driver was named s3c24xx-pcm, which cause direct namespace clash with the new PCM controller drivers, it has been renamed along with some of its local symbols. First two of the following series of patches does that and later ones make ground for and add the PCM controller driver. regards.

3 3

[alsa-devel] [PATCH] Update pcm doc strings
by Mads Kiilerich 14 Nov '09

14 Nov '09

# HG changeset patch # User Mads Kiilerich <mads(a)kiilerich.com> # Date 1258031300 -3600 # Node ID b17ca10ac8915e27c5bd11a448b3b2e25d31278f # Parent b8245aff2e583f9efe80bb5aa8f4c53917b76c9a Update pcm doc strings This is information I needed and is based on my understanding of information from Takashi Iwai. diff --git a/src/pcm/pcm.c b/src/pcm/pcm.c --- a/src/pcm/pcm.c +++ b/src/pcm/pcm.c @@ -168,17 +168,17 @@ the operation. \par SND_PCM_STATE_RUNNING -The PCM device is running. It processes the samples. The stream can +The PCM device has been started and is running. It processes the samples. The stream can be stopped using the #snd_pcm_drop() or -#snd_pcm_drain calls. +#snd_pcm_drain() calls. \par SND_PCM_STATE_XRUN The PCM device reached overrun (capture) or underrun (playback). You can use the -EPIPE return code from I/O functions (#snd_pcm_writei(), #snd_pcm_writen(), #snd_pcm_readi(), #snd_pcm_readn()) to determine this state without checking -the actual state via #snd_pcm_state() call. You can recover from -this state with #snd_pcm_prepare(), +the actual state via #snd_pcm_state() call. It is recommended to use +the helper function #snd_pcm_recover() to recover from this state, but you can also use #snd_pcm_prepare(), #snd_pcm_drop() or #snd_pcm_drain() calls. \par SND_PCM_STATE_DRAINING @@ -1226,9 +1226,9 @@ * \retval -EPIPE an underrun occurred * \retval -ESTRPIPE a suspend event occurred (stream is suspended and waiting for an application recovery) * - * If the blocking behaviour is selected, then routine waits until - * all requested bytes are played or put to the playback ring buffer. - * The count of bytes can be less only if a signal or underrun occurred. + * If the blocking behaviour is selected and it is running, then routine waits until + * all requested frames are played or put to the playback ring buffer. + * The returned number of frames can be less only if a signal or underrun occurred. * * If the non-blocking behaviour is selected, then routine doesn't wait at all. */ @@ -1258,9 +1258,9 @@ * \retval -EPIPE an underrun occurred * \retval -ESTRPIPE a suspend event occurred (stream is suspended and waiting for an application recovery) * - * If the blocking behaviour is selected, then routine waits until - * all requested bytes are played or put to the playback ring buffer. - * The count of bytes can be less only if a signal or underrun occurred. + * If the blocking behaviour is selected and it is running, then routine waits until + * all requested frames are played or put to the playback ring buffer. + * The returned number of frames can be less only if a signal or underrun occurred. * * If the non-blocking behaviour is selected, then routine doesn't wait at all. */ @@ -1290,8 +1290,8 @@ * \retval -EPIPE an overrun occurred * \retval -ESTRPIPE a suspend event occurred (stream is suspended and waiting for an application recovery) * - * If the blocking behaviour was selected, then routine waits until - * all requested bytes are filled. The count of bytes can be less only + * If the blocking behaviour was selected and it is running, then routine waits until + * all requested frames are filled. The returned number of frames can be less only * if a signal or underrun occurred. * * If the non-blocking behaviour is selected, then routine doesn't wait at all. @@ -1322,8 +1322,8 @@ * \retval -EPIPE an overrun occurred * \retval -ESTRPIPE a suspend event occurred (stream is suspended and waiting for an application recovery) * - * If the blocking behaviour was selected, then routine waits until - * all requested bytes are filled. The count of bytes can be less only + * If the blocking behaviour was selected and it is running, then routine waits until + * all requested frames are filled. The returned number of frames can be less only * if a signal or underrun occurred. * * If the non-blocking behaviour is selected, then routine doesn't wait at all. @@ -7211,6 +7211,8 @@ * \param silent do not print error reason * \return 0 when error code was handled successfuly, otherwise a negative error code * + * This a high-level helper function building on other functions. + * * This functions handles -EINTR (interrupted system call), * -EPIPE (overrun or underrun) and -ESTRPIPE (stream is suspended) * error codes trying to prepare given stream for next I/O.

2 1

[alsa-devel] [PATCH - juli.c 1/1] ALSA: juli - Patch for suspend/resume for ESI Juli@
by alexey.kv＠gmail.com 14 Nov '09

14 Nov '09

From: Aleksey Kunitskiy <alexey.kv(a)gmail.com> Add proper suspend/resume code for Juli@ cards. Based on ice1724 suspend/resume work of Igor Chernyshev. Fixes bug https://bugtrack.alsa-project.org/alsa-bug/view.php?id=4413 Tested on linux-2.6.31.6 Signed-off-by: Aleksey Kunitskiy <alexey.kv(a)gmail.com> --- pci/ice1712/juli.c | 29 +++++++++++++++++++++++++++++ 1 files changed, 29 insertions(+), 0 deletions(-) diff --git a/pci/ice1712/juli.c b/pci/ice1712/juli.c index 4bed963..2cf34c2 100644 --- a/pci/ice1712/juli.c +++ b/pci/ice1712/juli.c @@ -483,6 +483,28 @@ static int __devinit juli_add_controls(struct snd_ice1712 *ice) } /* + * suspend/resume + * */ + +#ifdef CONFIG_PM +static int __devinit juli_resume(struct snd_ice1712 *ice) +{ + struct snd_akm4xxx *ak = ice->akm; + /* akm4358 un-reset, un-mute */ + snd_akm4xxx_reset(ak, 0); + return 0; +} + +static int __devinit juli_suspend(struct snd_ice1712 *ice) +{ + struct snd_akm4xxx *ak = ice->akm; + /* akm4358 reset and soft-mute */ + snd_akm4xxx_reset(ak, 1); + return 0; +} +#endif + +/* * initialize the chip */ @@ -626,6 +648,13 @@ static int __devinit juli_init(struct snd_ice1712 *ice) ice->set_spdif_clock = juli_set_spdif_clock; ice->spdif.ops.open = juli_spdif_in_open; + +#ifdef CONFIG_PM + ice->pm_resume = &juli_resume; + ice->pm_suspend = &juli_suspend; + ice->pm_suspend_enabled = 1; +#endif + return 0; } -- 1.6.4.4

2 1

[alsa-devel] no sound when using TV-OUT
by Reiner 14 Nov '09

14 Nov '09

ok, it works as root so it is a user right problem! any suggestion(s) what to change? Reiner

1 0

[alsa-devel] no sound when using TV-OUT
by Reiner 14 Nov '09

14 Nov '09

here is the trace Mplayer gives me Opening audio decoder: [mp3lib] MPEG layer-2, layer-3 AUDIO: 48000 Hz, 2 ch, s16le, 192.0 kbit/12.50% (ratio: 24000->192000) Selected audio codec: [mp3] afm: mp3lib (mp3lib MPEG layer-2, layer-3) ========================================================================== [AO OSS] audio_setup: Can't open audio device /dev/dsp: Permission denied [AO_ALSA] alsa-lib: confmisc.c:768:(parse_card) cannot find card '0' [AO_ALSA] alsa-lib: conf.c:4154:(_snd_config_evaluate) function snd_func_card_driver returned error: Permission denied [AO_ALSA] alsa-lib: confmisc.c:392:(snd_func_concat) error evaluating strings [AO_ALSA] alsa-lib: conf.c:4154:(_snd_config_evaluate) function snd_func_concat returned error: Permission denied [AO_ALSA] alsa-lib: confmisc.c:1251:(snd_func_refer) error evaluating name [AO_ALSA] alsa-lib: conf.c:4154:(_snd_config_evaluate) function snd_func_refer returned error: Permission denied [AO_ALSA] alsa-lib: conf.c:4633:(snd_config_expand) Evaluate error: Permission denied [AO_ALSA] alsa-lib: pcm.c:2211:(snd_pcm_open_noupdate) Unknown PCM default [AO_ALSA] Playback open error: Permission denied [AO ESD] esd_open_sound failed: Connection timed out waitpid(): No child processes AO: [pulse] Init failed: Internal error [JACK] cannot open server [AO SDL] Samplerate: 48000Hz Channels: Stereo Format s16le [AO_ALSA] alsa-lib: confmisc.c:768:(parse_card) cannot find card '0' [AO_ALSA] alsa-lib: conf.c:4154:(_snd_config_evaluate) function snd_func_card_driver returned error: Permission denied [AO_ALSA] alsa-lib: confmisc.c:392:(snd_func_concat) error evaluating strings [AO_ALSA] alsa-lib: conf.c:4154:(_snd_config_evaluate) function snd_func_concat returned error: Permission denied [AO_ALSA] alsa-lib: confmisc.c:1251:(snd_func_refer) error evaluating name [AO_ALSA] alsa-lib: conf.c:4154:(_snd_config_evaluate) function snd_func_refer returned error: Permission denied [AO_ALSA] alsa-lib: conf.c:4633:(snd_config_expand) Evaluate error: Permission denied [AO_ALSA] alsa-lib: pcm.c:2211:(snd_pcm_open_noupdate) Unknown PCM default waitpid(): No child processes [AO SDL] Unable to open audio: No available audio device DVB card number must be between 1 and 4 AO: [null] 48000Hz 2ch s16le (2 bytes per sample) Starting playback...

1 0

[alsa-devel] no sound when using TV-Out
by Reiner 14 Nov '09

14 Nov '09

Hello, I have something strange: I have had Suse 11.1 (64 bit) and everything was ok. Now I have Suse 11.2 (64 bit) and xine, MPlayer are playing fine (with audio) if using the already running x-Server. For using the TV-OUT I have a seperate section in xorg.conf and I start a new X server with this conf, chnage the DISPLAY variable and launch xine, Mplayer. This has worked! Now I get a picture but no sound with BOTH players (xine, mplayer).So I think it has to do with some access rights to the sound device. PS: Pulse audio is not installed (with it flash has no sound) Any ideas ? Thanks Reiner

1 0

[alsa-devel] [PATCH 2/2] ASoC: OMAP: reconfigure DMA to resume audio
by Jane Wang 14 Nov '09

14 Nov '09

Reconfigure DMA transfer parameters to resume audio after system comming out of OFF state. Signed-off-by: Jane Wang <jwang(a)ti.com> --- sound/soc/omap/omap-pcm.c | 7 ++++++- 1 files changed, 6 insertions(+), 1 deletions(-) diff --git a/sound/soc/omap/omap-pcm.c b/sound/soc/omap/omap-pcm.c index 6a829ee..5e04390 100644 --- a/sound/soc/omap/omap-pcm.c +++ b/sound/soc/omap/omap-pcm.c @@ -215,8 +215,13 @@ static int omap_pcm_trigger(struct snd_pcm_substream *substream, int cmd) spin_lock_irqsave(&prtd->lock, flags); switch (cmd) { - case SNDRV_PCM_TRIGGER_START: case SNDRV_PCM_TRIGGER_RESUME: + /* Reconfigure DMA transfer parameters + * in order to come back from OFF mode + */ + omap_pcm_prepare(substream); + /* fall through */ + case SNDRV_PCM_TRIGGER_START: case SNDRV_PCM_TRIGGER_PAUSE_RELEASE: prtd->period_index = 0; /* Configure McBSP internal buffer usage */ -- 1.5.4.3

2 1

[alsa-devel] [RFC][PATCH] ARM: OMAP: McBSP: Use register cache
by Janusz Krzysztofik 14 Nov '09

14 Nov '09

Change the way McBSP registers are updated: use cached values instead of relying upon those read back from the device. With this patch, I have finally managed to get rid of all random playback/recording hangups on my OMAP1510 based Amstrad Delta (buggy?) hardware. Before that, I could suspect that values read back from McBSP registers before updating them happened to be errornous. I think there is one important point that makes this patch worth of applying, apart from my hardware quality. With the current code, if it ever happens to any machine, no matter if OMAP1510 or newer, to read incorrect value from a McBSP register, this wrong value will get written back without any checking. That can lead to hardware damage if, for example, an input pin is turned into output as a result. Created against linux-2.6.31-rc5 Tested on Amstrad Delta Signed-off-by: Janusz Krzysztofik --- --- linux-2.6.31-rc5/arch/arm/plat-omap/include/mach/mcbsp.h.orig 2009-08-11 23:43:25.000000000 +0200 +++ linux-2.6.31-rc5/arch/arm/plat-omap/include/mach/mcbsp.h 2009-08-11 23:45:46.000000000 +0200 @@ -377,6 +377,8 @@ struct omap_mcbsp { struct omap_mcbsp_platform_data *pdata; struct clk *iclk; struct clk *fclk; + + struct omap_mcbsp_reg_cfg reg_cache; }; extern struct omap_mcbsp **mcbsp_ptr; extern int omap_mcbsp_count; --- linux-2.6.31-rc5/arch/arm/plat-omap/mcbsp.c.orig 2009-08-11 23:43:25.000000000 +0200 +++ linux-2.6.31-rc5/arch/arm/plat-omap/mcbsp.c 2009-08-11 23:45:35.000000000 +0200 @@ -91,6 +91,7 @@ static void omap_mcbsp_dump_reg(u8 id) static irqreturn_t omap_mcbsp_tx_irq_handler(int irq, void *dev_id) { struct omap_mcbsp *mcbsp_tx = dev_id; + struct omap_mcbsp_reg_cfg *reg_cache = &mcbsp_tx->reg_cache; u16 irqst_spcr2; irqst_spcr2 = OMAP_MCBSP_READ(mcbsp_tx->io_base, SPCR2); @@ -101,7 +102,7 @@ static irqreturn_t omap_mcbsp_tx_irq_han irqst_spcr2); /* Writing zero to XSYNC_ERR clears the IRQ */ OMAP_MCBSP_WRITE(mcbsp_tx->io_base, SPCR2, - irqst_spcr2 & ~(XSYNC_ERR)); + reg_cache->spcr2 &= ~(XSYNC_ERR)); } else { complete(&mcbsp_tx->tx_irq_completion); } @@ -112,6 +113,7 @@ static irqreturn_t omap_mcbsp_tx_irq_han static irqreturn_t omap_mcbsp_rx_irq_handler(int irq, void *dev_id) { struct omap_mcbsp *mcbsp_rx = dev_id; + struct omap_mcbsp_reg_cfg *reg_cache = &mcbsp_rx->reg_cache; u16 irqst_spcr1; irqst_spcr1 = OMAP_MCBSP_READ(mcbsp_rx->io_base, SPCR1); @@ -122,7 +124,7 @@ static irqreturn_t omap_mcbsp_rx_irq_han irqst_spcr1); /* Writing zero to RSYNC_ERR clears the IRQ */ OMAP_MCBSP_WRITE(mcbsp_rx->io_base, SPCR1, - irqst_spcr1 & ~(RSYNC_ERR)); + reg_cache->spcr1 &= ~(RSYNC_ERR)); } else { complete(&mcbsp_rx->tx_irq_completion); } @@ -167,6 +169,7 @@ static void omap_mcbsp_rx_dma_callback(i void omap_mcbsp_config(unsigned int id, const struct omap_mcbsp_reg_cfg *config) { struct omap_mcbsp *mcbsp; + struct omap_mcbsp_reg_cfg *reg_cache; void __iomem *io_base; if (!omap_mcbsp_check_valid_id(id)) { @@ -174,26 +177,27 @@ void omap_mcbsp_config(unsigned int id, return; } mcbsp = id_to_mcbsp_ptr(id); + reg_cache = &mcbsp->reg_cache; io_base = mcbsp->io_base; dev_dbg(mcbsp->dev, "Configuring McBSP%d phys_base: 0x%08lx\n", mcbsp->id, mcbsp->phys_base); /* We write the given config */ - OMAP_MCBSP_WRITE(io_base, SPCR2, config->spcr2); - OMAP_MCBSP_WRITE(io_base, SPCR1, config->spcr1); - OMAP_MCBSP_WRITE(io_base, RCR2, config->rcr2); - OMAP_MCBSP_WRITE(io_base, RCR1, config->rcr1); - OMAP_MCBSP_WRITE(io_base, XCR2, config->xcr2); - OMAP_MCBSP_WRITE(io_base, XCR1, config->xcr1); - OMAP_MCBSP_WRITE(io_base, SRGR2, config->srgr2); - OMAP_MCBSP_WRITE(io_base, SRGR1, config->srgr1); - OMAP_MCBSP_WRITE(io_base, MCR2, config->mcr2); - OMAP_MCBSP_WRITE(io_base, MCR1, config->mcr1); - OMAP_MCBSP_WRITE(io_base, PCR0, config->pcr0); + OMAP_MCBSP_WRITE(io_base, SPCR2, reg_cache->spcr2 = config->spcr2); + OMAP_MCBSP_WRITE(io_base, SPCR1, reg_cache->spcr1 = config->spcr1); + OMAP_MCBSP_WRITE(io_base, RCR2, reg_cache->rcr2 = config->rcr2); + OMAP_MCBSP_WRITE(io_base, RCR1, reg_cache->rcr1 = config->rcr1); + OMAP_MCBSP_WRITE(io_base, XCR2, reg_cache->xcr2 = config->xcr2); + OMAP_MCBSP_WRITE(io_base, XCR1, reg_cache->xcr1 = config->xcr1); + OMAP_MCBSP_WRITE(io_base, SRGR2, reg_cache->srgr2 = config->srgr2); + OMAP_MCBSP_WRITE(io_base, SRGR1, reg_cache->srgr1 = config->srgr1); + OMAP_MCBSP_WRITE(io_base, MCR2, reg_cache->mcr2 = config->mcr2); + OMAP_MCBSP_WRITE(io_base, MCR1, reg_cache->mcr1 = config->mcr1); + OMAP_MCBSP_WRITE(io_base, PCR0, reg_cache->pcr0 = config->pcr0); if (cpu_is_omap2430() || cpu_is_omap34xx()) { - OMAP_MCBSP_WRITE(io_base, XCCR, config->xccr); - OMAP_MCBSP_WRITE(io_base, RCCR, config->rccr); + OMAP_MCBSP_WRITE(io_base, XCCR, reg_cache->xccr = config->xccr); + OMAP_MCBSP_WRITE(io_base, RCCR, reg_cache->rccr = config->rccr); } } EXPORT_SYMBOL(omap_mcbsp_config); @@ -232,6 +236,7 @@ EXPORT_SYMBOL(omap_mcbsp_set_io_type); int omap_mcbsp_request(unsigned int id) { struct omap_mcbsp *mcbsp; + struct omap_mcbsp_reg_cfg *reg_cache; int err; if (!omap_mcbsp_check_valid_id(id)) { @@ -239,6 +244,7 @@ int omap_mcbsp_request(unsigned int id) return -ENODEV; } mcbsp = id_to_mcbsp_ptr(id); + reg_cache = &mcbsp->reg_cache; spin_lock(&mcbsp->lock); if (!mcbsp->free) { @@ -261,8 +267,8 @@ int omap_mcbsp_request(unsigned int id) * Make sure that transmitter, receiver and sample-rate generator are * not running before activating IRQs. */ - OMAP_MCBSP_WRITE(mcbsp->io_base, SPCR1, 0); - OMAP_MCBSP_WRITE(mcbsp->io_base, SPCR2, 0); + OMAP_MCBSP_WRITE(mcbsp->io_base, SPCR1, reg_cache->spcr1 = 0); + OMAP_MCBSP_WRITE(mcbsp->io_base, SPCR2, reg_cache->spcr2 = 0); if (mcbsp->io_type == OMAP_MCBSP_IRQ_IO) { /* We need to get IRQs here */ @@ -335,42 +341,38 @@ EXPORT_SYMBOL(omap_mcbsp_free); void omap_mcbsp_start(unsigned int id, int tx, int rx) { struct omap_mcbsp *mcbsp; + struct omap_mcbsp_reg_cfg *reg_cache; void __iomem *io_base; int idle; - u16 w; if (!omap_mcbsp_check_valid_id(id)) { printk(KERN_ERR "%s: Invalid id (%d)\n", __func__, id + 1); return; } mcbsp = id_to_mcbsp_ptr(id); + reg_cache = &mcbsp->reg_cache; io_base = mcbsp->io_base; - mcbsp->rx_word_length = (OMAP_MCBSP_READ(io_base, RCR1) >> 5) & 0x7; - mcbsp->tx_word_length = (OMAP_MCBSP_READ(io_base, XCR1) >> 5) & 0x7; + mcbsp->rx_word_length = (reg_cache->rcr1 >> 5) & 0x7; + mcbsp->tx_word_length = (reg_cache->xcr1 >> 5) & 0x7; - idle = !((OMAP_MCBSP_READ(io_base, SPCR2) | - OMAP_MCBSP_READ(io_base, SPCR1)) & 1); + idle = !((reg_cache->spcr2 | reg_cache->spcr1) & 1); if (idle) { /* Start the sample generator */ - w = OMAP_MCBSP_READ(io_base, SPCR2); - OMAP_MCBSP_WRITE(io_base, SPCR2, w | (1 << 6)); + OMAP_MCBSP_WRITE(io_base, SPCR2, reg_cache->spcr2 |= (1 << 6)); } /* Enable transmitter and receiver */ - w = OMAP_MCBSP_READ(io_base, SPCR2); - OMAP_MCBSP_WRITE(io_base, SPCR2, w | (tx & 1)); + OMAP_MCBSP_WRITE(io_base, SPCR2, reg_cache->spcr2 |= (tx & 1)); - w = OMAP_MCBSP_READ(io_base, SPCR1); - OMAP_MCBSP_WRITE(io_base, SPCR1, w | (rx & 1)); + OMAP_MCBSP_WRITE(io_base, SPCR1, reg_cache->spcr1 |= (rx & 1)); udelay(100); if (idle) { /* Start frame sync */ - w = OMAP_MCBSP_READ(io_base, SPCR2); - OMAP_MCBSP_WRITE(io_base, SPCR2, w | (1 << 7)); + OMAP_MCBSP_WRITE(io_base, SPCR2, reg_cache->spcr2 |= (1 << 7)); } /* Dump McBSP Regs */ @@ -381,9 +383,9 @@ EXPORT_SYMBOL(omap_mcbsp_start); void omap_mcbsp_stop(unsigned int id, int tx, int rx) { struct omap_mcbsp *mcbsp; + struct omap_mcbsp_reg_cfg *reg_cache; void __iomem *io_base; int idle; - u16 w; if (!omap_mcbsp_check_valid_id(id)) { printk(KERN_ERR "%s: Invalid id (%d)\n", __func__, id + 1); @@ -391,23 +393,20 @@ void omap_mcbsp_stop(unsigned int id, in } mcbsp = id_to_mcbsp_ptr(id); + reg_cache = &mcbsp->reg_cache; io_base = mcbsp->io_base; /* Reset transmitter */ - w = OMAP_MCBSP_READ(io_base, SPCR2); - OMAP_MCBSP_WRITE(io_base, SPCR2, w & ~(tx & 1)); + OMAP_MCBSP_WRITE(io_base, SPCR2, reg_cache->spcr2 &= ~(tx & 1)); /* Reset receiver */ - w = OMAP_MCBSP_READ(io_base, SPCR1); - OMAP_MCBSP_WRITE(io_base, SPCR1, w & ~(rx & 1)); + OMAP_MCBSP_WRITE(io_base, SPCR1, reg_cache->spcr1 &= ~(rx & 1)); - idle = !((OMAP_MCBSP_READ(io_base, SPCR2) | - OMAP_MCBSP_READ(io_base, SPCR1)) & 1); + idle = !((reg_cache->spcr2 | reg_cache->spcr1) & 1); if (idle) { /* Reset the sample rate generator */ - w = OMAP_MCBSP_READ(io_base, SPCR2); - OMAP_MCBSP_WRITE(io_base, SPCR2, w & ~(1 << 6)); + OMAP_MCBSP_WRITE(io_base, SPCR2, reg_cache->spcr2 &= ~(1 << 6)); } } EXPORT_SYMBOL(omap_mcbsp_stop); @@ -557,6 +556,7 @@ EXPORT_SYMBOL(omap_mcbsp_recv_word); int omap_mcbsp_spi_master_xmit_word_poll(unsigned int id, u32 word) { struct omap_mcbsp *mcbsp; + struct omap_mcbsp_reg_cfg *reg_cache; void __iomem *io_base; omap_mcbsp_word_length tx_word_length; omap_mcbsp_word_length rx_word_length; @@ -567,6 +567,7 @@ int omap_mcbsp_spi_master_xmit_word_poll return -ENODEV; } mcbsp = id_to_mcbsp_ptr(id); + reg_cache = &mcbsp->reg_cache; io_base = mcbsp->io_base; tx_word_length = mcbsp->tx_word_length; rx_word_length = mcbsp->rx_word_length; @@ -580,9 +581,11 @@ int omap_mcbsp_spi_master_xmit_word_poll spcr2 = OMAP_MCBSP_READ(io_base, SPCR2); if (attempts++ > 1000) { /* We must reset the transmitter */ - OMAP_MCBSP_WRITE(io_base, SPCR2, spcr2 & (~XRST)); + OMAP_MCBSP_WRITE(io_base, SPCR2, + reg_cache->spcr2 &= (~XRST)); udelay(10); - OMAP_MCBSP_WRITE(io_base, SPCR2, spcr2 | XRST); + OMAP_MCBSP_WRITE(io_base, SPCR2, + reg_cache->spcr2 |= XRST); udelay(10); dev_err(mcbsp->dev, "McBSP%d transmitter not " "ready\n", mcbsp->id); @@ -601,9 +604,11 @@ int omap_mcbsp_spi_master_xmit_word_poll spcr1 = OMAP_MCBSP_READ(io_base, SPCR1); if (attempts++ > 1000) { /* We must reset the receiver */ - OMAP_MCBSP_WRITE(io_base, SPCR1, spcr1 & (~RRST)); + OMAP_MCBSP_WRITE(io_base, SPCR1, + reg_cache->spcr1 &= (~RRST)); udelay(10); - OMAP_MCBSP_WRITE(io_base, SPCR1, spcr1 | RRST); + OMAP_MCBSP_WRITE(io_base, SPCR1, + reg_cache->spcr1 |= RRST); udelay(10); dev_err(mcbsp->dev, "McBSP%d receiver not " "ready\n", mcbsp->id); @@ -623,6 +628,7 @@ EXPORT_SYMBOL(omap_mcbsp_spi_master_xmit int omap_mcbsp_spi_master_recv_word_poll(unsigned int id, u32 *word) { struct omap_mcbsp *mcbsp; + struct omap_mcbsp_reg_cfg *reg_cache; u32 clock_word = 0; void __iomem *io_base; omap_mcbsp_word_length tx_word_length; @@ -635,6 +641,7 @@ int omap_mcbsp_spi_master_recv_word_poll } mcbsp = id_to_mcbsp_ptr(id); + reg_cache = &mcbsp->reg_cache; io_base = mcbsp->io_base; tx_word_length = mcbsp->tx_word_length; @@ -649,9 +656,11 @@ int omap_mcbsp_spi_master_recv_word_poll spcr2 = OMAP_MCBSP_READ(io_base, SPCR2); if (attempts++ > 1000) { /* We must reset the transmitter */ - OMAP_MCBSP_WRITE(io_base, SPCR2, spcr2 & (~XRST)); + OMAP_MCBSP_WRITE(io_base, SPCR2, + reg_cache->spcr2 &= (~XRST)); udelay(10); - OMAP_MCBSP_WRITE(io_base, SPCR2, spcr2 | XRST); + OMAP_MCBSP_WRITE(io_base, SPCR2, + reg_cache->spcr2 |= XRST); udelay(10); dev_err(mcbsp->dev, "McBSP%d transmitter not " "ready\n", mcbsp->id); @@ -670,9 +679,11 @@ int omap_mcbsp_spi_master_recv_word_poll spcr1 = OMAP_MCBSP_READ(io_base, SPCR1); if (attempts++ > 1000) { /* We must reset the receiver */ - OMAP_MCBSP_WRITE(io_base, SPCR1, spcr1 & (~RRST)); + OMAP_MCBSP_WRITE(io_base, SPCR1, + reg_cache->spcr1 &= (~RRST)); udelay(10); - OMAP_MCBSP_WRITE(io_base, SPCR1, spcr1 | RRST); + OMAP_MCBSP_WRITE(io_base, SPCR1, + reg_cache->spcr1 |= RRST); udelay(10); dev_err(mcbsp->dev, "McBSP%d receiver not " "ready\n", mcbsp->id);

1 2

Re: [alsa-devel] [PATCH 2/2] ASoC: OMAP: reconfigure DMA to resume audio
by Mark Brown 13 Nov '09

13 Nov '09

On Thu, Nov 12, 2009 at 02:15:18PM -0600, Jane Wang wrote: > Reconfigure DMA transfer parameters to resume audio after system comming out of OFF state. > Signed-off-by: Jane Wang <jwang(a)ti.com> This looks OK to me but I'd like an ack from the OMAP folks. Adding Jarkko as well as he's the maintainer for OMAP audio. > --- > sound/soc/omap/omap-pcm.c | 7 ++++++- > 1 files changed, 6 insertions(+), 1 deletions(-) > > diff --git a/sound/soc/omap/omap-pcm.c b/sound/soc/omap/omap-pcm.c > index 6a829ee..5e04390 100644 > --- a/sound/soc/omap/omap-pcm.c > +++ b/sound/soc/omap/omap-pcm.c > @@ -215,8 +215,13 @@ static int omap_pcm_trigger(struct snd_pcm_substream *substream, int cmd) > > spin_lock_irqsave(&prtd->lock, flags); > switch (cmd) { > - case SNDRV_PCM_TRIGGER_START: > case SNDRV_PCM_TRIGGER_RESUME: > + /* Reconfigure DMA transfer parameters > + * in order to come back from OFF mode > + */ > + omap_pcm_prepare(substream); > + /* fall through */ > + case SNDRV_PCM_TRIGGER_START: > case SNDRV_PCM_TRIGGER_PAUSE_RELEASE: > prtd->period_index = 0; > /* Configure McBSP internal buffer usage */ > -- > 1.5.4.3 >

2 1

[alsa-devel] [PATCH] ice1712: Use bitrev8
by Akinobu Mita 13 Nov '09

13 Nov '09

Signed-off-by: Akinobu Mita <akinobu.mita(a)gmail.com> Cc: Jaroslav Kysela <perex(a)perex.cz> Cc: Takashi Iwai <tiwai(a)suse.de> Cc: alsa-devel(a)alsa-project.org --- sound/i2c/cs8427.c | 15 ++------------- sound/pci/Kconfig | 1 + 2 files changed, 3 insertions(+), 13 deletions(-) diff --git a/sound/i2c/cs8427.c b/sound/i2c/cs8427.c index 020a5d5..04ae870 100644 --- a/sound/i2c/cs8427.c +++ b/sound/i2c/cs8427.c @@ -23,6 +23,7 @@ #include <linux/slab.h> #include <linux/delay.h> #include <linux/init.h> +#include <linux/bitrev.h> #include <asm/unaligned.h> #include <sound/core.h> #include <sound/control.h> @@ -55,18 +56,6 @@ struct cs8427 { struct cs8427_stream capture; }; -static unsigned char swapbits(unsigned char val) -{ - int bit; - unsigned char res = 0; - for (bit = 0; bit < 8; bit++) { - res <<= 1; - res |= val & 1; - val >>= 1; - } - return res; -} - int snd_cs8427_reg_write(struct snd_i2c_device *device, unsigned char reg, unsigned char val) { @@ -149,7 +138,7 @@ static int snd_cs8427_send_corudata(struct snd_i2c_device *device, } data[0] = CS8427_REG_AUTOINC | CS8427_REG_CORU_DATABUF; for (idx = 0; idx < count; idx++) - data[idx + 1] = swapbits(ndata[idx]); + data[idx + 1] = bitrev8(ndata[idx]); if (snd_i2c_sendbytes(device, data, count + 1) != count + 1) return -EIO; return 1; diff --git a/sound/pci/Kconfig b/sound/pci/Kconfig index 75c602b..351654c 100644 --- a/sound/pci/Kconfig +++ b/sound/pci/Kconfig @@ -570,6 +570,7 @@ config SND_ICE1712 tristate "ICEnsemble ICE1712 (Envy24)" select SND_MPU401_UART select SND_AC97_CODEC + select BITREVERSE help Say Y here to include support for soundcards based on the ICE1712 (Envy24) chip. -- 1.6.5.1

2 1

[alsa-devel] [PATCH] OSS: fix error return in dma_ioctl()
by Roel Kluin 12 Nov '09

12 Nov '09

The returned error should stay negative Signed-off-by: Roel Kluin <roel.kluin(a)gmail.com> --- sound/oss/audio.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/sound/oss/audio.c b/sound/oss/audio.c index b69c05b..7df48a2 100644 --- a/sound/oss/audio.c +++ b/sound/oss/audio.c @@ -838,7 +838,7 @@ static int dma_ioctl(int dev, unsigned int cmd, void __user *arg) if ((err = audio_devs[dev]->d->prepare_for_input(dev, dmap_in->fragment_size, dmap_in->nbufs)) < 0) { spin_unlock_irqrestore(&dmap_in->lock,flags); - return -err; + return err; } dmap_in->dma_mode = DMODE_INPUT; audio_devs[dev]->enable_bits |= PCM_ENABLE_INPUT;

2 2

[alsa-devel] alsa-info: problem hda-intel based card
by Halim Sahin 12 Nov '09

12 Nov '09

Hello, I.ll attach an output of alsa-info.sh. The mainboard is a pov 330 (nvidia ion). The soundcard has three connectors 1. output 2. mic 3. line there are also a sp/dif and a hdmi device I have two problems: 1. The outputvolume of front is really low. Alsamixer shows front and surround but the later one has no effect. 2. hdmi output isn't active in the alsa default output. I can specify hw0,3 which works but it disables dmix. So the problem is how to enable hdmi audio out this way that aplay -Ddefault can use all available outputs simultaniously (analog, sp/dif, and hdmi). Thanks in advance for any help. BR. Halim -- Halim Sahin E-Mail: halim.sahin (at) t-online.de

2 5

[alsa-devel] ASoC updates for 2.6.33
by Mark Brown 12 Nov '09

12 Nov '09

The following changes since commit a68cc8daebdd8ba7fe457ab4b2a0ccdf3cedc9f8: Grant Likely (1): ASoC: mpc5200: remove duplicate identical IRQ handler are available in the git repository at: git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound-2.6.git for-2.6.33 Barry Song (1): ASoC: move setting ac97 platformdata earlier than ac97 read/write Jassi Brar (1): ASoC: Fixed arguments passed to SMDK64xx set_pll Joonyoung Shim (1): ASoC: Add jack_status_check callback function for GPIO jacks Mark Brown (1): ASoC: Add bit clock rate calculator utility functions include/sound/soc.h | 7 ++++ sound/soc/Makefile | 2 +- sound/soc/s3c24xx/smdk64xx_wm8580.c | 2 +- sound/soc/soc-core.c | 9 +++-- sound/soc/soc-jack.c | 3 ++ sound/soc/soc-utils.c | 68 +++++++++++++++++++++++++++++++++++ 6 files changed, 85 insertions(+), 6 deletions(-) create mode 100644 sound/soc/soc-utils.c

2 1

[alsa-devel] [PATCH] ASoC: Add jack_status_check callback function
by Joonyoung Shim 12 Nov '09

12 Nov '09

The jack_status_check callback function is the interface to check the status of the jack. Some target provides the method to distinguish what is the jack inserted - headphone jack, microphone jack, tvout jack, etc, so we can implement it using the jack_status_check function. Signed-off-by: Joonyoung Shim <jy0922.shim(a)samsung.com> --- include/sound/soc.h | 2 ++ sound/soc/soc-jack.c | 3 +++ 2 files changed, 5 insertions(+), 0 deletions(-) diff --git a/include/sound/soc.h b/include/sound/soc.h index 9323dcb..f66773b 100644 --- a/include/sound/soc.h +++ b/include/sound/soc.h @@ -333,6 +333,8 @@ struct snd_soc_jack_gpio { int debounce_time; struct snd_soc_jack *jack; struct work_struct work; + + int (*jack_status_check)(void); }; #endif diff --git a/sound/soc/soc-jack.c b/sound/soc/soc-jack.c index 1212414..3c07a94 100644 --- a/sound/soc/soc-jack.c +++ b/sound/soc/soc-jack.c @@ -163,6 +163,9 @@ static void snd_soc_jack_gpio_detect(struct snd_soc_jack_gpio *gpio) else report = 0; + if (gpio->jack_status_check) + report = gpio->jack_status_check(); + snd_soc_jack_report(jack, report, gpio->report); } -- 1.6.0.4

2 1

[alsa-devel] [PATCH v2] soc-core: move setting ac97 platformdata earlier than ac97 read/write
by Barry Song 12 Nov '09

12 Nov '09

While probing, AC97 codec drivers and soc-core generically execute the following sequence: snd_soc_new_ac97_codec -> snd_soc_new_pcms -> reset ac-link/read AC97 ID to detect ->... -> set platform_data to ac97 by soc-core commit 474828a40f6ddab6e2a3475a19c5c84aa3ec7d60 adds platform_data to snd_ac97 instance. But ac97 platform data hasn't given to snd_ac97 before actual ac97 operations. Then while ac97_read access platform_data of snd_ac97 for detecting, NULL pointer oops will fire. That means old platform_data patch doesn't work in real-life cases. This patch moves the operation of setting ac97 platform_data earlier than ac97 reading/writing operations. Then it makes platform_data of AC97 become practically useful. Signed-off-by: Barry Song <21cnbao(a)gmail.com> cc: Marek Vasut <marek.vasut(a)gmail.com> --- sound/soc/soc-core.c | 9 +++++---- 1 files changed, 5 insertions(+), 4 deletions(-) diff --git a/sound/soc/soc-core.c b/sound/soc/soc-core.c index e2b6d75..ef8f282 100644 --- a/sound/soc/soc-core.c +++ b/sound/soc/soc-core.c @@ -1083,11 +1083,8 @@ static void snd_soc_instantiate_card(struct snd_soc_card *card) continue; } } - if (card->dai_link[i].codec_dai->ac97_control) { + if (card->dai_link[i].codec_dai->ac97_control) ac97 = 1; - snd_ac97_dev_add_pdata(codec->ac97, - card->dai_link[i].cpu_dai->ac97_pdata); - } } snprintf(codec->card->shortname, sizeof(codec->card->shortname), @@ -1510,6 +1507,10 @@ int snd_soc_new_pcms(struct snd_soc_device *socdev, int idx, const char *xid) mutex_unlock(&codec->mutex); return ret; } + if (card->dai_link[i].codec_dai->ac97_control) { + snd_ac97_dev_add_pdata(codec->ac97, + card->dai_link[i].cpu_dai->ac97_pdata); + } } mutex_unlock(&codec->mutex); -- 1.5.6.3

2 1

[alsa-devel] [PATCH 4/4] Add ASoC support for DEVKIT8000
by Kim Botherway 12 Nov '09

12 Nov '09

This patch add support for DEVKIT8000, it is a copy of Beagleboard sound driver diff --git a/sound/soc/omap/Kconfig b/sound/soc/omap/Kconfig index 653a362..8cdcfe9 100644 --- a/sound/soc/omap/Kconfig +++ b/sound/soc/omap/Kconfig @@ -91,6 +91,14 @@ config SND_OMAP_SOC_OMAP3_BEAGLE help Say Y if you want to add support for SoC audio on the Beagleboard. +config SND_OMAP_SOC_OMAP3_DEVKIT8000 + tristate "SoC Audio support for OMAP3 DEVKIT8000" + depends on TWL4030_CORE && SND_OMAP_SOC && MACH_OMAP3_DEVKIT8000 + select SND_OMAP_SOC_MCBSP + select SND_SOC_TWL4030 + help + Say Y if you want to add support for SoC audio on the DEVKIT8000. + config SND_OMAP_SOC_ZOOM2 tristate "SoC Audio support for Zoom2" depends on TWL4030_CORE && SND_OMAP_SOC && MACH_OMAP_ZOOM2 diff --git a/sound/soc/omap/Makefile b/sound/soc/omap/Makefile index 02d6947..7239737 100644 --- a/sound/soc/omap/Makefile +++ b/sound/soc/omap/Makefile @@ -15,6 +15,7 @@ snd-soc-omap3evm-objs := omap3evm.o snd-soc-sdp3430-objs := sdp3430.o snd-soc-omap3pandora-objs := omap3pandora.o snd-soc-omap3beagle-objs := omap3beagle.o +snd-soc-omap3devkit8000-objs := omap3devkit8000.o snd-soc-zoom2-objs := zoom2.o obj-$(CONFIG_SND_OMAP_SOC_N810) += snd-soc-n810.o @@ -26,4 +27,5 @@ obj-$(CONFIG_MACH_OMAP3EVM) += snd-soc-omap3evm.o obj-$(CONFIG_SND_OMAP_SOC_SDP3430) += snd-soc-sdp3430.o obj-$(CONFIG_SND_OMAP_SOC_OMAP3_PANDORA) += snd-soc-omap3pandora.o obj-$(CONFIG_SND_OMAP_SOC_OMAP3_BEAGLE) += snd-soc-omap3beagle.o +obj-$(CONFIG_SND_OMAP_SOC_OMAP3_DEVKIT8000) += snd-soc-omap3devkit8000.o obj-$(CONFIG_SND_OMAP_SOC_ZOOM2) += snd-soc-zoom2.o diff --git a/sound/soc/omap/omap3devkit8000.c b/sound/soc/omap/omap3devkit8000.c new file mode 100644 index 0000000..6a975d4 --- /dev/null +++ b/sound/soc/omap/omap3devkit8000.c @@ -0,0 +1,154 @@ +/* + * omap3devkit8000.c -- SoC audio for OMAP3 Beagle + * + * Author: Steve Sakoman <steve(a)sakoman.com> + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License + * version 2 as published by the Free Software Foundation. + * + * This program is distributed in the hope that it will be useful, but + * WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA + * + */ + +#include <linux/clk.h> +#include <linux/platform_device.h> +#include <sound/core.h> +#include <sound/pcm.h> +#include <sound/soc.h> +#include <sound/soc-dapm.h> + +#include <asm/mach-types.h> +#include <plat/hardware.h> +#include <plat/gpio.h> +#include <plat/mcbsp.h> + +#include "omap-mcbsp.h" +#include "omap-pcm.h" +#include "../codecs/twl4030.h" + +static int omap3devkit8000_hw_params(struct snd_pcm_substream *substream, + struct snd_pcm_hw_params *params) +{ + struct snd_soc_pcm_runtime *rtd = substream->private_data; + struct snd_soc_dai *codec_dai = rtd->dai->codec_dai; + struct snd_soc_dai *cpu_dai = rtd->dai->cpu_dai; + unsigned int fmt; + int ret; + + switch (params_channels(params)) { + case 2: /* Stereo I2S mode */ + fmt = SND_SOC_DAIFMT_I2S | + SND_SOC_DAIFMT_NB_NF | + SND_SOC_DAIFMT_CBM_CFM; + break; + case 4: /* Four channel TDM mode */ + fmt = SND_SOC_DAIFMT_DSP_A | + SND_SOC_DAIFMT_IB_NF | + SND_SOC_DAIFMT_CBM_CFM; + break; + default: + return -EINVAL; + } + + /* Set codec DAI configuration */ + ret = snd_soc_dai_set_fmt(codec_dai, fmt); + if (ret < 0) { + printk(KERN_ERR "can't set codec DAI configuration\n"); + return ret; + } + + /* Set cpu DAI configuration */ + ret = snd_soc_dai_set_fmt(cpu_dai, fmt); + if (ret < 0) { + printk(KERN_ERR "can't set cpu DAI configuration\n"); + return ret; + } + + /* Set the codec system clock for DAC and ADC */ + ret = snd_soc_dai_set_sysclk(codec_dai, 0, 26000000, + SND_SOC_CLOCK_IN); + if (ret < 0) { + printk(KERN_ERR "can't set codec system clock\n"); + return ret; + } + + return 0; +} + +static struct snd_soc_ops omap3devkit8000_ops = { + .hw_params = omap3devkit8000_hw_params, +}; + +/* Digital audio interface glue - connects codec <--> CPU */ +static struct snd_soc_dai_link omap3devkit8000_dai = { + .name = "TWL4030", + .stream_name = "TWL4030", + .cpu_dai = &omap_mcbsp_dai[0], + .codec_dai = &twl4030_dai[TWL4030_DAI_HIFI], + .ops = &omap3devkit8000_ops, +}; + +/* Audio machine driver */ +static struct snd_soc_card snd_soc_omap3devkit8000 = { + .name = "omap3devkit8000", + .platform = &omap_soc_platform, + .dai_link = &omap3devkit8000_dai, + .num_links = 1, +}; + +/* Audio subsystem */ +static struct snd_soc_device omap3devkit8000_snd_devdata = { + .card = &snd_soc_omap3devkit8000, + .codec_dev = &soc_codec_dev_twl4030, +}; + +static struct platform_device *omap3devkit8000_snd_device; + +static int __init omap3devkit8000_soc_init(void) +{ + int ret; + pr_info("OMAP3 omap3devkit8000 SoC init\n"); + + omap3devkit8000_snd_device = platform_device_alloc("soc-audio", -1); + if (!omap3devkit8000_snd_device) { + printk(KERN_ERR "Platform device allocation failed\n"); + return -ENOMEM; + } + + platform_set_drvdata(omap3devkit8000_snd_device, &omap3devkit8000_snd_devdata); + omap3devkit8000_snd_devdata.dev = &omap3devkit8000_snd_device->dev; + *(unsigned int *)omap3devkit8000_dai.cpu_dai->private_data = 1; /* McBSP2 */ + + ret = platform_device_add(omap3devkit8000_snd_device); + if (ret) + goto err1; + + return 0; + +err1: + printk(KERN_ERR "Unable to add platform device\n"); + platform_device_put(omap3devkit8000_snd_device); + + return ret; +} + +static void __exit omap3devkit8000_soc_exit(void) +{ + platform_device_unregister(omap3devkit8000_snd_device); +} + +module_init(omap3devkit8000_soc_init); +module_exit(omap3devkit8000_soc_exit); + +MODULE_AUTHOR("Steve Sakoman <steve(a)sakoman.com>"); +MODULE_DESCRIPTION("ALSA SoC OMAP3 DEVKIT8000"); +MODULE_LICENSE("GPL"); -- To unsubscribe from this list: send the line "unsubscribe alsa-devel" in the body of a message to majordomo(a)vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html

3 2

[alsa-devel] [PATCH 0/6] Fixups to MPC5200 ASoC drivers
by Grant Likely 12 Nov '09

12 Nov '09

Hi everyone, Jon, as we talked about earlier today, I've spent some time working on the MPC5200 AC97 driver to try and get rid of some of the nagging bugs. The two big changes that I ended up making were to remove the tracking of appl_ptr (and all the race conditions that went with it), and to fix the handling of AC97 slot enables/disables so that a stream can be stopped and started again without going through the hw_params() step. I know that you had the appl_ptr tracking in to try and solve the problem of audible noise at the end of playback. After discussing the data flow model on #alsa-soc this morning, I learned that the driver is really supposed to be free-running, and the ALSA layer is supposed to be able to keep up. It is also responsible to ensure that buffer is filled with silence at the end of playback to eliminate noise before the trigger can properly turn everything off. Only a couple of other drivers use appl_ptr, so I'm pretty sure this driver shouldn't be doing it either. Instead, from a recommendation this morning, I added a 'fudge' factor to the value reported by the .pointer() callback of 1/4 the period size. At first I thought this helped, but after more testing I find that the driver seems to work correctly with aplay both with and without the fudge factor applied. However, I was able to reproduce the noise problem when using aplay if I have DEBUG #defined at the top of the mpc5200_dma.c file with debug console logs being spit out the serial port. In that situation, the STOP trigger calls printk(), and a stale sample can be heard at the end of playback. However, I believe this is a bug with the serial console driver (in that it disables IRQs for a long time) causing unbounded latencies, so the trigger doesn't get processed fast enough. It doesn't help that aplay doesn't flush the buffers with silence before triggering STOP. Other programs (like gstreamer) do seem to flush out stale data before stopping the stream. I'm sure someone will correct me if I'm making some bad assumptions here. So, please test. Let me know if these work or not. I've don't know if the last patch (Add fudge factor...) is needed or not. Cheers, g. --- Grant Likely (6): ASoC/mpc5200: Add fudge factor to value reported by .pointer() ASoC/mpc5200: fix enable/disable of AC97 slots ASoC/mpc5200: add to_psc_dma_stream() helper ASoC/mpc5200: Improve printk debug output for trigger ASoC/mpc5200: get rid of the appl_ptr tracking nonsense ASoC/mpc5200: Track DMA position by period number instead of bytes sound/soc/fsl/mpc5200_dma.c | 98 ++++++++++---------------------------- sound/soc/fsl/mpc5200_dma.h | 24 ++++++--- sound/soc/fsl/mpc5200_psc_ac97.c | 39 ++++++++------- 3 files changed, 63 insertions(+), 98 deletions(-) -- Signature

4 29

[alsa-devel] [PATCH] add support to reorder CPU and Codec DAI suspend/resume
by Barry Song 12 Nov '09

12 Nov '09

Due to some hardware dependence issues, some devices maybe require different suspend/resume execution order for CPU and Codec DAI to make sure the hardware can work normally after executing sleep and wakeup. In old ALSA driver, people include all suspend/resume operations of both CPU and Codec in same entries. Then they change order according to actual require. But in ASoC, we should give a chance to users to reorder CPU/Codec DAI suspend/resume instead of defining the fixed order if there are some strange hardware dependence problems. Signed-off-by: Barry Song <21cnbao(a)gmail.com> --- include/sound/soc.h | 4 ++++ sound/soc/soc-core.c | 48 ++++++++++++++++++++++++++++++++++++------------ 2 files changed, 40 insertions(+), 12 deletions(-) diff --git a/include/sound/soc.h b/include/sound/soc.h index b1245e3..701c362 100644 --- a/include/sound/soc.h +++ b/include/sound/soc.h @@ -494,6 +494,10 @@ struct snd_soc_card { struct snd_soc_dai_link *dai_link; int num_links; + /* CPU <--> Codec DAI suspend/resume order */ + int cpu_suspend_earlier; /* CPU DAI and platform suspend will be called earlier than Codec */ + int cpu_resume_earlier; /* CPU DAI and platform resume will be called earlier than Codec */ + struct snd_soc_device *socdev; struct snd_soc_codec *codec; diff --git a/sound/soc/soc-core.c b/sound/soc/soc-core.c index 2d190df..a1cc855 100644 --- a/sound/soc/soc-core.c +++ b/sound/soc/soc-core.c @@ -660,12 +660,14 @@ static int soc_suspend(struct device *dev) if (card->suspend_pre) card->suspend_pre(pdev, PMSG_SUSPEND); - for (i = 0; i < card->num_links; i++) { - struct snd_soc_dai *cpu_dai = card->dai_link[i].cpu_dai; - if (cpu_dai->suspend && !cpu_dai->ac97_control) - cpu_dai->suspend(cpu_dai); - if (platform->suspend) - platform->suspend(cpu_dai); + if (card->cpu_suspend_earlier) { + for (i = 0; i < card->num_links; i++) { + struct snd_soc_dai *cpu_dai = card->dai_link[i].cpu_dai; + if (cpu_dai->suspend && !cpu_dai->ac97_control) + cpu_dai->suspend(cpu_dai); + if (platform->suspend) + platform->suspend(cpu_dai); + } } /* close any waiting streams and save state */ @@ -692,6 +694,16 @@ static int soc_suspend(struct device *dev) cpu_dai->suspend(cpu_dai); } + if (!card->cpu_suspend_earlier) { + for (i = 0; i < card->num_links; i++) { + struct snd_soc_dai *cpu_dai = card->dai_link[i].cpu_dai; + if (cpu_dai->suspend && !cpu_dai->ac97_control) + cpu_dai->suspend(cpu_dai); + if (platform->suspend) + platform->suspend(cpu_dai); + } + } + if (card->suspend_post) card->suspend_post(pdev, PMSG_SUSPEND); @@ -728,6 +740,16 @@ static void soc_resume_deferred(struct work_struct *work) cpu_dai->resume(cpu_dai); } + if (card->cpu_resume_earlier) { + for (i = 0; i < card->num_links; i++) { + struct snd_soc_dai *cpu_dai = card->dai_link[i].cpu_dai; + if (cpu_dai->resume && !cpu_dai->ac97_control) + cpu_dai->resume(cpu_dai); + if (platform->resume) + platform->resume(cpu_dai); + } + } + if (codec_dev->resume) codec_dev->resume(pdev); @@ -749,12 +771,14 @@ static void soc_resume_deferred(struct work_struct *work) dai->ops->digital_mute(dai, 0); } - for (i = 0; i < card->num_links; i++) { - struct snd_soc_dai *cpu_dai = card->dai_link[i].cpu_dai; - if (cpu_dai->resume && !cpu_dai->ac97_control) - cpu_dai->resume(cpu_dai); - if (platform->resume) - platform->resume(cpu_dai); + if (!card->cpu_resume_earlier) { + for (i = 0; i < card->num_links; i++) { + struct snd_soc_dai *cpu_dai = card->dai_link[i].cpu_dai; + if (cpu_dai->resume && !cpu_dai->ac97_control) + cpu_dai->resume(cpu_dai); + if (platform->resume) + platform->resume(cpu_dai); + } } if (card->resume_post) -- 1.5.6.3

2 7

Re: [alsa-devel] [Intel-gfx] Problems with HDMI audio on Intel DG45FC motherboard
by Wu Fengguang 12 Nov '09

12 Nov '09

Hi David, On Tue, Nov 10, 2009 at 06:35:05PM +0800, David Härdeman wrote: > > On Thu, Nov 05, 2009 at 05:06:22PM +0800, David Härdeman wrote: > >> On Thu, November 5, 2009 08:47, Wu Fengguang wrote: > >>> > >>> Attached is my updated patchset, which includes the sticky > >>> stream/infoframe features. > >> > >> Thanks, I'll take a look at it as soon as possible. > > I've read through the latest set of patches you sent me and also compiled > a kernel using them. The patches look good and work great (save for the > fact that I still have a 0.2s silence, but it's still a big improvement). > I'd be happy to see them go upstream :) Thank you :) You mean 0.2s silence, not 0.2s lost of audio samples? I'd say you have smart ears :) Did you compared the playback over HDMI vs over legacy audio and feel the silence at start of HDMI stream? > On a related note, I still think the only way to get a really flawless > playback on my picky receiver is to implement some kind of "silentstream" > as mentioned earlier (since then I've also tried messing with VCFG and V, > but it seems to upset my receiver even more than complete silence since it > will take even longer to provide sounds once audio starts flowing again). > > Some other drivers seem to support it (though implemented via hardware > specific means), one example: > http://cgit.freedesktop.org/xorg/driver/xf86-video-radeonhd/commit/?id=422a… > > Do you think you could ask your colleagues at Intel to explain how they've > implemented silentstream in the windows driver? Hmm, I'm not sure if it would be possible. I'll check it. Thanks, Fengguang

2 1

[alsa-devel] [PATCH] ALSA: hda: Use model=mb5 for MacBookPro 5,2
by Daniel Chen 12 Nov '09

12 Nov '09

Hi, Attached please find a patch against current sound-2.6 HEAD adding the codec SSID for MacBookPro 5,2 to enable playback and capture (with the same caveat as for MacBookPro 5,1 that jacksense remains at odds). Thanks, Dan

3 6

[alsa-devel] [PATCH 13/13] pcmcia: rework the irq_req_t typedef
by Dominik Brodowski 11 Nov '09

11 Nov '09

Most of the irq_req_t typedef'd struct can be re-worked quite easily: (1) IRQInfo2 was unused in any case, so drop it. (2) IRQInfo1 was used write-only, so drop it. (3) Instance (private data to be passed to the IRQ handler): Most PCMCIA drivers using pcmcia_request_irq() to actually register an IRQ handler set the "dev_id" to the same pointer as the "priv" pointer in struct pcmcia_device. Modify the two exceptions (ipwireless, ibmtr_cs) to also work this waym and set the IRQ handler's "dev_id" to p_dev->priv unconditionally. (4) Handler is to be of type irq_handler_t. (5) Handler != NULL already tells whether an IRQ handler is present. Therefore, we do not need the IRQ_HANDLER_PRESENT flag in irq_req_t.Attributes. CC: netdev(a)vger.kernel.org CC: linux-bluetooth(a)vger.kernel.org CC: linux-ide(a)vger.kernel.org CC: linux-wireless(a)vger.kernel.org CC: linux-scsi(a)vger.kernel.org CC: alsa-devel(a)alsa-project.org CC: Jaroslav Kysela <perex(a)perex.cz> CC: Jiri Kosina <jkosina(a)suse.cz> CC: Karsten Keil <isdn(a)linux-pingi.de> Signed-off-by: Dominik Brodowski <linux(a)dominikbrodowski.net> --- drivers/ata/pata_pcmcia.c | 1 - drivers/bluetooth/bluecard_cs.c | 4 +--- drivers/bluetooth/bt3c_cs.c | 4 +--- drivers/bluetooth/btuart_cs.c | 4 +--- drivers/bluetooth/dtl1_cs.c | 4 +--- drivers/char/pcmcia/ipwireless/hardware.c | 8 ++++---- drivers/char/pcmcia/ipwireless/main.c | 6 +----- drivers/char/pcmcia/synclink_cs.c | 3 --- drivers/ide/ide-cs.c | 1 - drivers/isdn/hardware/avm/avm_cs.c | 2 -- drivers/isdn/hisax/avma1_cs.c | 2 -- drivers/isdn/hisax/elsa_cs.c | 1 - drivers/isdn/hisax/sedlbauer_cs.c | 1 - drivers/isdn/hisax/teles_cs.c | 1 - drivers/net/pcmcia/3c574_cs.c | 4 +--- drivers/net/pcmcia/3c589_cs.c | 4 +--- drivers/net/pcmcia/axnet_cs.c | 1 - drivers/net/pcmcia/com20020_cs.c | 8 +++----- drivers/net/pcmcia/fmvj18x_cs.c | 6 ++---- drivers/net/pcmcia/ibmtr_cs.c | 13 +++++++++---- drivers/net/pcmcia/nmclan_cs.c | 4 +--- drivers/net/pcmcia/pcnet_cs.c | 1 - drivers/net/pcmcia/smc91c92_cs.c | 8 +++----- drivers/net/pcmcia/xirc2ps_cs.c | 3 --- drivers/net/wireless/airo_cs.c | 1 - drivers/net/wireless/atmel_cs.c | 1 - drivers/net/wireless/b43/pcmcia.c | 2 -- drivers/net/wireless/hostap/hostap_cs.c | 5 +---- drivers/net/wireless/libertas/if_cs.c | 1 - drivers/net/wireless/netwave_cs.c | 5 +---- drivers/net/wireless/orinoco/orinoco_cs.c | 4 +--- drivers/net/wireless/orinoco/spectrum_cs.c | 4 +--- drivers/net/wireless/ray_cs.c | 4 +--- drivers/net/wireless/wavelan_cs.c | 5 ++--- drivers/net/wireless/wl3501_cs.c | 5 ++--- drivers/parport/parport_cs.c | 1 - drivers/pcmcia/pcmcia_resource.c | 18 +++++++++--------- drivers/scsi/pcmcia/aha152x_stub.c | 1 - drivers/scsi/pcmcia/fdomain_stub.c | 1 - drivers/scsi/pcmcia/nsp_cs.c | 4 +--- drivers/scsi/pcmcia/qlogic_stub.c | 1 - drivers/scsi/pcmcia/sym53c500_cs.c | 1 - drivers/serial/serial_cs.c | 1 - drivers/staging/comedi/drivers/cb_das16_cs.c | 1 - drivers/staging/comedi/drivers/das08_cs.c | 1 - drivers/staging/comedi/drivers/ni_daq_700.c | 1 - drivers/staging/comedi/drivers/ni_daq_dio24.c | 1 - drivers/staging/comedi/drivers/ni_labpc_cs.c | 1 - drivers/staging/comedi/drivers/ni_mio_cs.c | 4 ---- drivers/staging/comedi/drivers/quatech_daqp_cs.c | 4 +--- drivers/usb/host/sl811_cs.c | 1 - include/pcmcia/cs.h | 14 ++++++++------ sound/pcmcia/pdaudiocf/pdaudiocf.c | 4 +--- sound/pcmcia/vx/vxpocket.c | 4 +--- 54 files changed, 59 insertions(+), 136 deletions(-) diff --git a/drivers/ata/pata_pcmcia.c b/drivers/ata/pata_pcmcia.c index 5f94e21..1b392c9 100644 --- a/drivers/ata/pata_pcmcia.c +++ b/drivers/ata/pata_pcmcia.c @@ -268,7 +268,6 @@ static int pcmcia_init_one(struct pcmcia_device *pdev) pdev->io.Attributes2 = IO_DATA_PATH_WIDTH_8; pdev->io.IOAddrLines = 3; pdev->irq.Attributes = IRQ_TYPE_DYNAMIC_SHARING; - pdev->irq.IRQInfo1 = IRQ_LEVEL_ID; pdev->conf.Attributes = CONF_ENABLE_IRQ; pdev->conf.IntType = INT_MEMORY_AND_IO; diff --git a/drivers/bluetooth/bluecard_cs.c b/drivers/bluetooth/bluecard_cs.c index 1e0c4d8..2acdc60 100644 --- a/drivers/bluetooth/bluecard_cs.c +++ b/drivers/bluetooth/bluecard_cs.c @@ -867,11 +867,9 @@ static int bluecard_probe(struct pcmcia_device *link) link->io.Attributes1 = IO_DATA_PATH_WIDTH_8; link->io.NumPorts1 = 8; - link->irq.Attributes = IRQ_TYPE_DYNAMIC_SHARING | IRQ_HANDLE_PRESENT; - link->irq.IRQInfo1 = IRQ_LEVEL_ID; + link->irq.Attributes = IRQ_TYPE_DYNAMIC_SHARING; link->irq.Handler = bluecard_interrupt; - link->irq.Instance = info; link->conf.Attributes = CONF_ENABLE_IRQ; link->conf.IntType = INT_MEMORY_AND_IO; diff --git a/drivers/bluetooth/bt3c_cs.c b/drivers/bluetooth/bt3c_cs.c index 9787fda..d814a27 100644 --- a/drivers/bluetooth/bt3c_cs.c +++ b/drivers/bluetooth/bt3c_cs.c @@ -659,11 +659,9 @@ static int bt3c_probe(struct pcmcia_device *link) link->io.Attributes1 = IO_DATA_PATH_WIDTH_8; link->io.NumPorts1 = 8; - link->irq.Attributes = IRQ_TYPE_DYNAMIC_SHARING | IRQ_HANDLE_PRESENT; - link->irq.IRQInfo1 = IRQ_LEVEL_ID; + link->irq.Attributes = IRQ_TYPE_DYNAMIC_SHARING; link->irq.Handler = bt3c_interrupt; - link->irq.Instance = info; link->conf.Attributes = CONF_ENABLE_IRQ; link->conf.IntType = INT_MEMORY_AND_IO; diff --git a/drivers/bluetooth/btuart_cs.c b/drivers/bluetooth/btuart_cs.c index f44d752..d339464 100644 --- a/drivers/bluetooth/btuart_cs.c +++ b/drivers/bluetooth/btuart_cs.c @@ -588,11 +588,9 @@ static int btuart_probe(struct pcmcia_device *link) link->io.Attributes1 = IO_DATA_PATH_WIDTH_8; link->io.NumPorts1 = 8; - link->irq.Attributes = IRQ_TYPE_DYNAMIC_SHARING | IRQ_HANDLE_PRESENT; - link->irq.IRQInfo1 = IRQ_LEVEL_ID; + link->irq.Attributes = IRQ_TYPE_DYNAMIC_SHARING; link->irq.Handler = btuart_interrupt; - link->irq.Instance = info; link->conf.Attributes = CONF_ENABLE_IRQ; link->conf.IntType = INT_MEMORY_AND_IO; diff --git a/drivers/bluetooth/dtl1_cs.c b/drivers/bluetooth/dtl1_cs.c index 7cd8614..4f02a6f 100644 --- a/drivers/bluetooth/dtl1_cs.c +++ b/drivers/bluetooth/dtl1_cs.c @@ -573,11 +573,9 @@ static int dtl1_probe(struct pcmcia_device *link) link->io.Attributes1 = IO_DATA_PATH_WIDTH_8; link->io.NumPorts1 = 8; - link->irq.Attributes = IRQ_TYPE_DYNAMIC_SHARING | IRQ_HANDLE_PRESENT; - link->irq.IRQInfo1 = IRQ_LEVEL_ID; + link->irq.Attributes = IRQ_TYPE_DYNAMIC_SHARING; link->irq.Handler = dtl1_interrupt; - link->irq.Instance = info; link->conf.Attributes = CONF_ENABLE_IRQ; link->conf.IntType = INT_MEMORY_AND_IO; diff --git a/drivers/char/pcmcia/ipwireless/hardware.c b/drivers/char/pcmcia/ipwireless/hardware.c index 4c1820c..99cffda 100644 --- a/drivers/char/pcmcia/ipwireless/hardware.c +++ b/drivers/char/pcmcia/ipwireless/hardware.c @@ -1213,12 +1213,12 @@ static irqreturn_t ipwireless_handle_v2_v3_interrupt(int irq, irqreturn_t ipwireless_interrupt(int irq, void *dev_id) { - struct ipw_hardware *hw = dev_id; + struct ipw_dev *ipw = dev_id; - if (hw->hw_version == HW_VERSION_1) - return ipwireless_handle_v1_interrupt(irq, hw); + if (ipw->hardware->hw_version == HW_VERSION_1) + return ipwireless_handle_v1_interrupt(irq, ipw->hardware); else - return ipwireless_handle_v2_v3_interrupt(irq, hw); + return ipwireless_handle_v2_v3_interrupt(irq, ipw->hardware); } static void flush_packets_to_hw(struct ipw_hardware *hw) diff --git a/drivers/char/pcmcia/ipwireless/main.c b/drivers/char/pcmcia/ipwireless/main.c index 082146a..dff24da 100644 --- a/drivers/char/pcmcia/ipwireless/main.c +++ b/drivers/char/pcmcia/ipwireless/main.c @@ -93,8 +93,6 @@ static int ipwireless_probe(struct pcmcia_device *p_dev, p_dev->io.NumPorts1 = cfg->io.win[0].len; p_dev->io.IOAddrLines = 16; - p_dev->irq.IRQInfo1 = cfg->irq.IRQInfo1; - /* 0x40 causes it to generate level mode interrupts. */ /* 0x04 enables IREQ pin. */ p_dev->conf.ConfigIndex = cfg->index | 0x44; @@ -197,9 +195,8 @@ static int config_ipwireless(struct ipw_dev *ipw) link->conf.Attributes = CONF_ENABLE_IRQ; link->conf.IntType = INT_MEMORY_AND_IO; - link->irq.Attributes = IRQ_TYPE_DYNAMIC_SHARING | IRQ_HANDLE_PRESENT; + link->irq.Attributes = IRQ_TYPE_DYNAMIC_SHARING; link->irq.Handler = ipwireless_interrupt; - link->irq.Instance = ipw->hardware; INIT_WORK(&ipw->work_reboot, signalled_reboot_work); @@ -315,7 +312,6 @@ static int ipwireless_attach(struct pcmcia_device *link) ipw->link = link; link->priv = ipw; - link->irq.Instance = ipw; /* Link this device into our device list. */ link->dev_node = &ipw->nodes[0]; diff --git a/drivers/char/pcmcia/synclink_cs.c b/drivers/char/pcmcia/synclink_cs.c index 09b2590..c31a0d9 100644 --- a/drivers/char/pcmcia/synclink_cs.c +++ b/drivers/char/pcmcia/synclink_cs.c @@ -554,7 +554,6 @@ static int mgslpc_probe(struct pcmcia_device *link) /* Interrupt setup */ link->irq.Attributes = IRQ_TYPE_DYNAMIC_SHARING; - link->irq.IRQInfo1 = IRQ_LEVEL_ID; link->irq.Handler = NULL; link->conf.Attributes = 0; @@ -609,9 +608,7 @@ static int mgslpc_config(struct pcmcia_device *link) link->conf.ConfigIndex = 8; link->conf.Present = PRESENT_OPTION; - link->irq.Attributes |= IRQ_HANDLE_PRESENT; link->irq.Handler = mgslpc_isr; - link->irq.Instance = info; ret = pcmcia_request_irq(link, &link->irq); if (ret) diff --git a/drivers/ide/ide-cs.c b/drivers/ide/ide-cs.c index 6cee6c8..dd63963 100644 --- a/drivers/ide/ide-cs.c +++ b/drivers/ide/ide-cs.c @@ -103,7 +103,6 @@ static int ide_probe(struct pcmcia_device *link) link->io.Attributes2 = IO_DATA_PATH_WIDTH_8; link->io.IOAddrLines = 3; link->irq.Attributes = IRQ_TYPE_DYNAMIC_SHARING; - link->irq.IRQInfo1 = IRQ_LEVEL_ID; link->conf.Attributes = CONF_ENABLE_IRQ; link->conf.IntType = INT_MEMORY_AND_IO; diff --git a/drivers/isdn/hardware/avm/avm_cs.c b/drivers/isdn/hardware/avm/avm_cs.c index d388ead..5a6ae64 100644 --- a/drivers/isdn/hardware/avm/avm_cs.c +++ b/drivers/isdn/hardware/avm/avm_cs.c @@ -111,8 +111,6 @@ static int avmcs_probe(struct pcmcia_device *p_dev) p_dev->irq.Attributes = IRQ_TYPE_EXCLUSIVE; p_dev->irq.Attributes = IRQ_TYPE_DYNAMIC_SHARING|IRQ_FIRST_SHARED; - p_dev->irq.IRQInfo1 = IRQ_LEVEL_ID; - /* General socket configuration */ p_dev->conf.Attributes = CONF_ENABLE_IRQ; p_dev->conf.IntType = INT_MEMORY_AND_IO; diff --git a/drivers/isdn/hisax/avma1_cs.c b/drivers/isdn/hisax/avma1_cs.c index 6d963f9..f9bdff3 100644 --- a/drivers/isdn/hisax/avma1_cs.c +++ b/drivers/isdn/hisax/avma1_cs.c @@ -123,8 +123,6 @@ static int avma1cs_probe(struct pcmcia_device *p_dev) p_dev->irq.Attributes = IRQ_TYPE_EXCLUSIVE; p_dev->irq.Attributes = IRQ_TYPE_DYNAMIC_SHARING|IRQ_FIRST_SHARED; - p_dev->irq.IRQInfo1 = IRQ_LEVEL_ID; - /* General socket configuration */ p_dev->conf.Attributes = CONF_ENABLE_IRQ; p_dev->conf.IntType = INT_MEMORY_AND_IO; diff --git a/drivers/isdn/hisax/elsa_cs.c b/drivers/isdn/hisax/elsa_cs.c index cdcd297..a2f709f 100644 --- a/drivers/isdn/hisax/elsa_cs.c +++ b/drivers/isdn/hisax/elsa_cs.c @@ -138,7 +138,6 @@ static int elsa_cs_probe(struct pcmcia_device *link) /* Interrupt setup */ link->irq.Attributes = IRQ_TYPE_DYNAMIC_SHARING|IRQ_FIRST_SHARED; - link->irq.IRQInfo1 = IRQ_LEVEL_ID|IRQ_SHARE_ID; link->irq.Handler = NULL; /* diff --git a/drivers/isdn/hisax/sedlbauer_cs.c b/drivers/isdn/hisax/sedlbauer_cs.c index 331716f..af5d393 100644 --- a/drivers/isdn/hisax/sedlbauer_cs.c +++ b/drivers/isdn/hisax/sedlbauer_cs.c @@ -145,7 +145,6 @@ static int sedlbauer_probe(struct pcmcia_device *link) /* Interrupt setup */ link->irq.Attributes = IRQ_TYPE_DYNAMIC_SHARING|IRQ_FIRST_SHARED; - link->irq.IRQInfo1 = IRQ_LEVEL_ID; link->irq.Handler = NULL; /* diff --git a/drivers/isdn/hisax/teles_cs.c b/drivers/isdn/hisax/teles_cs.c index 7b11c15..ea70539 100644 --- a/drivers/isdn/hisax/teles_cs.c +++ b/drivers/isdn/hisax/teles_cs.c @@ -128,7 +128,6 @@ static int teles_probe(struct pcmcia_device *link) /* Interrupt setup */ link->irq.Attributes = IRQ_TYPE_DYNAMIC_SHARING|IRQ_FIRST_SHARED; - link->irq.IRQInfo1 = IRQ_LEVEL_ID|IRQ_SHARE_ID; link->irq.Handler = NULL; /* diff --git a/drivers/net/pcmcia/3c574_cs.c b/drivers/net/pcmcia/3c574_cs.c index 8b65e18..17a2722 100644 --- a/drivers/net/pcmcia/3c574_cs.c +++ b/drivers/net/pcmcia/3c574_cs.c @@ -283,10 +283,8 @@ static int tc574_probe(struct pcmcia_device *link) spin_lock_init(&lp->window_lock); link->io.NumPorts1 = 32; link->io.Attributes1 = IO_DATA_PATH_WIDTH_16; - link->irq.Attributes = IRQ_TYPE_DYNAMIC_SHARING|IRQ_HANDLE_PRESENT; - link->irq.IRQInfo1 = IRQ_LEVEL_ID; + link->irq.Attributes = IRQ_TYPE_DYNAMIC_SHARING; link->irq.Handler = &el3_interrupt; - link->irq.Instance = dev; link->conf.Attributes = CONF_ENABLE_IRQ; link->conf.IntType = INT_MEMORY_AND_IO; link->conf.ConfigIndex = 1; diff --git a/drivers/net/pcmcia/3c589_cs.c b/drivers/net/pcmcia/3c589_cs.c index c43c21d..6f8d7e2 100644 --- a/drivers/net/pcmcia/3c589_cs.c +++ b/drivers/net/pcmcia/3c589_cs.c @@ -194,10 +194,8 @@ static int tc589_probe(struct pcmcia_device *link) spin_lock_init(&lp->lock); link->io.NumPorts1 = 16; link->io.Attributes1 = IO_DATA_PATH_WIDTH_16; - link->irq.Attributes = IRQ_TYPE_DYNAMIC_SHARING|IRQ_HANDLE_PRESENT; - link->irq.IRQInfo1 = IRQ_LEVEL_ID; + link->irq.Attributes = IRQ_TYPE_DYNAMIC_SHARING; link->irq.Handler = &el3_interrupt; - link->irq.Instance = dev; link->conf.Attributes = CONF_ENABLE_IRQ; link->conf.IntType = INT_MEMORY_AND_IO; link->conf.ConfigIndex = 1; diff --git a/drivers/net/pcmcia/axnet_cs.c b/drivers/net/pcmcia/axnet_cs.c index 0552ddd..800597b 100644 --- a/drivers/net/pcmcia/axnet_cs.c +++ b/drivers/net/pcmcia/axnet_cs.c @@ -170,7 +170,6 @@ static int axnet_probe(struct pcmcia_device *link) info->p_dev = link; link->priv = dev; link->irq.Attributes = IRQ_TYPE_DYNAMIC_SHARING; - link->irq.IRQInfo1 = IRQ_LEVEL_ID; link->conf.Attributes = CONF_ENABLE_IRQ; link->conf.IntType = INT_MEMORY_AND_IO; diff --git a/drivers/net/pcmcia/com20020_cs.c b/drivers/net/pcmcia/com20020_cs.c index 51e9cb0..21d9c9d 100644 --- a/drivers/net/pcmcia/com20020_cs.c +++ b/drivers/net/pcmcia/com20020_cs.c @@ -164,11 +164,10 @@ static int com20020_probe(struct pcmcia_device *p_dev) p_dev->io.NumPorts1 = 16; p_dev->io.IOAddrLines = 16; p_dev->irq.Attributes = IRQ_TYPE_EXCLUSIVE; - p_dev->irq.IRQInfo1 = IRQ_LEVEL_ID; p_dev->conf.Attributes = CONF_ENABLE_IRQ; p_dev->conf.IntType = INT_MEMORY_AND_IO; - p_dev->irq.Instance = info->dev = dev; + info->dev = dev; p_dev->priv = info; return com20020_config(p_dev); @@ -275,9 +274,8 @@ static int com20020_config(struct pcmcia_device *link) ioaddr = dev->base_addr = link->io.BasePort1; dev_dbg(&link->dev, "got ioaddr %Xh\n", ioaddr); - dev_dbg(&link->dev, "request IRQ %d (%Xh/%Xh)\n", - link->irq.AssignedIRQ, - link->irq.IRQInfo1, link->irq.IRQInfo2); + dev_dbg(&link->dev, "request IRQ %d\n", + link->irq.AssignedIRQ); i = pcmcia_request_irq(link, &link->irq); if (i != 0) { diff --git a/drivers/net/pcmcia/fmvj18x_cs.c b/drivers/net/pcmcia/fmvj18x_cs.c index 9b5ca37..6e3e1ce 100644 --- a/drivers/net/pcmcia/fmvj18x_cs.c +++ b/drivers/net/pcmcia/fmvj18x_cs.c @@ -255,10 +255,8 @@ static int fmvj18x_probe(struct pcmcia_device *link) link->io.IOAddrLines = 5; /* Interrupt setup */ - link->irq.Attributes = IRQ_TYPE_DYNAMIC_SHARING|IRQ_HANDLE_PRESENT; - link->irq.IRQInfo1 = IRQ_LEVEL_ID; + link->irq.Attributes = IRQ_TYPE_DYNAMIC_SHARING; link->irq.Handler = &fjn_interrupt; - link->irq.Instance = dev; /* General socket configuration */ link->conf.Attributes = CONF_ENABLE_IRQ; @@ -428,7 +426,7 @@ static int fmvj18x_config(struct pcmcia_device *link) if (link->io.NumPorts2 != 0) { link->irq.Attributes = - IRQ_TYPE_DYNAMIC_SHARING|IRQ_FIRST_SHARED|IRQ_HANDLE_PRESENT; + IRQ_TYPE_DYNAMIC_SHARING|IRQ_FIRST_SHARED; ret = mfc_try_io_port(link); if (ret != 0) goto failed; } else if (cardtype == UNGERMANN) { diff --git a/drivers/net/pcmcia/ibmtr_cs.c b/drivers/net/pcmcia/ibmtr_cs.c index 76706e1..37f4a6f 100644 --- a/drivers/net/pcmcia/ibmtr_cs.c +++ b/drivers/net/pcmcia/ibmtr_cs.c @@ -119,6 +119,12 @@ static const struct ethtool_ops netdev_ethtool_ops = { .get_drvinfo = netdev_get_drvinfo, }; +static irqreturn_t ibmtr_interrupt(int irq, void *dev_id) { + ibmtr_dev_t *info = dev_id; + struct net_device *dev = info->dev; + return tok_interrupt(irq, dev); +}; + /*====================================================================== ibmtr_attach() creates an "instance" of the driver, allocating @@ -150,14 +156,13 @@ static int __devinit ibmtr_attach(struct pcmcia_device *link) link->io.Attributes1 = IO_DATA_PATH_WIDTH_8; link->io.NumPorts1 = 4; link->io.IOAddrLines = 16; - link->irq.Attributes = IRQ_TYPE_EXCLUSIVE | IRQ_HANDLE_PRESENT; - link->irq.IRQInfo1 = IRQ_LEVEL_ID; - link->irq.Handler = &tok_interrupt; + link->irq.Attributes = IRQ_TYPE_EXCLUSIVE; + link->irq.Handler = ibmtr_interrupt; link->conf.Attributes = CONF_ENABLE_IRQ; link->conf.IntType = INT_MEMORY_AND_IO; link->conf.Present = PRESENT_OPTION; - link->irq.Instance = info->dev = dev; + info->dev = dev; SET_ETHTOOL_OPS(dev, &netdev_ethtool_ops); diff --git a/drivers/net/pcmcia/nmclan_cs.c b/drivers/net/pcmcia/nmclan_cs.c index 2d0c6f9..dae5ef6 100644 --- a/drivers/net/pcmcia/nmclan_cs.c +++ b/drivers/net/pcmcia/nmclan_cs.c @@ -463,10 +463,8 @@ static int nmclan_probe(struct pcmcia_device *link) link->io.NumPorts1 = 32; link->io.Attributes1 = IO_DATA_PATH_WIDTH_AUTO; link->io.IOAddrLines = 5; - link->irq.Attributes = IRQ_TYPE_EXCLUSIVE | IRQ_HANDLE_PRESENT; - link->irq.IRQInfo1 = IRQ_LEVEL_ID; + link->irq.Attributes = IRQ_TYPE_EXCLUSIVE; link->irq.Handler = &mace_interrupt; - link->irq.Instance = dev; link->conf.Attributes = CONF_ENABLE_IRQ; link->conf.IntType = INT_MEMORY_AND_IO; link->conf.ConfigIndex = 1; diff --git a/drivers/net/pcmcia/pcnet_cs.c b/drivers/net/pcmcia/pcnet_cs.c index 30baee7..de2d100 100644 --- a/drivers/net/pcmcia/pcnet_cs.c +++ b/drivers/net/pcmcia/pcnet_cs.c @@ -266,7 +266,6 @@ static int pcnet_probe(struct pcmcia_device *link) link->priv = dev; link->irq.Attributes = IRQ_TYPE_DYNAMIC_SHARING; - link->irq.IRQInfo1 = IRQ_LEVEL_ID; link->conf.Attributes = CONF_ENABLE_IRQ; link->conf.IntType = INT_MEMORY_AND_IO; diff --git a/drivers/net/pcmcia/smc91c92_cs.c b/drivers/net/pcmcia/smc91c92_cs.c index 2e795de..9e0da37 100644 --- a/drivers/net/pcmcia/smc91c92_cs.c +++ b/drivers/net/pcmcia/smc91c92_cs.c @@ -329,10 +329,8 @@ static int smc91c92_probe(struct pcmcia_device *link) link->io.NumPorts1 = 16; link->io.Attributes1 = IO_DATA_PATH_WIDTH_AUTO; link->io.IOAddrLines = 4; - link->irq.Attributes = IRQ_TYPE_DYNAMIC_SHARING|IRQ_HANDLE_PRESENT; - link->irq.IRQInfo1 = IRQ_LEVEL_ID; + link->irq.Attributes = IRQ_TYPE_DYNAMIC_SHARING; link->irq.Handler = &smc_interrupt; - link->irq.Instance = dev; link->conf.Attributes = CONF_ENABLE_IRQ; link->conf.IntType = INT_MEMORY_AND_IO; @@ -456,7 +454,7 @@ static int mhz_mfc_config(struct pcmcia_device *link) link->conf.Attributes |= CONF_ENABLE_SPKR; link->conf.Status = CCSR_AUDIO_ENA; link->irq.Attributes = - IRQ_TYPE_DYNAMIC_SHARING|IRQ_FIRST_SHARED|IRQ_HANDLE_PRESENT; + IRQ_TYPE_DYNAMIC_SHARING|IRQ_FIRST_SHARED; link->io.IOAddrLines = 16; link->io.Attributes2 = IO_DATA_PATH_WIDTH_8; link->io.NumPorts2 = 8; @@ -655,7 +653,7 @@ static int osi_config(struct pcmcia_device *link) link->conf.Attributes |= CONF_ENABLE_SPKR; link->conf.Status = CCSR_AUDIO_ENA; link->irq.Attributes = - IRQ_TYPE_DYNAMIC_SHARING|IRQ_FIRST_SHARED|IRQ_HANDLE_PRESENT; + IRQ_TYPE_DYNAMIC_SHARING|IRQ_FIRST_SHARED; link->io.NumPorts1 = 64; link->io.Attributes2 = IO_DATA_PATH_WIDTH_8; link->io.NumPorts2 = 8; diff --git a/drivers/net/pcmcia/xirc2ps_cs.c b/drivers/net/pcmcia/xirc2ps_cs.c index f75ac71..fe504b7 100644 --- a/drivers/net/pcmcia/xirc2ps_cs.c +++ b/drivers/net/pcmcia/xirc2ps_cs.c @@ -556,7 +556,6 @@ xirc2ps_probe(struct pcmcia_device *link) link->conf.IntType = INT_MEMORY_AND_IO; link->conf.ConfigIndex = 1; link->irq.Handler = xirc2ps_interrupt; - link->irq.Instance = dev; /* Fill in card specific entries */ dev->netdev_ops = &netdev_ops; @@ -835,8 +834,6 @@ xirc2ps_config(struct pcmcia_device * link) link->io.IOAddrLines =10; link->io.Attributes1 = IO_DATA_PATH_WIDTH_16; - link->irq.Attributes = IRQ_HANDLE_PRESENT; - link->irq.IRQInfo1 = IRQ_LEVEL_ID; if (local->modem) { int pass; diff --git a/drivers/net/wireless/airo_cs.c b/drivers/net/wireless/airo_cs.c index 7d3a96f..f6036fb 100644 --- a/drivers/net/wireless/airo_cs.c +++ b/drivers/net/wireless/airo_cs.c @@ -134,7 +134,6 @@ static int airo_probe(struct pcmcia_device *p_dev) /* Interrupt setup */ p_dev->irq.Attributes = IRQ_TYPE_DYNAMIC_SHARING; - p_dev->irq.IRQInfo1 = IRQ_LEVEL_ID; p_dev->irq.Handler = NULL; /* diff --git a/drivers/net/wireless/atmel_cs.c b/drivers/net/wireless/atmel_cs.c index 18a58b8..3240791 100644 --- a/drivers/net/wireless/atmel_cs.c +++ b/drivers/net/wireless/atmel_cs.c @@ -143,7 +143,6 @@ static int atmel_probe(struct pcmcia_device *p_dev) /* Interrupt setup */ p_dev->irq.Attributes = IRQ_TYPE_DYNAMIC_SHARING; - p_dev->irq.IRQInfo1 = IRQ_LEVEL_ID; p_dev->irq.Handler = NULL; /* diff --git a/drivers/net/wireless/b43/pcmcia.c b/drivers/net/wireless/b43/pcmcia.c index 2588358..984174b 100644 --- a/drivers/net/wireless/b43/pcmcia.c +++ b/drivers/net/wireless/b43/pcmcia.c @@ -98,9 +98,7 @@ static int __devinit b43_pcmcia_probe(struct pcmcia_device *dev) goto err_disable; dev->irq.Attributes = IRQ_TYPE_DYNAMIC_SHARING; - dev->irq.IRQInfo1 = IRQ_LEVEL_ID; dev->irq.Handler = NULL; /* The handler is registered later. */ - dev->irq.Instance = NULL; res = pcmcia_request_irq(dev, &dev->irq); if (res != 0) goto err_disable; diff --git a/drivers/net/wireless/hostap/hostap_cs.c b/drivers/net/wireless/hostap/hostap_cs.c index 243e912..c9640a3 100644 --- a/drivers/net/wireless/hostap/hostap_cs.c +++ b/drivers/net/wireless/hostap/hostap_cs.c @@ -641,11 +641,8 @@ static int prism2_config(struct pcmcia_device *link) * irq structure is initialized. */ if (link->conf.Attributes & CONF_ENABLE_IRQ) { - link->irq.Attributes = IRQ_TYPE_DYNAMIC_SHARING | - IRQ_HANDLE_PRESENT; - link->irq.IRQInfo1 = IRQ_LEVEL_ID; + link->irq.Attributes = IRQ_TYPE_DYNAMIC_SHARING; link->irq.Handler = prism2_interrupt; - link->irq.Instance = dev; ret = pcmcia_request_irq(link, &link->irq); if (ret) goto failed; diff --git a/drivers/net/wireless/libertas/if_cs.c b/drivers/net/wireless/libertas/if_cs.c index f2b1655..b1d8459 100644 --- a/drivers/net/wireless/libertas/if_cs.c +++ b/drivers/net/wireless/libertas/if_cs.c @@ -837,7 +837,6 @@ static int if_cs_probe(struct pcmcia_device *p_dev) p_dev->irq.Attributes = IRQ_TYPE_DYNAMIC_SHARING; p_dev->irq.Handler = NULL; - p_dev->irq.IRQInfo1 = IRQ_INFO2_VALID | IRQ_LEVEL_ID; p_dev->conf.Attributes = 0; p_dev->conf.IntType = INT_MEMORY_AND_IO; diff --git a/drivers/net/wireless/netwave_cs.c b/drivers/net/wireless/netwave_cs.c index f5333b7..e61e6b9 100644 --- a/drivers/net/wireless/netwave_cs.c +++ b/drivers/net/wireless/netwave_cs.c @@ -384,8 +384,7 @@ static int netwave_probe(struct pcmcia_device *link) link->io.IOAddrLines = 5; /* Interrupt setup */ - link->irq.Attributes = IRQ_TYPE_DYNAMIC_SHARING | IRQ_HANDLE_PRESENT; - link->irq.IRQInfo1 = IRQ_LEVEL_ID; + link->irq.Attributes = IRQ_TYPE_DYNAMIC_SHARING; link->irq.Handler = &netwave_interrupt; /* General socket configuration */ @@ -404,8 +403,6 @@ static int netwave_probe(struct pcmcia_device *link) dev->watchdog_timeo = TX_TIMEOUT; - link->irq.Instance = dev; - return netwave_pcmcia_config( link); } /* netwave_attach */ diff --git a/drivers/net/wireless/orinoco/orinoco_cs.c b/drivers/net/wireless/orinoco/orinoco_cs.c index 688b398..f27bb83 100644 --- a/drivers/net/wireless/orinoco/orinoco_cs.c +++ b/drivers/net/wireless/orinoco/orinoco_cs.c @@ -120,10 +120,8 @@ orinoco_cs_probe(struct pcmcia_device *link) link->priv = priv; /* Interrupt setup */ - link->irq.Attributes = IRQ_TYPE_DYNAMIC_SHARING | IRQ_HANDLE_PRESENT; - link->irq.IRQInfo1 = IRQ_LEVEL_ID; + link->irq.Attributes = IRQ_TYPE_DYNAMIC_SHARING; link->irq.Handler = orinoco_interrupt; - link->irq.Instance = priv; /* General socket configuration defaults can go here. In this * client, we assume very little, and rely on the CIS for diff --git a/drivers/net/wireless/orinoco/spectrum_cs.c b/drivers/net/wireless/orinoco/spectrum_cs.c index c609371..59bda24 100644 --- a/drivers/net/wireless/orinoco/spectrum_cs.c +++ b/drivers/net/wireless/orinoco/spectrum_cs.c @@ -194,10 +194,8 @@ spectrum_cs_probe(struct pcmcia_device *link) link->priv = priv; /* Interrupt setup */ - link->irq.Attributes = IRQ_TYPE_DYNAMIC_SHARING | IRQ_HANDLE_PRESENT; - link->irq.IRQInfo1 = IRQ_LEVEL_ID; + link->irq.Attributes = IRQ_TYPE_DYNAMIC_SHARING; link->irq.Handler = orinoco_interrupt; - link->irq.Instance = priv; /* General socket configuration defaults can go here. In this * client, we assume very little, and rely on the CIS for diff --git a/drivers/net/wireless/ray_cs.c b/drivers/net/wireless/ray_cs.c index 5e0f4c3..91213f9 100644 --- a/drivers/net/wireless/ray_cs.c +++ b/drivers/net/wireless/ray_cs.c @@ -323,8 +323,7 @@ static int ray_probe(struct pcmcia_device *p_dev) p_dev->io.IOAddrLines = 5; /* Interrupt setup. For PCMCIA, driver takes what's given */ - p_dev->irq.Attributes = IRQ_TYPE_DYNAMIC_SHARING | IRQ_HANDLE_PRESENT; - p_dev->irq.IRQInfo1 = IRQ_LEVEL_ID; + p_dev->irq.Attributes = IRQ_TYPE_DYNAMIC_SHARING; p_dev->irq.Handler = &ray_interrupt; /* General socket configuration */ @@ -333,7 +332,6 @@ static int ray_probe(struct pcmcia_device *p_dev) p_dev->conf.ConfigIndex = 1; p_dev->priv = dev; - p_dev->irq.Instance = dev; local->finder = p_dev; local->card_status = CARD_INSERTED; diff --git a/drivers/net/wireless/wavelan_cs.c b/drivers/net/wireless/wavelan_cs.c index df3579a..33918fd 100644 --- a/drivers/net/wireless/wavelan_cs.c +++ b/drivers/net/wireless/wavelan_cs.c @@ -4438,8 +4438,7 @@ wavelan_probe(struct pcmcia_device *p_dev) p_dev->io.IOAddrLines = 3; /* Interrupt setup */ - p_dev->irq.Attributes = IRQ_TYPE_DYNAMIC_SHARING | IRQ_HANDLE_PRESENT; - p_dev->irq.IRQInfo1 = IRQ_LEVEL_ID; + p_dev->irq.Attributes = IRQ_TYPE_DYNAMIC_SHARING; p_dev->irq.Handler = wavelan_interrupt; /* General socket configuration */ @@ -4451,7 +4450,7 @@ wavelan_probe(struct pcmcia_device *p_dev) if (!dev) return -ENOMEM; - p_dev->priv = p_dev->irq.Instance = dev; + p_dev->priv = dev; lp = netdev_priv(dev); diff --git a/drivers/net/wireless/wl3501_cs.c b/drivers/net/wireless/wl3501_cs.c index 9a956c7..5f0401a 100644 --- a/drivers/net/wireless/wl3501_cs.c +++ b/drivers/net/wireless/wl3501_cs.c @@ -1898,8 +1898,7 @@ static int wl3501_probe(struct pcmcia_device *p_dev) p_dev->io.IOAddrLines = 5; /* Interrupt setup */ - p_dev->irq.Attributes = IRQ_TYPE_DYNAMIC_SHARING | IRQ_HANDLE_PRESENT; - p_dev->irq.IRQInfo1 = IRQ_LEVEL_ID; + p_dev->irq.Attributes = IRQ_TYPE_DYNAMIC_SHARING; p_dev->irq.Handler = wl3501_interrupt; /* General socket configuration */ @@ -1922,7 +1921,7 @@ static int wl3501_probe(struct pcmcia_device *p_dev) dev->wireless_handlers = &wl3501_handler_def; SET_ETHTOOL_OPS(dev, &ops); netif_stop_queue(dev); - p_dev->priv = p_dev->irq.Instance = dev; + p_dev->priv = dev; return wl3501_config(p_dev); out_link: diff --git a/drivers/parport/parport_cs.c b/drivers/parport/parport_cs.c index e56a4de..7dd370f 100644 --- a/drivers/parport/parport_cs.c +++ b/drivers/parport/parport_cs.c @@ -106,7 +106,6 @@ static int parport_probe(struct pcmcia_device *link) link->io.Attributes1 = IO_DATA_PATH_WIDTH_8; link->io.Attributes2 = IO_DATA_PATH_WIDTH_8; link->irq.Attributes = IRQ_TYPE_DYNAMIC_SHARING; - link->irq.IRQInfo1 = IRQ_LEVEL_ID; link->conf.Attributes = CONF_ENABLE_IRQ; link->conf.IntType = INT_MEMORY_AND_IO; diff --git a/drivers/pcmcia/pcmcia_resource.c b/drivers/pcmcia/pcmcia_resource.c index 1f33ed6..e10b883 100644 --- a/drivers/pcmcia/pcmcia_resource.c +++ b/drivers/pcmcia/pcmcia_resource.c @@ -383,8 +383,8 @@ static int pcmcia_release_irq(struct pcmcia_device *p_dev, irq_req_t *req) s->irq.AssignedIRQ = 0; } - if (req->Attributes & IRQ_HANDLE_PRESENT) { - free_irq(req->AssignedIRQ, req->Instance); + if (req->Handler) { + free_irq(req->AssignedIRQ, p_dev->priv); } #ifdef CONFIG_PCMCIA_PROBE @@ -664,7 +664,7 @@ int pcmcia_request_irq(struct pcmcia_device *p_dev, irq_req_t *req) /* if the underlying IRQ infrastructure allows for it, only allocate * the IRQ, but do not enable it */ - if (!(req->Attributes & IRQ_HANDLE_PRESENT)) + if (!(req->Handler)) type |= IRQ_NOAUTOEN; #endif /* IRQ_NOAUTOEN */ @@ -674,7 +674,7 @@ int pcmcia_request_irq(struct pcmcia_device *p_dev, irq_req_t *req) } else { int try; u32 mask = s->irq_mask; - void *data = &p_dev->dev.driver; /* something unique to this device */ + void *data = p_dev; /* something unique to this device */ for (try = 0; try < 64; try++) { irq = try % 32; @@ -691,12 +691,12 @@ int pcmcia_request_irq(struct pcmcia_device *p_dev, irq_req_t *req) * registering a dummy handle works, i.e. if the IRQ isn't * marked as used by the kernel resource management core */ ret = request_irq(irq, - (req->Attributes & IRQ_HANDLE_PRESENT) ? req->Handler : test_action, + (req->Handler) ? req->Handler : test_action, type, p_dev->devname, - (req->Attributes & IRQ_HANDLE_PRESENT) ? req->Instance : data); + (req->Handler) ? p_dev->priv : data); if (!ret) { - if (!(req->Attributes & IRQ_HANDLE_PRESENT)) + if (!req->Handler) free_irq(irq, data); break; } @@ -713,9 +713,9 @@ int pcmcia_request_irq(struct pcmcia_device *p_dev, irq_req_t *req) irq = s->pci_irq; } - if (ret && (req->Attributes & IRQ_HANDLE_PRESENT)) { + if (ret && req->Handler) { ret = request_irq(irq, req->Handler, type, - p_dev->devname, req->Instance); + p_dev->devname, p_dev->priv); if (ret) { dev_printk(KERN_INFO, &s->dev, "request_irq() failed\n"); diff --git a/drivers/scsi/pcmcia/aha152x_stub.c b/drivers/scsi/pcmcia/aha152x_stub.c index 4329e4e..528733b 100644 --- a/drivers/scsi/pcmcia/aha152x_stub.c +++ b/drivers/scsi/pcmcia/aha152x_stub.c @@ -106,7 +106,6 @@ static int aha152x_probe(struct pcmcia_device *link) link->io.Attributes1 = IO_DATA_PATH_WIDTH_AUTO; link->io.IOAddrLines = 10; link->irq.Attributes = IRQ_TYPE_DYNAMIC_SHARING; - link->irq.IRQInfo1 = IRQ_LEVEL_ID; link->conf.Attributes = CONF_ENABLE_IRQ; link->conf.IntType = INT_MEMORY_AND_IO; link->conf.Present = PRESENT_OPTION; diff --git a/drivers/scsi/pcmcia/fdomain_stub.c b/drivers/scsi/pcmcia/fdomain_stub.c index 5792b55..9140406 100644 --- a/drivers/scsi/pcmcia/fdomain_stub.c +++ b/drivers/scsi/pcmcia/fdomain_stub.c @@ -89,7 +89,6 @@ static int fdomain_probe(struct pcmcia_device *link) link->io.Attributes1 = IO_DATA_PATH_WIDTH_AUTO; link->io.IOAddrLines = 10; link->irq.Attributes = IRQ_TYPE_EXCLUSIVE; - link->irq.IRQInfo1 = IRQ_LEVEL_ID; link->conf.Attributes = CONF_ENABLE_IRQ; link->conf.IntType = INT_MEMORY_AND_IO; link->conf.Present = PRESENT_OPTION; diff --git a/drivers/scsi/pcmcia/nsp_cs.c b/drivers/scsi/pcmcia/nsp_cs.c index 9dfd6f5..c2341af 100644 --- a/drivers/scsi/pcmcia/nsp_cs.c +++ b/drivers/scsi/pcmcia/nsp_cs.c @@ -1564,12 +1564,10 @@ static int nsp_cs_probe(struct pcmcia_device *link) link->io.IOAddrLines = 10; /* not used */ /* Interrupt setup */ - link->irq.Attributes = IRQ_TYPE_EXCLUSIVE | IRQ_HANDLE_PRESENT; - link->irq.IRQInfo1 = IRQ_LEVEL_ID; + link->irq.Attributes = IRQ_TYPE_EXCLUSIVE; /* Interrupt handler */ link->irq.Handler = &nspintr; - link->irq.Instance = info; link->irq.Attributes |= IRQF_SHARED; /* General socket configuration */ diff --git a/drivers/scsi/pcmcia/qlogic_stub.c b/drivers/scsi/pcmcia/qlogic_stub.c index 65d7ad5..f85f094 100644 --- a/drivers/scsi/pcmcia/qlogic_stub.c +++ b/drivers/scsi/pcmcia/qlogic_stub.c @@ -162,7 +162,6 @@ static int qlogic_probe(struct pcmcia_device *link) link->io.Attributes1 = IO_DATA_PATH_WIDTH_AUTO; link->io.IOAddrLines = 10; link->irq.Attributes = IRQ_TYPE_EXCLUSIVE; - link->irq.IRQInfo1 = IRQ_LEVEL_ID; link->conf.Attributes = CONF_ENABLE_IRQ; link->conf.IntType = INT_MEMORY_AND_IO; link->conf.Present = PRESENT_OPTION; diff --git a/drivers/scsi/pcmcia/sym53c500_cs.c b/drivers/scsi/pcmcia/sym53c500_cs.c index 851a41c..e7564d8 100644 --- a/drivers/scsi/pcmcia/sym53c500_cs.c +++ b/drivers/scsi/pcmcia/sym53c500_cs.c @@ -867,7 +867,6 @@ SYM53C500_probe(struct pcmcia_device *link) link->io.Attributes1 = IO_DATA_PATH_WIDTH_AUTO; link->io.IOAddrLines = 10; link->irq.Attributes = IRQ_TYPE_EXCLUSIVE; - link->irq.IRQInfo1 = IRQ_LEVEL_ID; link->conf.Attributes = CONF_ENABLE_IRQ; link->conf.IntType = INT_MEMORY_AND_IO; diff --git a/drivers/serial/serial_cs.c b/drivers/serial/serial_cs.c index 8d651a6..5d6f947 100644 --- a/drivers/serial/serial_cs.c +++ b/drivers/serial/serial_cs.c @@ -334,7 +334,6 @@ static int serial_probe(struct pcmcia_device *link) link->io.Attributes1 = IO_DATA_PATH_WIDTH_8; link->io.NumPorts1 = 8; link->irq.Attributes = IRQ_TYPE_DYNAMIC_SHARING; - link->irq.IRQInfo1 = IRQ_LEVEL_ID; link->conf.Attributes = CONF_ENABLE_IRQ; if (do_sound) { link->conf.Attributes |= CONF_ENABLE_SPKR; diff --git a/drivers/staging/comedi/drivers/cb_das16_cs.c b/drivers/staging/comedi/drivers/cb_das16_cs.c index 9e75802..39923cb 100644 --- a/drivers/staging/comedi/drivers/cb_das16_cs.c +++ b/drivers/staging/comedi/drivers/cb_das16_cs.c @@ -703,7 +703,6 @@ static int das16cs_pcmcia_attach(struct pcmcia_device *link) /* Initialize the pcmcia_device structure */ /* Interrupt setup */ link->irq.Attributes = IRQ_TYPE_DYNAMIC_SHARING; - link->irq.IRQInfo1 = IRQ_LEVEL_ID; link->irq.Handler = NULL; link->conf.Attributes = 0; diff --git a/drivers/staging/comedi/drivers/das08_cs.c b/drivers/staging/comedi/drivers/das08_cs.c index 384a77a..9b945e5 100644 --- a/drivers/staging/comedi/drivers/das08_cs.c +++ b/drivers/staging/comedi/drivers/das08_cs.c @@ -173,7 +173,6 @@ static int das08_pcmcia_attach(struct pcmcia_device *link) /* Interrupt setup */ link->irq.Attributes = IRQ_TYPE_EXCLUSIVE; - link->irq.IRQInfo1 = IRQ_LEVEL_ID; link->irq.Handler = NULL; /* diff --git a/drivers/staging/comedi/drivers/ni_daq_700.c b/drivers/staging/comedi/drivers/ni_daq_700.c index 7328a84..ef5e118 100644 --- a/drivers/staging/comedi/drivers/ni_daq_700.c +++ b/drivers/staging/comedi/drivers/ni_daq_700.c @@ -503,7 +503,6 @@ static int dio700_cs_attach(struct pcmcia_device *link) /* Interrupt setup */ link->irq.Attributes = IRQ_TYPE_DYNAMIC_SHARING; - link->irq.IRQInfo1 = IRQ_LEVEL_ID; link->irq.Handler = NULL; /* diff --git a/drivers/staging/comedi/drivers/ni_daq_dio24.c b/drivers/staging/comedi/drivers/ni_daq_dio24.c index 5056315..9017be3 100644 --- a/drivers/staging/comedi/drivers/ni_daq_dio24.c +++ b/drivers/staging/comedi/drivers/ni_daq_dio24.c @@ -254,7 +254,6 @@ static int dio24_cs_attach(struct pcmcia_device *link) /* Interrupt setup */ link->irq.Attributes = IRQ_TYPE_DYNAMIC_SHARING; - link->irq.IRQInfo1 = IRQ_LEVEL_ID; link->irq.Handler = NULL; /* diff --git a/drivers/staging/comedi/drivers/ni_labpc_cs.c b/drivers/staging/comedi/drivers/ni_labpc_cs.c index 7fb5058..7d514b3 100644 --- a/drivers/staging/comedi/drivers/ni_labpc_cs.c +++ b/drivers/staging/comedi/drivers/ni_labpc_cs.c @@ -230,7 +230,6 @@ static int labpc_cs_attach(struct pcmcia_device *link) /* Interrupt setup */ link->irq.Attributes = IRQ_TYPE_DYNAMIC_SHARING | IRQ_FORCED_PULSE; - link->irq.IRQInfo1 = IRQ_INFO2_VALID | IRQ_PULSE_ID; link->irq.Handler = NULL; /* diff --git a/drivers/staging/comedi/drivers/ni_mio_cs.c b/drivers/staging/comedi/drivers/ni_mio_cs.c index ca7ab4a..d692f4b 100644 --- a/drivers/staging/comedi/drivers/ni_mio_cs.c +++ b/drivers/staging/comedi/drivers/ni_mio_cs.c @@ -274,7 +274,6 @@ static int cs_attach(struct pcmcia_device *link) link->io.Attributes1 = IO_DATA_PATH_WIDTH_16; link->io.NumPorts1 = 16; link->irq.Attributes = IRQ_TYPE_DYNAMIC_SHARING; - link->irq.IRQInfo1 = IRQ_LEVEL_ID; link->conf.Attributes = CONF_ENABLE_IRQ; link->conf.IntType = INT_MEMORY_AND_IO; @@ -325,9 +324,6 @@ static int mio_pcmcia_config_loop(struct pcmcia_device *p_dev, p_dev->io.IOAddrLines = cfg->io.flags & CISTPL_IO_LINES_MASK; p_dev->io.NumPorts2 = 0; - p_dev->irq.IRQInfo1 = cfg->irq.IRQInfo1; - p_dev->irq.IRQInfo2 = cfg->irq.IRQInfo2; - for (base = 0x000; base < 0x400; base += 0x20) { p_dev->io.BasePort1 = base; ret = pcmcia_request_io(p_dev, &p_dev->io); diff --git a/drivers/staging/comedi/drivers/quatech_daqp_cs.c b/drivers/staging/comedi/drivers/quatech_daqp_cs.c index 48e7c27..5256fd9 100644 --- a/drivers/staging/comedi/drivers/quatech_daqp_cs.c +++ b/drivers/staging/comedi/drivers/quatech_daqp_cs.c @@ -1041,10 +1041,8 @@ static int daqp_cs_attach(struct pcmcia_device *link) link->priv = local; /* Interrupt setup */ - link->irq.Attributes = IRQ_TYPE_DYNAMIC_SHARING | IRQ_HANDLE_PRESENT; - link->irq.IRQInfo1 = IRQ_LEVEL_ID; + link->irq.Attributes = IRQ_TYPE_DYNAMIC_SHARING; link->irq.Handler = daqp_interrupt; - link->irq.Instance = local; /* General socket configuration defaults can go here. In this diff --git a/drivers/usb/host/sl811_cs.c b/drivers/usb/host/sl811_cs.c index f87aba6..39d253e 100644 --- a/drivers/usb/host/sl811_cs.c +++ b/drivers/usb/host/sl811_cs.c @@ -243,7 +243,6 @@ static int sl811_cs_probe(struct pcmcia_device *link) /* Initialize */ link->irq.Attributes = IRQ_TYPE_EXCLUSIVE; - link->irq.IRQInfo1 = IRQ_INFO2_VALID|IRQ_LEVEL_ID; link->irq.Handler = NULL; link->conf.Attributes = 0; diff --git a/include/pcmcia/cs.h b/include/pcmcia/cs.h index 904468a..afc2bfb 100644 --- a/include/pcmcia/cs.h +++ b/include/pcmcia/cs.h @@ -15,6 +15,10 @@ #ifndef _LINUX_CS_H #define _LINUX_CS_H +#ifdef __KERNEL__ +#include <linux/interrupt.h> +#endif + /* For AccessConfigurationRegister */ typedef struct conf_reg_t { u_char Function; @@ -111,11 +115,9 @@ typedef struct io_req_t { /* For RequestIRQ and ReleaseIRQ */ typedef struct irq_req_t { - u_int Attributes; - u_int AssignedIRQ; - u_int IRQInfo1, IRQInfo2; /* IRQInfo2 is ignored */ - void *Handler; - void *Instance; + u_int Attributes; + u_int AssignedIRQ; + irq_handler_t Handler; } irq_req_t; /* Attributes for RequestIRQ and ReleaseIRQ */ @@ -125,7 +127,7 @@ typedef struct irq_req_t { #define IRQ_TYPE_DYNAMIC_SHARING 0x02 #define IRQ_FORCED_PULSE 0x04 #define IRQ_FIRST_SHARED 0x08 -#define IRQ_HANDLE_PRESENT 0x10 +//#define IRQ_HANDLE_PRESENT 0x10 #define IRQ_PULSE_ALLOCATED 0x100 /* Bits in IRQInfo1 field */ diff --git a/sound/pcmcia/pdaudiocf/pdaudiocf.c b/sound/pcmcia/pdaudiocf/pdaudiocf.c index 447aaae..7717e01 100644 --- a/sound/pcmcia/pdaudiocf/pdaudiocf.c +++ b/sound/pcmcia/pdaudiocf/pdaudiocf.c @@ -142,12 +142,10 @@ static int snd_pdacf_probe(struct pcmcia_device *link) link->io.Attributes1 = IO_DATA_PATH_WIDTH_AUTO; link->io.NumPorts1 = 16; - link->irq.Attributes = IRQ_TYPE_EXCLUSIVE | IRQ_HANDLE_PRESENT | IRQ_FORCED_PULSE; + link->irq.Attributes = IRQ_TYPE_EXCLUSIVE | IRQ_FORCED_PULSE; // link->irq.Attributes = IRQ_TYPE_DYNAMIC_SHARING|IRQ_FIRST_SHARED; - link->irq.IRQInfo1 = 0 /* | IRQ_LEVEL_ID */; link->irq.Handler = pdacf_interrupt; - link->irq.Instance = pdacf; link->conf.Attributes = CONF_ENABLE_IRQ; link->conf.IntType = INT_MEMORY_AND_IO; link->conf.ConfigIndex = 1; diff --git a/sound/pcmcia/vx/vxpocket.c b/sound/pcmcia/vx/vxpocket.c index 5a5db48..7be3b33 100644 --- a/sound/pcmcia/vx/vxpocket.c +++ b/sound/pcmcia/vx/vxpocket.c @@ -161,11 +161,9 @@ static int snd_vxpocket_new(struct snd_card *card, int ibl, link->io.Attributes1 = IO_DATA_PATH_WIDTH_AUTO; link->io.NumPorts1 = 16; - link->irq.Attributes = IRQ_TYPE_EXCLUSIVE | IRQ_HANDLE_PRESENT; + link->irq.Attributes = IRQ_TYPE_EXCLUSIVE; - link->irq.IRQInfo1 = IRQ_LEVEL_ID; link->irq.Handler = &snd_vx_irq_handler; - link->irq.Instance = chip; link->conf.Attributes = CONF_ENABLE_IRQ; link->conf.IntType = INT_MEMORY_AND_IO; -- 1.6.0.4

2 1

[alsa-devel] [PATCH] ALSA: hda_intel: disable corb rirb when single_cmd active
by Troy Kisky 11 Nov '09

11 Nov '09

Poulsbo(US15W) cannot have any corb registers initialized when using single_cmd mode. When send_cmd timeout occur, note error. Signed-off-by: Troy Kisky <troy.kisky(a)boundarydevices.com> --- sound/pci/hda/hda_intel.c | 16 +++++++++++----- 1 files changed, 11 insertions(+), 5 deletions(-) diff --git a/sound/pci/hda/hda_intel.c b/sound/pci/hda/hda_intel.c index c9ad182..c2ff585 100644 --- a/sound/pci/hda/hda_intel.c +++ b/sound/pci/hda/hda_intel.c @@ -524,6 +524,16 @@ static void azx_init_cmd_io(struct azx *chip) /* CORB set up */ chip->corb.addr = chip->rb.addr; chip->corb.buf = (u32 *)chip->rb.area; + + /* RIRB set up */ + chip->rirb.addr = chip->rb.addr + 2048; + chip->rirb.buf = (u32 *)(chip->rb.area + 2048); + chip->rirb.wp = chip->rirb.rp = 0; + memset(chip->rirb.cmds, 0, sizeof(chip->rirb.cmds)); + if (chip->single_cmd) { + spin_unlock_irq(&chip->reg_lock); + return; + } azx_writel(chip, CORBLBASE, (u32)chip->corb.addr); azx_writel(chip, CORBUBASE, upper_32_bits(chip->corb.addr)); @@ -536,11 +546,6 @@ static void azx_init_cmd_io(struct azx *chip) /* enable corb dma */ azx_writeb(chip, CORBCTL, ICH6_CORBCTL_RUN); - /* RIRB set up */ - chip->rirb.addr = chip->rb.addr + 2048; - chip->rirb.buf = (u32 *)(chip->rb.area + 2048); - chip->rirb.wp = chip->rirb.rp = 0; - memset(chip->rirb.cmds, 0, sizeof(chip->rirb.cmds)); azx_writel(chip, RIRBLBASE, (u32)chip->rirb.addr); azx_writel(chip, RIRBUBASE, upper_32_bits(chip->rirb.addr)); @@ -783,6 +788,7 @@ static int azx_single_send_cmd(struct hda_bus *bus, u32 val) if (printk_ratelimit()) snd_printd(SFX "send_cmd timeout: IRS=0x%x, val=0x%x\n", azx_readw(chip, IRS), val); + chip->rirb.res[addr] = -1; return -EIO; } -- 1.5.6.3

2 14

[alsa-devel] What is a name for the PC speaker input/output volume control?
by Krzysztof Helt 11 Nov '09

11 Nov '09

Hi Takashi, I have run into the issue that OSS emulation layer provides less controls than the alsa mixer. One specific problem is the OSS Speaker control is not properly mapped on all drivers (among others the wss/cs4236 family) due to the fact that the speaker input/output is called "Mono" in this driver. I have found that there are at least three names are used by drivers: "PC Speaker" "Speaker" "Mono" for the same input/output pair (At least on the ISA cards there is only single purpose mono channel - to route the PC speaker). Which name should be used? I will convert all ISA drivers to the selected name (and fix the OSS mixer to map this name to the "Speaker" control). Regards, Krzysztof ---------------------------------------------------------------------- Kawalerka za 79 000 zl! Sprawdz >>> http://link.interia.pl/f2425

3 2

[alsa-devel] [PATCH] soc-core: move setting ac97 platform data earlier than ac97 read/write
by Barry Song 11 Nov '09

11 Nov '09

While probing, AC97 codec drivers generically execute the following sequence: snd_soc_new_ac97_codec -> snd_soc_new_pcms -> reset ac-link/read AC97 ID to detect ->... -> snd_soc_init_card commit 474828a40f6ddab6e2a3475a19c5c84aa3ec7d60 adds platform_data to snd_ac97 instance. But ac97 platform data hasn't given to snd_ac97 until snd_soc_init_card. Then while ac97_read access platform_data of snd_ac97 for detecting, NULL pointer oops will fire. That means old platform_data patch doesn't work in real-life cases. This patch moves the operation of setting ac97 platform_data earlier than ac97 reading/writing operations. Then it makes platform_data of AC97 become practically useful. Signed-off-by: Barry Song <21cnbao(a)gmail.com> cc: Marek Vasut <marek.vasut(a)gmail.com> --- sound/soc/soc-core.c | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/sound/soc/soc-core.c b/sound/soc/soc-core.c index 2d190df..a900778 100644 --- a/sound/soc/soc-core.c +++ b/sound/soc/soc-core.c @@ -1427,6 +1427,9 @@ int snd_soc_new_pcms(struct snd_soc_device *socdev, int idx, const char *xid) mutex_unlock(&codec->mutex); return ret; } + if (card->dai_link[i].codec_dai->ac97_control) + snd_ac97_dev_add_pdata(codec->ac97, + card->dai_link[i].cpu_dai->ac97_pdata); } mutex_unlock(&codec->mutex); @@ -1458,11 +1461,8 @@ int snd_soc_init_card(struct snd_soc_device *socdev) continue; } } - if (card->dai_link[i].codec_dai->ac97_control) { + if (card->dai_link[i].codec_dai->ac97_control) ac97 = 1; - snd_ac97_dev_add_pdata(codec->ac97, - card->dai_link[i].cpu_dai->ac97_pdata); - } } snprintf(codec->card->shortname, sizeof(codec->card->shortname), "%s", card->name); -- 1.5.6.3

2 2

[alsa-devel] ASoC updates for 2.6.33
by Mark Brown 11 Nov '09

11 Nov '09

The following changes since commit 4cae37fa98f4d50778161ec033122444e3c10a01: Takashi Iwai (1): ASoC: Remove dead code and labels are available in the git repository at: git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound-2.6.git for-2.6.33 Graeme Gregory (1): ASoC: omap-mcbsp - add support for upto 16 channels. Grant Likely (6): ASoC/mpc5200: Track DMA position by period number instead of bytes ASoC/mpc5200: get rid of the appl_ptr tracking nonsense ASoC/mpc5200: Improve printk debug output for trigger ASoC/mpc5200: add to_psc_dma_stream() helper ASoC/mpc5200: fix enable/disable of AC97 slots ASoC: mpc5200: remove duplicate identical IRQ handler Jarkko Nikula (1): ASoC: Pandora: Pass SRG input clock frequency to the OMAP McBSP DAI Mark Brown (1): Merge branch 'twl4030-mfd' into for-2.6.33 Peter Ujfalusi (4): MFD: TWL4030: Add audio_mclk to the codec platform data OMAP: Configure audio_mclk for twl4030-codec MFD MFD: twl4030-codec: APLL_INFREQ handling in the MFD driver ASoC: TWL4030: Do not modify the APLL_CTL register arch/arm/mach-omap2/board-3430sdp.c | 1 + arch/arm/mach-omap2/board-omap3beagle.c | 1 + arch/arm/mach-omap2/board-omap3evm.c | 1 + arch/arm/mach-omap2/board-omap3pandora.c | 1 + arch/arm/mach-omap2/board-overo.c | 1 + arch/arm/mach-omap2/board-zoom2.c | 1 + drivers/mfd/twl4030-codec.c | 35 +++++++++ include/linux/i2c/twl4030.h | 1 + include/linux/mfd/twl4030-codec.h | 1 + sound/soc/codecs/twl4030.c | 76 ++++++++----------- sound/soc/fsl/mpc5200_dma.c | 123 ++++++------------------------ sound/soc/fsl/mpc5200_dma.h | 24 ++++-- sound/soc/fsl/mpc5200_psc_ac97.c | 39 +++++----- sound/soc/omap/omap-mcbsp.c | 63 +++++++++------ sound/soc/omap/omap3pandora.c | 24 +++---- 15 files changed, 183 insertions(+), 209 deletions(-)

2 1

Re: [alsa-devel] [PATCH]ASoc:ZOOM2:Add support for DSP rendering.
by Mark Brown 11 Nov '09

11 Nov '09

On Thu, Nov 05, 2009 at 04:21:31PM -0600, Jane Wang wrote: > New mixer controls added to send dapm stream events to power up/down TWL4030 > DAPM widgets along playback and capture paths. In case of DSP rendering, > use the corresponding mixer control to power up widgets before stream starts > and power down the widges after stream stops. What does the hardware look like and what is the problem you're trying to solve here? Sending stream events into the core is a definite layering violation and is likely to fail with some use case transitions but without knowing what the patch is trying to achieve it's hard to offer much advice. > +static const char *path_control[] = {"Off", "On"}; > +static const struct soc_enum zoom2_enum[] = { > + SOC_ENUM_SINGLE_EXT(ARRAY_SIZE(path_control), path_control), > +}; Why is this an enumerated control and not a switch?

3 3

[alsa-devel] [PATCH] ALSA: possible read past array alc88[02]_parse_auto_config()
by Roel Kluin 11 Nov '09

11 Nov '09

The test of index `i' is after the read - too late - and unsafe: if snd_hda_get_connections() fails in the last iteration a read beyond the array is possible. Signed-off-by: Roel Kluin <roel.kluin(a)gmail.com> --- sound/pci/hda/patch_realtek.c | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/sound/pci/hda/patch_realtek.c b/sound/pci/hda/patch_realtek.c index ff20048..fd094f5 100644 --- a/sound/pci/hda/patch_realtek.c +++ b/sound/pci/hda/patch_realtek.c @@ -4684,9 +4684,9 @@ static int alc880_parse_auto_config(struct hda_codec *codec) spec->multiout.dig_out_nid = dig_nid; else { spec->multiout.slave_dig_outs = spec->slave_dig_outs; - spec->slave_dig_outs[i - 1] = dig_nid; - if (i == ARRAY_SIZE(spec->slave_dig_outs) - 1) + if (i >= ARRAY_SIZE(spec->slave_dig_outs) - 1) break; + spec->slave_dig_outs[i - 1] = dig_nid; } } if (spec->autocfg.dig_in_pin) @@ -9813,9 +9813,9 @@ static int alc882_parse_auto_config(struct hda_codec *codec) spec->multiout.dig_out_nid = dig_nid; else { spec->multiout.slave_dig_outs = spec->slave_dig_outs; - spec->slave_dig_outs[i - 1] = dig_nid; - if (i == ARRAY_SIZE(spec->slave_dig_outs) - 1) + if (i >= ARRAY_SIZE(spec->slave_dig_outs) - 1) break; + spec->slave_dig_outs[i - 1] = dig_nid; } } if (spec->autocfg.dig_in_pin)

2 1

[alsa-devel] [PATCH] ALSA: hda: Use 3stack quirk for some broken Dell models
by Dan Chen 11 Nov '09

11 Nov '09

Hi, In triaging bugs for Ubuntu 9.10, I've seen several Dell models that are behaving strangely with the current driver. Attached please find a patch against current sound-2.6 HEAD that allows these models to have somewhat more sane behaviour when headphones are inserted. Thanks, Dan

3 9

[alsa-devel] [PATCH] SMDK64XX I2S: Debugged arguments passed to set_pll
by Jassi Brar 11 Nov '09

11 Nov '09

Corrected the order of 'source' and 'pll_id' arguments. Signed-off-by: Jassi Brar <jassi.brar(a)samsung.com> --- sound/soc/s3c24xx/smdk64xx_wm8580.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/sound/soc/s3c24xx/smdk64xx_wm8580.c b/sound/soc/s3c24xx/smdk64xx_wm8580.c index cb8a916..216dd1e 100644 --- a/sound/soc/s3c24xx/smdk64xx_wm8580.c +++ b/sound/soc/s3c24xx/smdk64xx_wm8580.c @@ -115,7 +115,7 @@ static int smdk64xx_hw_params(struct snd_pcm_substream *substream, if (ret < 0) return ret; - ret = snd_soc_dai_set_pll(codec_dai, 0, WM8580_PLLA, + ret = snd_soc_dai_set_pll(codec_dai, WM8580_PLLA, 0, SMDK64XX_WM8580_FREQ, pll_out); if (ret < 0) return ret; -- 1.6.2.5

1 0

[alsa-devel] [PATCH 7/7] S3C PCM: Added the CPU driver for PCM controllers
by Jassi Brar 11 Nov '09

11 Nov '09

Signed-off-by: Jassi Brar <jassi.brar(a)samsung.com> --- sound/soc/s3c24xx/Kconfig | 3 + sound/soc/s3c24xx/Makefile | 2 + sound/soc/s3c24xx/s3c-pcm.c | 552 +++++++++++++++++++++++++++++++++++++++++++ sound/soc/s3c24xx/s3c-pcm.h | 123 ++++++++++ 4 files changed, 680 insertions(+), 0 deletions(-) create mode 100644 sound/soc/s3c24xx/s3c-pcm.c create mode 100644 sound/soc/s3c24xx/s3c-pcm.h diff --git a/sound/soc/s3c24xx/Kconfig b/sound/soc/s3c24xx/Kconfig index d7912f1..b489f1a 100644 --- a/sound/soc/s3c24xx/Kconfig +++ b/sound/soc/s3c24xx/Kconfig @@ -24,6 +24,9 @@ config SND_S3C64XX_SOC_I2S select SND_S3C_I2SV2_SOC select S3C64XX_DMA +config SND_S3C_SOC_PCM + tristate + config SND_S3C2443_SOC_AC97 tristate select S3C2410_DMA diff --git a/sound/soc/s3c24xx/Makefile b/sound/soc/s3c24xx/Makefile index 3bdb74d..8835d59 100644 --- a/sound/soc/s3c24xx/Makefile +++ b/sound/soc/s3c24xx/Makefile @@ -5,6 +5,7 @@ snd-soc-s3c2412-i2s-objs := s3c2412-i2s.o snd-soc-s3c64xx-i2s-objs := s3c64xx-i2s.o snd-soc-s3c2443-ac97-objs := s3c2443-ac97.o snd-soc-s3c-i2s-v2-objs := s3c-i2s-v2.o +snd-soc-s3c-pcm-objs := s3c-pcm.o obj-$(CONFIG_SND_S3C24XX_SOC) += snd-soc-s3c24xx.o obj-$(CONFIG_SND_S3C24XX_SOC_I2S) += snd-soc-s3c24xx-i2s.o @@ -12,6 +13,7 @@ obj-$(CONFIG_SND_S3C2443_SOC_AC97) += snd-soc-s3c2443-ac97.o obj-$(CONFIG_SND_S3C2412_SOC_I2S) += snd-soc-s3c2412-i2s.o obj-$(CONFIG_SND_S3C64XX_SOC_I2S) += snd-soc-s3c64xx-i2s.o obj-$(CONFIG_SND_S3C_I2SV2_SOC) += snd-soc-s3c-i2s-v2.o +obj-$(CONFIG_SND_S3C_SOC_PCM) += snd-soc-s3c-pcm.o # S3C24XX Machine Support snd-soc-jive-wm8750-objs := jive_wm8750.o diff --git a/sound/soc/s3c24xx/s3c-pcm.c b/sound/soc/s3c24xx/s3c-pcm.c new file mode 100644 index 0000000..7fbf88c --- /dev/null +++ b/sound/soc/s3c24xx/s3c-pcm.c @@ -0,0 +1,552 @@ +/* sound/soc/s3c24xx/s3c-pcm.c + * + * ALSA SoC Audio Layer - S3C PCM-Controller driver + * + * Copyright (c) 2009 Samsung Electronics Co. Ltd + * Author: Jaswinder Singh <jassi.brar(a)samsung.com> + * based upon I2S drivers by Ben Dooks. + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License version 2 as + * published by the Free Software Foundation. + */ + +#include <linux/init.h> +#include <linux/module.h> +#include <linux/device.h> +#include <linux/delay.h> +#include <linux/clk.h> +#include <linux/kernel.h> +#include <linux/gpio.h> +#include <linux/io.h> + +#include <sound/core.h> +#include <sound/pcm.h> +#include <sound/pcm_params.h> +#include <sound/initval.h> +#include <sound/soc.h> + +#include <plat/audio.h> +#include <plat/dma.h> + +#include "s3c-audio.h" +#include "s3c-pcm.h" + +static struct s3c2410_dma_client s3c_pcm_dma_client_out = { + .name = "PCM Stereo out" +}; + +static struct s3c2410_dma_client s3c_pcm_dma_client_in = { + .name = "PCM Stereo in" +}; + +static struct s3c_dma_params s3c_pcm_stereo_out[] = { + [0] = { + .client = &s3c_pcm_dma_client_out, + .dma_size = 4, + }, + [1] = { + .client = &s3c_pcm_dma_client_out, + .dma_size = 4, + }, +}; + +static struct s3c_dma_params s3c_pcm_stereo_in[] = { + [0] = { + .client = &s3c_pcm_dma_client_in, + .dma_size = 4, + }, + [1] = { + .client = &s3c_pcm_dma_client_in, + .dma_size = 4, + }, +}; + +static struct s3c_pcm_info s3c_pcm[2]; + +static inline struct s3c_pcm_info *to_info(struct snd_soc_dai *cpu_dai) +{ + return cpu_dai->private_data; +} + +static void s3c_pcm_snd_txctrl(struct s3c_pcm_info *pcm, int on) +{ + void __iomem *regs = pcm->regs; + u32 ctl, clkctl; + + clkctl = readl(regs + S3C_PCM_CLKCTL); + ctl = readl(regs + S3C_PCM_CTL); + ctl &= ~(S3C_PCM_CTL_TXDIPSTICK_MASK + << S3C_PCM_CTL_TXDIPSTICK_SHIFT); + + if (on) { + ctl |= S3C_PCM_CTL_TXDMA_EN; + ctl |= S3C_PCM_CTL_TXFIFO_EN; + ctl |= S3C_PCM_CTL_ENABLE; + ctl |= (0x20<<S3C_PCM_CTL_TXDIPSTICK_SHIFT); + clkctl |= S3C_PCM_CLKCTL_SERCLK_EN; + } else { + ctl &= ~S3C_PCM_CTL_TXDMA_EN; + ctl &= ~S3C_PCM_CTL_TXFIFO_EN; + + if (!(ctl & S3C_PCM_CTL_RXFIFO_EN)) { + ctl &= ~S3C_PCM_CTL_ENABLE; + if (!pcm->idleclk) + clkctl |= S3C_PCM_CLKCTL_SERCLK_EN; + } + } + + writel(clkctl, regs + S3C_PCM_CLKCTL); + writel(ctl, regs + S3C_PCM_CTL); +} + +static void s3c_pcm_snd_rxctrl(struct s3c_pcm_info *pcm, int on) +{ + void __iomem *regs = pcm->regs; + u32 ctl, clkctl; + + ctl = readl(regs + S3C_PCM_CTL); + clkctl = readl(regs + S3C_PCM_CLKCTL); + + if (on) { + ctl |= S3C_PCM_CTL_RXDMA_EN; + ctl |= S3C_PCM_CTL_RXFIFO_EN; + ctl |= S3C_PCM_CTL_ENABLE; + clkctl |= S3C_PCM_CLKCTL_SERCLK_EN; + } else { + ctl &= ~S3C_PCM_CTL_RXDMA_EN; + ctl &= ~S3C_PCM_CTL_RXFIFO_EN; + + if (!(ctl & S3C_PCM_CTL_TXFIFO_EN)) { + ctl &= ~S3C_PCM_CTL_ENABLE; + if (!pcm->idleclk) + clkctl |= S3C_PCM_CLKCTL_SERCLK_EN; + } + } + + writel(clkctl, regs + S3C_PCM_CLKCTL); + writel(ctl, regs + S3C_PCM_CTL); +} + +static int s3c_pcm_trigger(struct snd_pcm_substream *substream, int cmd, + struct snd_soc_dai *dai) +{ + struct snd_soc_pcm_runtime *rtd = substream->private_data; + struct s3c_pcm_info *pcm = to_info(rtd->dai->cpu_dai); + unsigned long flags; + + dev_dbg(pcm->dev, "Entered %s\n", __func__); + + switch (cmd) { + case SNDRV_PCM_TRIGGER_START: + case SNDRV_PCM_TRIGGER_RESUME: + case SNDRV_PCM_TRIGGER_PAUSE_RELEASE: + spin_lock_irqsave(&pcm->lock, flags); + + if (substream->stream == SNDRV_PCM_STREAM_CAPTURE) + s3c_pcm_snd_rxctrl(pcm, 1); + else + s3c_pcm_snd_txctrl(pcm, 1); + + spin_unlock_irqrestore(&pcm->lock, flags); + break; + + case SNDRV_PCM_TRIGGER_STOP: + case SNDRV_PCM_TRIGGER_SUSPEND: + case SNDRV_PCM_TRIGGER_PAUSE_PUSH: + spin_lock_irqsave(&pcm->lock, flags); + + if (substream->stream == SNDRV_PCM_STREAM_CAPTURE) + s3c_pcm_snd_rxctrl(pcm, 0); + else + s3c_pcm_snd_txctrl(pcm, 0); + + spin_unlock_irqrestore(&pcm->lock, flags); + break; + + default: + return -EINVAL; + } + + return 0; +} + +static int s3c_pcm_hw_params(struct snd_pcm_substream *substream, + struct snd_pcm_hw_params *params, + struct snd_soc_dai *socdai) +{ + struct snd_soc_pcm_runtime *rtd = substream->private_data; + struct snd_soc_dai_link *dai = rtd->dai; + struct s3c_pcm_info *pcm = to_info(dai->cpu_dai); + void __iomem *regs = pcm->regs; + struct clk *clk; + int sclk_div, sync_div; + unsigned long flags; + u32 clkctl; + + dev_dbg(pcm->dev, "Entered %s\n", __func__); + + if (substream->stream == SNDRV_PCM_STREAM_PLAYBACK) + dai->cpu_dai->dma_data = pcm->dma_playback; + else + dai->cpu_dai->dma_data = pcm->dma_capture; + + /* Strictly check for sample size */ + switch (params_format(params)) { + case SNDRV_PCM_FORMAT_S16_LE: + break; + default: + return -EINVAL; + } + + spin_lock_irqsave(&pcm->lock, flags); + + /* Get hold of the PCMSOURCE_CLK */ + clkctl = readl(regs + S3C_PCM_CLKCTL); + if (clkctl & S3C_PCM_CLKCTL_SERCLKSEL_PCLK) + clk = pcm->pclk; + else + clk = pcm->cclk; + + /* Set the SCLK divider */ + sclk_div = clk_get_rate(clk) / pcm->sclk_per_fs / + params_rate(params) / 2 - 1; + + clkctl &= ~(S3C_PCM_CLKCTL_SCLKDIV_MASK + << S3C_PCM_CLKCTL_SCLKDIV_SHIFT); + clkctl |= ((sclk_div & S3C_PCM_CLKCTL_SCLKDIV_MASK) + << S3C_PCM_CLKCTL_SCLKDIV_SHIFT); + + /* Set the SYNC divider */ + sync_div = pcm->sclk_per_fs - 1; + + clkctl &= ~(S3C_PCM_CLKCTL_SYNCDIV_MASK + << S3C_PCM_CLKCTL_SYNCDIV_SHIFT); + clkctl |= ((sync_div & S3C_PCM_CLKCTL_SYNCDIV_MASK) + << S3C_PCM_CLKCTL_SYNCDIV_SHIFT); + + writel(clkctl, regs + S3C_PCM_CLKCTL); + + spin_unlock_irqrestore(&pcm->lock, flags); + + dev_dbg(pcm->dev, "PCMSOURCE_CLK-%lu SCLK=%ufs \ + SCLK_DIV=%d SYNC_DIV=%d\n", + clk_get_rate(clk), pcm->sclk_per_fs, + sclk_div, sync_div); + + return 0; +} + +static int s3c_pcm_set_fmt(struct snd_soc_dai *cpu_dai, + unsigned int fmt) +{ + struct s3c_pcm_info *pcm = to_info(cpu_dai); + void __iomem *regs = pcm->regs; + unsigned long flags; + int ret = 0; + u32 ctl; + + dev_dbg(pcm->dev, "Entered %s\n", __func__); + + spin_lock_irqsave(&pcm->lock, flags); + + ctl = readl(regs + S3C_PCM_CTL); + + switch (fmt & SND_SOC_DAIFMT_INV_MASK) { + case SND_SOC_DAIFMT_NB_NF: + /* Nothing to do, NB_NF by default */ + break; + default: + dev_err(pcm->dev, "Unsupported clock inversion!\n"); + ret = -EINVAL; + goto exit; + } + + switch (fmt & SND_SOC_DAIFMT_MASTER_MASK) { + case SND_SOC_DAIFMT_CBS_CFS: + /* Nothing to do, Master by default */ + break; + default: + dev_err(pcm->dev, "Unsupported master/slave format!\n"); + ret = -EINVAL; + goto exit; + } + + switch (fmt & SND_SOC_DAIFMT_CLOCK_MASK) { + case SND_SOC_DAIFMT_CONT: + pcm->idleclk = 1; + break; + case SND_SOC_DAIFMT_GATED: + pcm->idleclk = 0; + break; + default: + dev_err(pcm->dev, "Invalid Clock gating request!\n"); + ret = -EINVAL; + goto exit; + } + + switch (fmt & SND_SOC_DAIFMT_FORMAT_MASK) { + case SND_SOC_DAIFMT_DSP_A: + ctl |= S3C_PCM_CTL_TXMSB_AFTER_FSYNC; + ctl |= S3C_PCM_CTL_RXMSB_AFTER_FSYNC; + break; + case SND_SOC_DAIFMT_DSP_B: + ctl &= ~S3C_PCM_CTL_TXMSB_AFTER_FSYNC; + ctl &= ~S3C_PCM_CTL_RXMSB_AFTER_FSYNC; + break; + default: + dev_err(pcm->dev, "Unsupported data format!\n"); + ret = -EINVAL; + goto exit; + } + + writel(ctl, regs + S3C_PCM_CTL); + +exit: + spin_unlock_irqrestore(&pcm->lock, flags); + + return ret; +} + +static int s3c_pcm_set_clkdiv(struct snd_soc_dai *cpu_dai, + int div_id, int div) +{ + struct s3c_pcm_info *pcm = to_info(cpu_dai); + + switch (div_id) { + case S3C_PCM_SCLK_PER_FS: + pcm->sclk_per_fs = div; + break; + + default: + return -EINVAL; + } + + return 0; +} + +static int s3c_pcm_set_sysclk(struct snd_soc_dai *cpu_dai, + int clk_id, unsigned int freq, int dir) +{ + struct s3c_pcm_info *pcm = to_info(cpu_dai); + void __iomem *regs = pcm->regs; + u32 clkctl = readl(regs + S3C_PCM_CLKCTL); + + switch (clk_id) { + case S3C_PCM_CLKSRC_PCLK: + clkctl |= S3C_PCM_CLKCTL_SERCLKSEL_PCLK; + break; + + case S3C_PCM_CLKSRC_MUX: + clkctl &= ~S3C_PCM_CLKCTL_SERCLKSEL_PCLK; + + if (clk_get_rate(pcm->cclk) != freq) + clk_set_rate(pcm->cclk, freq); + + break; + + default: + return -EINVAL; + } + + writel(clkctl, regs + S3C_PCM_CLKCTL); + + return 0; +} + +static struct snd_soc_dai_ops s3c_pcm_dai_ops = { + .set_sysclk = s3c_pcm_set_sysclk, + .set_clkdiv = s3c_pcm_set_clkdiv, + .trigger = s3c_pcm_trigger, + .hw_params = s3c_pcm_hw_params, + .set_fmt = s3c_pcm_set_fmt, +}; + +#define S3C_PCM_RATES SNDRV_PCM_RATE_8000_96000 + +#define S3C_PCM_DECLARE(n) \ +{ \ + .name = "samsung-pcm", \ + .id = (n), \ + .symmetric_rates = 1, \ + .ops = &s3c_pcm_dai_ops, \ + .playback = { \ + .channels_min = 2, \ + .channels_max = 2, \ + .rates = S3C_PCM_RATES, \ + .formats = SNDRV_PCM_FMTBIT_S16_LE, \ + }, \ + .capture = { \ + .channels_min = 2, \ + .channels_max = 2, \ + .rates = S3C_PCM_RATES, \ + .formats = SNDRV_PCM_FMTBIT_S16_LE, \ + }, \ +} + +struct snd_soc_dai s3c_pcm_dai[] = { + S3C_PCM_DECLARE(0), + S3C_PCM_DECLARE(1), +}; +EXPORT_SYMBOL_GPL(s3c_pcm_dai); + +static __devinit int s3c_pcm_dev_probe(struct platform_device *pdev) +{ + struct s3c_pcm_info *pcm; + struct snd_soc_dai *dai; + struct resource *mem_res, *dmatx_res, *dmarx_res; + struct s3c_audio_pdata *pcm_pdata; + int ret; + + /* Check for valid device index */ + if ((pdev->id < 0) || pdev->id >= ARRAY_SIZE(s3c_pcm)) { + dev_err(&pdev->dev, "id %d out of range\n", pdev->id); + return -EINVAL; + } + + pcm_pdata = pdev->dev.platform_data; + + /* Check for availability of necessary resource */ + dmatx_res = platform_get_resource(pdev, IORESOURCE_DMA, 0); + if (!dmatx_res) { + dev_err(&pdev->dev, "Unable to get PCM-TX dma resource\n"); + return -ENXIO; + } + + dmarx_res = platform_get_resource(pdev, IORESOURCE_DMA, 1); + if (!dmarx_res) { + dev_err(&pdev->dev, "Unable to get PCM-RX dma resource\n"); + return -ENXIO; + } + + mem_res = platform_get_resource(pdev, IORESOURCE_MEM, 0); + if (!mem_res) { + dev_err(&pdev->dev, "Unable to get register resource\n"); + return -ENXIO; + } + + if (pcm_pdata && pcm_pdata->cfg_gpio && pcm_pdata->cfg_gpio(pdev)) { + dev_err(&pdev->dev, "Unable to configure gpio\n"); + return -EINVAL; + } + + pcm = &s3c_pcm[pdev->id]; + pcm->dev = &pdev->dev; + + spin_lock_init(&pcm->lock); + + dai = &s3c_pcm_dai[pdev->id]; + dai->dev = &pdev->dev; + + /* Default is 128fs */ + pcm->sclk_per_fs = 128; + + pcm->cclk = clk_get(&pdev->dev, "audio-bus"); + if (IS_ERR(pcm->cclk)) { + dev_err(&pdev->dev, "failed to get audio-bus\n"); + ret = PTR_ERR(pcm->cclk); + goto err1; + } + clk_enable(pcm->cclk); + + /* record our pcm structure for later use in the callbacks */ + dai->private_data = pcm; + + if (!request_mem_region(mem_res->start, + resource_size(mem_res), "samsung-pcm")) { + dev_err(&pdev->dev, "Unable to request register region\n"); + ret = -EBUSY; + goto err2; + } + + pcm->regs = ioremap(mem_res->start, 0x100); + if (pcm->regs == NULL) { + dev_err(&pdev->dev, "cannot ioremap registers\n"); + ret = -ENXIO; + goto err3; + } + + pcm->pclk = clk_get(&pdev->dev, "pcm"); + if (IS_ERR(pcm->pclk)) { + dev_err(&pdev->dev, "failed to get pcm_clock\n"); + ret = -ENOENT; + goto err4; + } + clk_enable(pcm->pclk); + + ret = snd_soc_register_dai(dai); + if (ret != 0) { + dev_err(&pdev->dev, "failed to get pcm_clock\n"); + goto err5; + } + + s3c_pcm_stereo_in[pdev->id].dma_addr = mem_res->start + + S3C_PCM_RXFIFO; + s3c_pcm_stereo_out[pdev->id].dma_addr = mem_res->start + + S3C_PCM_TXFIFO; + + s3c_pcm_stereo_in[pdev->id].channel = dmarx_res->start; + s3c_pcm_stereo_out[pdev->id].channel = dmatx_res->start; + + pcm->dma_capture = &s3c_pcm_stereo_in[pdev->id]; + pcm->dma_playback = &s3c_pcm_stereo_out[pdev->id]; + + return 0; + +err5: + clk_disable(pcm->pclk); + clk_put(pcm->pclk); +err4: + iounmap(pcm->regs); +err3: + release_mem_region(mem_res->start, resource_size(mem_res)); +err2: + clk_disable(pcm->cclk); + clk_put(pcm->cclk); +err1: + return ret; +} + +static __devexit int s3c_pcm_dev_remove(struct platform_device *pdev) +{ + struct s3c_pcm_info *pcm = &s3c_pcm[pdev->id]; + struct resource *mem_res; + + iounmap(pcm->regs); + + mem_res = platform_get_resource(pdev, IORESOURCE_MEM, 0); + release_mem_region(mem_res->start, resource_size(mem_res)); + + clk_disable(pcm->cclk); + clk_disable(pcm->pclk); + clk_put(pcm->pclk); + clk_put(pcm->cclk); + + return 0; +} + +static struct platform_driver s3c_pcm_driver = { + .probe = s3c_pcm_dev_probe, + .remove = s3c_pcm_dev_remove, + .driver = { + .name = "samsung-pcm", + .owner = THIS_MODULE, + }, +}; + +static int __init s3c_pcm_init(void) +{ + return platform_driver_register(&s3c_pcm_driver); +} +module_init(s3c_pcm_init); + +static void __exit s3c_pcm_exit(void) +{ + platform_driver_unregister(&s3c_pcm_driver); +} +module_exit(s3c_pcm_exit); + +/* Module information */ +MODULE_AUTHOR("Jaswinder Singh, <jassi.brar(a)samsung.com>"); +MODULE_DESCRIPTION("S3C PCM Controller Driver"); +MODULE_LICENSE("GPL"); diff --git a/sound/soc/s3c24xx/s3c-pcm.h b/sound/soc/s3c24xx/s3c-pcm.h new file mode 100644 index 0000000..69ff997 --- /dev/null +++ b/sound/soc/s3c24xx/s3c-pcm.h @@ -0,0 +1,123 @@ +/* sound/soc/s3c24xx/s3c-pcm.h + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License version 2 as + * published by the Free Software Foundation. + * + */ + +#ifndef __S3C_PCM_H +#define __S3C_PCM_H __FILE__ + +/*Register Offsets */ +#define S3C_PCM_CTL (0x00) +#define S3C_PCM_CLKCTL (0x04) +#define S3C_PCM_TXFIFO (0x08) +#define S3C_PCM_RXFIFO (0x0C) +#define S3C_PCM_IRQCTL (0x10) +#define S3C_PCM_IRQSTAT (0x14) +#define S3C_PCM_FIFOSTAT (0x18) +#define S3C_PCM_CLRINT (0x20) + +/* PCM_CTL Bit-Fields */ +#define S3C_PCM_CTL_TXDIPSTICK_MASK (0x3f) +#define S3C_PCM_CTL_TXDIPSTICK_SHIFT (13) +#define S3C_PCM_CTL_RXDIPSTICK_MSK (0x3f<<7) +#define S3C_PCM_CTL_TXDMA_EN (0x1<<6) +#define S3C_PCM_CTL_RXDMA_EN (0x1<<5) +#define S3C_PCM_CTL_TXMSB_AFTER_FSYNC (0x1<<4) +#define S3C_PCM_CTL_RXMSB_AFTER_FSYNC (0x1<<3) +#define S3C_PCM_CTL_TXFIFO_EN (0x1<<2) +#define S3C_PCM_CTL_RXFIFO_EN (0x1<<1) +#define S3C_PCM_CTL_ENABLE (0x1<<0) + +/* PCM_CLKCTL Bit-Fields */ +#define S3C_PCM_CLKCTL_SERCLK_EN (0x1<<19) +#define S3C_PCM_CLKCTL_SERCLKSEL_PCLK (0x1<<18) +#define S3C_PCM_CLKCTL_SCLKDIV_MASK (0x1ff) +#define S3C_PCM_CLKCTL_SYNCDIV_MASK (0x1ff) +#define S3C_PCM_CLKCTL_SCLKDIV_SHIFT (9) +#define S3C_PCM_CLKCTL_SYNCDIV_SHIFT (0) + +/* PCM_TXFIFO Bit-Fields */ +#define S3C_PCM_TXFIFO_DVALID (0x1<<16) +#define S3C_PCM_TXFIFO_DATA_MSK (0xffff<<0) + +/* PCM_RXFIFO Bit-Fields */ +#define S3C_PCM_RXFIFO_DVALID (0x1<<16) +#define S3C_PCM_RXFIFO_DATA_MSK (0xffff<<0) + +/* PCM_IRQCTL Bit-Fields */ +#define S3C_PCM_IRQCTL_IRQEN (0x1<<14) +#define S3C_PCM_IRQCTL_WRDEN (0x1<<12) +#define S3C_PCM_IRQCTL_TXEMPTYEN (0x1<<11) +#define S3C_PCM_IRQCTL_TXALMSTEMPTYEN (0x1<<10) +#define S3C_PCM_IRQCTL_TXFULLEN (0x1<<9) +#define S3C_PCM_IRQCTL_TXALMSTFULLEN (0x1<<8) +#define S3C_PCM_IRQCTL_TXSTARVEN (0x1<<7) +#define S3C_PCM_IRQCTL_TXERROVRFLEN (0x1<<6) +#define S3C_PCM_IRQCTL_RXEMPTEN (0x1<<5) +#define S3C_PCM_IRQCTL_RXALMSTEMPTEN (0x1<<4) +#define S3C_PCM_IRQCTL_RXFULLEN (0x1<<3) +#define S3C_PCM_IRQCTL_RXALMSTFULLEN (0x1<<2) +#define S3C_PCM_IRQCTL_RXSTARVEN (0x1<<1) +#define S3C_PCM_IRQCTL_RXERROVRFLEN (0x1<<0) + +/* PCM_IRQSTAT Bit-Fields */ +#define S3C_PCM_IRQSTAT_IRQPND (0x1<<13) +#define S3C_PCM_IRQSTAT_WRD_XFER (0x1<<12) +#define S3C_PCM_IRQSTAT_TXEMPTY (0x1<<11) +#define S3C_PCM_IRQSTAT_TXALMSTEMPTY (0x1<<10) +#define S3C_PCM_IRQSTAT_TXFULL (0x1<<9) +#define S3C_PCM_IRQSTAT_TXALMSTFULL (0x1<<8) +#define S3C_PCM_IRQSTAT_TXSTARV (0x1<<7) +#define S3C_PCM_IRQSTAT_TXERROVRFL (0x1<<6) +#define S3C_PCM_IRQSTAT_RXEMPT (0x1<<5) +#define S3C_PCM_IRQSTAT_RXALMSTEMPT (0x1<<4) +#define S3C_PCM_IRQSTAT_RXFULL (0x1<<3) +#define S3C_PCM_IRQSTAT_RXALMSTFULL (0x1<<2) +#define S3C_PCM_IRQSTAT_RXSTARV (0x1<<1) +#define S3C_PCM_IRQSTAT_RXERROVRFL (0x1<<0) + +/* PCM_FIFOSTAT Bit-Fields */ +#define S3C_PCM_FIFOSTAT_TXCNT_MSK (0x3f<<14) +#define S3C_PCM_FIFOSTAT_TXFIFOEMPTY (0x1<<13) +#define S3C_PCM_FIFOSTAT_TXFIFOALMSTEMPTY (0x1<<12) +#define S3C_PCM_FIFOSTAT_TXFIFOFULL (0x1<<11) +#define S3C_PCM_FIFOSTAT_TXFIFOALMSTFULL (0x1<<10) +#define S3C_PCM_FIFOSTAT_RXCNT_MSK (0x3f<<4) +#define S3C_PCM_FIFOSTAT_RXFIFOEMPTY (0x1<<3) +#define S3C_PCM_FIFOSTAT_RXFIFOALMSTEMPTY (0x1<<2) +#define S3C_PCM_FIFOSTAT_RXFIFOFULL (0x1<<1) +#define S3C_PCM_FIFOSTAT_RXFIFOALMSTFULL (0x1<<0) + +#define S3C_PCM_CLKSRC_PCLK 0 +#define S3C_PCM_CLKSRC_MUX 1 + +#define S3C_PCM_SCLK_PER_FS 0 + +/** + * struct s3c_pcm_info - S3C PCM Controller information + * @dev: The parent device passed to use from the probe. + * @regs: The pointer to the device register block. + * @dma_playback: DMA information for playback channel. + * @dma_capture: DMA information for capture channel. + */ +struct s3c_pcm_info { + spinlock_t lock; + struct device *dev; + void __iomem *regs; + + unsigned int sclk_per_fs; + + /* Whether to keep PCMSCLK enabled even when idle(no active xfer) */ + unsigned int idleclk; + + struct clk *pclk; + struct clk *cclk; + + struct s3c_dma_params *dma_playback; + struct s3c_dma_params *dma_capture; +}; + +#endif /* __S3C_PCM_H */ -- 1.6.2.5

1 0

[alsa-devel] [PATCH 6/7] S3C64XX PCM: Defined PCM controller platform devices
by Jassi Brar 11 Nov '09

11 Nov '09

Signed-off-by: Jassi Brar <jassi.brar(a)samsung.com> --- arch/arm/plat-s3c/include/plat/devs.h | 3 + arch/arm/plat-s3c64xx/dev-audio.c | 101 ++++++++++++++++++++++++++++++++- 2 files changed, 103 insertions(+), 1 deletions(-) diff --git a/arch/arm/plat-s3c/include/plat/devs.h b/arch/arm/plat-s3c/include/plat/devs.h index 0f540ea..932cbbb 100644 --- a/arch/arm/plat-s3c/include/plat/devs.h +++ b/arch/arm/plat-s3c/include/plat/devs.h @@ -28,6 +28,9 @@ extern struct platform_device s3c64xx_device_iis0; extern struct platform_device s3c64xx_device_iis1; extern struct platform_device s3c64xx_device_iisv4; +extern struct platform_device s3c64xx_device_pcm0; +extern struct platform_device s3c64xx_device_pcm1; + extern struct platform_device s3c_device_fb; extern struct platform_device s3c_device_usb; extern struct platform_device s3c_device_lcd; diff --git a/arch/arm/plat-s3c64xx/dev-audio.c b/arch/arm/plat-s3c64xx/dev-audio.c index 1322beb..9e07344 100644 --- a/arch/arm/plat-s3c64xx/dev-audio.c +++ b/arch/arm/plat-s3c64xx/dev-audio.c @@ -15,9 +15,14 @@ #include <mach/irqs.h> #include <mach/map.h> +#include <mach/dma.h> +#include <mach/gpio.h> #include <plat/devs.h> - +#include <plat/audio.h> +#include <plat/gpio-bank-d.h> +#include <plat/gpio-bank-e.h> +#include <plat/gpio-cfg.h> static struct resource s3c64xx_iis0_resource[] = { [0] = { @@ -66,3 +71,97 @@ struct platform_device s3c64xx_device_iisv4 = { .resource = s3c64xx_iisv4_resource, }; EXPORT_SYMBOL(s3c64xx_device_iisv4); + + +/* PCM Controller platform_devices */ + +static int s3c64xx_pcm_cfg_gpio(struct platform_device *pdev) +{ + switch (pdev->id) { + case 0: + s3c_gpio_cfgpin(S3C64XX_GPD(0), S3C64XX_GPD0_PCM0_SCLK); + s3c_gpio_cfgpin(S3C64XX_GPD(1), S3C64XX_GPD1_PCM0_EXTCLK); + s3c_gpio_cfgpin(S3C64XX_GPD(2), S3C64XX_GPD2_PCM0_FSYNC); + s3c_gpio_cfgpin(S3C64XX_GPD(3), S3C64XX_GPD3_PCM0_SIN); + s3c_gpio_cfgpin(S3C64XX_GPD(4), S3C64XX_GPD4_PCM0_SOUT); + break; + case 1: + s3c_gpio_cfgpin(S3C64XX_GPE(0), S3C64XX_GPE0_PCM1_SCLK); + s3c_gpio_cfgpin(S3C64XX_GPE(1), S3C64XX_GPE1_PCM1_EXTCLK); + s3c_gpio_cfgpin(S3C64XX_GPE(2), S3C64XX_GPE2_PCM1_FSYNC); + s3c_gpio_cfgpin(S3C64XX_GPE(3), S3C64XX_GPE3_PCM1_SIN); + s3c_gpio_cfgpin(S3C64XX_GPE(4), S3C64XX_GPE4_PCM1_SOUT); + break; + default: + printk(KERN_DEBUG "Invalid PCM Controller number!"); + return -EINVAL; + } + + return 0; +} + +static struct resource s3c64xx_pcm0_resource[] = { + [0] = { + .start = S3C64XX_PA_PCM0, + .end = S3C64XX_PA_PCM0 + 0x100 - 1, + .flags = IORESOURCE_MEM, + }, + [1] = { + .start = DMACH_PCM0_TX, + .end = DMACH_PCM0_TX, + .flags = IORESOURCE_DMA, + }, + [2] = { + .start = DMACH_PCM0_RX, + .end = DMACH_PCM0_RX, + .flags = IORESOURCE_DMA, + }, +}; + +struct s3c_audio_pdata s3c_pcm0_pdata = { + .cfg_gpio = s3c64xx_pcm_cfg_gpio, +}; + +struct platform_device s3c64xx_device_pcm0 = { + .name = "samsung-pcm", + .id = 0, + .num_resources = ARRAY_SIZE(s3c64xx_pcm0_resource), + .resource = s3c64xx_pcm0_resource, + .dev = { + .platform_data = &s3c_pcm0_pdata, + }, +}; +EXPORT_SYMBOL(s3c64xx_device_pcm0); + +static struct resource s3c64xx_pcm1_resource[] = { + [0] = { + .start = S3C64XX_PA_PCM1, + .end = S3C64XX_PA_PCM1 + 0x100 - 1, + .flags = IORESOURCE_MEM, + }, + [1] = { + .start = DMACH_PCM1_TX, + .end = DMACH_PCM1_TX, + .flags = IORESOURCE_DMA, + }, + [2] = { + .start = DMACH_PCM1_RX, + .end = DMACH_PCM1_RX, + .flags = IORESOURCE_DMA, + }, +}; + +struct s3c_audio_pdata s3c_pcm1_pdata = { + .cfg_gpio = s3c64xx_pcm_cfg_gpio, +}; + +struct platform_device s3c64xx_device_pcm1 = { + .name = "samsung-pcm", + .id = 1, + .num_resources = ARRAY_SIZE(s3c64xx_pcm1_resource), + .resource = s3c64xx_pcm1_resource, + .dev = { + .platform_data = &s3c_pcm1_pdata, + }, +}; +EXPORT_SYMBOL(s3c64xx_device_pcm1); -- 1.6.2.5

1 0

[alsa-devel] [PATCH 1/7] S3C AUDIO: Rename s3c24xx_pcm prefix to s3c_dma
by Jassi Brar 11 Nov '09

11 Nov '09

The s3c24xx_pcm prefix for the soc_platform is inappropriate when some Samsung SoCs have PCM controllers which will eventually have drivers and hence namespace ambiguities. To resolve naming ambiguities in future the following have been renamed in order 1) s3c24xx_pcm_dma_params -> s3c_dma_params 2) s3c24xx_pcm_preallocate_dma_buffer -> s3c_preallocate_dma_buffer 3) s3c24xx_pcm_dmamask -> s3c_dma_mask 4) s3c24xx_pcm_XXX -> s3c_dma_XXX Signed-off-by: Jassi Brar <jassi.brar(a)samsung.com> --- sound/soc/s3c24xx/s3c-i2s-v2.c | 2 +- sound/soc/s3c24xx/s3c-i2s-v2.h | 4 +- sound/soc/s3c24xx/s3c2412-i2s.c | 4 +- sound/soc/s3c24xx/s3c2443-ac97.c | 10 ++-- sound/soc/s3c24xx/s3c24xx-i2s.c | 10 ++-- sound/soc/s3c24xx/s3c24xx-pcm.c | 76 +++++++++++++++++++------------------- sound/soc/s3c24xx/s3c24xx-pcm.h | 6 +- sound/soc/s3c24xx/s3c64xx-i2s.c | 4 +- 8 files changed, 58 insertions(+), 58 deletions(-) diff --git a/sound/soc/s3c24xx/s3c-i2s-v2.c b/sound/soc/s3c24xx/s3c-i2s-v2.c index 28b0ab2..5a442aa 100644 --- a/sound/soc/s3c24xx/s3c-i2s-v2.c +++ b/sound/soc/s3c24xx/s3c-i2s-v2.c @@ -394,7 +394,7 @@ static int s3c2412_i2s_trigger(struct snd_pcm_substream *substream, int cmd, int capture = (substream->stream == SNDRV_PCM_STREAM_CAPTURE); unsigned long irqs; int ret = 0; - int channel = ((struct s3c24xx_pcm_dma_params *) + int channel = ((struct s3c_dma_params *) rtd->dai->cpu_dai->dma_data)->channel; pr_debug("Entered %s\n", __func__); diff --git a/sound/soc/s3c24xx/s3c-i2s-v2.h b/sound/soc/s3c24xx/s3c-i2s-v2.h index f66854a..ecf8eaa 100644 --- a/sound/soc/s3c24xx/s3c-i2s-v2.h +++ b/sound/soc/s3c24xx/s3c-i2s-v2.h @@ -49,8 +49,8 @@ struct s3c_i2sv2_info { unsigned char master; - struct s3c24xx_pcm_dma_params *dma_playback; - struct s3c24xx_pcm_dma_params *dma_capture; + struct s3c_dma_params *dma_playback; + struct s3c_dma_params *dma_capture; u32 suspend_iismod; u32 suspend_iiscon; diff --git a/sound/soc/s3c24xx/s3c2412-i2s.c b/sound/soc/s3c24xx/s3c2412-i2s.c index ac5e47b..23718ea 100644 --- a/sound/soc/s3c24xx/s3c2412-i2s.c +++ b/sound/soc/s3c24xx/s3c2412-i2s.c @@ -50,14 +50,14 @@ static struct s3c2410_dma_client s3c2412_dma_client_in = { .name = "I2S PCM Stereo in" }; -static struct s3c24xx_pcm_dma_params s3c2412_i2s_pcm_stereo_out = { +static struct s3c_dma_params s3c2412_i2s_pcm_stereo_out = { .client = &s3c2412_dma_client_out, .channel = DMACH_I2S_OUT, .dma_addr = S3C2410_PA_IIS + S3C2412_IISTXD, .dma_size = 4, }; -static struct s3c24xx_pcm_dma_params s3c2412_i2s_pcm_stereo_in = { +static struct s3c_dma_params s3c2412_i2s_pcm_stereo_in = { .client = &s3c2412_dma_client_in, .channel = DMACH_I2S_IN, .dma_addr = S3C2410_PA_IIS + S3C2412_IISRXD, diff --git a/sound/soc/s3c24xx/s3c2443-ac97.c b/sound/soc/s3c24xx/s3c2443-ac97.c index b25e9f9..678b176 100644 --- a/sound/soc/s3c24xx/s3c2443-ac97.c +++ b/sound/soc/s3c24xx/s3c2443-ac97.c @@ -188,21 +188,21 @@ static struct s3c2410_dma_client s3c2443_dma_client_micin = { .name = "AC97 Mic Mono in" }; -static struct s3c24xx_pcm_dma_params s3c2443_ac97_pcm_stereo_out = { +static struct s3c_dma_params s3c2443_ac97_pcm_stereo_out = { .client = &s3c2443_dma_client_out, .channel = DMACH_PCM_OUT, .dma_addr = S3C2440_PA_AC97 + S3C_AC97_PCM_DATA, .dma_size = 4, }; -static struct s3c24xx_pcm_dma_params s3c2443_ac97_pcm_stereo_in = { +static struct s3c_dma_params s3c2443_ac97_pcm_stereo_in = { .client = &s3c2443_dma_client_in, .channel = DMACH_PCM_IN, .dma_addr = S3C2440_PA_AC97 + S3C_AC97_PCM_DATA, .dma_size = 4, }; -static struct s3c24xx_pcm_dma_params s3c2443_ac97_mic_mono_in = { +static struct s3c_dma_params s3c2443_ac97_mic_mono_in = { .client = &s3c2443_dma_client_micin, .channel = DMACH_MIC_IN, .dma_addr = S3C2440_PA_AC97 + S3C_AC97_MIC_DATA, @@ -290,7 +290,7 @@ static int s3c2443_ac97_trigger(struct snd_pcm_substream *substream, int cmd, { u32 ac_glbctrl; struct snd_soc_pcm_runtime *rtd = substream->private_data; - int channel = ((struct s3c24xx_pcm_dma_params *) + int channel = ((struct s3c_dma_params *) rtd->dai->cpu_dai->dma_data)->channel; ac_glbctrl = readl(s3c24xx_ac97.regs + S3C_AC97_GLBCTRL); @@ -339,7 +339,7 @@ static int s3c2443_ac97_mic_trigger(struct snd_pcm_substream *substream, { u32 ac_glbctrl; struct snd_soc_pcm_runtime *rtd = substream->private_data; - int channel = ((struct s3c24xx_pcm_dma_params *) + int channel = ((struct s3c_dma_params *) rtd->dai->cpu_dai->dma_data)->channel; ac_glbctrl = readl(s3c24xx_ac97.regs + S3C_AC97_GLBCTRL); diff --git a/sound/soc/s3c24xx/s3c24xx-i2s.c b/sound/soc/s3c24xx/s3c24xx-i2s.c index c76b8bb..afb4bc9 100644 --- a/sound/soc/s3c24xx/s3c24xx-i2s.c +++ b/sound/soc/s3c24xx/s3c24xx-i2s.c @@ -49,14 +49,14 @@ static struct s3c2410_dma_client s3c24xx_dma_client_in = { .name = "I2S PCM Stereo in" }; -static struct s3c24xx_pcm_dma_params s3c24xx_i2s_pcm_stereo_out = { +static struct s3c_dma_params s3c24xx_i2s_pcm_stereo_out = { .client = &s3c24xx_dma_client_out, .channel = DMACH_I2S_OUT, .dma_addr = S3C2410_PA_IIS + S3C2410_IISFIFO, .dma_size = 2, }; -static struct s3c24xx_pcm_dma_params s3c24xx_i2s_pcm_stereo_in = { +static struct s3c_dma_params s3c24xx_i2s_pcm_stereo_in = { .client = &s3c24xx_dma_client_in, .channel = DMACH_I2S_IN, .dma_addr = S3C2410_PA_IIS + S3C2410_IISFIFO, @@ -258,12 +258,12 @@ static int s3c24xx_i2s_hw_params(struct snd_pcm_substream *substream, switch (params_format(params)) { case SNDRV_PCM_FORMAT_S8: iismod &= ~S3C2410_IISMOD_16BIT; - ((struct s3c24xx_pcm_dma_params *) + ((struct s3c_dma_params *) rtd->dai->cpu_dai->dma_data)->dma_size = 1; break; case SNDRV_PCM_FORMAT_S16_LE: iismod |= S3C2410_IISMOD_16BIT; - ((struct s3c24xx_pcm_dma_params *) + ((struct s3c_dma_params *) rtd->dai->cpu_dai->dma_data)->dma_size = 2; break; default: @@ -280,7 +280,7 @@ static int s3c24xx_i2s_trigger(struct snd_pcm_substream *substream, int cmd, { int ret = 0; struct snd_soc_pcm_runtime *rtd = substream->private_data; - int channel = ((struct s3c24xx_pcm_dma_params *) + int channel = ((struct s3c_dma_params *) rtd->dai->cpu_dai->dma_data)->channel; pr_debug("Entered %s\n", __func__); diff --git a/sound/soc/s3c24xx/s3c24xx-pcm.c b/sound/soc/s3c24xx/s3c24xx-pcm.c index 151a694..cb49400 100644 --- a/sound/soc/s3c24xx/s3c24xx-pcm.c +++ b/sound/soc/s3c24xx/s3c24xx-pcm.c @@ -32,7 +32,7 @@ #include "s3c24xx-pcm.h" -static const struct snd_pcm_hardware s3c24xx_pcm_hardware = { +static const struct snd_pcm_hardware s3c_dma_hardware = { .info = SNDRV_PCM_INFO_INTERLEAVED | SNDRV_PCM_INFO_BLOCK_TRANSFER | SNDRV_PCM_INFO_MMAP | @@ -62,15 +62,15 @@ struct s3c24xx_runtime_data { dma_addr_t dma_start; dma_addr_t dma_pos; dma_addr_t dma_end; - struct s3c24xx_pcm_dma_params *params; + struct s3c_dma_params *params; }; -/* s3c24xx_pcm_enqueue +/* s3c_dma_enqueue * * place a dma buffer onto the queue for the dma system * to handle. */ -static void s3c24xx_pcm_enqueue(struct snd_pcm_substream *substream) +static void s3c_dma_enqueue(struct snd_pcm_substream *substream) { struct s3c24xx_runtime_data *prtd = substream->runtime->private_data; dma_addr_t pos = prtd->dma_pos; @@ -132,19 +132,19 @@ static void s3c24xx_audio_buffdone(struct s3c2410_dma_chan *channel, spin_lock(&prtd->lock); if (prtd->state & ST_RUNNING && !s3c_dma_has_circular()) { prtd->dma_loaded--; - s3c24xx_pcm_enqueue(substream); + s3c_dma_enqueue(substream); } spin_unlock(&prtd->lock); } -static int s3c24xx_pcm_hw_params(struct snd_pcm_substream *substream, +static int s3c_dma_hw_params(struct snd_pcm_substream *substream, struct snd_pcm_hw_params *params) { struct snd_pcm_runtime *runtime = substream->runtime; struct s3c24xx_runtime_data *prtd = runtime->private_data; struct snd_soc_pcm_runtime *rtd = substream->private_data; - struct s3c24xx_pcm_dma_params *dma = rtd->dai->cpu_dai->dma_data; + struct s3c_dma_params *dma = rtd->dai->cpu_dai->dma_data; unsigned long totbytes = params_buffer_bytes(params); int ret = 0; @@ -197,7 +197,7 @@ static int s3c24xx_pcm_hw_params(struct snd_pcm_substream *substream, return 0; } -static int s3c24xx_pcm_hw_free(struct snd_pcm_substream *substream) +static int s3c_dma_hw_free(struct snd_pcm_substream *substream) { struct s3c24xx_runtime_data *prtd = substream->runtime->private_data; @@ -214,7 +214,7 @@ static int s3c24xx_pcm_hw_free(struct snd_pcm_substream *substream) return 0; } -static int s3c24xx_pcm_prepare(struct snd_pcm_substream *substream) +static int s3c_dma_prepare(struct snd_pcm_substream *substream) { struct s3c24xx_runtime_data *prtd = substream->runtime->private_data; int ret = 0; @@ -247,12 +247,12 @@ static int s3c24xx_pcm_prepare(struct snd_pcm_substream *substream) prtd->dma_pos = prtd->dma_start; /* enqueue dma buffers */ - s3c24xx_pcm_enqueue(substream); + s3c_dma_enqueue(substream); return ret; } -static int s3c24xx_pcm_trigger(struct snd_pcm_substream *substream, int cmd) +static int s3c_dma_trigger(struct snd_pcm_substream *substream, int cmd) { struct s3c24xx_runtime_data *prtd = substream->runtime->private_data; int ret = 0; @@ -287,7 +287,7 @@ static int s3c24xx_pcm_trigger(struct snd_pcm_substream *substream, int cmd) } static snd_pcm_uframes_t -s3c24xx_pcm_pointer(struct snd_pcm_substream *substream) +s3c_dma_pointer(struct snd_pcm_substream *substream) { struct snd_pcm_runtime *runtime = substream->runtime; struct s3c24xx_runtime_data *prtd = runtime->private_data; @@ -322,7 +322,7 @@ s3c24xx_pcm_pointer(struct snd_pcm_substream *substream) return bytes_to_frames(substream->runtime, res); } -static int s3c24xx_pcm_open(struct snd_pcm_substream *substream) +static int s3c_dma_open(struct snd_pcm_substream *substream) { struct snd_pcm_runtime *runtime = substream->runtime; struct s3c24xx_runtime_data *prtd; @@ -330,7 +330,7 @@ static int s3c24xx_pcm_open(struct snd_pcm_substream *substream) pr_debug("Entered %s\n", __func__); snd_pcm_hw_constraint_integer(runtime, SNDRV_PCM_HW_PARAM_PERIODS); - snd_soc_set_runtime_hwparams(substream, &s3c24xx_pcm_hardware); + snd_soc_set_runtime_hwparams(substream, &s3c_dma_hardware); prtd = kzalloc(sizeof(struct s3c24xx_runtime_data), GFP_KERNEL); if (prtd == NULL) @@ -342,7 +342,7 @@ static int s3c24xx_pcm_open(struct snd_pcm_substream *substream) return 0; } -static int s3c24xx_pcm_close(struct snd_pcm_substream *substream) +static int s3c_dma_close(struct snd_pcm_substream *substream) { struct snd_pcm_runtime *runtime = substream->runtime; struct s3c24xx_runtime_data *prtd = runtime->private_data; @@ -350,14 +350,14 @@ static int s3c24xx_pcm_close(struct snd_pcm_substream *substream) pr_debug("Entered %s\n", __func__); if (!prtd) - pr_debug("s3c24xx_pcm_close called with prtd == NULL\n"); + pr_debug("s3c_dma_close called with prtd == NULL\n"); kfree(prtd); return 0; } -static int s3c24xx_pcm_mmap(struct snd_pcm_substream *substream, +static int s3c_dma_mmap(struct snd_pcm_substream *substream, struct vm_area_struct *vma) { struct snd_pcm_runtime *runtime = substream->runtime; @@ -370,23 +370,23 @@ static int s3c24xx_pcm_mmap(struct snd_pcm_substream *substream, runtime->dma_bytes); } -static struct snd_pcm_ops s3c24xx_pcm_ops = { - .open = s3c24xx_pcm_open, - .close = s3c24xx_pcm_close, +static struct snd_pcm_ops s3c_dma_ops = { + .open = s3c_dma_open, + .close = s3c_dma_close, .ioctl = snd_pcm_lib_ioctl, - .hw_params = s3c24xx_pcm_hw_params, - .hw_free = s3c24xx_pcm_hw_free, - .prepare = s3c24xx_pcm_prepare, - .trigger = s3c24xx_pcm_trigger, - .pointer = s3c24xx_pcm_pointer, - .mmap = s3c24xx_pcm_mmap, + .hw_params = s3c_dma_hw_params, + .hw_free = s3c_dma_hw_free, + .prepare = s3c_dma_prepare, + .trigger = s3c_dma_trigger, + .pointer = s3c_dma_pointer, + .mmap = s3c_dma_mmap, }; -static int s3c24xx_pcm_preallocate_dma_buffer(struct snd_pcm *pcm, int stream) +static int s3c_preallocate_dma_buffer(struct snd_pcm *pcm, int stream) { struct snd_pcm_substream *substream = pcm->streams[stream].substream; struct snd_dma_buffer *buf = &substream->dma_buffer; - size_t size = s3c24xx_pcm_hardware.buffer_bytes_max; + size_t size = s3c_dma_hardware.buffer_bytes_max; pr_debug("Entered %s\n", __func__); @@ -401,7 +401,7 @@ static int s3c24xx_pcm_preallocate_dma_buffer(struct snd_pcm *pcm, int stream) return 0; } -static void s3c24xx_pcm_free_dma_buffers(struct snd_pcm *pcm) +static void s3c_dma_free_dma_buffers(struct snd_pcm *pcm) { struct snd_pcm_substream *substream; struct snd_dma_buffer *buf; @@ -424,9 +424,9 @@ static void s3c24xx_pcm_free_dma_buffers(struct snd_pcm *pcm) } } -static u64 s3c24xx_pcm_dmamask = DMA_BIT_MASK(32); +static u64 s3c_dma_mask = DMA_BIT_MASK(32); -static int s3c24xx_pcm_new(struct snd_card *card, +static int s3c_dma_new(struct snd_card *card, struct snd_soc_dai *dai, struct snd_pcm *pcm) { int ret = 0; @@ -434,19 +434,19 @@ static int s3c24xx_pcm_new(struct snd_card *card, pr_debug("Entered %s\n", __func__); if (!card->dev->dma_mask) - card->dev->dma_mask = &s3c24xx_pcm_dmamask; + card->dev->dma_mask = &s3c_dma_mask; if (!card->dev->coherent_dma_mask) card->dev->coherent_dma_mask = 0xffffffff; if (dai->playback.channels_min) { - ret = s3c24xx_pcm_preallocate_dma_buffer(pcm, + ret = s3c_preallocate_dma_buffer(pcm, SNDRV_PCM_STREAM_PLAYBACK); if (ret) goto out; } if (dai->capture.channels_min) { - ret = s3c24xx_pcm_preallocate_dma_buffer(pcm, + ret = s3c_preallocate_dma_buffer(pcm, SNDRV_PCM_STREAM_CAPTURE); if (ret) goto out; @@ -457,9 +457,9 @@ static int s3c24xx_pcm_new(struct snd_card *card, struct snd_soc_platform s3c24xx_soc_platform = { .name = "s3c24xx-audio", - .pcm_ops = &s3c24xx_pcm_ops, - .pcm_new = s3c24xx_pcm_new, - .pcm_free = s3c24xx_pcm_free_dma_buffers, + .pcm_ops = &s3c_dma_ops, + .pcm_new = s3c_dma_new, + .pcm_free = s3c_dma_free_dma_buffers, }; EXPORT_SYMBOL_GPL(s3c24xx_soc_platform); @@ -476,5 +476,5 @@ static void __exit s3c24xx_soc_platform_exit(void) module_exit(s3c24xx_soc_platform_exit); MODULE_AUTHOR("Ben Dooks, <ben(a)simtec.co.uk>"); -MODULE_DESCRIPTION("Samsung S3C24XX PCM DMA module"); +MODULE_DESCRIPTION("Samsung S3C Audio DMA module"); MODULE_LICENSE("GPL"); diff --git a/sound/soc/s3c24xx/s3c24xx-pcm.h b/sound/soc/s3c24xx/s3c24xx-pcm.h index 0088c79..8cbc071 100644 --- a/sound/soc/s3c24xx/s3c24xx-pcm.h +++ b/sound/soc/s3c24xx/s3c24xx-pcm.h @@ -9,13 +9,13 @@ * ALSA PCM interface for the Samsung S3C24xx CPU */ -#ifndef _S3C24XX_PCM_H -#define _S3C24XX_PCM_H +#ifndef _S3C_AUDIO_H +#define _S3C_AUDIO_H #define ST_RUNNING (1<<0) #define ST_OPENED (1<<1) -struct s3c24xx_pcm_dma_params { +struct s3c_dma_params { struct s3c2410_dma_client *client; /* stream identifier */ int channel; /* Channel ID */ dma_addr_t dma_addr; diff --git a/sound/soc/s3c24xx/s3c64xx-i2s.c b/sound/soc/s3c24xx/s3c64xx-i2s.c index d68cae1..719d63c 100644 --- a/sound/soc/s3c24xx/s3c64xx-i2s.c +++ b/sound/soc/s3c24xx/s3c64xx-i2s.c @@ -46,7 +46,7 @@ static struct s3c2410_dma_client s3c64xx_dma_client_in = { .name = "I2S PCM Stereo in" }; -static struct s3c24xx_pcm_dma_params s3c64xx_i2s_pcm_stereo_out[2] = { +static struct s3c_dma_params s3c64xx_i2s_pcm_stereo_out[2] = { [0] = { .channel = DMACH_I2S0_OUT, .client = &s3c64xx_dma_client_out, @@ -61,7 +61,7 @@ static struct s3c24xx_pcm_dma_params s3c64xx_i2s_pcm_stereo_out[2] = { }, }; -static struct s3c24xx_pcm_dma_params s3c64xx_i2s_pcm_stereo_in[2] = { +static struct s3c_dma_params s3c64xx_i2s_pcm_stereo_in[2] = { [0] = { .channel = DMACH_I2S0_IN, .client = &s3c64xx_dma_client_in, -- 1.6.2.5

1 0

[alsa-devel] ASoC updates for 2.6.33
by Mark Brown 11 Nov '09

11 Nov '09

The following changes since commit ebab1b1d07266ab8ca9f65065e68b02f05504c4e: Mark Brown (1): ASoC: Minor fixups to tpa6130a2 driver are available in the git repository at: git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound-2.6.git for-2.6.33 Ben Dooks (1): ASoC: S3C: Remove <plat/audio.h> Eero Nurkkala (1): ASoC: Serialize access to dapm_power_widgets() Igor Grinberg (1): ASoC: finally enable support for eXeda and CM-X300 Mark Brown (2): ASoC: Remove snd_soc_suspend_device() Merge branch 'for-2.6.32' into for-2.6.33 Peter Ujfalusi (2): ASoC: TPA6130A2: Make tpa6130a2_power as static ASoC: Codec driver for Texas Instruments tlv320dac33 codec arch/arm/plat-s3c/include/plat/audio.h | 45 -- include/sound/soc.h | 5 - include/sound/tlv320dac33-plat.h | 20 + sound/soc/codecs/Kconfig | 4 + sound/soc/codecs/Makefile | 2 + sound/soc/codecs/cs4270.c | 20 - sound/soc/codecs/tlv320dac33.c | 1237 ++++++++++++++++++++++++++++++++ sound/soc/codecs/tlv320dac33.h | 267 +++++++ sound/soc/codecs/tpa6130a2.c | 2 +- sound/soc/codecs/tpa6130a2.h | 1 - sound/soc/codecs/wm8350.c | 17 - sound/soc/codecs/wm8400.c | 17 - sound/soc/codecs/wm8523.c | 17 - sound/soc/codecs/wm8580.c | 17 - sound/soc/codecs/wm8711.c | 17 - sound/soc/codecs/wm8731.c | 34 - sound/soc/codecs/wm8753.c | 35 - sound/soc/codecs/wm8776.c | 34 - sound/soc/codecs/wm8900.c | 17 - sound/soc/codecs/wm8903.c | 17 - sound/soc/codecs/wm8940.c | 17 - sound/soc/codecs/wm8960.c | 17 - sound/soc/codecs/wm8961.c | 17 - sound/soc/codecs/wm8988.c | 34 - sound/soc/codecs/wm9081.c | 17 - sound/soc/pxa/Kconfig | 3 +- sound/soc/s3c24xx/neo1973_wm8753.c | 1 - sound/soc/s3c24xx/s3c-i2s-v2.c | 1 - sound/soc/s3c24xx/s3c2412-i2s.c | 1 - sound/soc/s3c24xx/s3c2443-ac97.c | 1 - sound/soc/s3c24xx/s3c24xx-i2s.c | 2 +- sound/soc/s3c24xx/s3c24xx-pcm.c | 1 - sound/soc/s3c24xx/s3c64xx-i2s.c | 1 - sound/soc/soc-core.c | 39 - sound/soc/soc-dapm.c | 2 +- 35 files changed, 1535 insertions(+), 444 deletions(-) delete mode 100644 arch/arm/plat-s3c/include/plat/audio.h create mode 100644 include/sound/tlv320dac33-plat.h create mode 100644 sound/soc/codecs/tlv320dac33.c create mode 100644 sound/soc/codecs/tlv320dac33.h

3 5

[alsa-devel] hda-intel: no codecs initialized with Teradici sound card and ALSA 1.0.17
by James Pearson 10 Nov '09

10 Nov '09

I'm using CentOS 5.3 (which uses ALSA 1.0.17) and a Teradici KVM over IP extender - which has an hda_intel type sound chipset However, when the snd_hda_intel module is loaded, dmesg reports: PCI: Enabling device 0000:04:00.1 (0000 -> 0002) ACPI: PCI Interrupt 0000:04:00.1[A] -> GSI 16 (level, low) -> IRQ 177 PCI: Setting latency timer of device 0000:04:00.1 to 64 hda-intel: no codecs initialized ACPI: PCI interrupt for device 0000:04:00.1 disabled ... and /proc/asound/cards reports: --- no soundcards --- I've tried loading the snd-hda-intel module with various 'model=' options (including basic and auto), but it makes no difference However, we also have CentOS 4.7 on machines with same Teradici card using ALSA 1.0.15 (that replaces the ALSA version that ships with CentOS 4) patched to support the Teradici card - using a patch based on the one that went into ALSA 1.0.17 to support the Teradici card. In this case the audio works - dmesg reports: ACPI: PCI Interrupt 0000:82:00.1[A] -> GSI 47 (level, high) -> IRQ 233 PCI: Setting latency timer of device 0000:82:00.1 to 64 hda_codec: Unknown model for ALC883, trying auto-probe from BIOS... And in this case, /proc/asound/cards reports: 0 [Teradici ]: HDA-Intel - HDA Teradici HDA Teradici at 0xd0100000 irq 233 and playback works fine. Any idea why ALSA 1.0.17 doesn't work with the Teradici card? I don't really want to replace the the ALSA kernel code with a more up to date version if at all possible ... is there a way of 'forcing' the 1.0.17 code 'to work' ? lspci -vv for this card reports 04:00.1 Audio device: Teradici Corp. Unknown device 1200 Subsystem: Unknown device e49c:040b Control: I/O- Mem- BusMaster- SpecCycle- MemWINV- VGASnoop- ParErr- Stepping- SERR- FastB2B- Status: Cap+ 66MHz- UDF- FastB2B- ParErr- DEVSEL=fast >TAbort- <TAbort- <MAbort- >SERR- <PERR- Interrupt: pin A routed to IRQ 177 Region 0: Memory at fbbf8000 (64-bit, non-prefetchable) [disabled] [size=16K] Capabilities: [40] Power Management version 3 Flags: PMEClk- DSI- D1- D2+ AuxCurrent=375mA PME(D0+,D1-,D2-,D3hot+,D3cold+) Status: D0 PME-Enable- DSel=0 DScale=0 PME- Capabilities: [50] Message Signalled Interrupts: 64bit+ Queue=0/0 Enable- Address: 0000000000000000 Data: 0000 Capabilities: [70] Express Endpoint IRQ 0 Device: Supported: MaxPayload 128 bytes, PhantFunc 0, ExtTag- Device: Latency L0s <2us, L1 <8us Device: AtnBtn- AtnInd- PwrInd- Device: Errors: Correctable- Non-Fatal- Fatal- Unsupported- Device: RlxdOrd+ ExtTag- PhantFunc- AuxPwr- NoSnoop- Device: MaxPayload 128 bytes, MaxReadReq 512 bytes Link: Supported Speed 2.5Gb/s, Width x1, ASPM L0s L1, Port 0 Link: Latency L0s <64ns, L1 <16us Link: ASPM Disabled RCB 64 bytes CommClk- ExtSynch- Link: Speed 2.5Gb/s, Width x1 aplay -l (using ALSA 1.0.15 on CentOS 4) reports **** List of PLAYBACK Hardware Devices **** card 0: Teradici [HDA Teradici], device 0: ALC883 Analog [ALC883 Analog] Subdevices: 1/1 Subdevice #0: subdevice #0 Thanks James Pearson

2 4

[alsa-devel] [PATCH] ASoC/mpc5200: remove duplicate identical IRQ handler
by Grant Likely 10 Nov '09

10 Nov '09

The TX and RX irq handlers are identical. Merge them Signed-off-by: Grant Likely <grant.likely(a)secretlab.ca> --- Hi Mark. Here's one more cleanup patch. sound/soc/fsl/mpc5200_dma.c | 33 +++------------------------------ 1 files changed, 3 insertions(+), 30 deletions(-) diff --git a/sound/soc/fsl/mpc5200_dma.c b/sound/soc/fsl/mpc5200_dma.c index ee5a606..440b749 100644 --- a/sound/soc/fsl/mpc5200_dma.c +++ b/sound/soc/fsl/mpc5200_dma.c @@ -66,32 +66,7 @@ static void psc_dma_bcom_enqueue_next_buffer(struct psc_dma_stream *s) } /* Bestcomm DMA irq handler */ -static irqreturn_t psc_dma_bcom_irq_tx(int irq, void *_psc_dma_stream) -{ - struct psc_dma_stream *s = _psc_dma_stream; - - spin_lock(&s->psc_dma->lock); - /* For each finished period, dequeue the completed period buffer - * and enqueue a new one in it's place. */ - while (bcom_buffer_done(s->bcom_task)) { - bcom_retrieve_buffer(s->bcom_task, NULL, NULL); - - s->period_current = (s->period_current+1) % s->runtime->periods; - s->period_count++; - - psc_dma_bcom_enqueue_next_buffer(s); - } - spin_unlock(&s->psc_dma->lock); - - /* If the stream is active, then also inform the PCM middle layer - * of the period finished event. */ - if (s->active) - snd_pcm_period_elapsed(s->stream); - - return IRQ_HANDLED; -} - -static irqreturn_t psc_dma_bcom_irq_rx(int irq, void *_psc_dma_stream) +static irqreturn_t psc_dma_bcom_irq(int irq, void *_psc_dma_stream) { struct psc_dma_stream *s = _psc_dma_stream; @@ -486,11 +461,9 @@ int mpc5200_audio_dma_create(struct of_device *op) rc = request_irq(psc_dma->irq, &psc_dma_status_irq, IRQF_SHARED, "psc-dma-status", psc_dma); - rc |= request_irq(psc_dma->capture.irq, - &psc_dma_bcom_irq_rx, IRQF_SHARED, + rc |= request_irq(psc_dma->capture.irq, &psc_dma_bcom_irq, IRQF_SHARED, "psc-dma-capture", &psc_dma->capture); - rc |= request_irq(psc_dma->playback.irq, - &psc_dma_bcom_irq_tx, IRQF_SHARED, + rc |= request_irq(psc_dma->playback.irq, &psc_dma_bcom_irq, IRQF_SHARED, "psc-dma-playback", &psc_dma->playback); if (rc) { ret = -ENODEV;

2 1

[alsa-devel] [PATCH 0/4 v2] ASoC/MFD/OMAP: TWL4030: APLL_CTL handling change
by Peter Ujfalusi 10 Nov '09

10 Nov '09

Hello, Changes from the first series: - Typos fixed and warning/error messages for APLL frequency mismatch now consistent - twl4030-codec MFD driver audio_mclk validity check simplified - Commit message for the twl4030-codec MFD driver has been changed also - Patch: "ASoC: TWL4030: Make sure, that the codec is powered on startup" has been removed from the series, since it is already taken. Intro text from the first series: The following series changes the way how the APLL_CTL register is handled by the twl4030 codec related drivers. Moving the configuration of APLL_CTL register from child drivers (specifically from soc codec driver) to the twl4030-codec MFD driver. Because the audio_mclk is static, board specific and can not be changed in runtime, the codec MFD is the right place to configure it early enough, so child can use the hardware correctly. Before this patch for example the APLL_INFREQ was configured first, when the user played or recorded audio via the twl4030. The digital bypass needs correct APLL_INFREQ to be configured in order to work properly. If the digital bypass enabled before any audio activity, in some cases the bypassed audio was not correct. The series also addresses the issue, that after boot-up, neither of the loopbacks was working, because the codec was actually off. Setting the codec->bias_level to _OFF, before setting the codec bias level to STANDBY fixes this issue. This series is on top of Takashi's sound-2.6 topic/asoc branch, which has the twl403-codec MFD and related patches for 2.6.33. It would be really nice, if this series would make it also to the same branch, since this fixes some real anomalies brought in by the cleanup of the twl4030 codec related drivers. These problems were hidden before because of the inconsistent handling of bits and states in the codec driver in the past. --- Peter Ujfalusi (4): MFD: TWL4030: Add audio_mclk to the codec platform data OMAP: Configure audio_mclk for twl4030-codec MFD MFD: twl4030-codec: APLL_INFREQ handling in the MFD driver ASoC: TWL4030: Do not modify the APLL_CTL register arch/arm/mach-omap2/board-3430sdp.c | 1 + arch/arm/mach-omap2/board-omap3beagle.c | 1 + arch/arm/mach-omap2/board-omap3evm.c | 1 + arch/arm/mach-omap2/board-omap3pandora.c | 1 + arch/arm/mach-omap2/board-overo.c | 1 + arch/arm/mach-omap2/board-zoom2.c | 1 + drivers/mfd/twl4030-codec.c | 35 ++++++++++++++ include/linux/i2c/twl4030.h | 1 + include/linux/mfd/twl4030-codec.h | 1 + sound/soc/codecs/twl4030.c | 76 ++++++++++++------------------ 10 files changed, 74 insertions(+), 45 deletions(-)

4 10

[alsa-devel] [PATCH V3] ASoC: omap-mcbsp - add support for upto 16 channels.
by Liam Girdwood 10 Nov '09

10 Nov '09

This time we use wlen * channels when CODEC masters BCLK and FRAME, otherwise same as V2. From: Graeme Gregory <gg(a)slimlogic.co.uk> This patch increases the number of supported audio channels from 4 to 16 and has been sponsored by Shotspotter Inc. It also fixes a FSYNC rate calculation bug when McBSP is FSYNC master. Signed-off-by: Graeme Gregory <gg(a)slimlogic.co.uk> Signed-off-by: Liam Girdwood <lrg(a)slimlogic.co.uk> --- sound/soc/omap/omap-mcbsp.c | 63 +++++++++++++++++++++++++----------------- 1 files changed, 37 insertions(+), 26 deletions(-) diff --git a/sound/soc/omap/omap-mcbsp.c b/sound/soc/omap/omap-mcbsp.c index 3341f49..45be942 100644 --- a/sound/soc/omap/omap-mcbsp.c +++ b/sound/soc/omap/omap-mcbsp.c @@ -49,6 +49,8 @@ struct omap_mcbsp_data { */ int active; int configured; + unsigned int in_freq; + int clk_div; }; #define to_mcbsp(priv) container_of((priv), struct omap_mcbsp_data, bus_id) @@ -257,7 +259,7 @@ static int omap_mcbsp_dai_hw_params(struct snd_pcm_substream *substream, int dma, bus_id = mcbsp_data->bus_id, id = cpu_dai->id; int wlen, channels, wpf, sync_mode = OMAP_DMA_SYNC_ELEMENT; unsigned long port; - unsigned int format; + unsigned int format, div, framesize, master; if (cpu_class_is_omap1()) { dma = omap1_dma_reqs[bus_id][substream->stream]; @@ -294,28 +296,19 @@ static int omap_mcbsp_dai_hw_params(struct snd_pcm_substream *substream, format = mcbsp_data->fmt & SND_SOC_DAIFMT_FORMAT_MASK; wpf = channels = params_channels(params); - switch (channels) { - case 2: - if (format == SND_SOC_DAIFMT_I2S) { - /* Use dual-phase frames */ - regs->rcr2 |= RPHASE; - regs->xcr2 |= XPHASE; - /* Set 1 word per (McBSP) frame for phase1 and phase2 */ - wpf--; - regs->rcr2 |= RFRLEN2(wpf - 1); - regs->xcr2 |= XFRLEN2(wpf - 1); - } - case 1: - case 4: - /* Set word per (McBSP) frame for phase1 */ - regs->rcr1 |= RFRLEN1(wpf - 1); - regs->xcr1 |= XFRLEN1(wpf - 1); - break; - default: - /* Unsupported number of channels */ - return -EINVAL; + if (channels == 2 && format == SND_SOC_DAIFMT_I2S) { + /* Use dual-phase frames */ + regs->rcr2 |= RPHASE; + regs->xcr2 |= XPHASE; + /* Set 1 word per (McBSP) frame for phase1 and phase2 */ + wpf--; + regs->rcr2 |= RFRLEN2(wpf - 1); + regs->xcr2 |= XFRLEN2(wpf - 1); } + regs->rcr1 |= RFRLEN1(wpf - 1); + regs->xcr1 |= XFRLEN1(wpf - 1); + switch (params_format(params)) { case SNDRV_PCM_FORMAT_S16_LE: /* Set word lengths */ @@ -330,15 +323,30 @@ static int omap_mcbsp_dai_hw_params(struct snd_pcm_substream *substream, return -EINVAL; } + /* In McBSP master modes, FRAME (i.e. sample rate) is generated + * by _counting_ BCLKs. Calculate frame size in BCLKs */ + master = mcbsp_data->fmt & SND_SOC_DAIFMT_MASTER_MASK; + if (master == SND_SOC_DAIFMT_CBS_CFS) { + div = mcbsp_data->clk_div ? mcbsp_data->clk_div : 1; + framesize = (mcbsp_data->in_freq / div) / params_rate(params); + + if (framesize < wlen * channels) { + printk(KERN_ERR "%s: not enough bandwidth for desired rate and " + "channels\n", __func__); + return -EINVAL; + } + } else + framesize = wlen * channels; + /* Set FS period and length in terms of bit clock periods */ switch (format) { case SND_SOC_DAIFMT_I2S: - regs->srgr2 |= FPER(wlen * channels - 1); - regs->srgr1 |= FWID(wlen - 1); + regs->srgr2 |= FPER(framesize - 1); + regs->srgr1 |= FWID((framesize >> 1) - 1); break; case SND_SOC_DAIFMT_DSP_A: case SND_SOC_DAIFMT_DSP_B: - regs->srgr2 |= FPER(wlen * channels - 1); + regs->srgr2 |= FPER(framesize - 1); regs->srgr1 |= FWID(0); break; } @@ -454,6 +462,7 @@ static int omap_mcbsp_dai_set_clkdiv(struct snd_soc_dai *cpu_dai, if (div_id != OMAP_MCBSP_CLKGDV) return -ENODEV; + mcbsp_data->clk_div = div; regs->srgr1 |= CLKGDV(div - 1); return 0; @@ -554,6 +563,8 @@ static int omap_mcbsp_dai_set_dai_sysclk(struct snd_soc_dai *cpu_dai, struct omap_mcbsp_reg_cfg *regs = &mcbsp_data->regs; int err = 0; + mcbsp_data->in_freq = freq; + switch (clk_id) { case OMAP_MCBSP_SYSCLK_CLK: regs->srgr2 |= CLKSM; @@ -598,13 +609,13 @@ static struct snd_soc_dai_ops omap_mcbsp_dai_ops = { .id = (link_id), \ .playback = { \ .channels_min = 1, \ - .channels_max = 4, \ + .channels_max = 16, \ .rates = OMAP_MCBSP_RATES, \ .formats = SNDRV_PCM_FMTBIT_S16_LE, \ }, \ .capture = { \ .channels_min = 1, \ - .channels_max = 4, \ + .channels_max = 16, \ .rates = OMAP_MCBSP_RATES, \ .formats = SNDRV_PCM_FMTBIT_S16_LE, \ }, \ -- 1.6.3.3

4 3

Re: [alsa-devel] RME HDSPe AIO
by Demian Martin 10 Nov '09

10 Nov '09

Flo, Why do you say "No. This is a pro audio card and it's full potential cannot be used with ALSA."? What is there in Alsa that will restrict the use of the card (or any card) for pro audio use? The Trinnov room correction system which is a pro market product uses Hammerfall cards and Alsa to do some very ambitious pro audio functions for example. Demian Martin Product Design Services -----Original Message----- Date: Sun, 08 Nov 2009 20:44:04 +0100 From: Florian Faber <faber(a)faberman.de> Subject: Re: [alsa-devel] RME HDSPe AIO To: Jonathan Leonard <jonathan.adams.leonard(a)gmail.com> Cc: alsa-devel(a)alsa-project.org Message-ID: <4AF71F84.6090405(a)faberman.de> Content-Type: text/plain; charset=ISO-8859-1 Jonathan, > The AIO is purported to be very similar to the 9632 and should be > using the snd-hdsp module. No. It has the hdspe core and should be used as such. > I would like to use this card in ALSA, That's nice, but you should have checked before buying the card. The AIO is not supported. > Besides my individual circumstance I wonder if ALSA should not be > accomodating this great card somehow. No. This is a pro audio card and it's full potential cannot be used with ALSA. Flo -- Machines can do the work, so people have time to think. public key DA43FEF4 x-hkp://wwwkeys.eu.pgp.net

4 3

[alsa-devel] Crackly sound with dmix rate 48000
by Daniel Drake 10 Nov '09

10 Nov '09

Hi, In our musical activities, the OLPC/Sugar platform uses csound which in turn uses ALSA for playing sounds. On our latest XO hardware model, where we now use HDA instead of cs5536, we are experiencing some crackly sounds from our csound-based applications. Other apps are fine. We discovered that changing the dmix rate from 48000 to 44100 solves the cracklyness. What does this indicate? Might csound be producing sounds at rate 44100, which dmix previously had to convert to 48000, which was too taxing to the system? Any suggestions for how to diagnose this further? (or would changing the rate be seen as a reasonable thing to do in this situation?) Thanks, Daniel

2 1

[alsa-devel] [PATCH] ALSA: hda - Tweak OLPC XO-1.5 microphone bias
by Daniel Drake 10 Nov '09

10 Nov '09

Our contacts at Conexant suggested that we reduce the external microphone bias to 50% in order to center the input signal with the DC input range of the codec. This is because the microphone port is DC coupled for potential use with sensors. Signed-off-by: Daniel Drake <dsd(a)laptop.org> --- sound/pci/hda/patch_conexant.c | 15 ++++++++++++--- 1 files changed, 12 insertions(+), 3 deletions(-) diff --git a/sound/pci/hda/patch_conexant.c b/sound/pci/hda/patch_conexant.c index 5d3a25d..ace8898 100644 --- a/sound/pci/hda/patch_conexant.c +++ b/sound/pci/hda/patch_conexant.c @@ -110,6 +110,7 @@ struct conexant_spec { unsigned int dell_automute; unsigned int port_d_mode; + unsigned char ext_mic_bias; }; static int conexant_playback_pcm_open(struct hda_pcm_stream *hinfo, @@ -1917,6 +1918,11 @@ static hda_nid_t cxt5066_adc_nids[3] = { 0x14, 0x15, 0x16 }; static hda_nid_t cxt5066_capsrc_nids[1] = { 0x17 }; #define CXT5066_SPDIF_OUT 0x21 +/* OLPC's microphone port is DC coupled for use with external sensors, + * therefore we use a 50% mic bias in order to center the input signal with + * the DC input range of the codec. */ +#define CXT5066_OLPC_EXT_MIC_BIAS PIN_VREF50 + static struct hda_channel_mode cxt5066_modes[1] = { { 2, NULL }, }; @@ -1970,9 +1976,10 @@ static int cxt5066_hp_master_sw_put(struct snd_kcontrol *kcontrol, /* toggle input of built-in and mic jack appropriately */ static void cxt5066_automic(struct hda_codec *codec) { - static struct hda_verb ext_mic_present[] = { + struct conexant_spec *spec = codec->spec; + struct hda_verb ext_mic_present[] = { /* enable external mic, port B */ - {0x1a, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_VREF80}, + {0x1a, AC_VERB_SET_PIN_WIDGET_CONTROL, spec->ext_mic_bias}, /* switch to external mic input */ {0x17, AC_VERB_SET_CONNECT_SEL, 0}, @@ -2225,7 +2232,7 @@ static struct hda_verb cxt5066_init_verbs_olpc[] = { {0x19, AC_VERB_SET_CONNECT_SEL, 0x00}, /* DAC1 */ /* Port B: external microphone */ - {0x1a, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_VREF80}, + {0x1a, AC_VERB_SET_PIN_WIDGET_CONTROL, CXT5066_OLPC_EXT_MIC_BIAS}, /* Port C: internal microphone */ {0x1b, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_VREF80}, @@ -2343,6 +2350,7 @@ static int patch_cxt5066(struct hda_codec *codec) spec->input_mux = &cxt5066_capture_source; spec->port_d_mode = PIN_HP; + spec->ext_mic_bias = PIN_VREF80; spec->num_init_verbs = 1; spec->init_verbs[0] = cxt5066_init_verbs; @@ -2374,6 +2382,7 @@ static int patch_cxt5066(struct hda_codec *codec) spec->mixers[spec->num_mixers++] = cxt5066_mixer_master_olpc; spec->mixers[spec->num_mixers++] = cxt5066_mixers; spec->port_d_mode = 0; + spec->ext_mic_bias = CXT5066_OLPC_EXT_MIC_BIAS; /* no S/PDIF out */ spec->multiout.dig_out_nid = 0; -- 1.6.2.5

2 1

[alsa-devel] HDA timeouts
by Maxim Levitsky 10 Nov '09

10 Nov '09

Hi, Sometimes (1 in 5 boots) I see the following: azx_get_response timeout, switching to polling mode: last cmd=0x014f0900 I initially blamed MSI that I enabled explicitly. If it is enabled, there is another timeout just before this line. Now I explicitly disable msi, and still see this. It seems that codec hangs or so. my codec#0 attached. Best regards, Maxim Levitsky

2 4

[alsa-devel] [PATCH 2/2] sh: ms7724se: Add runtime PM support for FSI
by Kuninori Morimoto 10 Nov '09

10 Nov '09

Signed-off-by: Kuninori Morimoto <morimoto.kuninori(a)renesas.com> --- arch/sh/boards/mach-se/7724/setup.c | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/arch/sh/boards/mach-se/7724/setup.c b/arch/sh/boards/mach-se/7724/setup.c index e78c3be..0894bba 100644 --- a/arch/sh/boards/mach-se/7724/setup.c +++ b/arch/sh/boards/mach-se/7724/setup.c @@ -313,6 +313,9 @@ static struct platform_device fsi_device = { .dev = { .platform_data = &fsi_info, }, + .archdata = { + .hwblk_id = HWBLK_SPU, /* FSI needs SPU hwblk */ + }, }; /* KEYSC in SoC (Needs SW33-2 set to ON) */ -- 1.6.3.3

2 2

[alsa-devel] [PATCH] ALSA: hda: Use model=auto quirk for Sony VAIO VGN-FW170J using ALC262
by Dan Chen 09 Nov '09

09 Nov '09

Hi, Attached please find a patch against sound-2.6 HEAD using ALC262_AUTO for the Sony VAIO VGN-FW170J. Without using model=auto, the internal mic does not function. Thanks, Dan

2 1

[alsa-devel] [PATCH] ASoC: Pandora: Pass SRG input clock frequency to the OMAP McBSP DAI
by Jarkko Nikula 09 Nov '09

09 Nov '09

Upcoming change to omap-mcbsp.c require that machine drivers using OMAP as a DAI master to pass sample rate generator input clock frequency to the omap-mcbsp.c DAI driver. Pandora is using 256*Fs output from the TWL4030 codec as an input clock to the McBSP sample rate generator. Signed-off-by: Jarkko Nikula <jhnikula(a)gmail.com> Tested-by: Grazvydas Ignotas <notasas(a)gmail.com> --- sound/soc/omap/omap3pandora.c | 24 ++++++++++-------------- 1 files changed, 10 insertions(+), 14 deletions(-) diff --git a/sound/soc/omap/omap3pandora.c b/sound/soc/omap/omap3pandora.c index ad219aa..cace5f1 100644 --- a/sound/soc/omap/omap3pandora.c +++ b/sound/soc/omap/omap3pandora.c @@ -40,9 +40,12 @@ #define PREFIX "ASoC omap3pandora: " -static int omap3pandora_cmn_hw_params(struct snd_soc_dai *codec_dai, - struct snd_soc_dai *cpu_dai, unsigned int fmt) +static int omap3pandora_cmn_hw_params(struct snd_pcm_substream *substream, + struct snd_pcm_hw_params *params, unsigned int fmt) { + struct snd_soc_pcm_runtime *rtd = substream->private_data; + struct snd_soc_dai *codec_dai = rtd->dai->codec_dai; + struct snd_soc_dai *cpu_dai = rtd->dai->cpu_dai; int ret; /* Set codec DAI configuration */ @@ -68,8 +71,9 @@ static int omap3pandora_cmn_hw_params(struct snd_soc_dai *codec_dai, } /* Set McBSP clock to external */ - ret = snd_soc_dai_set_sysclk(cpu_dai, OMAP_MCBSP_SYSCLK_CLKS_EXT, 0, - SND_SOC_CLOCK_IN); + ret = snd_soc_dai_set_sysclk(cpu_dai, OMAP_MCBSP_SYSCLK_CLKS_EXT, + 256 * params_rate(params), + SND_SOC_CLOCK_IN); if (ret < 0) { pr_err(PREFIX "can't set cpu system clock\n"); return ret; @@ -87,11 +91,7 @@ static int omap3pandora_cmn_hw_params(struct snd_soc_dai *codec_dai, static int omap3pandora_out_hw_params(struct snd_pcm_substream *substream, struct snd_pcm_hw_params *params) { - struct snd_soc_pcm_runtime *rtd = substream->private_data; - struct snd_soc_dai *codec_dai = rtd->dai->codec_dai; - struct snd_soc_dai *cpu_dai = rtd->dai->cpu_dai; - - return omap3pandora_cmn_hw_params(codec_dai, cpu_dai, + return omap3pandora_cmn_hw_params(substream, params, SND_SOC_DAIFMT_I2S | SND_SOC_DAIFMT_IB_NF | SND_SOC_DAIFMT_CBS_CFS); @@ -100,11 +100,7 @@ static int omap3pandora_out_hw_params(struct snd_pcm_substream *substream, static int omap3pandora_in_hw_params(struct snd_pcm_substream *substream, struct snd_pcm_hw_params *params) { - struct snd_soc_pcm_runtime *rtd = substream->private_data; - struct snd_soc_dai *codec_dai = rtd->dai->codec_dai; - struct snd_soc_dai *cpu_dai = rtd->dai->cpu_dai; - - return omap3pandora_cmn_hw_params(codec_dai, cpu_dai, + return omap3pandora_cmn_hw_params(substream, params, SND_SOC_DAIFMT_I2S | SND_SOC_DAIFMT_NB_NF | SND_SOC_DAIFMT_CBS_CFS); -- 1.6.5

2 1

[alsa-devel] [PATCH] OMAP: McBSP: Do not use extensive spin locks for dma_op_mode
by Peter Ujfalusi 09 Nov '09

09 Nov '09

The use of the spin lock, which supposed to protect the the dma_op_mode causing "INFO: inconsistent lock state" on playback start. Remove the spin locks around the dma_op_mode, when it's purpuse is to protect the dma_op_mode. Signed-off-by: Peter Ujfalusi <peter.ujfalusi(a)nokia.com> --- arch/arm/plat-omap/mcbsp.c | 6 ------ 1 files changed, 0 insertions(+), 6 deletions(-) diff --git a/arch/arm/plat-omap/mcbsp.c b/arch/arm/plat-omap/mcbsp.c index 88ac976..9b33671 100644 --- a/arch/arm/plat-omap/mcbsp.c +++ b/arch/arm/plat-omap/mcbsp.c @@ -298,9 +298,7 @@ int omap_mcbsp_get_dma_op_mode(unsigned int id) } mcbsp = id_to_mcbsp_ptr(id); - spin_lock_irq(&mcbsp->lock); dma_op_mode = mcbsp->dma_op_mode; - spin_unlock_irq(&mcbsp->lock); return dma_op_mode; } @@ -318,7 +316,6 @@ static inline void omap34xx_mcbsp_request(struct omap_mcbsp *mcbsp) syscon = OMAP_MCBSP_READ(mcbsp->io_base, SYSCON); syscon &= ~(ENAWAKEUP | SIDLEMODE(0x03) | CLOCKACTIVITY(0x03)); - spin_lock_irq(&mcbsp->lock); if (mcbsp->dma_op_mode == MCBSP_DMA_MODE_THRESHOLD) { syscon |= (ENAWAKEUP | SIDLEMODE(0x02) | CLOCKACTIVITY(0x02)); @@ -327,7 +324,6 @@ static inline void omap34xx_mcbsp_request(struct omap_mcbsp *mcbsp) } else { syscon |= SIDLEMODE(0x01); } - spin_unlock_irq(&mcbsp->lock); OMAP_MCBSP_WRITE(mcbsp->io_base, SYSCON, syscon); } @@ -1145,9 +1141,7 @@ static ssize_t dma_op_mode_show(struct device *dev, ssize_t len = 0; const char * const *s; - spin_lock_irq(&mcbsp->lock); dma_op_mode = mcbsp->dma_op_mode; - spin_unlock_irq(&mcbsp->lock); for (s = &dma_op_modes[i]; i < ARRAY_SIZE(dma_op_modes); s++, i++) { if (dma_op_mode == i) -- 1.6.5.1

4 13

[alsa-devel] [PATCH 1/7] S3C AUDIO: Rename s3c24xx_pcm prefix to s3c_dma
by Jassi Brar 09 Nov '09

09 Nov '09

The s3c24xx_pcm prefix for the soc_platform is inappropriate when some Samsung SoCs have PCM controllers which will eventually have drivers and hence namespace ambiguities. To resolve naming ambiguities in future the following have been renamed in order 1) s3c24xx_pcm_dma_params -> s3c_audio_dma_params 2) s3c24xx_pcm_preallocate_dma_buffer -> s3c_preallocate_dma_buffer 3) s3c24xx_pcm_dmamask -> s3c_dmamask 4) s3c24xx_pcm_XXX -> s3c_dma_XXX Signed-off-by: Jassi Brar <jassi.brar(a)samsung.com> --- sound/soc/s3c24xx/s3c-i2s-v2.c | 2 +- sound/soc/s3c24xx/s3c-i2s-v2.h | 4 +- sound/soc/s3c24xx/s3c2412-i2s.c | 4 +- sound/soc/s3c24xx/s3c2443-ac97.c | 10 ++-- sound/soc/s3c24xx/s3c24xx-i2s.c | 10 ++-- sound/soc/s3c24xx/s3c24xx-pcm.c | 76 +++++++++++++++++++------------------- sound/soc/s3c24xx/s3c24xx-pcm.h | 6 +- sound/soc/s3c24xx/s3c64xx-i2s.c | 4 +- 8 files changed, 58 insertions(+), 58 deletions(-) diff --git a/sound/soc/s3c24xx/s3c-i2s-v2.c b/sound/soc/s3c24xx/s3c-i2s-v2.c index 28b0ab2..9788e65 100644 --- a/sound/soc/s3c24xx/s3c-i2s-v2.c +++ b/sound/soc/s3c24xx/s3c-i2s-v2.c @@ -394,7 +394,7 @@ static int s3c2412_i2s_trigger(struct snd_pcm_substream *substream, int cmd, int capture = (substream->stream == SNDRV_PCM_STREAM_CAPTURE); unsigned long irqs; int ret = 0; - int channel = ((struct s3c24xx_pcm_dma_params *) + int channel = ((struct s3c_audio_dma_params *) rtd->dai->cpu_dai->dma_data)->channel; pr_debug("Entered %s\n", __func__); diff --git a/sound/soc/s3c24xx/s3c-i2s-v2.h b/sound/soc/s3c24xx/s3c-i2s-v2.h index f66854a..02e16db 100644 --- a/sound/soc/s3c24xx/s3c-i2s-v2.h +++ b/sound/soc/s3c24xx/s3c-i2s-v2.h @@ -49,8 +49,8 @@ struct s3c_i2sv2_info { unsigned char master; - struct s3c24xx_pcm_dma_params *dma_playback; - struct s3c24xx_pcm_dma_params *dma_capture; + struct s3c_audio_dma_params *dma_playback; + struct s3c_audio_dma_params *dma_capture; u32 suspend_iismod; u32 suspend_iiscon; diff --git a/sound/soc/s3c24xx/s3c2412-i2s.c b/sound/soc/s3c24xx/s3c2412-i2s.c index ac5e47b..6bc13d5 100644 --- a/sound/soc/s3c24xx/s3c2412-i2s.c +++ b/sound/soc/s3c24xx/s3c2412-i2s.c @@ -50,14 +50,14 @@ static struct s3c2410_dma_client s3c2412_dma_client_in = { .name = "I2S PCM Stereo in" }; -static struct s3c24xx_pcm_dma_params s3c2412_i2s_pcm_stereo_out = { +static struct s3c_audio_dma_params s3c2412_i2s_pcm_stereo_out = { .client = &s3c2412_dma_client_out, .channel = DMACH_I2S_OUT, .dma_addr = S3C2410_PA_IIS + S3C2412_IISTXD, .dma_size = 4, }; -static struct s3c24xx_pcm_dma_params s3c2412_i2s_pcm_stereo_in = { +static struct s3c_audio_dma_params s3c2412_i2s_pcm_stereo_in = { .client = &s3c2412_dma_client_in, .channel = DMACH_I2S_IN, .dma_addr = S3C2410_PA_IIS + S3C2412_IISRXD, diff --git a/sound/soc/s3c24xx/s3c2443-ac97.c b/sound/soc/s3c24xx/s3c2443-ac97.c index b25e9f9..d3bd29a 100644 --- a/sound/soc/s3c24xx/s3c2443-ac97.c +++ b/sound/soc/s3c24xx/s3c2443-ac97.c @@ -188,21 +188,21 @@ static struct s3c2410_dma_client s3c2443_dma_client_micin = { .name = "AC97 Mic Mono in" }; -static struct s3c24xx_pcm_dma_params s3c2443_ac97_pcm_stereo_out = { +static struct s3c_audio_dma_params s3c2443_ac97_pcm_stereo_out = { .client = &s3c2443_dma_client_out, .channel = DMACH_PCM_OUT, .dma_addr = S3C2440_PA_AC97 + S3C_AC97_PCM_DATA, .dma_size = 4, }; -static struct s3c24xx_pcm_dma_params s3c2443_ac97_pcm_stereo_in = { +static struct s3c_audio_dma_params s3c2443_ac97_pcm_stereo_in = { .client = &s3c2443_dma_client_in, .channel = DMACH_PCM_IN, .dma_addr = S3C2440_PA_AC97 + S3C_AC97_PCM_DATA, .dma_size = 4, }; -static struct s3c24xx_pcm_dma_params s3c2443_ac97_mic_mono_in = { +static struct s3c_audio_dma_params s3c2443_ac97_mic_mono_in = { .client = &s3c2443_dma_client_micin, .channel = DMACH_MIC_IN, .dma_addr = S3C2440_PA_AC97 + S3C_AC97_MIC_DATA, @@ -290,7 +290,7 @@ static int s3c2443_ac97_trigger(struct snd_pcm_substream *substream, int cmd, { u32 ac_glbctrl; struct snd_soc_pcm_runtime *rtd = substream->private_data; - int channel = ((struct s3c24xx_pcm_dma_params *) + int channel = ((struct s3c_audio_dma_params *) rtd->dai->cpu_dai->dma_data)->channel; ac_glbctrl = readl(s3c24xx_ac97.regs + S3C_AC97_GLBCTRL); @@ -339,7 +339,7 @@ static int s3c2443_ac97_mic_trigger(struct snd_pcm_substream *substream, { u32 ac_glbctrl; struct snd_soc_pcm_runtime *rtd = substream->private_data; - int channel = ((struct s3c24xx_pcm_dma_params *) + int channel = ((struct s3c_audio_dma_params *) rtd->dai->cpu_dai->dma_data)->channel; ac_glbctrl = readl(s3c24xx_ac97.regs + S3C_AC97_GLBCTRL); diff --git a/sound/soc/s3c24xx/s3c24xx-i2s.c b/sound/soc/s3c24xx/s3c24xx-i2s.c index c76b8bb..998e752 100644 --- a/sound/soc/s3c24xx/s3c24xx-i2s.c +++ b/sound/soc/s3c24xx/s3c24xx-i2s.c @@ -49,14 +49,14 @@ static struct s3c2410_dma_client s3c24xx_dma_client_in = { .name = "I2S PCM Stereo in" }; -static struct s3c24xx_pcm_dma_params s3c24xx_i2s_pcm_stereo_out = { +static struct s3c_audio_dma_params s3c24xx_i2s_pcm_stereo_out = { .client = &s3c24xx_dma_client_out, .channel = DMACH_I2S_OUT, .dma_addr = S3C2410_PA_IIS + S3C2410_IISFIFO, .dma_size = 2, }; -static struct s3c24xx_pcm_dma_params s3c24xx_i2s_pcm_stereo_in = { +static struct s3c_audio_dma_params s3c24xx_i2s_pcm_stereo_in = { .client = &s3c24xx_dma_client_in, .channel = DMACH_I2S_IN, .dma_addr = S3C2410_PA_IIS + S3C2410_IISFIFO, @@ -258,12 +258,12 @@ static int s3c24xx_i2s_hw_params(struct snd_pcm_substream *substream, switch (params_format(params)) { case SNDRV_PCM_FORMAT_S8: iismod &= ~S3C2410_IISMOD_16BIT; - ((struct s3c24xx_pcm_dma_params *) + ((struct s3c_audio_dma_params *) rtd->dai->cpu_dai->dma_data)->dma_size = 1; break; case SNDRV_PCM_FORMAT_S16_LE: iismod |= S3C2410_IISMOD_16BIT; - ((struct s3c24xx_pcm_dma_params *) + ((struct s3c_audio_dma_params *) rtd->dai->cpu_dai->dma_data)->dma_size = 2; break; default: @@ -280,7 +280,7 @@ static int s3c24xx_i2s_trigger(struct snd_pcm_substream *substream, int cmd, { int ret = 0; struct snd_soc_pcm_runtime *rtd = substream->private_data; - int channel = ((struct s3c24xx_pcm_dma_params *) + int channel = ((struct s3c_audio_dma_params *) rtd->dai->cpu_dai->dma_data)->channel; pr_debug("Entered %s\n", __func__); diff --git a/sound/soc/s3c24xx/s3c24xx-pcm.c b/sound/soc/s3c24xx/s3c24xx-pcm.c index 27cf097..a0be71f 100644 --- a/sound/soc/s3c24xx/s3c24xx-pcm.c +++ b/sound/soc/s3c24xx/s3c24xx-pcm.c @@ -32,7 +32,7 @@ #include "s3c24xx-pcm.h" -static const struct snd_pcm_hardware s3c24xx_pcm_hardware = { +static const struct snd_pcm_hardware s3c_dma_hardware = { .info = SNDRV_PCM_INFO_INTERLEAVED | SNDRV_PCM_INFO_BLOCK_TRANSFER | SNDRV_PCM_INFO_MMAP | @@ -62,15 +62,15 @@ struct s3c24xx_runtime_data { dma_addr_t dma_start; dma_addr_t dma_pos; dma_addr_t dma_end; - struct s3c24xx_pcm_dma_params *params; + struct s3c_audio_dma_params *params; }; -/* s3c24xx_pcm_enqueue +/* s3c_dma_enqueue * * place a dma buffer onto the queue for the dma system * to handle. */ -static void s3c24xx_pcm_enqueue(struct snd_pcm_substream *substream) +static void s3c_dma_enqueue(struct snd_pcm_substream *substream) { struct s3c24xx_runtime_data *prtd = substream->runtime->private_data; dma_addr_t pos = prtd->dma_pos; @@ -124,19 +124,19 @@ static void s3c24xx_audio_buffdone(struct s3c2410_dma_chan *channel, spin_lock(&prtd->lock); if (prtd->state & ST_RUNNING) { prtd->dma_loaded--; - s3c24xx_pcm_enqueue(substream); + s3c_dma_enqueue(substream); } spin_unlock(&prtd->lock); } -static int s3c24xx_pcm_hw_params(struct snd_pcm_substream *substream, +static int s3c_dma_hw_params(struct snd_pcm_substream *substream, struct snd_pcm_hw_params *params) { struct snd_pcm_runtime *runtime = substream->runtime; struct s3c24xx_runtime_data *prtd = runtime->private_data; struct snd_soc_pcm_runtime *rtd = substream->private_data; - struct s3c24xx_pcm_dma_params *dma = rtd->dai->cpu_dai->dma_data; + struct s3c_audio_dma_params *dma = rtd->dai->cpu_dai->dma_data; unsigned long totbytes = params_buffer_bytes(params); int ret = 0; @@ -184,7 +184,7 @@ static int s3c24xx_pcm_hw_params(struct snd_pcm_substream *substream, return 0; } -static int s3c24xx_pcm_hw_free(struct snd_pcm_substream *substream) +static int s3c_dma_hw_free(struct snd_pcm_substream *substream) { struct s3c24xx_runtime_data *prtd = substream->runtime->private_data; @@ -201,7 +201,7 @@ static int s3c24xx_pcm_hw_free(struct snd_pcm_substream *substream) return 0; } -static int s3c24xx_pcm_prepare(struct snd_pcm_substream *substream) +static int s3c_dma_prepare(struct snd_pcm_substream *substream) { struct s3c24xx_runtime_data *prtd = substream->runtime->private_data; int ret = 0; @@ -234,12 +234,12 @@ static int s3c24xx_pcm_prepare(struct snd_pcm_substream *substream) prtd->dma_pos = prtd->dma_start; /* enqueue dma buffers */ - s3c24xx_pcm_enqueue(substream); + s3c_dma_enqueue(substream); return ret; } -static int s3c24xx_pcm_trigger(struct snd_pcm_substream *substream, int cmd) +static int s3c_dma_trigger(struct snd_pcm_substream *substream, int cmd) { struct s3c24xx_runtime_data *prtd = substream->runtime->private_data; int ret = 0; @@ -274,7 +274,7 @@ static int s3c24xx_pcm_trigger(struct snd_pcm_substream *substream, int cmd) } static snd_pcm_uframes_t -s3c24xx_pcm_pointer(struct snd_pcm_substream *substream) +s3c_dma_pointer(struct snd_pcm_substream *substream) { struct snd_pcm_runtime *runtime = substream->runtime; struct s3c24xx_runtime_data *prtd = runtime->private_data; @@ -309,7 +309,7 @@ s3c24xx_pcm_pointer(struct snd_pcm_substream *substream) return bytes_to_frames(substream->runtime, res); } -static int s3c24xx_pcm_open(struct snd_pcm_substream *substream) +static int s3c_dma_open(struct snd_pcm_substream *substream) { struct snd_pcm_runtime *runtime = substream->runtime; struct s3c24xx_runtime_data *prtd; @@ -317,7 +317,7 @@ static int s3c24xx_pcm_open(struct snd_pcm_substream *substream) pr_debug("Entered %s\n", __func__); snd_pcm_hw_constraint_integer(runtime, SNDRV_PCM_HW_PARAM_PERIODS); - snd_soc_set_runtime_hwparams(substream, &s3c24xx_pcm_hardware); + snd_soc_set_runtime_hwparams(substream, &s3c_dma_hardware); prtd = kzalloc(sizeof(struct s3c24xx_runtime_data), GFP_KERNEL); if (prtd == NULL) @@ -329,7 +329,7 @@ static int s3c24xx_pcm_open(struct snd_pcm_substream *substream) return 0; } -static int s3c24xx_pcm_close(struct snd_pcm_substream *substream) +static int s3c_dma_close(struct snd_pcm_substream *substream) { struct snd_pcm_runtime *runtime = substream->runtime; struct s3c24xx_runtime_data *prtd = runtime->private_data; @@ -337,14 +337,14 @@ static int s3c24xx_pcm_close(struct snd_pcm_substream *substream) pr_debug("Entered %s\n", __func__); if (!prtd) - pr_debug("s3c24xx_pcm_close called with prtd == NULL\n"); + pr_debug("s3c_dma_close called with prtd == NULL\n"); kfree(prtd); return 0; } -static int s3c24xx_pcm_mmap(struct snd_pcm_substream *substream, +static int s3c_dma_mmap(struct snd_pcm_substream *substream, struct vm_area_struct *vma) { struct snd_pcm_runtime *runtime = substream->runtime; @@ -357,23 +357,23 @@ static int s3c24xx_pcm_mmap(struct snd_pcm_substream *substream, runtime->dma_bytes); } -static struct snd_pcm_ops s3c24xx_pcm_ops = { - .open = s3c24xx_pcm_open, - .close = s3c24xx_pcm_close, +static struct snd_pcm_ops s3c_dma_ops = { + .open = s3c_dma_open, + .close = s3c_dma_close, .ioctl = snd_pcm_lib_ioctl, - .hw_params = s3c24xx_pcm_hw_params, - .hw_free = s3c24xx_pcm_hw_free, - .prepare = s3c24xx_pcm_prepare, - .trigger = s3c24xx_pcm_trigger, - .pointer = s3c24xx_pcm_pointer, - .mmap = s3c24xx_pcm_mmap, + .hw_params = s3c_dma_hw_params, + .hw_free = s3c_dma_hw_free, + .prepare = s3c_dma_prepare, + .trigger = s3c_dma_trigger, + .pointer = s3c_dma_pointer, + .mmap = s3c_dma_mmap, }; -static int s3c24xx_pcm_preallocate_dma_buffer(struct snd_pcm *pcm, int stream) +static int s3c_preallocate_dma_buffer(struct snd_pcm *pcm, int stream) { struct snd_pcm_substream *substream = pcm->streams[stream].substream; struct snd_dma_buffer *buf = &substream->dma_buffer; - size_t size = s3c24xx_pcm_hardware.buffer_bytes_max; + size_t size = s3c_dma_hardware.buffer_bytes_max; pr_debug("Entered %s\n", __func__); @@ -388,7 +388,7 @@ static int s3c24xx_pcm_preallocate_dma_buffer(struct snd_pcm *pcm, int stream) return 0; } -static void s3c24xx_pcm_free_dma_buffers(struct snd_pcm *pcm) +static void s3c_dma_free_dma_buffers(struct snd_pcm *pcm) { struct snd_pcm_substream *substream; struct snd_dma_buffer *buf; @@ -411,9 +411,9 @@ static void s3c24xx_pcm_free_dma_buffers(struct snd_pcm *pcm) } } -static u64 s3c24xx_pcm_dmamask = DMA_BIT_MASK(32); +static u64 s3c_dmamask = DMA_BIT_MASK(32); -static int s3c24xx_pcm_new(struct snd_card *card, +static int s3c_dma_new(struct snd_card *card, struct snd_soc_dai *dai, struct snd_pcm *pcm) { int ret = 0; @@ -421,19 +421,19 @@ static int s3c24xx_pcm_new(struct snd_card *card, pr_debug("Entered %s\n", __func__); if (!card->dev->dma_mask) - card->dev->dma_mask = &s3c24xx_pcm_dmamask; + card->dev->dma_mask = &s3c_dmamask; if (!card->dev->coherent_dma_mask) card->dev->coherent_dma_mask = 0xffffffff; if (dai->playback.channels_min) { - ret = s3c24xx_pcm_preallocate_dma_buffer(pcm, + ret = s3c_preallocate_dma_buffer(pcm, SNDRV_PCM_STREAM_PLAYBACK); if (ret) goto out; } if (dai->capture.channels_min) { - ret = s3c24xx_pcm_preallocate_dma_buffer(pcm, + ret = s3c_preallocate_dma_buffer(pcm, SNDRV_PCM_STREAM_CAPTURE); if (ret) goto out; @@ -444,9 +444,9 @@ static int s3c24xx_pcm_new(struct snd_card *card, struct snd_soc_platform s3c24xx_soc_platform = { .name = "s3c24xx-audio", - .pcm_ops = &s3c24xx_pcm_ops, - .pcm_new = s3c24xx_pcm_new, - .pcm_free = s3c24xx_pcm_free_dma_buffers, + .pcm_ops = &s3c_dma_ops, + .pcm_new = s3c_dma_new, + .pcm_free = s3c_dma_free_dma_buffers, }; EXPORT_SYMBOL_GPL(s3c24xx_soc_platform); @@ -463,5 +463,5 @@ static void __exit s3c24xx_soc_platform_exit(void) module_exit(s3c24xx_soc_platform_exit); MODULE_AUTHOR("Ben Dooks, <ben(a)simtec.co.uk>"); -MODULE_DESCRIPTION("Samsung S3C24XX PCM DMA module"); +MODULE_DESCRIPTION("Samsung S3C Audio DMA module"); MODULE_LICENSE("GPL"); diff --git a/sound/soc/s3c24xx/s3c24xx-pcm.h b/sound/soc/s3c24xx/s3c24xx-pcm.h index 0088c79..d04ddf8 100644 --- a/sound/soc/s3c24xx/s3c24xx-pcm.h +++ b/sound/soc/s3c24xx/s3c24xx-pcm.h @@ -9,13 +9,13 @@ * ALSA PCM interface for the Samsung S3C24xx CPU */ -#ifndef _S3C24XX_PCM_H -#define _S3C24XX_PCM_H +#ifndef _S3C_AUDIO_H +#define _S3C_AUDIO_H #define ST_RUNNING (1<<0) #define ST_OPENED (1<<1) -struct s3c24xx_pcm_dma_params { +struct s3c_audio_dma_params { struct s3c2410_dma_client *client; /* stream identifier */ int channel; /* Channel ID */ dma_addr_t dma_addr; diff --git a/sound/soc/s3c24xx/s3c64xx-i2s.c b/sound/soc/s3c24xx/s3c64xx-i2s.c index b67eed5..03f5a6b 100644 --- a/sound/soc/s3c24xx/s3c64xx-i2s.c +++ b/sound/soc/s3c24xx/s3c64xx-i2s.c @@ -46,7 +46,7 @@ static struct s3c2410_dma_client s3c64xx_dma_client_in = { .name = "I2S PCM Stereo in" }; -static struct s3c24xx_pcm_dma_params s3c64xx_i2s_pcm_stereo_out[2] = { +static struct s3c_audio_dma_params s3c64xx_i2s_pcm_stereo_out[2] = { [0] = { .channel = DMACH_I2S0_OUT, .client = &s3c64xx_dma_client_out, @@ -61,7 +61,7 @@ static struct s3c24xx_pcm_dma_params s3c64xx_i2s_pcm_stereo_out[2] = { }, }; -static struct s3c24xx_pcm_dma_params s3c64xx_i2s_pcm_stereo_in[2] = { +static struct s3c_audio_dma_params s3c64xx_i2s_pcm_stereo_in[2] = { [0] = { .channel = DMACH_I2S0_IN, .client = &s3c64xx_dma_client_in, -- 1.6.2.5

4 9

Re: [alsa-devel] Capture not working in MMAP mode with '-v'
by Aggarwal, Anuj 09 Nov '09

09 Nov '09

> -----Original Message----- > From: Aggarwal, Anuj > Sent: Thursday, September 24, 2009 2:28 PM > To: alsa-devel(a)alsa-project.org > Subject: Capture not working in MMAP mode with '-v' > > Hi, > > When I try to capture audio in MMAP mode using the following > command, it works properly: > > arecord -f cd -d 10 -M rec01.wav > > However, if I specify '-v' along with the above command, it fails to > capture anything and prints log and returns immediately: > > Recording WAVE 'rec03.wav' : Signed 16 bit Little Endian, > Rate 44100 Hz, Stereo > Plug PCM: Hardware PCM card 0 'omap3evm' device 0 subdevice 0 > Its setup is: > stream : CAPTURE > access : MMAP_INTERLEAVED > format : S16_LE > subformat : STD > channels : 2 > rate : 44100 > exact rate : 44100 (44100/1) > msbits : 16 > buffer_size : 22052 > period_size : 5513 > period_time : 125011 > tstamp_mode : NONE > period_step : 1 > avail_min : 5513 > period_event : 0 > start_threshold : 1 > stop_threshold : 22052 > silence_threshold: 0 > silence_size : 0 > boundary : 1445199872 > appl_ptr : 0 > hw_ptr : 0 > mmap_area[0] = 0x4030e000,0,32 (16) > mmap_area[1] = 0x4030e000,16,32 (16) > > I have not observed this problem while playing audio, only > while capture this issue crops up. > > Any pointers? Any updates on this? We have observed similar problem on other platforms as well. > > Thanks & Regards, > Anuj Aggarwal >

4 6

[alsa-devel] [PATCH V2] ASoC - Add support for upto 16 channels on OMAP MCBSP
by Liam Girdwood 09 Nov '09

09 Nov '09

From: Graeme Gregory <gg(a)slimlogic.co.uk> This patch increases the number of supported audio channels from 4 to 16 and has been sponsored by Shotspotter Inc. It also fixes a FSYNC rate calculation bug when McBSP is FSYNC master. Signed-off-by: Graeme Gregory <gg(a)slimlogic.co.uk> Signed-off-by: Liam Girdwood <lrg(a)slimlogic.co.uk> --- sound/soc/omap/omap-mcbsp.c | 59 ++++++++++++++++++++++++------------------- 1 files changed, 33 insertions(+), 26 deletions(-) diff --git a/sound/soc/omap/omap-mcbsp.c b/sound/soc/omap/omap-mcbsp.c index 3341f49..3ea4a00 100644 --- a/sound/soc/omap/omap-mcbsp.c +++ b/sound/soc/omap/omap-mcbsp.c @@ -49,6 +49,8 @@ struct omap_mcbsp_data { */ int active; int configured; + unsigned int in_freq; + int clk_div; }; #define to_mcbsp(priv) container_of((priv), struct omap_mcbsp_data, bus_id) @@ -257,7 +259,7 @@ static int omap_mcbsp_dai_hw_params(struct snd_pcm_substream *substream, int dma, bus_id = mcbsp_data->bus_id, id = cpu_dai->id; int wlen, channels, wpf, sync_mode = OMAP_DMA_SYNC_ELEMENT; unsigned long port; - unsigned int format; + unsigned int format, div, framesize; if (cpu_class_is_omap1()) { dma = omap1_dma_reqs[bus_id][substream->stream]; @@ -294,28 +296,19 @@ static int omap_mcbsp_dai_hw_params(struct snd_pcm_substream *substream, format = mcbsp_data->fmt & SND_SOC_DAIFMT_FORMAT_MASK; wpf = channels = params_channels(params); - switch (channels) { - case 2: - if (format == SND_SOC_DAIFMT_I2S) { - /* Use dual-phase frames */ - regs->rcr2 |= RPHASE; - regs->xcr2 |= XPHASE; - /* Set 1 word per (McBSP) frame for phase1 and phase2 */ - wpf--; - regs->rcr2 |= RFRLEN2(wpf - 1); - regs->xcr2 |= XFRLEN2(wpf - 1); - } - case 1: - case 4: - /* Set word per (McBSP) frame for phase1 */ - regs->rcr1 |= RFRLEN1(wpf - 1); - regs->xcr1 |= XFRLEN1(wpf - 1); - break; - default: - /* Unsupported number of channels */ - return -EINVAL; + if (channels == 2 && format == SND_SOC_DAIFMT_I2S) { + /* Use dual-phase frames */ + regs->rcr2 |= RPHASE; + regs->xcr2 |= XPHASE; + /* Set 1 word per (McBSP) frame for phase1 and phase2 */ + wpf--; + regs->rcr2 |= RFRLEN2(wpf - 1); + regs->xcr2 |= XFRLEN2(wpf - 1); } + regs->rcr1 |= RFRLEN1(wpf - 1); + regs->xcr1 |= XFRLEN1(wpf - 1); + switch (params_format(params)) { case SNDRV_PCM_FORMAT_S16_LE: /* Set word lengths */ @@ -330,15 +323,26 @@ static int omap_mcbsp_dai_hw_params(struct snd_pcm_substream *substream, return -EINVAL; } + /* In McBSP master modes, FRAME (i.e. sample rate) is generated + * by _counting_ BCLKs. Calculate frame size in BCLKs */ + div = mcbsp_data->clk_div ? mcbsp_data->clk_div : 1; + framesize = (mcbsp_data->in_freq / div) / params_rate(params); + + if (framesize < wlen * channels) { + printk(KERN_ERR "%s: not enough bandwidth for desired rate and channels\n", + __func__); + return -EINVAL; + } + /* Set FS period and length in terms of bit clock periods */ switch (format) { case SND_SOC_DAIFMT_I2S: - regs->srgr2 |= FPER(wlen * channels - 1); - regs->srgr1 |= FWID(wlen - 1); + regs->srgr2 |= FPER(framesize - 1); + regs->srgr1 |= FWID((framesize >> 1) - 1); break; case SND_SOC_DAIFMT_DSP_A: case SND_SOC_DAIFMT_DSP_B: - regs->srgr2 |= FPER(wlen * channels - 1); + regs->srgr2 |= FPER(framesize - 1); regs->srgr1 |= FWID(0); break; } @@ -454,6 +458,7 @@ static int omap_mcbsp_dai_set_clkdiv(struct snd_soc_dai *cpu_dai, if (div_id != OMAP_MCBSP_CLKGDV) return -ENODEV; + mcbsp_data->clk_div = div; regs->srgr1 |= CLKGDV(div - 1); return 0; @@ -554,6 +559,8 @@ static int omap_mcbsp_dai_set_dai_sysclk(struct snd_soc_dai *cpu_dai, struct omap_mcbsp_reg_cfg *regs = &mcbsp_data->regs; int err = 0; + mcbsp_data->in_freq = freq; + switch (clk_id) { case OMAP_MCBSP_SYSCLK_CLK: regs->srgr2 |= CLKSM; @@ -598,13 +605,13 @@ static struct snd_soc_dai_ops omap_mcbsp_dai_ops = { .id = (link_id), \ .playback = { \ .channels_min = 1, \ - .channels_max = 4, \ + .channels_max = 16, \ .rates = OMAP_MCBSP_RATES, \ .formats = SNDRV_PCM_FMTBIT_S16_LE, \ }, \ .capture = { \ .channels_min = 1, \ - .channels_max = 4, \ + .channels_max = 16, \ .rates = OMAP_MCBSP_RATES, \ .formats = SNDRV_PCM_FMTBIT_S16_LE, \ }, \ -- 1.6.3.3

4 9

[alsa-devel] [PATCH 1/2] ASoC: sh: fsi: Add runtime PM support
by Kuninori Morimoto 09 Nov '09

09 Nov '09

This patch add support runtime PM. Driver callbacks for Runtime PM are empty because the device registers are always re-initialized after pm_runtime_get_sync(). The Runtime PM functions replaces the clock framework module stop bit handling in this driver. Signed-off-by: Kuninori Morimoto <morimoto.kuninori(a)renesas.com> Signed-off-by: Magnus Damm <damm(a)opensource.se> --- sound/soc/sh/fsi.c | 39 +++++++++++++++++++++++++-------------- 1 files changed, 25 insertions(+), 14 deletions(-) diff --git a/sound/soc/sh/fsi.c b/sound/soc/sh/fsi.c index e1a3d1a..aaec738 100644 --- a/sound/soc/sh/fsi.c +++ b/sound/soc/sh/fsi.c @@ -17,7 +17,7 @@ #include <linux/platform_device.h> #include <linux/delay.h> #include <linux/list.h> -#include <linux/clk.h> +#include <linux/pm_runtime.h> #include <linux/io.h> #include <sound/core.h> #include <sound/pcm.h> @@ -105,7 +105,6 @@ struct fsi_priv { struct fsi_master { void __iomem *base; int irq; - struct clk *clk; struct fsi_priv fsia; struct fsi_priv fsib; struct sh_fsi_platform_info *info; @@ -559,7 +558,7 @@ static int fsi_dai_startup(struct snd_pcm_substream *substream, int is_master; int ret = 0; - clk_enable(master->clk); + pm_runtime_get_sync(dai->dev); /* CKG1 */ data = is_play ? (1 << 0) : (1 << 4); @@ -674,7 +673,7 @@ static void fsi_dai_shutdown(struct snd_pcm_substream *substream, fsi_irq_disable(fsi, is_play); fsi_clk_ctrl(fsi, 0); - clk_disable(master->clk); + pm_runtime_put_sync(dai->dev); } static int fsi_dai_trigger(struct snd_pcm_substream *substream, int cmd, @@ -872,7 +871,6 @@ EXPORT_SYMBOL_GPL(fsi_soc_platform); static int fsi_probe(struct platform_device *pdev) { struct resource *res; - char clk_name[8]; unsigned int irq; int ret; @@ -903,14 +901,9 @@ static int fsi_probe(struct platform_device *pdev) master->fsia.base = master->base; master->fsib.base = master->base + 0x40; - /* FSI is based on SPU mstp */ - snprintf(clk_name, sizeof(clk_name), "spu%d", pdev->id); - master->clk = clk_get(NULL, clk_name); - if (IS_ERR(master->clk)) { - dev_err(&pdev->dev, "cannot get %s mstp\n", clk_name); - ret = -EIO; - goto exit_iounmap; - } + pm_suspend_ignore_children(&pdev->dev, true); + pm_runtime_enable(&pdev->dev); + pm_runtime_resume(&pdev->dev); fsi_soc_dai[0].dev = &pdev->dev; fsi_soc_dai[1].dev = &pdev->dev; @@ -947,7 +940,7 @@ static int fsi_remove(struct platform_device *pdev) snd_soc_unregister_dais(fsi_soc_dai, ARRAY_SIZE(fsi_soc_dai)); snd_soc_unregister_platform(&fsi_soc_platform); - clk_put(master->clk); + pm_runtime_disable(&pdev->dev); free_irq(master->irq, master); @@ -957,9 +950,27 @@ static int fsi_remove(struct platform_device *pdev) return 0; } +static int fsi_runtime_nop(struct device *dev) +{ + /* Runtime PM callback shared between ->runtime_suspend() + * and ->runtime_resume(). Simply returns success. + * + * This driver re-initializes all registers after + * pm_runtime_get_sync() anyway so there is no need + * to save and restore registers here. + */ + return 0; +} + +static struct dev_pm_ops fsi_pm_ops = { + .runtime_suspend = fsi_runtime_nop, + .runtime_resume = fsi_runtime_nop, +}; + static struct platform_driver fsi_driver = { .driver = { .name = "sh_fsi", + .pm = &fsi_pm_ops, }, .probe = fsi_probe, .remove = fsi_remove, -- 1.6.3.3

1 1

[alsa-devel] [PATCH v4 00/12] introduce skip_spaces(), reducing code size plus some clean-ups
by André Goddard Rosa 08 Nov '09

08 Nov '09

This patch reduces lib.a code size by 173 bytes on my Core 2 with gcc 4.4.1 even considering that it exports a newly defined function skip_spaces() to drivers: text data bss dec hex filename 64867 840 592 66299 102fb (TOTALS-lib.a-before) 64954 584 588 66126 1024e (TOTALS-lib.a-after) and implements some code tidy up. Besides reducing lib.a size, it converts many in-tree drivers to use the newly defined function, which makes another small reduction on kernel size overall when those drivers are used. p.s.: Ingo, I hope to have finally fixed my environment by using send-email now. Please let me know if you have any problem with these and thank you for the good advice. get_maintainer.pl gave lots of people as output, I hope that's ok. Changelog: v4: convert drivers over newly defined skip_spaces() function v3: improved comments on patch 5/7 and factorize a switch statement on 6/7 as per suggestions from Ingo and Frederic (thanks!) v2: addressed feedback from Frederic Weisbecker review (thanks!!) and split into separate patches v1: original submission André Goddard Rosa (12): vsprintf: factorize "(null)" string vsprintf: pre-calculate final string length for later use vsprintf: give it some care to please checkpatch.pl vsprintf: use TOLOWER whenever possible vsprintf: reduce code size by avoiding extra check vsprintf: move local vars to block local vars and remove unneeded ones vsprintf: factor out skip_space code in a separate function vsprintf: reuse almost identical simple_strtoulX() functions ctype: constify read-only _ctype string string: factorize skip_spaces and export it to be generally available string: on strstrip(), first remove leading spaces before running over str tree-wide: convert open calls to remove spaces to skip_spaces() lib function arch/s390/kernel/debug.c | 3 +- arch/um/drivers/mconsole_kern.c | 16 +- arch/x86/kernel/cpu/mtrr/if.c | 11 +- drivers/md/dm-table.c | 6 +- drivers/md/md.c | 4 +- drivers/parisc/pdc_stable.c | 9 +- drivers/platform/x86/thinkpad_acpi.c | 7 +- drivers/pnp/interface.c | 36 +--- drivers/s390/block/dasd_proc.c | 5 +- drivers/video/backlight/lcd.c | 4 +- drivers/video/display/display-sysfs.c | 2 +- fs/cachefiles/daemon.c | 8 +- fs/ext4/super.c | 7 +- include/linux/ctype.h | 2 +- include/linux/string.h | 1 + kernel/params.c | 8 +- lib/argv_split.c | 13 +- lib/ctype.c | 50 +++--- lib/dynamic_debug.c | 4 +- lib/string.c | 19 ++- lib/vsprintf.c | 342 ++++++++++++++++----------------- net/irda/irnet/irnet.h | 1 + net/irda/irnet/irnet_ppp.c | 8 +- net/netfilter/xt_recent.c | 3 +- sound/pci/hda/hda_hwdep.c | 7 +- 25 files changed, 264 insertions(+), 312 deletions(-)

5 17

[alsa-devel] RME HDSPe AIO
by Jonathan Leonard 08 Nov '09

08 Nov '09

Hello, I am writing in regards to the RME HDSPe AIO card and its support in ALSA. The card itself in 64studio is recognized incorrectly as HDSP MADI rev d4. Running lspci -nn shows this line for the device: 02:00.0 Multimedia audio controller [0401]: Xilinx Corporation RME Hammerfall DSP MADI [10ee:3fc6] (rev d4) ALSA in 64studio 3.0 beta 3 loads snd-hdspm incorrectly when it should be loading snd-hdsp. I have reviewed pcitables and pci.ids on this distro, and also the public pci reference and the above device id is currently assigned to: Multimedia audio controller: Xilinx Corporation RME Hammerfall DSP MADI (rev d4) The AIO is purported to be very similar to the 9632 and should be using the snd-hdsp module. I would like to use this card in ALSA, and have begun reviewing the guide for making ALSA drivers, but am not sure how exactly to fix the matter since the manufacturer has not incremented the id, or they have not assigned the same id as a 9632. This device is recognized and functioning perfectly on the XP partition. Besides my individual circumstance I wonder if ALSA should not be accomodating this great card somehow. Let me know if I can help by contacting RME developers for info or otherwise. Thank you, jonathan adams leonard

2 2

[alsa-devel] [PATCH]Use DMA_BIT_MASK(32) instead of deprecated DMA_32BIT_MASK
by Marin Mitov 08 Nov '09

08 Nov '09

Hi all, Use DMA_BIT_MASK(32) instead of deprecated DMA_32BIT_MASK Signed-off-by: Marin Mitov <mitov(a)issp.bas.bg> ========================================================= --- sound/soc/s6000/s6000-pcm.c.orig 2009-11-08 17:49:09.000000000 +0200 +++ sound/soc/s6000/s6000-pcm.c 2009-11-08 17:50:56.000000000 +0200 @@ -423,7 +423,7 @@ snd_pcm_lib_preallocate_free_for_all(pcm); } -static u64 s6000_pcm_dmamask = DMA_32BIT_MASK; +static u64 s6000_pcm_dmamask = DMA_BIT_MASK(32); static int s6000_pcm_new(struct snd_card *card, struct snd_soc_dai *dai, struct snd_pcm *pcm) @@ -435,7 +435,7 @@ if (!card->dev->dma_mask) card->dev->dma_mask = &s6000_pcm_dmamask; if (!card->dev->coherent_dma_mask) - card->dev->coherent_dma_mask = DMA_32BIT_MASK; + card->dev->coherent_dma_mask = DMA_BIT_MASK(32); if (params->dma_in) { s6dmac_disable_chan(DMA_MASK_DMAC(params->dma_in),

1 0

[alsa-devel] [PATCHv2 alsa-lib 0/3] Close-on-exec flag for device nodes
by Rémi Denis-Courmont 08 Nov '09

08 Nov '09

Hello, This is basically the same patch series as yesterday, but addressing Lennart's issue. Comments welcome. configure.in | 2 ++ include/local.h | 17 +++++++++++------ src/control/control_hw.c | 11 ----------- src/hwdep/hwdep_hw.c | 11 ----------- src/pcm/pcm_hw.c | 12 ------------ src/rawmidi/rawmidi_hw.c | 11 ----------- src/seq/seq_hw.c | 11 ----------- src/timer/timer_hw.c | 11 ----------- 8 files changed, 13 insertions(+), 73 deletions(-) -- Rémi Denis-Courmont http://www.remlab.net/

3 10

Re: [alsa-devel] [Intel-gfx] Problems with HDMI audio on Intel DG45FC motherboard
by Wu Fengguang 08 Nov '09

08 Nov '09

On Wed, Oct 21, 2009 at 06:37:58AM +0800, David Härdeman wrote: > On Tue, Oct 20, 2009 at 09:26:00AM +0800, Wu Fengguang wrote: > >On Thu, Oct 15, 2009 at 01:40:53AM +0800, David Härdeman wrote: > >> ii) Is there any documentation somewhere on how this mapping is supposed > >> to be performed in user space? > > > >I think Shane has provided a good example for you in another email :) > >Here are more descriptions for the route plugin: > > So perhaps I should still file a bug with the ALSA bugtracker asking for > the default ALSA userspace to include a channel mapping along Shane's > recommendation? That would be good. I'm not sure if PulseAudio need a separate fix. (Lennart CCed). > >> >Complete silence for how much time? > >> > >> For the entire duration of the particular movie/audio track/video > >> clip/whatever. > >> > > > >I actually have a DG45FC box and have not run into this problem for > >all the HDMI monitors I have. What's your monitor model? > > A Samsung LE-55A956 LCD TV. But I think the problem is not with the > monitor (TV) but rather with the receiver that is between the DG45FC and > the TV. The receiver is a Marantz SR8002 with HDMI support. Got it. If you have a HDMI capable TV or monitor, it would be possible to get rid of the Marantz and check if the problem sticks :) > >Did the kernel emit some error messages? > > Nope OK. You can get more debug info if turning on CONFIG_SND_VERBOSE_PROCFS=y CONFIG_SND_VERBOSE_PRINTK=y CONFIG_SND_DEBUG=y CONFIG_SND_DEBUG_VERBOSE=y CONFIG_SND_PCM_XRUN_DEBUG=y > >What if you change display > >modes with xrandr? > > Haven't tried that yet...currently running on 1920x1080@60 which should > (I guess) be one of the most common modes with modern LCD TV's. The infoframe would be different for 2-channel pure music and 5.1 channel movie. The video timing might also affect audio stream, because the HDMI audio data is transfered in the gaps of video data. > >HDMI codec/sink seem to take some time to response to the output > >enable and new infoframe, so there are some delay. I've moved the HDMI > >output enable command to module load time, this helps. The infoframe > >is in theory created in run time based on the format of _each_ new > >audio stream, so infoframe transmission has to be started/stopped > >for each track.. > > So my current theory is along the line of HDMI audio infoframe or video > infoframe problems. Do you have any pointers where in the driver(s) > the infoframes (both audio and video) are generated so that I can add > some debugging statements to dump the frames and compare the working > and non-working scenarios? I guess the infoframe itself should be identical for the same clip. Have you tried upgrading to a recent Xorg/intel gfx driver? Anyway, the kernel driver code is linux/sound/pci/hda/patch_intelhdmi.c The relevant function is hdmi_setup_audio_infoframe(). Inside which the hdmi_setup_channel_mapping() is not functioning for G45, hdmi_setup_channel_allocation() is no-op for 2-channel music. hdmi_debug_dip_size() and hdmi_clear_dip_buffers() can also be commented out. And feel free to ask more questions :) Thanks, Fengguang

2 1

[alsa-devel] [PATCH] es18xx: code improvements
by Krzysztof Helt 08 Nov '09

08 Nov '09

From: Krzysztof Helt <krzysztof.h1(a)wp.pl> 1. Set the third argument of the snd_device_new to not NULL, so there is no warning about bug during chip detection. The third argument is not used in this driver. It was changed in my previous patch. 2. Remove the fm_port and mpu_port fields from the snd_es18xx structure. They can be converted to function arguments. 3. Remove the dmaN_size fields from the snd_es18xx structure. These values are used only in pointer functions and can be easily calculated. 4. Remove the ctrl_lock spinlock which is used only in one read function which is called once during chip initialization. There are many writes to the same register and they are not protected on purpose (see the comment ina the snd_es18xx_config_write()). 5. Use the first part of the text5Sources string table as the text4Soruces table (they are the same). 6. Merge the same cases for the ES1887 and ES1888 when setting chip's caps. 7. Move the snd_es18xx_reset() to __devinit section. Signed-off-by: Krzysztof Helt <krzysztof.h1(a)wp.pl> --- sound/isa/es18xx.c | 91 +++++++++++++++++++++++---------------------------- 1 files changed, 41 insertions(+), 50 deletions(-) diff --git a/sound/isa/es18xx.c b/sound/isa/es18xx.c index 5cf42b4..06e871e 100644 --- a/sound/isa/es18xx.c +++ b/sound/isa/es18xx.c @@ -102,8 +102,6 @@ struct snd_es18xx { unsigned long port; /* port of ESS chip */ - unsigned long mpu_port; /* MPU-401 port of ESS chip */ - unsigned long fm_port; /* FM port */ unsigned long ctrl_port; /* Control port of ESS chip */ struct resource *res_port; struct resource *res_mpu_port; @@ -116,8 +114,6 @@ struct snd_es18xx { unsigned short audio2_vol; /* volume level of audio2 */ unsigned short active; /* active channel mask */ - unsigned int dma1_size; - unsigned int dma2_size; unsigned int dma1_shift; unsigned int dma2_shift; @@ -135,7 +131,6 @@ struct snd_es18xx { spinlock_t reg_lock; spinlock_t mixer_lock; - spinlock_t ctrl_lock; #ifdef CONFIG_PM unsigned char pm_reg; #endif @@ -354,7 +349,7 @@ static inline int snd_es18xx_mixer_writable(struct snd_es18xx *chip, unsigned ch } -static int snd_es18xx_reset(struct snd_es18xx *chip) +static int __devinit snd_es18xx_reset(struct snd_es18xx *chip) { int i; outb(0x03, chip->port + 0x06); @@ -490,8 +485,6 @@ static int snd_es18xx_playback1_prepare(struct snd_es18xx *chip, unsigned int size = snd_pcm_lib_buffer_bytes(substream); unsigned int count = snd_pcm_lib_period_bytes(substream); - chip->dma2_size = size; - snd_es18xx_rate_set(chip, substream, DAC2); /* Transfer Count Reload */ @@ -591,8 +584,6 @@ static int snd_es18xx_capture_prepare(struct snd_pcm_substream *substream) unsigned int size = snd_pcm_lib_buffer_bytes(substream); unsigned int count = snd_pcm_lib_period_bytes(substream); - chip->dma1_size = size; - snd_es18xx_reset_fifo(chip); /* Set stereo/mono */ @@ -659,8 +650,6 @@ static int snd_es18xx_playback2_prepare(struct snd_es18xx *chip, unsigned int size = snd_pcm_lib_buffer_bytes(substream); unsigned int count = snd_pcm_lib_period_bytes(substream); - chip->dma1_size = size; - snd_es18xx_reset_fifo(chip); /* Set stereo/mono */ @@ -821,17 +810,18 @@ static irqreturn_t snd_es18xx_interrupt(int irq, void *dev_id) static snd_pcm_uframes_t snd_es18xx_playback_pointer(struct snd_pcm_substream *substream) { struct snd_es18xx *chip = snd_pcm_substream_chip(substream); + unsigned int size = snd_pcm_lib_buffer_bytes(substream); int pos; if (substream->number == 0 && (chip->caps & ES18XX_PCM2)) { if (!(chip->active & DAC2)) return 0; - pos = snd_dma_pointer(chip->dma2, chip->dma2_size); + pos = snd_dma_pointer(chip->dma2, size); return pos >> chip->dma2_shift; } else { if (!(chip->active & DAC1)) return 0; - pos = snd_dma_pointer(chip->dma1, chip->dma1_size); + pos = snd_dma_pointer(chip->dma1, size); return pos >> chip->dma1_shift; } } @@ -839,11 +829,12 @@ static snd_pcm_uframes_t snd_es18xx_playback_pointer(struct snd_pcm_substream *s static snd_pcm_uframes_t snd_es18xx_capture_pointer(struct snd_pcm_substream *substream) { struct snd_es18xx *chip = snd_pcm_substream_chip(substream); + unsigned int size = snd_pcm_lib_buffer_bytes(substream); int pos; if (!(chip->active & ADC1)) return 0; - pos = snd_dma_pointer(chip->dma1, chip->dma1_size); + pos = snd_dma_pointer(chip->dma1, size); return pos >> chip->dma1_shift; } @@ -974,9 +965,6 @@ static int snd_es18xx_capture_close(struct snd_pcm_substream *substream) static int snd_es18xx_info_mux(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_info *uinfo) { - static char *texts4Source[4] = { - "Mic", "CD", "Line", "Master" - }; static char *texts5Source[5] = { "Mic", "CD", "Line", "Master", "Mix" }; @@ -994,7 +982,8 @@ static int snd_es18xx_info_mux(struct snd_kcontrol *kcontrol, struct snd_ctl_ele uinfo->value.enumerated.items = 4; if (uinfo->value.enumerated.item > 3) uinfo->value.enumerated.item = 3; - strcpy(uinfo->value.enumerated.name, texts4Source[uinfo->value.enumerated.item]); + strcpy(uinfo->value.enumerated.name, + texts5Source[uinfo->value.enumerated.item]); break; case 0x1887: case 0x1888: @@ -1378,11 +1367,9 @@ ES18XX_SINGLE("Hardware Master Volume Split", 0, 0x64, 7, 1, 0), static int __devinit snd_es18xx_config_read(struct snd_es18xx *chip, unsigned char reg) { int data; - unsigned long flags; - spin_lock_irqsave(&chip->ctrl_lock, flags); + outb(reg, chip->ctrl_port); data = inb(chip->ctrl_port + 1); - spin_unlock_irqrestore(&chip->ctrl_lock, flags); return data; } @@ -1398,7 +1385,9 @@ static void __devinit snd_es18xx_config_write(struct snd_es18xx *chip, #endif } -static int __devinit snd_es18xx_initialize(struct snd_es18xx *chip) +static int __devinit snd_es18xx_initialize(struct snd_es18xx *chip, + unsigned long mpu_port, + unsigned long fm_port) { int mask = 0; @@ -1412,15 +1401,15 @@ static int __devinit snd_es18xx_initialize(struct snd_es18xx *chip) if (chip->caps & ES18XX_CONTROL) { /* Hardware volume IRQ */ snd_es18xx_config_write(chip, 0x27, chip->irq); - if (chip->fm_port > 0 && chip->fm_port != SNDRV_AUTO_PORT) { + if (fm_port > 0 && fm_port != SNDRV_AUTO_PORT) { /* FM I/O */ - snd_es18xx_config_write(chip, 0x62, chip->fm_port >> 8); - snd_es18xx_config_write(chip, 0x63, chip->fm_port & 0xff); + snd_es18xx_config_write(chip, 0x62, fm_port >> 8); + snd_es18xx_config_write(chip, 0x63, fm_port & 0xff); } - if (chip->mpu_port > 0 && chip->mpu_port != SNDRV_AUTO_PORT) { + if (mpu_port > 0 && mpu_port != SNDRV_AUTO_PORT) { /* MPU-401 I/O */ - snd_es18xx_config_write(chip, 0x64, chip->mpu_port >> 8); - snd_es18xx_config_write(chip, 0x65, chip->mpu_port & 0xff); + snd_es18xx_config_write(chip, 0x64, mpu_port >> 8); + snd_es18xx_config_write(chip, 0x65, mpu_port & 0xff); /* MPU-401 IRQ */ snd_es18xx_config_write(chip, 0x28, chip->irq); } @@ -1507,11 +1496,12 @@ static int __devinit snd_es18xx_initialize(struct snd_es18xx *chip) snd_es18xx_mixer_write(chip, 0x7A, 0x68); /* Enable and set hardware volume interrupt */ snd_es18xx_mixer_write(chip, 0x64, 0x06); - if (chip->mpu_port > 0 && chip->mpu_port != SNDRV_AUTO_PORT) { + if (mpu_port > 0 && mpu_port != SNDRV_AUTO_PORT) { /* MPU401 share irq with audio Joystick enabled FM enabled */ - snd_es18xx_mixer_write(chip, 0x40, 0x43 | (chip->mpu_port & 0xf0) >> 1); + snd_es18xx_mixer_write(chip, 0x40, + 0x43 | (mpu_port & 0xf0) >> 1); } snd_es18xx_mixer_write(chip, 0x7f, ((irqmask + 1) << 1) | 0x01); } @@ -1629,7 +1619,9 @@ static int __devinit snd_es18xx_identify(struct snd_es18xx *chip) return 0; } -static int __devinit snd_es18xx_probe(struct snd_es18xx *chip) +static int __devinit snd_es18xx_probe(struct snd_es18xx *chip, + unsigned long mpu_port, + unsigned long fm_port) { if (snd_es18xx_identify(chip) < 0) { snd_printk(KERN_ERR PFX "[0x%lx] ESS chip not found\n", chip->port); @@ -1650,8 +1642,6 @@ static int __devinit snd_es18xx_probe(struct snd_es18xx *chip) chip->caps = ES18XX_PCM2 | ES18XX_SPATIALIZER | ES18XX_RECMIX | ES18XX_NEW_RATE | ES18XX_AUXB | ES18XX_I2S | ES18XX_CONTROL | ES18XX_HWV; break; case 0x1887: - chip->caps = ES18XX_PCM2 | ES18XX_RECMIX | ES18XX_AUXB | ES18XX_DUPLEX_SAME; - break; case 0x1888: chip->caps = ES18XX_PCM2 | ES18XX_RECMIX | ES18XX_AUXB | ES18XX_DUPLEX_SAME; break; @@ -1666,7 +1656,7 @@ static int __devinit snd_es18xx_probe(struct snd_es18xx *chip) if (chip->dma1 == chip->dma2) chip->caps &= ~(ES18XX_PCM2 | ES18XX_DUPLEX_SAME); - return snd_es18xx_initialize(chip); + return snd_es18xx_initialize(chip, mpu_port, fm_port); } static struct snd_pcm_ops snd_es18xx_playback_ops = { @@ -1802,10 +1792,7 @@ static int __devinit snd_es18xx_new_device(struct snd_card *card, spin_lock_init(&chip->reg_lock); spin_lock_init(&chip->mixer_lock); - spin_lock_init(&chip->ctrl_lock); chip->port = port; - chip->mpu_port = mpu_port; - chip->fm_port = fm_port; chip->irq = -1; chip->dma1 = -1; chip->dma2 = -1; @@ -1841,11 +1828,11 @@ static int __devinit snd_es18xx_new_device(struct snd_card *card, } chip->dma2 = dma2; - if (snd_es18xx_probe(chip) < 0) { + if (snd_es18xx_probe(chip, mpu_port, fm_port) < 0) { snd_es18xx_free(card); - return -ENODEV; - } - err = snd_device_new(card, SNDRV_DEV_LOWLEVEL, NULL, &ops); + return -ENODEV; + } + err = snd_device_new(card, SNDRV_DEV_LOWLEVEL, chip, &ops); if (err < 0) { snd_es18xx_free(card); return err; @@ -1980,7 +1967,7 @@ static int index[SNDRV_CARDS] = SNDRV_DEFAULT_IDX; /* Index 0-MAX */ static char *id[SNDRV_CARDS] = SNDRV_DEFAULT_STR; /* ID for this card */ static int enable[SNDRV_CARDS] = SNDRV_DEFAULT_ENABLE_ISAPNP; /* Enable this card */ #ifdef CONFIG_PNP -static int isapnp[SNDRV_CARDS] = {[0 ... (SNDRV_CARDS - 1)] = 1}; +static int isapnp[SNDRV_CARDS] = SNDRV_DEFAULT_ENABLE_ISAPNP; #endif static long port[SNDRV_CARDS] = SNDRV_DEFAULT_PORT; /* 0x220,0x240,0x260,0x280 */ #ifndef CONFIG_PNP @@ -2160,19 +2147,23 @@ static int __devinit snd_audiodrive_probe(struct snd_card *card, int dev) return err; if (fm_port[dev] > 0 && fm_port[dev] != SNDRV_AUTO_PORT) { - if (snd_opl3_create(card, chip->fm_port, chip->fm_port + 2, OPL3_HW_OPL3, 0, &opl3) < 0) { - snd_printk(KERN_WARNING PFX "opl3 not detected at 0x%lx\n", chip->fm_port); + if (snd_opl3_create(card, fm_port[dev], fm_port[dev] + 2, + OPL3_HW_OPL3, 0, &opl3) < 0) { + snd_printk(KERN_WARNING PFX + "opl3 not detected at 0x%lx\n", + fm_port[dev]); } else { - if ((err = snd_opl3_hwdep_new(opl3, 0, 1, NULL)) < 0) + err = snd_opl3_hwdep_new(opl3, 0, 1, NULL); + if (err < 0) return err; } } if (mpu_port[dev] > 0 && mpu_port[dev] != SNDRV_AUTO_PORT) { - if ((err = snd_mpu401_uart_new(card, 0, MPU401_HW_ES18XX, - chip->mpu_port, 0, - irq[dev], 0, - &chip->rmidi)) < 0) + err = snd_mpu401_uart_new(card, 0, MPU401_HW_ES18XX, + mpu_port[dev], 0, + irq[dev], 0, &chip->rmidi); + if (err < 0) return err; } -- 1.6.4 Tanie rozmowy telefoniczne! Sprawdz >> http://link.interia.pl/f2410

2 1

[alsa-devel] [PATCH - alsa-lib 1/1] Defined symbols exposing the hrtimer to applications.
by Pedro Lopez-Cabanillas 08 Nov '09

08 Nov '09

Signed-off-by: Pedro Lopez-Cabanillas <pedro.lopez.cabanillas(a)gmail.com> --- include/sound/asound.h | 1 + include/timer.h | 2 ++ 2 files changed, 3 insertions(+), 0 deletions(-) diff --git a/include/sound/asound.h b/include/sound/asound.h index 62d1e57..fa88938 100644 --- a/include/sound/asound.h +++ b/include/sound/asound.h @@ -593,6 +593,7 @@ enum sndrv_timer_slave_class { #define SNDRV_TIMER_GLOBAL_SYSTEM 0 #define SNDRV_TIMER_GLOBAL_RTC 1 #define SNDRV_TIMER_GLOBAL_HPET 2 +#define SNDRV_TIMER_GLOBAL_HRTIMER 3 /* info flags */ #define SNDRV_TIMER_FLG_SLAVE (1<<0) /* cannot be controlled */ diff --git a/include/timer.h b/include/timer.h index 4d06e31..2803f53 100644 --- a/include/timer.h +++ b/include/timer.h @@ -115,6 +115,8 @@ typedef struct _snd_timer_tread { #define SND_TIMER_GLOBAL_RTC 1 /** global timer - HPET */ #define SND_TIMER_GLOBAL_HPET 2 +/** global timer - HRTIMER */ +#define SND_TIMER_GLOBAL_HRTIMER 3 /** timer open mode flag - non-blocking behaviour */ #define SND_TIMER_OPEN_NONBLOCK (1<<0) -- 1.6.4.2

2 1

[alsa-devel] [PATCH 75/75] snd-aica: declare MODULE_FIRMWARE
by Ben Hutchings 08 Nov '09

08 Nov '09

Signed-off-by: Ben Hutchings <ben(a)decadent.org.uk> --- sound/sh/aica.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/sound/sh/aica.c b/sound/sh/aica.c index 583a369..a0df401 100644 --- a/sound/sh/aica.c +++ b/sound/sh/aica.c @@ -49,6 +49,7 @@ MODULE_AUTHOR("Adrian McMenamin <adrian(a)mcmen.demon.co.uk>"); MODULE_DESCRIPTION("Dreamcast AICA sound (pcm) driver"); MODULE_LICENSE("GPL"); MODULE_SUPPORTED_DEVICE("{{Yamaha/SEGA, AICA}}"); +MODULE_FIRMWARE("aica_firmware.bin"); /* module parameters */ #define CARD_NAME "AICA" -- 1.6.5.2

2 1

Re: [alsa-devel] snd-hdsp driver error?
by Raymond Yau 08 Nov '09

08 Nov '09

Not sure the H-DSP.conf uploaded by tom-ipp is OK since I don't have this card https://bugtrack.alsa-project.org/alsa-bug/view.php?id=4650 http://pulseaudio.org/ticket/564 The problem of using your card with pulseaudio 1) No front device defined 2) No master volume control 3) The card only support SNDRV_PCM_INFO_NONINTERLEAVED but seem PA only support SNDRV_PCM_INFO_INTERLEAVED 4) PA expect your card support stereo but your card did not support stereo 2009/11/7 Lars Zobbe <fedesensfar(a)gmail.com> > Thanks a lot Raymond. Now that's good news. Something that can be fixed is > always good news. > > And Takashi and Jaroslav? Are they on this mailing list. I suppose it would > just be a cuestion of putting their names in the subject field then. > > It would be so great if you could find a fix for this legendary card. > Crossing my fingers. > > Thanks again. You've been a great help (I hope), now I'll just have to find > those two guys. > > Lars. > > > > On Sat, Nov 7, 2009 at 12:12 AM, Raymond Yau <superquad.vortex2(a)gmail.com>wrote: > >> AFAIK , alsa-lib use the driver name to find the name of corresponding >> conf file from /usr/share/alsa/cards/aliases.conf >> In your case , H-DSP.conf does not exist and there is no aliases in >> /usr/share/alsa/cards/aliases.conf >> >> You have to ask Takashi or Jaroslav to fix this issue for your card >> >> open("/usr/share/alsa/cards/aliases.conf", O_RDONLY) = 3 >> >> >> access("/usr/share/alsa/cards/H-DSP.conf", R_OK) = -1 ENOENT (No such >> file or directory) >> open("/dev/snd/controlC1", O_RDONLY) = 3 >> close(3) = 0 >> >> >> write(2, "ALSA lib confmisc.c:1286:(snd_fu"..., 42ALSA lib >> confmisc.c:1286:(snd_func_refer) ) = 42 >> write(2, "Unable to find definition 'cards"..., 58Unable to find >> definition 'cards.H-DSP.pcm.front.0:CARD=0') = 58 >> write(2, "\n", 1 >> >> >> >> 2009/11/7 Lars Zobbe <fedesensfar(a)gmail.com> >> >> > It is a clean install. >> > lars@lars-desktop:~$ lsb_release -a && uname -a >> > No LSB modules are available. >> > Distributor ID: Ubuntu >> > Description: Ubuntu 9.10 >> > Release: 9.10 >> > Codename: karmic >> > Linux lars-desktop 2.6.31-14-generic #48-Ubuntu SMP Fri Oct 16 14:05:01 >> UTC >> > 2009 x86_64 GNU/Linux >> > >> > It didn't work with pulseaudio in any previos version (of ubuntu or any >> > other distro I've tried) either. >> > And the standard answer from people "out there" is "forget about pulse >> it >> > doesn't work with the HDSP" f.x. this guy >> > http://ubuntuforums.org/showpost.php?p=7578331&postcount=10 >> > And that's why I contacted pulseaudio developers first when I found out >> the >> > it was because snd_hdsp didn't load with the preferred udev but only >> with >> > module-detect (se my first post). They said that I should inform Alsa >> > developers as there seems to be a problem with the alsa driver. >> > >> > I've attached the strace output. >> > >> > Thanks. >> > Lars. >> > >> > >> > >> > >> > On Fri, Nov 6, 2009 at 2:53 AM, Raymond Yau < >> superquad.vortex2(a)gmail.com>wrote: >> > >> >> Is it a clean install of Ubuntu 9.10 or upgrade from previous Ubuntu ? >> >> >> >> you may need to find out why aplay -v -Dfront 32bit.wav fail ? >> >> >> >> strace aplay -v -Dfront 32bit.wav >> >> >> >> >> >> >> >> >> >> >> >> !!Linux Distribution >> >> >> >> !!------------------ >> >> >> >> Ubuntu 9.10 \n \l DISTRIB_ID=Ubuntu DISTRIB_DESCRIPTION="Ubuntu 9.10" >> >> >> >> !!Sound Servers on this system >> >> !!---------------------------- >> >> >> >> Pulseaudio: >> >> Installed - Yes (/usr/bin/pulseaudio) >> >> >> >> >> >> Running - Yes >> >> >> >> ESound Daemon: >> >> Installed - Yes (/usr/bin/esd) >> >> Running - No >> >> >> >> Jack: >> >> Installed - Yes (/usr/bin/jackd) >> >> Running - No >> >> >> >> >> >> !!ALSA configuration files >> >> >> >> >> >> !!------------------------ >> >> >> >> !!User specific config file (~/.asoundrc) >> >> >> >> pcm.!default { >> >> type plug >> >> slave { pcm "jack" } >> >> } >> >> >> >> pcm.jack { >> >> type jack >> >> playback_ports { >> >> >> >> 0 alsa_pcm:playback_1 >> >> >> >> 1 alsa_pcm:playback_2 >> >> } >> >> capture_ports { >> >> 0 alsa_pcm:capture_1 >> >> 1 alsa_pcm:capture_2 >> >> } >> >> } >> >> >> >> ctl.mixer0 { >> >> type hw >> >> card 0 >> >> } >> >> >> >> >> >> lars@lars-desktop:~$ aplay -v -Dfront:0 32bit.wav >> >> ALSA lib confmisc.c:1286:(snd_func_refer) Unable to find definition >> >> 'cards.H-DSP.pcm.front.0:CARD=0' >> >> ALSA lib conf.c:3513:(_snd_config_evaluate) function snd_func_refer >> >> returned error: No such file or directory >> >> ALSA lib conf.c:3985:(snd_config_expand) Evaluate error: No such file >> or >> >> directory >> >> ALSA lib pcm.c:2211:(snd_pcm_open_noupdate) Unknown PCM front:0 >> >> aplay: main:608: audio open error: No such file or directory >> >> >> >> >> >> Did PA developer tell you not to load oss module ? >> >> >> >> >> >> >> >> D: alsa-util.c: Checking for subset analog-mono (hw:%f) >> >> D: alsa-util.c: Trying hw:0 with SND_PCM_NO_AUTO_FORMAT ... >> >> D: alsa-util.c: Managed to open hw:0 >> >> D: alsa-util.c: snd_pcm_hw_params_set_access() failed: Invalid argument >> >> D: alsa-util.c: Trying hw:0 without SND_PCM_NO_AUTO_FORMAT ... >> >> D: alsa-util.c: Managed to open hw:0 >> >> D: alsa-util.c: snd_pcm_hw_params_set_access() failed: Invalid argument >> >> D: alsa-util.c: Trying plug:hw:0 with SND_PCM_NO_AUTO_FORMAT ... >> >> D: alsa-util.c: Managed to open plug:hw:0 >> >> D: alsa-util.c: snd_pcm_hw_params_set_format(Signed 16 bit Little >> Endian) >> >> failed: Invalid argument >> >> D: alsa-util.c: snd_pcm_hw_params_set_format(Signed 16 bit Big Endian) >> >> failed: Invalid argument >> >> D: alsa-util.c: snd_pcm_hw_params_set_format(Float 32 bit Little >> Endian) >> >> failed: Invalid argument >> >> D: alsa-util.c: snd_pcm_hw_params_set_format(Float 32 bit Big Endian) >> >> failed: Invalid argument >> >> D: alsa-util.c: snd_pcm_hw_params_set_channels(1) failed: Invalid >> argument >> >> D: alsa-util.c: Trying plug:hw:0 without SND_PCM_NO_AUTO_FORMAT ... >> >> D: alsa-util.c: Managed to open plug:hw:0 >> >> D: alsa-util.c: snd_pcm_hw_params_set_channels(1) failed: Invalid >> argument >> >> I: alsa-util.c: Failed to set hardware parameters on plug:hw:0: Invalid >> >> argument >> >> D: alsa-util.c: Trying hw:0 as last resort... >> >> D: alsa-util.c: Trying hw:0 with SND_PCM_NO_AUTO_FORMAT ... >> >> D: alsa-util.c: Managed to open hw:0 >> >> D: alsa-util.c: snd_pcm_hw_params_set_access() failed: Invalid argument >> >> D: alsa-util.c: Trying hw:0 without SND_PCM_NO_AUTO_FORMAT ... >> >> D: alsa-util.c: Managed to open hw:0 >> >> D: alsa-util.c: snd_pcm_hw_params_set_access() failed: Invalid argument >> >> D: alsa-util.c: Trying plug:hw:0 with SND_PCM_NO_AUTO_FORMAT ... >> >> D: alsa-util.c: Managed to open plug:hw:0 >> >> D: alsa-util.c: snd_pcm_hw_params_set_format(Signed 16 bit Little >> Endian) >> >> failed: Invalid argument >> >> D: alsa-util.c: snd_pcm_hw_params_set_format(Signed 16 bit Big Endian) >> >> failed: Invalid argument >> >> D: alsa-util.c: snd_pcm_hw_params_set_format(Float 32 bit Little >> Endian) >> >> failed: Invalid argument >> >> D: alsa-util.c: snd_pcm_hw_params_set_format(Float 32 bit Big Endian) >> >> failed: Invalid argument >> >> D: alsa-util.c: Maximum hw buffer size is 371 ms >> >> I: (alsa-lib)pcm_hw.c: SNDRV_PCM_IOCTL_HW_PARAMS failed >> >> I: (alsa-lib)pcm_hw.c: SNDRV_PCM_IOCTL_HW_PARAMS failed >> >> I: (alsa-lib)pcm_hw.c: SNDRV_PCM_IOCTL_HW_PARAMS failed >> >> I: (alsa-lib)pcm_hw.c: SNDRV_PCM_IOCTL_HW_PARAMS failed >> >> D: alsa-util.c: Set neither period nor buffer size. >> >> I: (alsa-lib)pcm_hw.c: SNDRV_PCM_IOCTL_HW_PARAMS failed >> >> I: alsa-util.c: snd_pcm_hw_params failed: Device or resource busy >> >> D: alsa-util.c: Trying plug:hw:0 without SND_PCM_NO_AUTO_FORMAT ... >> >> D: alsa-util.c: Managed to open plug:hw:0 >> >> D: alsa-util.c: Maximum hw buffer size is 371 ms >> >> I: (alsa-lib)pcm_hw.c: SNDRV_PCM_IOCTL_HW_PARAMS failed >> >> I: (alsa-lib)pcm_hw.c: SNDRV_PCM_IOCTL_HW_PARAMS failed >> >> I: (alsa-lib)pcm_hw.c: SNDRV_PCM_IOCTL_HW_PARAMS failed >> >> I: (alsa-lib)pcm_hw.c: SNDRV_PCM_IOCTL_HW_PARAMS failed >> >> D: alsa-util.c: Set neither period nor buffer size. >> >> I: (alsa-lib)pcm_hw.c: SNDRV_PCM_IOCTL_HW_PARAMS failed >> >> I: alsa-util.c: snd_pcm_hw_params failed: Device or resource busy >> >> I: alsa-util.c: Failed to set hardware parameters on plug:hw:0: Device >> or >> >> resource busy >> >> E: module.c: Failed to load module "module-alsa-source" (argument: >> >> "device_id=0"): initialization failed. >> >> W: module.c: module-oss is deprecated: Please use module-alsa-card >> instead >> >> of module-oss! >> >> D: oss-util.c: capabilities: MMAP REALTIME TRIGGER >> >> I: module-oss.c: Device opened in O_RDONLY mode. >> >> D: oss-util.c: Asking for 4 fragments of size 512 (requested 880) >> >> E: oss-util.c: SNDCTL_DSP_SETFMT: Device or resource busy >> >> E: module.c: Failed to load module "module-oss" (argument: >> >> "device=/dev/dsp"): initialization failed. >> >> W: module-detect.c: failed to detect any sound hardware. >> >> >> >> >> >> 2009/11/6 Lars Zobbe <fedesensfar(a)gmail.com> >> >> >> >> Sorry. I didn't realise that it was a bash script. Here is the link to >> my >> >>> alsa-info >> >>> >> >>> >> http://www.alsa-project.org/db/?f=d3728557be71067e2ed0920747118ae7efff2829 >> >>> >> >>> Thanks again. >> >>> Lars. >> >>> >> >>> >> >>> On Thu, Nov 5, 2009 at 5:29 AM, Raymond Yau < >> superquad.vortex2(a)gmail.com >> >>> > wrote: >> >>> >> >>>> Please provide the full pulseaudio log and output of alsa-info.sh >> >>>> >> >>>> http://www.pulseaudio.org/wiki/Troubleshooting >> >>>> >> >>>> pulseaudio -k; pulseaudio -vvv >> >>>> >> >>>> and >> >>>> >> >>>> aplay -v -Dfront:0 32bit.wav >> >>>> >> >>>> aplay -v -M -Dfront:0 32bit.wav >> >>>> >> >>>> aplay -v -Dplughw:0 any.wav >> >>>> >> >>>> aplay -v -M -Dplughw:0 any.wav >> >>>> >> >>>> >> >>>> 2009/11/4 Lars Zobbe <fedesensfar(a)gmail.com> >> >>>> >> >>>> > Hi Raymond. >> >>>> > >> >>>> > I so sorry Raymond. But I'm not sure what to do with this info. Is >> >>>> there >> >>>> > something more I have to tell you? Is there anything I can do to >> make >> >>>> > pulseaudio able to detect via udev? Can I copy-paste that bit of >> code >> >>>> you >> >>>> > sent me somewhere? >> >>>> > Please tell me if there's more you need to know. >> >>>> > Greetings. >> >>>> > Lars. >> >>>> > >> >>>> > >> >>>> > >> >>>> > >> >>>> > On Tue, Nov 3, 2009 at 7:48 AM, Raymond Yau < >> >>>> superquad.vortex2(a)gmail.com>wrote: >> >>>> > >> >>>> >> I guess route plugin used by RME96*.conf does not support mmap >> when >> >>>> there >> >>>> >> is >> >>>> >> channel conversion since minimum channels supported by hdsp is 14 >> >>>> >> >> >>>> >> >> >>>> >> static struct snd_pcm_hardware snd_hdsp_playback_subinfo = >> >>>> >> { >> >>>> >> .info = (SNDRV_PCM_INFO_MMAP | >> >>>> >> SNDRV_PCM_INFO_MMAP_VALID | >> >>>> >> SNDRV_PCM_INFO_NONINTERLEAVED | >> >>>> >> SNDRV_PCM_INFO_SYNC_START | >> >>>> >> SNDRV_PCM_INFO_DOUBLE), >> >>>> >> #ifdef SNDRV_BIG_ENDIAN >> >>>> >> .formats = SNDRV_PCM_FMTBIT_S32_BE, >> >>>> >> #else >> >>>> >> .formats = SNDRV_PCM_FMTBIT_S32_LE, >> >>>> >> #endif >> >>>> >> .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), >> >>>> >> .rate_min = 32000, >> >>>> >> .rate_max = 96000, >> >>>> >> .channels_min = 14, >> >>>> >> .channels_max = HDSP_MAX_CHANNELS, >> >>>> >> .buffer_bytes_max = HDSP_CHANNEL_BUFFER_BYTES * >> HDSP_MAX_CHANNELS, >> >>>> >> .period_bytes_min = (64 * 4) * 10, >> >>>> >> .period_bytes_max = (8192 * 4) * HDSP_MAX_CHANNELS, >> >>>> >> .periods_min = 2, >> >>>> >> .periods_max = 2, >> >>>> >> .fifo_size = 0 >> >>>> >> }; >> >>>> >> >> >>>> >> 2009/11/2 Lars Zobbe <fedesensfar(a)gmail.com> >> >>>> >> >> >>>> >> > Hi. >> >>>> >> > >> >>>> >> > Talking to one of the pulseaudio developers (*Colin Guthrie*) >> about >> >>>> a >> >>>> >> > problem with pulseaudio loading modules and my sound card (RME >> HDSP >> >>>> >> 9632), >> >>>> >> > I >> >>>> >> > was adviced to inform you about the problem. >> >>>> >> > >> >>>> >> > I'm on ubuntu 9.10, 64bit, kernel 2.6.31 with an amd64 x2 3800+ >> >>>> >> processor. >> >>>> >> > >> >>>> >> > >> >>>> >> > Symptoms are: >> >>>> >> > Can only make pulseaudio load modules with the deprecated >> >>>> load-module >> >>>> >> > module-detect command, module-udev-detect doesn't detect >> anything >> >>>> (no >> >>>> >> sound >> >>>> >> > - only null sink output in padevchooser). >> >>>> >> > I get terrible stuttering. >> >>>> >> > I can remove pulseaudio and make things work, more or less. >> >>>> However, >> >>>> >> that >> >>>> >> > leaves me without software mixing and apps fighting for the >> rights >> >>>> to >> >>>> >> make >> >>>> >> > sound. And more inconveniences (fx. no volume-control). >> >>>> >> > I can play sound from audacity without stuttering by choosing >> the >> >>>> >> cardname >> >>>> >> > directly in output HDSP, not ALSA, not pulseaudio. >> >>>> >> > >> >>>> >> > >> >>>> >> > When trying to run alsa-info.sh I get a lot of "not found" >> errors. >> >>>> So >> >>>> >> > you'll >> >>>> >> > get some manual info (they might have moved som files around in >> >>>> ubuntu >> >>>> >> > 9.10). >> >>>> >> > >> >>>> >> > This is part of my syslog during a boot. (I did the formatting >> to >> >>>> bold). >> >>>> >> > >> >>>> >> > Nov 2 10:57:32 lars-desktop pulseaudio[1524]: module.c: >> >>>> module-detect >> >>>> >> is >> >>>> >> > deprecated: Please use module-udev-detect instead of >> module-detect! >> >>>> >> > Nov 2 10:57:37 lars-desktop pulseaudio[1524]: ratelimit.c: 27 >> >>>> events >> >>>> >> > suppressed >> >>>> >> > Nov 2 10:57:39 lars-desktop pulseaudio[1612]: module.c: >> >>>> module-detect >> >>>> >> is >> >>>> >> > deprecated: Please use module-udev-detect instead of >> module-detect! >> >>>> >> > Nov 2 10:57:44 lars-desktop pulseaudio[1612]: ratelimit.c: 23 >> >>>> events >> >>>> >> > suppressed >> >>>> >> > Nov 2 10:57:44 lars-desktop pulseaudio[1612]: alsa-sink.c: ALSA >> >>>> woke us >> >>>> >> up >> >>>> >> > to write new data to the device, but there was actually nothing >> to >> >>>> >> write! >> >>>> >> > Nov 2 10:57:44 lars-desktop pulseaudio[1612]: alsa-sink.c: >> *Most >> >>>> likely >> >>>> >> > this is a bug in the ALSA driver 'snd_hdsp'. Please report this >> >>>> issue to >> >>>> >> > the >> >>>> >> > ALSA developers.* >> >>>> >> > Nov 2 10:57:44 lars-desktop pulseaudio[1612]: alsa-sink.c: We >> were >> >>>> >> woken >> >>>> >> > up >> >>>> >> > with POLLOUT set -- however a subsequent snd_pcm_avail() >> returned 0 >> >>>> or >> >>>> >> > another value < min_avail. >> >>>> >> > Nov 2 10:57:49 lars-desktop pulseaudio[1612]: ratelimit.c: 99 >> >>>> events >> >>>> >> > suppressed >> >>>> >> > >> >>>> >> > Later if I try to play audio I get terrible skipping or >> stuttering >> >>>> and >> >>>> >> my >> >>>> >> > syslog (in less than a minute) writes: >> >>>> >> > Nov 2 11:55:16 lars-desktop pulseaudio[1612]: ratelimit.c: 16 >> >>>> events >> >>>> >> > suppressed >> >>>> >> > Nov 2 11:55:21 lars-desktop pulseaudio[1612]: ratelimit.c: 34 >> >>>> events >> >>>> >> > suppressed >> >>>> >> > Nov 2 11:55:26 lars-desktop pulseaudio[1612]: ratelimit.c: 70 >> >>>> events >> >>>> >> > suppressed >> >>>> >> > Nov 2 11:55:31 lars-desktop pulseaudio[1612]: ratelimit.c: 29 >> >>>> events >> >>>> >> > suppressed >> >>>> >> > Nov 2 11:55:36 lars-desktop pulseaudio[1612]: ratelimit.c: 43 >> >>>> events >> >>>> >> > suppressed >> >>>> >> > Nov 2 11:55:41 lars-desktop pulseaudio[1612]: ratelimit.c: 161 >> >>>> events >> >>>> >> > suppressed >> >>>> >> > Nov 2 11:55:46 lars-desktop pulseaudio[1612]: ratelimit.c: 28 >> >>>> events >> >>>> >> > suppressed >> >>>> >> > Nov 2 11:55:51 lars-desktop pulseaudio[1612]: ratelimit.c: 18 >> >>>> events >> >>>> >> > suppressed >> >>>> >> > Nov 2 11:55:56 lars-desktop pulseaudio[1612]: ratelimit.c: 16 >> >>>> events >> >>>> >> > suppressed >> >>>> >> > >> >>>> >> > Here's the relevant part (concerning my sound card) of lspci >> -vvv >> >>>> >> > >> >>>> >> > 02:09.0 Multimedia audio controller: Xilinx Corporation RME >> >>>> Hammerfall >> >>>> >> DSP >> >>>> >> > (rev 9a) >> >>>> >> > Control: I/O- Mem+ BusMaster+ SpecCycle- MemWINV- VGASnoop- >> >>>> ParErr- >> >>>> >> > Stepping- SERR- FastB2B- DisINTx- >> >>>> >> > Status: Cap- 66MHz- UDF- FastB2B- ParErr- DEVSEL=medium >> >TAbort- >> >>>> >> > <TAbort- <MAbort- >SERR- <PERR- INTx- >> >>>> >> > Latency: 255 >> >>>> >> > Interrupt: pin A routed to IRQ 19 >> >>>> >> > Region 0: Memory at fdff0000 (32-bit, non-prefetchable) >> >>>> [size=64K] >> >>>> >> > Kernel driver in use: RME Hammerfall DSP >> >>>> >> > Kernel modules: snd-hdsp >> >>>> >> > >> >>>> >> > And: >> >>>> >> > lars@lars-desktop:~$ aplay -l >> >>>> >> > **** List of PLAYBACK Hardware Devices **** >> >>>> >> > card 0: DSP [Hammerfall DSP], device 0: RME Hammerfall HDSP 9632 >> >>>> [RME >> >>>> >> > Hammerfall HDSP 9632] >> >>>> >> > Subdevices: 1/1 >> >>>> >> > Subdevice #0: subdevice #0 >> >>>> >> > >> >>>> >> > >> >>>> >> > lars@lars-desktop:~$ cat /proc/asound/version >> >>>> >> > Advanced Linux Sound Architecture Driver Version 1.0.21. >> >>>> >> > Compiled on Oct 15 2009 for kernel 2.6.31-14-generic (SMP). >> >>>> >> > >> >>>> >> > lars@lars-desktop:~$ cat /proc/asound/cards >> >>>> >> > 0 [DSP ]: H-DSP - Hammerfall DSP >> >>>> >> > RME Hammerfall HDSP 9632 at 0xfdff0000, irq >> 19 >> >>>> >> > >> >>>> >> > >> >>>> >> > lars@lars-desktop:~$ cat /proc/asound/modules >> >>>> >> > 0 snd_hdsp >> >>>> >> > >> >>>> >> > I don't have .asound.conf files. >> >>>> >> > >> >>>> >> > lars@lars-desktop:~$ hdsploader >> >>>> >> > hdsploader - firmware loader for RME Hammerfall DSP cards >> >>>> >> > Looking for HDSP + Multiface or Digiface cards : >> >>>> >> > Card 0 : RME Hammerfall HDSP 9632 at 0xfdff0000, irq 19 >> >>>> >> > >> >>>> >> > And of course. My computer makes no sound if I don't load the >> >>>> hdspmixer >> >>>> >> at >> >>>> >> > startup. I guess that's just normal for this card though. >> >>>> >> > >> >>>> >> > Please let me know, if you need more info. I really hope you can >> >>>> help >> >>>> >> out >> >>>> >> > here. And that this might help you to. >> >>>> >> > >> >>>> >> > Thanks for the great work you do. Greetings. >> >>>> >> > Lars Zobbe. >> >>>> >> > _______________________________________________ >> >>>> >> > Alsa-devel mailing list >> >>>> >> > Alsa-devel(a)alsa-project.org >> >>>> >> > http://mailman.alsa-project.org/mailman/listinfo/alsa-devel >> >>>> >> > >> >>>> >> _______________________________________________ >> >>>> >> Alsa-devel mailing list >> >>>> >> Alsa-devel(a)alsa-project.org >> >>>> >> http://mailman.alsa-project.org/mailman/listinfo/alsa-devel >> >>>> >> >> >>>> > >> >>>> > >> >>>> _______________________________________________ >> >>>> Alsa-devel mailing list >> >>>> Alsa-devel(a)alsa-project.org >> >>>> http://mailman.alsa-project.org/mailman/listinfo/alsa-devel >> >>>> >> >>> >> >>> >> >> >> > >> _______________________________________________ >> Alsa-devel mailing list >> Alsa-devel(a)alsa-project.org >> http://mailman.alsa-project.org/mailman/listinfo/alsa-devel >> > >

1 0

[alsa-devel] [PATCH 6/7] S3C64XX PCM: Defined PCM controller platform devices
by Jassi Brar 08 Nov '09

08 Nov '09

Signed-off-by: Jassi Brar <jassi.brar(a)samsung.com> --- arch/arm/plat-s3c/include/plat/devs.h | 3 + arch/arm/plat-s3c64xx/dev-audio.c | 101 ++++++++++++++++++++++++++++++++- 2 files changed, 103 insertions(+), 1 deletions(-) diff --git a/arch/arm/plat-s3c/include/plat/devs.h b/arch/arm/plat-s3c/include/plat/devs.h index 0f540ea..932cbbb 100644 --- a/arch/arm/plat-s3c/include/plat/devs.h +++ b/arch/arm/plat-s3c/include/plat/devs.h @@ -28,6 +28,9 @@ extern struct platform_device s3c64xx_device_iis0; extern struct platform_device s3c64xx_device_iis1; extern struct platform_device s3c64xx_device_iisv4; +extern struct platform_device s3c64xx_device_pcm0; +extern struct platform_device s3c64xx_device_pcm1; + extern struct platform_device s3c_device_fb; extern struct platform_device s3c_device_usb; extern struct platform_device s3c_device_lcd; diff --git a/arch/arm/plat-s3c64xx/dev-audio.c b/arch/arm/plat-s3c64xx/dev-audio.c index 1322beb..c7f1acc 100644 --- a/arch/arm/plat-s3c64xx/dev-audio.c +++ b/arch/arm/plat-s3c64xx/dev-audio.c @@ -15,9 +15,14 @@ #include <mach/irqs.h> #include <mach/map.h> +#include <mach/dma.h> +#include <mach/gpio.h> #include <plat/devs.h> - +#include <plat/audio.h> +#include <plat/gpio-bank-d.h> +#include <plat/gpio-bank-e.h> +#include <plat/gpio-cfg.h> static struct resource s3c64xx_iis0_resource[] = { [0] = { @@ -66,3 +71,97 @@ struct platform_device s3c64xx_device_iisv4 = { .resource = s3c64xx_iisv4_resource, }; EXPORT_SYMBOL(s3c64xx_device_iisv4); + + +/* PCM Controller platform_devices */ + +static int s3c64xx_pcm_cfg_gpio(struct platform_device *pdev) +{ + switch (pdev->id) { + case 0: + s3c_gpio_cfgpin(S3C64XX_GPD(0), S3C64XX_GPD0_PCM0_SCLK); + s3c_gpio_cfgpin(S3C64XX_GPD(1), S3C64XX_GPD1_PCM0_EXTCLK); + s3c_gpio_cfgpin(S3C64XX_GPD(2), S3C64XX_GPD2_PCM0_FSYNC); + s3c_gpio_cfgpin(S3C64XX_GPD(3), S3C64XX_GPD3_PCM0_SIN); + s3c_gpio_cfgpin(S3C64XX_GPD(4), S3C64XX_GPD4_PCM0_SOUT); + break; + case 1: + s3c_gpio_cfgpin(S3C64XX_GPE(0), S3C64XX_GPE0_PCM1_SCLK); + s3c_gpio_cfgpin(S3C64XX_GPE(1), S3C64XX_GPE1_PCM1_EXTCLK); + s3c_gpio_cfgpin(S3C64XX_GPE(2), S3C64XX_GPE2_PCM1_FSYNC); + s3c_gpio_cfgpin(S3C64XX_GPE(3), S3C64XX_GPE3_PCM1_SIN); + s3c_gpio_cfgpin(S3C64XX_GPE(4), S3C64XX_GPE4_PCM1_SOUT); + break; + default: + printk(KERN_DEBUG "Invalid PCM Controller number!"); + return -EINVAL; + } + + return 0; +} + +static struct resource s3c64xx_pcm0_resource[] = { + [0] = { + .start = S3C64XX_PA_PCM0, + .end = S3C64XX_PA_PCM0 + 0x100 - 1, + .flags = IORESOURCE_MEM, + }, + [1] = { + .start = DMACH_PCM0_TX, + .end = DMACH_PCM0_TX, + .flags = IORESOURCE_DMA, + }, + [2] = { + .start = DMACH_PCM0_RX, + .end = DMACH_PCM0_RX, + .flags = IORESOURCE_DMA, + }, +}; + +struct s3c_audio_pdata s3c_pcm0_pdata = { + .cfg_gpio = s3c64xx_pcm_cfg_gpio, +}; + +struct platform_device s3c64xx_device_pcm0 = { + .name = "s3c-pcm", + .id = 0, + .num_resources = ARRAY_SIZE(s3c64xx_pcm0_resource), + .resource = s3c64xx_pcm0_resource, + .dev = { + .platform_data = &s3c_pcm0_pdata, + }, +}; +EXPORT_SYMBOL(s3c64xx_device_pcm0); + +static struct resource s3c64xx_pcm1_resource[] = { + [0] = { + .start = S3C64XX_PA_PCM1, + .end = S3C64XX_PA_PCM1 + 0x100 - 1, + .flags = IORESOURCE_MEM, + }, + [1] = { + .start = DMACH_PCM1_TX, + .end = DMACH_PCM1_TX, + .flags = IORESOURCE_DMA, + }, + [2] = { + .start = DMACH_PCM1_RX, + .end = DMACH_PCM1_RX, + .flags = IORESOURCE_DMA, + }, +}; + +struct s3c_audio_pdata s3c_pcm1_pdata = { + .cfg_gpio = s3c64xx_pcm_cfg_gpio, +}; + +struct platform_device s3c64xx_device_pcm1 = { + .name = "s3c-pcm", + .id = 1, + .num_resources = ARRAY_SIZE(s3c64xx_pcm1_resource), + .resource = s3c64xx_pcm1_resource, + .dev = { + .platform_data = &s3c_pcm1_pdata, + }, +}; +EXPORT_SYMBOL(s3c64xx_device_pcm1); -- 1.6.2.5

3 4

[alsa-devel] [PATCH] S3C64XX I2S: Enable audio-bus clock
by Jassi Brar 07 Nov '09

07 Nov '09

Added the missing clk_enable after acquiring the 'audio-bus' clock. Signed-off-by: Jassi Brar <jassi.brar(a)samsung.com> --- sound/soc/s3c24xx/s3c64xx-i2s.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/sound/soc/s3c24xx/s3c64xx-i2s.c b/sound/soc/s3c24xx/s3c64xx-i2s.c index b67eed5..d68cae1 100644 --- a/sound/soc/s3c24xx/s3c64xx-i2s.c +++ b/sound/soc/s3c24xx/s3c64xx-i2s.c @@ -236,6 +236,8 @@ static __devinit int s3c64xx_iis_dev_probe(struct platform_device *pdev) goto err; } + clk_enable(i2s->iis_cclk); + ret = s3c_i2sv2_probe(pdev, dai, i2s, 0); if (ret) goto err_clk; -- 1.6.2.5

3 5

[alsa-devel] [PATCH 7/7] S3C PCM: Added the CPU driver for PCM controllers
by Jassi Brar 07 Nov '09

07 Nov '09

Signed-off-by: Jassi Brar <jassi.brar(a)samsung.com> --- sound/soc/s3c24xx/Kconfig | 3 + sound/soc/s3c24xx/Makefile | 2 + sound/soc/s3c24xx/s3c-pcm.c | 558 +++++++++++++++++++++++++++++++++++++++++++ sound/soc/s3c24xx/s3c-pcm.h | 123 ++++++++++ 4 files changed, 686 insertions(+), 0 deletions(-) create mode 100644 sound/soc/s3c24xx/s3c-pcm.c create mode 100644 sound/soc/s3c24xx/s3c-pcm.h diff --git a/sound/soc/s3c24xx/Kconfig b/sound/soc/s3c24xx/Kconfig index d7912f1..b489f1a 100644 --- a/sound/soc/s3c24xx/Kconfig +++ b/sound/soc/s3c24xx/Kconfig @@ -24,6 +24,9 @@ config SND_S3C64XX_SOC_I2S select SND_S3C_I2SV2_SOC select S3C64XX_DMA +config SND_S3C_SOC_PCM + tristate + config SND_S3C2443_SOC_AC97 tristate select S3C2410_DMA diff --git a/sound/soc/s3c24xx/Makefile b/sound/soc/s3c24xx/Makefile index 3bdb74d..8835d59 100644 --- a/sound/soc/s3c24xx/Makefile +++ b/sound/soc/s3c24xx/Makefile @@ -5,6 +5,7 @@ snd-soc-s3c2412-i2s-objs := s3c2412-i2s.o snd-soc-s3c64xx-i2s-objs := s3c64xx-i2s.o snd-soc-s3c2443-ac97-objs := s3c2443-ac97.o snd-soc-s3c-i2s-v2-objs := s3c-i2s-v2.o +snd-soc-s3c-pcm-objs := s3c-pcm.o obj-$(CONFIG_SND_S3C24XX_SOC) += snd-soc-s3c24xx.o obj-$(CONFIG_SND_S3C24XX_SOC_I2S) += snd-soc-s3c24xx-i2s.o @@ -12,6 +13,7 @@ obj-$(CONFIG_SND_S3C2443_SOC_AC97) += snd-soc-s3c2443-ac97.o obj-$(CONFIG_SND_S3C2412_SOC_I2S) += snd-soc-s3c2412-i2s.o obj-$(CONFIG_SND_S3C64XX_SOC_I2S) += snd-soc-s3c64xx-i2s.o obj-$(CONFIG_SND_S3C_I2SV2_SOC) += snd-soc-s3c-i2s-v2.o +obj-$(CONFIG_SND_S3C_SOC_PCM) += snd-soc-s3c-pcm.o # S3C24XX Machine Support snd-soc-jive-wm8750-objs := jive_wm8750.o diff --git a/sound/soc/s3c24xx/s3c-pcm.c b/sound/soc/s3c24xx/s3c-pcm.c new file mode 100644 index 0000000..04ddf9d --- /dev/null +++ b/sound/soc/s3c24xx/s3c-pcm.c @@ -0,0 +1,558 @@ +/* sound/soc/s3c24xx/s3c-pcm.c + * + * ALSA SoC Audio Layer - S3C PCM-Controller driver + * + * Copyright (c) 2009 Samsung Electronics Co. Ltd + * Author: Jaswinder Singh <jassi.brar(a)samsung.com> + * based upon I2S drivers by Ben Dooks. + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License version 2 as + * published by the Free Software Foundation. + */ + +#include <linux/init.h> +#include <linux/module.h> +#include <linux/device.h> +#include <linux/delay.h> +#include <linux/clk.h> +#include <linux/kernel.h> +#include <linux/gpio.h> +#include <linux/io.h> + +#include <sound/core.h> +#include <sound/pcm.h> +#include <sound/pcm_params.h> +#include <sound/initval.h> +#include <sound/soc.h> + +#include <plat/audio.h> +#include <plat/dma.h> + +#include "s3c-audio.h" +#include "s3c-pcm.h" + +static struct s3c2410_dma_client s3c_pcm_dma_client_out = { + .name = "PCM Stereo out" +}; + +static struct s3c2410_dma_client s3c_pcm_dma_client_in = { + .name = "PCM Stereo in" +}; + +static struct s3c_audio_dma_params s3c_pcm_stereo_out[] = { + [0] = { + .client = &s3c_pcm_dma_client_out, + .dma_size = 4, + }, + [1] = { + .client = &s3c_pcm_dma_client_out, + .dma_size = 4, + }, +}; + +static struct s3c_audio_dma_params s3c_pcm_stereo_in[] = { + [0] = { + .client = &s3c_pcm_dma_client_in, + .dma_size = 4, + }, + [1] = { + .client = &s3c_pcm_dma_client_in, + .dma_size = 4, + }, +}; + +static struct s3c_pcm_info s3c_pcm[2]; + +static inline struct s3c_pcm_info *to_info(struct snd_soc_dai *cpu_dai) +{ + return cpu_dai->private_data; +} + +static void s3c_pcm_snd_txctrl(struct s3c_pcm_info *pcm, int on) +{ + void __iomem *regs = pcm->regs; + u32 ctl, clkctl; + + clkctl = readl(regs + S3C_PCM_CLKCTL); + ctl = readl(regs + S3C_PCM_CTL); + ctl &= ~(S3C_PCM_CTL_TXDIPSTICK_MASK + << S3C_PCM_CTL_TXDIPSTICK_SHIFT); + + if (on) { + ctl |= S3C_PCM_CTL_TXDMA_EN; + ctl |= S3C_PCM_CTL_TXFIFO_EN; + ctl |= S3C_PCM_CTL_ENABLE; + ctl |= (0x20<<S3C_PCM_CTL_TXDIPSTICK_SHIFT); + clkctl |= S3C_PCM_CLKCTL_SERCLK_EN; + } else { + ctl &= ~S3C_PCM_CTL_TXDMA_EN; + ctl &= ~S3C_PCM_CTL_TXFIFO_EN; + + if (!(ctl & S3C_PCM_CTL_RXFIFO_EN)) { + ctl &= ~S3C_PCM_CTL_ENABLE; + if (!pcm->idleclk) + clkctl |= S3C_PCM_CLKCTL_SERCLK_EN; + } + } + + writel(clkctl, regs + S3C_PCM_CLKCTL); + writel(ctl, regs + S3C_PCM_CTL); +} + +static void s3c_pcm_snd_rxctrl(struct s3c_pcm_info *pcm, int on) +{ + void __iomem *regs = pcm->regs; + u32 ctl, clkctl; + + ctl = readl(regs + S3C_PCM_CTL); + clkctl = readl(regs + S3C_PCM_CLKCTL); + + if (on) { + ctl |= S3C_PCM_CTL_RXDMA_EN; + ctl |= S3C_PCM_CTL_RXFIFO_EN; + ctl |= S3C_PCM_CTL_ENABLE; + clkctl |= S3C_PCM_CLKCTL_SERCLK_EN; + } else { + ctl &= ~S3C_PCM_CTL_RXDMA_EN; + ctl &= ~S3C_PCM_CTL_RXFIFO_EN; + + if (!(ctl & S3C_PCM_CTL_TXFIFO_EN)) { + ctl &= ~S3C_PCM_CTL_ENABLE; + if (!pcm->idleclk) + clkctl |= S3C_PCM_CLKCTL_SERCLK_EN; + } + } + + writel(clkctl, regs + S3C_PCM_CLKCTL); + writel(ctl, regs + S3C_PCM_CTL); +} + +static int s3c_pcm_trigger(struct snd_pcm_substream *substream, int cmd, + struct snd_soc_dai *dai) +{ + struct snd_soc_pcm_runtime *rtd = substream->private_data; + struct s3c_pcm_info *pcm = to_info(rtd->dai->cpu_dai); + + dev_dbg(pcm->dev, "Entered %s\n", __func__); + + switch (cmd) { + case SNDRV_PCM_TRIGGER_START: + case SNDRV_PCM_TRIGGER_RESUME: + case SNDRV_PCM_TRIGGER_PAUSE_RELEASE: + spin_lock_irq(&pcm->lock); + + if (substream->stream == SNDRV_PCM_STREAM_CAPTURE) + s3c_pcm_snd_rxctrl(pcm, 1); + else + s3c_pcm_snd_txctrl(pcm, 1); + + spin_unlock_irq(&pcm->lock); + break; + + case SNDRV_PCM_TRIGGER_STOP: + case SNDRV_PCM_TRIGGER_SUSPEND: + case SNDRV_PCM_TRIGGER_PAUSE_PUSH: + spin_lock_irq(&pcm->lock); + + if (substream->stream == SNDRV_PCM_STREAM_CAPTURE) + s3c_pcm_snd_rxctrl(pcm, 0); + else + s3c_pcm_snd_txctrl(pcm, 0); + + spin_unlock_irq(&pcm->lock); + break; + + default: + return -EINVAL; + } + + return 0; +} + +static int s3c_pcm_hw_params(struct snd_pcm_substream *substream, + struct snd_pcm_hw_params *params, + struct snd_soc_dai *socdai) +{ + struct snd_soc_pcm_runtime *rtd = substream->private_data; + struct snd_soc_dai_link *dai = rtd->dai; + struct s3c_pcm_info *pcm = to_info(dai->cpu_dai); + void __iomem *regs = pcm->regs; + struct clk *clk; + u32 clkctl; + int sclk_div, sync_div; + + dev_dbg(pcm->dev, "Entered %s\n", __func__); + + if (substream->stream == SNDRV_PCM_STREAM_PLAYBACK) + dai->cpu_dai->dma_data = pcm->dma_playback; + else + dai->cpu_dai->dma_data = pcm->dma_capture; + + /* Strictly check for sample size */ + switch (params_format(params)) { + case SNDRV_PCM_FORMAT_S16_LE: + break; + default: + return -EINVAL; + } + + spin_lock_irq(&pcm->lock); + + /* Get hold of the PCMSOURCE_CLK */ + clkctl = readl(regs + S3C_PCM_CLKCTL); + clk = (clkctl & S3C_PCM_CLKCTL_SERCLKSEL_PCLK) ? + pcm->pclk : pcm->cclk; + + /* Set the SCLK divider */ + sclk_div = clk_get_rate(clk) / pcm->sclk_per_fs / + params_rate(params) / 2 - 1; + + clkctl &= ~(S3C_PCM_CLKCTL_SCLKDIV_MASK + << S3C_PCM_CLKCTL_SCLKDIV_SHIFT); + clkctl |= ((sclk_div & S3C_PCM_CLKCTL_SCLKDIV_MASK) + << S3C_PCM_CLKCTL_SCLKDIV_SHIFT); + + /* Set the SYNC divider */ + sync_div = pcm->sclk_per_fs - 1; + + clkctl &= ~(S3C_PCM_CLKCTL_SYNCDIV_MASK + << S3C_PCM_CLKCTL_SYNCDIV_SHIFT); + clkctl |= ((sync_div & S3C_PCM_CLKCTL_SYNCDIV_MASK) + << S3C_PCM_CLKCTL_SYNCDIV_SHIFT); + + writel(clkctl, regs + S3C_PCM_CLKCTL); + + spin_unlock_irq(&pcm->lock); + + dev_dbg(pcm->dev, "PCMSOURCE_CLK-%lu SCLK=%ufs \ + SCLK_DIV=%d SYNC_DIV=%d\n", + clk_get_rate(clk), pcm->sclk_per_fs, + sclk_div, sync_div); + + return 0; +} + +static int s3c_pcm_set_fmt(struct snd_soc_dai *cpu_dai, + unsigned int fmt) +{ + struct s3c_pcm_info *pcm = to_info(cpu_dai); + void __iomem *regs = pcm->regs; + u32 ctl; + + dev_dbg(pcm->dev, "Entered %s\n", __func__); + + spin_lock_irq(&pcm->lock); + + ctl = readl(regs + S3C_PCM_CTL); + + switch (fmt & SND_SOC_DAIFMT_INV_MASK) { + case SND_SOC_DAIFMT_NB_NF: + /* Nothing to do, NB_NF by default */ + break; + default: + spin_unlock_irq(&pcm->lock); + dev_err(pcm->dev, "Unsupported clock inversion!\n"); + return -EINVAL; + } + + switch (fmt & SND_SOC_DAIFMT_MASTER_MASK) { + case SND_SOC_DAIFMT_CBS_CFS: + /* Nothing to do, Master by default */ + break; + default: + spin_unlock_irq(&pcm->lock); + dev_err(pcm->dev, "Unsupported master/slave format!\n"); + return -EINVAL; + } + + switch (fmt & SND_SOC_DAIFMT_CLOCK_MASK) { + case SND_SOC_DAIFMT_CONT: + pcm->idleclk = 1; + break; + case SND_SOC_DAIFMT_GATED: + pcm->idleclk = 0; + break; + default: + spin_unlock_irq(&pcm->lock); + dev_err(pcm->dev, "Invalid Clock gating request!\n"); + return -EINVAL; + } + + switch (fmt & SND_SOC_DAIFMT_FORMAT_MASK) { + case SND_SOC_DAIFMT_DSP_A: + ctl |= S3C_PCM_CTL_TXMSB_AFTER_FSYNC; + ctl |= S3C_PCM_CTL_RXMSB_AFTER_FSYNC; + break; + case SND_SOC_DAIFMT_DSP_B: + ctl &= ~S3C_PCM_CTL_TXMSB_AFTER_FSYNC; + ctl &= ~S3C_PCM_CTL_RXMSB_AFTER_FSYNC; + break; + default: + spin_unlock_irq(&pcm->lock); + dev_err(pcm->dev, "Unsupported data format!\n"); + return -EINVAL; + } + + writel(ctl, regs + S3C_PCM_CTL); + + spin_unlock_irq(&pcm->lock); + + return 0; +} + +static int s3c_pcm_set_clkdiv(struct snd_soc_dai *cpu_dai, + int div_id, int div) +{ + struct s3c_pcm_info *pcm = to_info(cpu_dai); + + switch (div_id) { + case S3C_PCM_SCLK_PER_FS: + pcm->sclk_per_fs = div; + break; + + default: + return -EINVAL; + } + + return 0; +} + +static int s3c_pcm_set_sysclk(struct snd_soc_dai *cpu_dai, + int clk_id, unsigned int freq, int dir) +{ + struct s3c_pcm_info *pcm = to_info(cpu_dai); + void __iomem *regs = pcm->regs; + u32 clkctl = readl(regs + S3C_PCM_CLKCTL); + + switch (clk_id) { + case S3C_PCM_CLKSRC_PCLK: + clkctl |= S3C_PCM_CLKCTL_SERCLKSEL_PCLK; + break; + + case S3C_PCM_CLKSRC_MUX: + clkctl &= ~S3C_PCM_CLKCTL_SERCLKSEL_PCLK; + + if (clk_get_rate(pcm->cclk) != freq) + clk_set_rate(pcm->cclk, freq); + + break; + + default: + return -EINVAL; + } + + writel(clkctl, regs + S3C_PCM_CLKCTL); + + return 0; +} + +struct clk *s3c_pcm_get_clock(struct snd_soc_dai *cpu_dai) +{ + struct s3c_pcm_info *pcm = to_info(cpu_dai); + void __iomem *regs = pcm->regs; + u32 clkctl = readl(regs + S3C_PCM_CLKCTL); + + if (clkctl & S3C_PCM_CLKCTL_SERCLKSEL_PCLK) + return pcm->pclk; + else + return pcm->cclk; +} +EXPORT_SYMBOL_GPL(s3c_pcm_get_clock); + +static struct snd_soc_dai_ops s3c_pcm_dai_ops = { + .set_sysclk = s3c_pcm_set_sysclk, + .set_clkdiv = s3c_pcm_set_clkdiv, + .trigger = s3c_pcm_trigger, + .hw_params = s3c_pcm_hw_params, + .set_fmt = s3c_pcm_set_fmt, +}; + +#define S3C_PCM_RATES SNDRV_PCM_RATE_8000_96000 + +#define S3C_PCM_DECLARE(n) \ +{ \ + .name = "s3c-pcm", \ + .id = (n), \ + .symmetric_rates = 1, \ + .ops = &s3c_pcm_dai_ops, \ + .playback = { \ + .channels_min = 2, \ + .channels_max = 2, \ + .rates = S3C_PCM_RATES, \ + .formats = SNDRV_PCM_FMTBIT_S16_LE, \ + }, \ + .capture = { \ + .channels_min = 2, \ + .channels_max = 2, \ + .rates = S3C_PCM_RATES, \ + .formats = SNDRV_PCM_FMTBIT_S16_LE, \ + }, \ +} + +struct snd_soc_dai s3c_pcm_dai[] = { + S3C_PCM_DECLARE(0), + S3C_PCM_DECLARE(1), +}; +EXPORT_SYMBOL_GPL(s3c_pcm_dai); + +static __devinit int s3c_pcm_dev_probe(struct platform_device *pdev) +{ + struct s3c_pcm_info *pcm; + struct snd_soc_dai *dai; + struct resource *mem_res, *dmatx_res, *dmarx_res; + struct s3c_audio_pdata *pcm_pdata; + int ret; + + /* Check for valid device index */ + if (pdev->id >= ARRAY_SIZE(s3c_pcm)) { + dev_err(&pdev->dev, "id %d out of range\n", pdev->id); + return -EINVAL; + } + + pcm_pdata = pdev->dev.platform_data; + + /* Check for availability of necessary resource */ + dmatx_res = platform_get_resource(pdev, IORESOURCE_DMA, 0); + if (!dmatx_res) { + dev_err(&pdev->dev, "Unable to get PCM-TX dma resource\n"); + return -ENXIO; + } + + dmarx_res = platform_get_resource(pdev, IORESOURCE_DMA, 1); + if (!dmarx_res) { + dev_err(&pdev->dev, "Unable to get PCM-RX dma resource\n"); + return -ENXIO; + } + + mem_res = platform_get_resource(pdev, IORESOURCE_MEM, 0); + if (!mem_res) { + dev_err(&pdev->dev, "Unable to get register resource\n"); + return -ENXIO; + } + + if (pcm_pdata && pcm_pdata->cfg_gpio && pcm_pdata->cfg_gpio(pdev)) { + dev_err(&pdev->dev, "Unable to configure gpio\n"); + return -EINVAL; + } + + pcm = &s3c_pcm[pdev->id]; + pcm->dev = &pdev->dev; + + spin_lock_init(&pcm->lock); + + dai = &s3c_pcm_dai[pdev->id]; + dai->dev = &pdev->dev; + + /* Default is 128fs */ + pcm->sclk_per_fs = 128; + + pcm->cclk = clk_get(&pdev->dev, "audio-bus"); + if (IS_ERR(pcm->cclk)) { + dev_err(&pdev->dev, "failed to get audio-bus\n"); + ret = PTR_ERR(pcm->cclk); + goto err1; + } + clk_enable(pcm->cclk); + + /* record our pcm structure for later use in the callbacks */ + dai->private_data = pcm; + + if (!request_mem_region(mem_res->start, + resource_size(mem_res), "s3c-pcm")) { + dev_err(&pdev->dev, "Unable to request register region\n"); + ret = -EBUSY; + goto err2; + } + + pcm->regs = ioremap(mem_res->start, 0x100); + if (pcm->regs == NULL) { + dev_err(&pdev->dev, "cannot ioremap registers\n"); + ret = -ENXIO; + goto err3; + } + + pcm->pclk = clk_get(&pdev->dev, "pcm"); + if (IS_ERR(pcm->pclk)) { + dev_err(&pdev->dev, "failed to get pcm_clock\n"); + ret = -ENOENT; + goto err4; + } + clk_enable(pcm->pclk); + + ret = snd_soc_register_dai(dai); + if (ret != 0) { + dev_err(&pdev->dev, "failed to get pcm_clock\n"); + goto err5; + } + + s3c_pcm_stereo_in[pdev->id].dma_addr = mem_res->start + + S3C_PCM_RXFIFO; + s3c_pcm_stereo_out[pdev->id].dma_addr = mem_res->start + + S3C_PCM_TXFIFO; + + s3c_pcm_stereo_in[pdev->id].channel = dmarx_res->start; + s3c_pcm_stereo_out[pdev->id].channel = dmatx_res->start; + + pcm->dma_capture = &s3c_pcm_stereo_in[pdev->id]; + pcm->dma_playback = &s3c_pcm_stereo_out[pdev->id]; + + return 0; + +err5: + clk_disable(pcm->pclk); + clk_put(pcm->pclk); +err4: + iounmap(pcm->regs); +err3: + release_mem_region(mem_res->start, resource_size(mem_res)); +err2: + clk_disable(pcm->cclk); + clk_put(pcm->cclk); +err1: + return ret; +} + +static __devexit int s3c_pcm_dev_remove(struct platform_device *pdev) +{ + struct s3c_pcm_info *pcm = &s3c_pcm[pdev->id]; + struct resource *mem_res; + + iounmap(pcm->regs); + + mem_res = platform_get_resource(pdev, IORESOURCE_MEM, 0); + release_mem_region(mem_res->start, resource_size(mem_res)); + + clk_disable(pcm->cclk); + clk_disable(pcm->pclk); + clk_put(pcm->pclk); + clk_put(pcm->cclk); + + return 0; +} + +static struct platform_driver s3c_pcm_driver = { + .probe = s3c_pcm_dev_probe, + .remove = s3c_pcm_dev_remove, + .driver = { + .name = "s3c-pcm", + .owner = THIS_MODULE, + }, +}; + +static int __init s3c_pcm_init(void) +{ + return platform_driver_register(&s3c_pcm_driver); +} +module_init(s3c_pcm_init); + +static void __exit s3c_pcm_exit(void) +{ + platform_driver_unregister(&s3c_pcm_driver); +} +module_exit(s3c_pcm_exit); + +/* Module information */ +MODULE_AUTHOR("Jaswinder Singh, <jassi.brar(a)samsung.com>"); +MODULE_DESCRIPTION("S3C PCM Controller Driver"); +MODULE_LICENSE("GPL"); diff --git a/sound/soc/s3c24xx/s3c-pcm.h b/sound/soc/s3c24xx/s3c-pcm.h new file mode 100644 index 0000000..4b89127 --- /dev/null +++ b/sound/soc/s3c24xx/s3c-pcm.h @@ -0,0 +1,123 @@ +/* sound/soc/s3c24xx/s3c-pcm.h + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License version 2 as + * published by the Free Software Foundation. + * + */ + +#ifndef __S3C_PCM_H +#define __S3C_PCM_H __FILE__ + +/*Register Offsets */ +#define S3C_PCM_CTL (0x00) +#define S3C_PCM_CLKCTL (0x04) +#define S3C_PCM_TXFIFO (0x08) +#define S3C_PCM_RXFIFO (0x0C) +#define S3C_PCM_IRQCTL (0x10) +#define S3C_PCM_IRQSTAT (0x14) +#define S3C_PCM_FIFOSTAT (0x18) +#define S3C_PCM_CLRINT (0x20) + +/* PCM_CTL Bit-Fields */ +#define S3C_PCM_CTL_TXDIPSTICK_MASK (0x3f) +#define S3C_PCM_CTL_TXDIPSTICK_SHIFT (13) +#define S3C_PCM_CTL_RXDIPSTICK_MSK (0x3f<<7) +#define S3C_PCM_CTL_TXDMA_EN (0x1<<6) +#define S3C_PCM_CTL_RXDMA_EN (0x1<<5) +#define S3C_PCM_CTL_TXMSB_AFTER_FSYNC (0x1<<4) +#define S3C_PCM_CTL_RXMSB_AFTER_FSYNC (0x1<<3) +#define S3C_PCM_CTL_TXFIFO_EN (0x1<<2) +#define S3C_PCM_CTL_RXFIFO_EN (0x1<<1) +#define S3C_PCM_CTL_ENABLE (0x1<<0) + +/* PCM_CLKCTL Bit-Fields */ +#define S3C_PCM_CLKCTL_SERCLK_EN (0x1<<19) +#define S3C_PCM_CLKCTL_SERCLKSEL_PCLK (0x1<<18) +#define S3C_PCM_CLKCTL_SCLKDIV_MASK (0x1ff) +#define S3C_PCM_CLKCTL_SYNCDIV_MASK (0x1ff) +#define S3C_PCM_CLKCTL_SCLKDIV_SHIFT (9) +#define S3C_PCM_CLKCTL_SYNCDIV_SHIFT (0) + +/* PCM_TXFIFO Bit-Fields */ +#define S3C_PCM_TXFIFO_DVALID (0x1<<16) +#define S3C_PCM_TXFIFO_DATA_MSK (0xffff<<0) + +/* PCM_RXFIFO Bit-Fields */ +#define S3C_PCM_RXFIFO_DVALID (0x1<<16) +#define S3C_PCM_RXFIFO_DATA_MSK (0xffff<<0) + +/* PCM_IRQCTL Bit-Fields */ +#define S3C_PCM_IRQCTL_IRQEN (0x1<<14) +#define S3C_PCM_IRQCTL_WRDEN (0x1<<12) +#define S3C_PCM_IRQCTL_TXEMPTYEN (0x1<<11) +#define S3C_PCM_IRQCTL_TXALMSTEMPTYEN (0x1<<10) +#define S3C_PCM_IRQCTL_TXFULLEN (0x1<<9) +#define S3C_PCM_IRQCTL_TXALMSTFULLEN (0x1<<8) +#define S3C_PCM_IRQCTL_TXSTARVEN (0x1<<7) +#define S3C_PCM_IRQCTL_TXERROVRFLEN (0x1<<6) +#define S3C_PCM_IRQCTL_RXEMPTEN (0x1<<5) +#define S3C_PCM_IRQCTL_RXALMSTEMPTEN (0x1<<4) +#define S3C_PCM_IRQCTL_RXFULLEN (0x1<<3) +#define S3C_PCM_IRQCTL_RXALMSTFULLEN (0x1<<2) +#define S3C_PCM_IRQCTL_RXSTARVEN (0x1<<1) +#define S3C_PCM_IRQCTL_RXERROVRFLEN (0x1<<0) + +/* PCM_IRQSTAT Bit-Fields */ +#define S3C_PCM_IRQSTAT_IRQPND (0x1<<13) +#define S3C_PCM_IRQSTAT_WRD_XFER (0x1<<12) +#define S3C_PCM_IRQSTAT_TXEMPTY (0x1<<11) +#define S3C_PCM_IRQSTAT_TXALMSTEMPTY (0x1<<10) +#define S3C_PCM_IRQSTAT_TXFULL (0x1<<9) +#define S3C_PCM_IRQSTAT_TXALMSTFULL (0x1<<8) +#define S3C_PCM_IRQSTAT_TXSTARV (0x1<<7) +#define S3C_PCM_IRQSTAT_TXERROVRFL (0x1<<6) +#define S3C_PCM_IRQSTAT_RXEMPT (0x1<<5) +#define S3C_PCM_IRQSTAT_RXALMSTEMPT (0x1<<4) +#define S3C_PCM_IRQSTAT_RXFULL (0x1<<3) +#define S3C_PCM_IRQSTAT_RXALMSTFULL (0x1<<2) +#define S3C_PCM_IRQSTAT_RXSTARV (0x1<<1) +#define S3C_PCM_IRQSTAT_RXERROVRFL (0x1<<0) + +/* PCM_FIFOSTAT Bit-Fields */ +#define S3C_PCM_FIFOSTAT_TXCNT_MSK (0x3f<<14) +#define S3C_PCM_FIFOSTAT_TXFIFOEMPTY (0x1<<13) +#define S3C_PCM_FIFOSTAT_TXFIFOALMSTEMPTY (0x1<<12) +#define S3C_PCM_FIFOSTAT_TXFIFOFULL (0x1<<11) +#define S3C_PCM_FIFOSTAT_TXFIFOALMSTFULL (0x1<<10) +#define S3C_PCM_FIFOSTAT_RXCNT_MSK (0x3f<<4) +#define S3C_PCM_FIFOSTAT_RXFIFOEMPTY (0x1<<3) +#define S3C_PCM_FIFOSTAT_RXFIFOALMSTEMPTY (0x1<<2) +#define S3C_PCM_FIFOSTAT_RXFIFOFULL (0x1<<1) +#define S3C_PCM_FIFOSTAT_RXFIFOALMSTFULL (0x1<<0) + +#define S3C_PCM_CLKSRC_PCLK 0 +#define S3C_PCM_CLKSRC_MUX 1 + +#define S3C_PCM_SCLK_PER_FS 0 + +/** + * struct s3c_pcm_info - S3C PCM Controller information + * @dev: The parent device passed to use from the probe. + * @regs: The pointer to the device register block. + * @dma_playback: DMA information for playback channel. + * @dma_capture: DMA information for capture channel. + */ +struct s3c_pcm_info { + spinlock_t lock; + struct device *dev; + void __iomem *regs; + + unsigned int sclk_per_fs; + + /* Whether to keep PCMSCLK enabled even when idle(no active xfer) */ + unsigned int idleclk; + + struct clk *pclk; + struct clk *cclk; + + struct s3c_audio_dma_params *dma_playback; + struct s3c_audio_dma_params *dma_capture; +}; + +#endif /* __S3C_PCM_H */ -- 1.6.2.5

3 3

[alsa-devel] [PATCH 5/7] S3C AUDIO: Add header to pass platform data to device drivers.
by Jassi Brar 07 Nov '09

07 Nov '09

Signed-off-by: Jassi Brar <jassi.brar(a)samsung.com> --- arch/arm/plat-s3c/include/plat/audio.h | 20 ++++++++++++++++++++ 1 files changed, 20 insertions(+), 0 deletions(-) create mode 100644 arch/arm/plat-s3c/include/plat/audio.h diff --git a/arch/arm/plat-s3c/include/plat/audio.h b/arch/arm/plat-s3c/include/plat/audio.h new file mode 100644 index 0000000..9b2007c --- /dev/null +++ b/arch/arm/plat-s3c/include/plat/audio.h @@ -0,0 +1,20 @@ +/* arch/arm/plat-s3c/include/plat/audio.h + * + * Copyright (c) 2009 Samsung Electronics Co. Ltd + * Author: Jaswinder Singh <jassi.brar(a)samsung.com> + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License version 2 as + * published by the Free Software Foundation. + */ + +/** + * struct s3c_audio_pdata - common platform data for audio device drivers + * @pdata: Pointer to protocol(I2S, PCM or AC97) specific platform data + * @cfg_gpio: Callback function to setup mux'ed pins in I2S/PCM/AC97 mode + */ +struct s3c_audio_pdata { + void *pdata; + + int (*cfg_gpio)(struct platform_device *); +}; -- 1.6.2.5

3 3

[alsa-devel] ASoC updates for 2.6.33
by Mark Brown 07 Nov '09

07 Nov '09

The following changes since commit b3f5a272a33ef06a37cd44703c46ec916b8a1c93: Peter Ujfalusi (1): ASoC: TWL4030: Make sure, that the codec is powered on startup are available in the git repository at: git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound-2.6.git for-2.6.33 Again this is mostly the merge up of rc6 so looks a lot bigger than it is. Aaro Koskinen (2): panic: Fix panic message visibility by calling bust_spinlocks(0) before dying omap: RX-51: Drop I2C-1 speed to 2200 Adam Jackson (1): drm/i915: Initialize HDMI outputs as HDMI connectors, not DVI. Ajit Khaparde (4): be2net: Fix a bug in preparation of mcc wrb which was causing flash operation to fail be2net: Bug Fix while accounting of multicast frames during netdev stats update be2net: Fix a typo in be_cmds.h be2net: Bug fix to properly update ethtool tx-checksumming after ethtool -K <ifname> tx off Alan Cox (9): libertas: fix build libertas: fix build ethoc: fix warning from 32bit build Staging: et131x: Correct WRAP bit handling Staging: et131x: Fix the add_10bit macro pata_sc1200: Fix crash on boot dpt_i2o: Fix up copy*user ray_cs: Fix copy_from_user handling tty: Mark generic_serial users as BROKEN Alan Stern (3): USB: serial: don't call release without attach USB: ipaq: fix oops when device is plugged in USB: storage: When a device returns no sense data, call it a Hardware Error Albert Herranz (1): b43: do not stack-allocate pio rx/tx header and tail buffers Alek Du (1): kbuild: Fix size_append issue for bzip2/lzma kernel Alex Chiang (7): Documentation: ABI: rename sysfs-devices-cache_disable properly Documentation: ABI: document /sys/devices/system/cpu/ Documentation: ABI: /sys/devices/system/cpu/ topology files Documentation: ABI: /sys/devices/system/cpu/cpu#/ topology files Documentation: ABI: /sys/devices/system/cpu/sched_[mc|smt]_power_savings Documentation: ABI: /sys/devices/system/cpu/cpuidle/ Documentation: ABI: /sys/devices/system/cpu/cpu#/node Alex Deucher (1): drm/radeon/kms: add support for "Surround View" Alex Elder (2): Merge branch 'master' into for-linus Merge branch 'master' of ssh://oss.sgi.com/oss/git/xfs/xfs into for-linus Alexander Duyck (4): e1000e: swap max hw supported frame size between 82574 and 82583 igb: fix memory leak when setting ring size while interface is down ixgbe: fix memory leak when resizing rings while interface is down igbvf: fix memory leak when ring size changed while interface down Alexey Dobriyan (4): Btrfs: constify dentry_operations headers: remove sched.h from interrupt.h loop: fix NULL dereference if mount fails sysctl: fix false positives when PROC_SYSCTL=n Alok Kataria (1): x86, vmi: Mark VMI deprecated and schedule it for removal Amerigo Wang (1): kbuild,scripts: use non-builtin echo for '-e' Amit Kucheria (1): Input: fix rx51 board keymap Amit Kumar Salecha (1): netxen: fix tx timeout handling on firmware hang Andi Kleen (4): HWPOISON: Clean up PR_MCE_KILL interface HWPOISON: Add brief hwpoison description to Documentation HWPOISON: Fix page count leak in hwpoison late kill in do_swap_page HWPOISON: Allow schedule_on_each_cpu() from keventd Andreas Gruenbacher (1): dnotify: ignore FS_EVENT_ON_CHILD Andreas Krebbel (1): [S390] Add highgprs facility to /proc/cpuinfo Andreas Schwab (3): tty: fix vt_compat_ioctl powerpc: Fix segment mapping in vdso32 powerpc: Align vDSO base address Andrew Morton (2): dm log: userspace fix incorrect luid cast in userspace_ctr revert "mm: oom analysis: add buffer cache information to show_free_areas()" Andrey Yurovsky (1): mac80211: trivial: fix spelling in mesh_hwmp Andy Whitcroft (7): checkpatch: possible types -- prevent illegal modifiers being added checkpatch: correctly stop scanning at the bottom of a hunk checkpatch: update copyright dates checkpatch: fix false errors due to macro concatenation checkpatch: fix __attribute__ matching checkpatch: fix false EXPORT_SYMBOL warning checkpatch: version 0.30 Anil Ravindranath (1): [SCSI] pmcraid: Changed driver prints to scmd/sdev_printk Anil Veerabhadrappa (1): [SCSI] bnx2i: Fix context mapping issue for architectures with PAGE_SIZE != 4096 Anirban Chakraborty (1): [SCSI] qla2xxx: Fix NULL ptr deref bug in fail path during queue create Anton Blanchard (2): futex: Fix typo in FUTEX_WAIT/WAKE_BITSET_PRIVATE definitions powerpc: Fix hypervisor TLB batching Anton Vorontsov (3): powerpc/kgdb: Fix build failure caused by "kgdb.c: unused variable 'acc'" net: Fix OF platform drivers coldplug/hotplug when compiled as modules USB: fsl_udc_core: Fix kernel oops on module removal Antonio Ospite (1): [ARM] pxamci: fix printing gpio numbers in pxamci_probe Anuj Aggarwal (1): omap: SDMA: Fixing bug in omap_dma_set_global_params() Arjan van de Ven (7): perf timechart: Add a power-only mode x86: Simplify bound checks in the MTRR code x86, timers: Check for pending timers after (device) interrupts perf timechart: Fix the wakeup-arrows that point to non-visible processes perf timechart: Improve the visual appearance of scheduler delays net: use WARN() for the WARN_ON in commit b6b39e8f3fbbb x86: Remove STACKPROTECTOR_ALL Arnaldo Carvalho de Melo (2): perf top: Add poll_idle to the skip list perf tools: elf_sym__is_function() should accept "zero" sized functions Arnaud Patard (1): MIPS: O32: Fix ppoll Arnd Bergmann (1): warn about use of uninstalled kernel headers Artem Bityutskiy (3): OMAP3: PM: introduce a new powerdomain walk helper ARM: 5759/1: Add register information of threads to coredump UBI: fix backward compatibility Ashwin Chaugule (1): perf tools: Remove static debugfs path from parse-events Atsushi Nemoto (1): MIPS: TXx9: Fix spi-baseclk value Aurelien Jarno (1): KVM: fix LAPIC timer period overflow Avi Kivity (1): KVM: Prevent overflow in KVM_GET_SUPPORTED_CPUID Barry Song (1): Blackfin: BF51x: add PTP MMR defines Bart Van Assche (1): IB: Fix typo in udev rule documentation Bartlomiej Zolnierkiewicz (7): pata_atp867x: fix it to not claim MWDMA support pata_atp867x: PIO support fixes pata_atp867x: add Power Management support sis5513: fix PIO setup for ATAPI devices Revert "Revert "ide: try to use PIO Mode 0 during probe if possible"" MAINTAINERS: rt2x00 list is moderated MAINTAINERS: rt2x00 list is moderated Ben Dooks (12): KS8851: Add soft reset at probe time KS8851: Fix MAC address write order KS8851: Fix ks8851_set_rx_mode() for IFF_MULTICAST DM9000: Fix revision ID for DM9000B ARM: S3C: Add info for supporting circular DMA buffers ARM: S3C2410: Fix link if CONFIG_S3C2410_IOTIMING is not set ARM: Merge fixes-s3c64xx ARM: Merge fixes-s3c64xx-dma ARM: S3C2440: mini2440: Fix missing CONFIG_S3C_DEV_USB_HOST ARM: S3C24XX: Fix warnings in arch/arm/plat-s3c24xx/gpio.c ARM: S3C2440: mini2440: Fix spare warnings ARM: S3C2410: Fix sparse warnings in arch/arm/mach-s3c2410/gpio.c Ben Hutchings (5): net: Support inclusion of <linux/socket.h> before <sys/socket.h> nfs: Avoid overrun when copying client IP address string acenic: Pass up error code from ace_load_firmware() sfc: Set ip_summed correctly for page buffers passed to GRO hfsplus: refuse to mount volumes larger than 2TB Benjamin Herrenschmidt (7): powerpc/pmac: Fix issues with sleep on some powerbooks powerpc/mm: Fix hang accessing top of vmalloc space usb-storage: Workaround devices with bogus sense size Merge commit 'ftrace/ppc' into merge powerpc/ppc64: Use preempt_schedule_irq instead of preempt_schedule Merge commit 'gcl/merge' into merge 8250_pci: add IBM Saturn serial card Benoit PAPILLAULT (1): rt2x00: Fix crypto in TX frame for rt2800usb Bernd Schmidt (1): ROMFS: fix length used with romfs_dev_strnlen() function Bjorn Helgaas (3): PCI: PCIe portdrv: remove "-driver" from driver name PCI: remove pci_assign_resource_fixed() iwlwifi: use %pM for formatted MAC addresses Björn Smedman (1): mac80211: fix for incorrect sequence number on hostapd injected frames Bo Liu (1): mm: remove incorrect swap_count() from try_to_unuse() Borislav Petkov (10): initcalls: Add early_initcall() for modules x86: EDAC: carve out AMD MCE decoding logic amd64_edac: fix driver instance lookup table allocation amd64_edac: fix DRAM base and limit address extraction amd64_edac: fix interleave enable tests amd64_edac: fix K8 intlv_sel check amd64_edac: fix chip select handling amd64_edac: fix DRAM base and limit extraction amd64_edac: beef up DRAM error injection amd64_edac: fix DRAM base and limit extraction masks, v2 Brandon Philips (1): sky2: set carrier off in probe Brian Niebuhr (1): USB: gadget: Fix EEM driver comments and VID/PID Brian Rogers (1): drm/i915: Don't call intel_update_fbc from intel_crtc_cursor_set Brice Goglin (1): myri10ge: improve port type reporting in ethtool Bruce Allan (9): e1000e: reset the PHY on 82577/82578 when going to Sx e1000e: clear PHY wakeup bit after LCD reset on 82577/82578 e1000e: increase swflag acquisition timeout for ICHx/PCH e1000e: 82577/82578 requires a different method to configure LPLU e1000e: separate mutex usage between NVM and PHY/CSR register for ICHx/PCH e1000e: allow for swflag to be held over consecutive PHY accesses e100: e100_phy_init() isolates selected PHY, causes 10 second boot delay e1000e: config PHY via software after resets e1000e: rework disable K1 at 1000Mbps for 82577/82578 Bryan Wu (1): USB: option: TLAYTECH TUE800 support Catalin Marinas (4): ARM: 5746/1: Handle possible translation errors in ARMv6/v7 coherent_user_range ARM: 5747/1: Fix the start_pg value in free_memmap() kmemleak: Check for NULL pointer returned by create_object() ARM: 5757/1: Thumb-2: Correct "mov.w pc, lr" instruction which is unpredictable Chris Dearman (4): MIPS: MTI: Fix accesses to device registers on MIPS boards MIPS: SPRAM: Clean up support code a little MIPS: CMP: Fix memory barriers for correct operation of amon_cpu_start MIPS: GIC: Random fixes and enhancements. Chris Mason (10): Btrfs: fix deadlock on async thread startup Btrfs: cleanup extent_clear_unlock_delalloc flags Btrfs: delay clearing EXTENT_DELALLOC for compressed extents Btrfs: fix uninit compiler warning in cow_file_range_nocow Btrfs: fix file clone ioctl for bookend extents Btrfs: only write one super copy during fsync Btrfs: avoid tree log commit when there are no changes Btrfs: streamline tree-log btree block writeout Btrfs: fix btrfs acl #ifdef checks Btrfs: always pin metadata in discard mode Chris Rankin (1): net: Teach pegasus driver to ignore bluetoother adapters with clashing Vendor:Product IDs Chris Wilson (4): drm/i915: Record device minor rather than pointer in TRACE_EVENT drm/i915: batch submit seqno off-by-one. drm/i915: Enable irq to trace batch buffer completion. perf: Propagate term signal to child Christian Borntraeger (6): KVM: s390: fix memsize >= 4G [S390] module: fix memory leak in s390 module loader [S390] Fix memory leak in /proc/cio_ignore [S390] Fix enabled udelay for short delays. virtio: let header files include virtio_ids.h connector: fix regression introduced by sid connector Christof Schmitt (10): [SCSI] sg: Free data buffers after calling blk_rq_unmap_user [SCSI] zfcp: correctly initialize unchained requests [SCSI] zfcp: Fix initial device and cfdc for delayed adapter allocation [SCSI] zfcp: Fix oops during shutdown of offline device [SCSI] zfcp: Fix lockdep warning when offlining device with offline chpid [SCSI] zfcp: Fix hang when offlining device with offline chpid [SCSI] zfcp: Handle WWPN mismatch in PLOGI payload [SCSI] zfcp: Warn about storage devices with broken PLOGI data [SCSI] zfcp: Fix timer initialization for ct and els requests [SCSI] zfcp: Flush SCSI registration work when adding unit Christoph Hellwig (9): parisc: convert to asm-generic/hardirq.h sparc32: convert to asm-generic/hardirq.h xfs: implement ->dirty_inode to fix timestamp handling xfs: cleanup ->sync_fs xfs: stop calling filemap_fdatawait inside ->fsync xfs: fix double IRELE in xfs_dqrele_inode Btrfs: add -o discard option Btrfs: enable discard support virtio_blk: revert QUEUE_FLAG_VIRT addition Chuck Ebbert (1): perf_events: Make ABI definitions available to userspace Claudio Scordino (1): ARM: 5776/1: Check compiler version and EABI support when adding ARM unwind support. Clemens Ladisch (2): sound: via82xx: move DXS volume controls to PCM interface sound: via82xx: deactivate DXS controls of inactive streams Cornelia Huck (1): sysfs: Allow sysfs_move_dir(..., NULL) again. Corrado Zoccolo (3): cfq-iosched: fix possible problem with jiffies wraparound cfq-iosched: fix think time allowed for seekers cfq-iosched: avoid probable slice overrun when idling Daisuke Nishimura (1): mm: don't call pte_unmap() against an improper pte Dan Williams (6): md/raid5: initialize conf->device_lock earlier md/raid456: downlevel multicore operations to raid_run_ops md/raid6: kill a gcc-4.0.1 'uninitialized variable' warning async_pq: kill a stray dma_map() call and other cleanups async_pq: rename scribble page async_tx: fix asynchronous raid6 recovery for ddf layouts Daniel T Chen (1): ALSA: hda: Use quirk mask for Dell Inspiron Mini9/Vostro A90 using ALC268 Daniel Walker (1): omap: iovmm: Add missing mutex_unlock Darren Hart (3): futex: fix requeue_pi key imbalance futex: Check for NULL keys in match_futex futex: Move drop_futex_key_refs out of spinlock'ed region Darren Salt (2): eeepc-laptop: Prevent a panic when disabling RT2860 wireless when associated Staging: rt2860sta: prevent a panic when disabling when associated Darrick J. Wong (2): KVM: Prevent kvm_init from corrupting debugfs structures hwmon: enhance the sysfs API for power meters Dave Airlie (9): drm/radeon/kms: respect single crtc cards, only create one crtc. (v2) drm/fb: add setcmap and fix 8-bit support. drm/fb: add more correct 8/16/24/32 bpp fb support. drm/ttm: fix refcounting in ttm global code. drm/radeon: use list_for_each_entry instead of list_for_each drm/radeon/kms: fix vline register for second head. Merge branch 'drm-next' of ../drm-next into drm-linus drm/radeon/kms: ignore vga arbiter return. drm/kms: fix kms/fbdev colormap support properly. Dave Chinner (3): xfs: fix xfs_quiesce_data xfs: mark inodes dirty before issuing I/O xfs: make sure xfs_sync_fsdata covers the log Dave Mitchell (1): ibm_newemac: Added 16K Tx FIFO size support for EMAC4 Dave Young (2): bluetooth: scheduling while atomic bug fix bluetooth: static lock key fix David Daney (3): MIPS: Octeon: Fix compile error in arch/mips/cavium-octeon/smp.c MIPS: Octeon: Use write_{un,}lock_irq{restore,save} to set irq affinity MIPS: Octeon: Use lockless interrupt controller operations when possible. David Henningsson (1): ALSA: ice1724 - Make call to set hw params succeed on ESI Juli@ David Howells (2): KEYS: get_instantiation_keyring() should inc the keyring refcount in all cases NOMMU: Don't pass NULL pointers to fput() in do_mmap_pgoff() David Härdeman (1): Input: winbond-cir - select LEDS_TRIGGERS David J. Wilder (1): RDMA/addr: Fix resolution of local IPv6 addresses David Jeffery (1): [SCSI] st: fix possible memory use after free after MTSETBLK ioctl David Miller (1): mm, perf_event: Make vmalloc_user() align base kernel virtual address to SHMLBA David Rientjes (1): oprofile: fix race condition in event_buffer free David S. Miller (21): sparc: Support HW cache events. sparc: Support all ultra3 and ultra4 derivatives. sparc: Add Niagara2 HW cache event support. sparc: Niagara1 perf event support. sparc64: Add initial perf event conflict resolution and checks. sparc64: Increase vmalloc size to fix percpu regressions. sparc64: Add a basic conflict engine in preparation for multi-counter support. sparc64: Minor coding style fixups in perf code. sparc64: Fix comment typo in perf_event.c sparc64: Cache per-cpu %pcr register value in perf code. Revert "ide: try to use PIO Mode 0 during probe if possible" znet: Don't claim DMA lock around free_dma() calls. Merge branch 'master' of git://git.kernel.org/.../linville/wireless-2.6 sparc64: Fix niagara2 perf IRQ bits. net: Link in PHY drivers before others. sparc64: Fix D-cache flushing on swapin from SW devices. sparc64: Set IRQF_DISABLED on LDC channel IRQs. Merge branch 'master' of git://git.kernel.org/.../linville/wireless-2.6 Revert "tcp: fix tcp_defer_accept to consider the timeout" Merge branch 'master' of git://git.kernel.org/.../linville/wireless-2.6 Merge branch 'master' of git://git.kernel.org/.../linville/wireless-2.6 David Teigland (2): dlm: fix lowcomms_connect_node for sctp dlm: fix socket fd translation David Vrabel (4): mmc: sdio: don't require CISTPL_VERS_1 to contain 4 strings USB: rename Documentation/ABI/.../sysfs-class-usb_host USB: whci-hcd: handle early deletion of endpoints USB: whci-hcd: always do an update after processing a halted qTD David Woodhouse (6): intel-iommu: Yet another BIOS workaround: Isoch DMAR unit with no TLB space Rename pci_init() to pci_apply_final_quirks(), move it to quirks.c Mark pci_apply_final_quirks() __init rather than __devinit Run pci_apply_final_quirks() sooner. x86: Move pci_iommu_init to rootfs_initcall() libertas if_usb: Fix crash on 64-bit machines Dennis O'Brien (1): [ARM] pxa: workaround errata #37 by not using half turbo switching Dhananjay Phadke (3): netxen: fix pci bar mapping netxen: fix i2c init netxen: avoid undue board config check Dirk Hohndel (1): pata_ali: trivial fix of a very frequent spelling mistake Dmitry Artamonow (2): ARM: 5752/1: SA1100: fix building of h3100 irda/sa1100_ir: check return value of startup hook Dmitry Eremin-Solenikov (1): Input: gpio-keys - use IRQF_SHARED Dmitry Torokhov (12): Input: libps2 - fix dependancy on i8042 Input: i8042 - print debug data when testing AUX IRQ delivery Input: synaptics - add another Protege M300 to rate blacklist Input: i8042 - make pnp_data_busted variable boolean instead of int Input: atkbd - restore resetting LED state at startup Input: atkbd - postpone restoring LED/repeat rate at resume Input: fix locking issue in /proc/bus/input/ handlers Input: i8042 - add Sony Vaio VGN-FZ240E to the nomux list Input: logips2pp - model 73 is actually TrackMan FX Driver core: allow certain drivers prohibit bind/unbind via sysfs Merge commit 'v2.6.32-rc5' into for-linus Input: i8042 - try to get stable CTR value when initializing Dominik Brodowski (3): pcmcia: pccard_read_tuple and TUPLE_RETURN_COMMON cleanup pcmcia: do not try to store more than 4 version strings ALSA: pcmcia: use dynamic debug infrastructure, deprecate CS_CHECK (sound) Don Skidmore (2): ixgbe: add support for 82599 Combined Backplane ixgbe: add support for 82599 based X520 10G Dual KX4 Mezz card Dragos Tatulea (1): powerpc/oprofile: Add ppc750 CL as supported by oprofile Earl Chew (1): fs: pipe.c null pointer dereference Eero Nurkkala (1): NOHZ: update idle state also when NOHZ is inactive Eli Cohen (1): mlx4_core: Add a new supported 40 GigE device ID Elina Pasheva (3): USB: serial: sierra driver version change to 1.3.8 USB: serial: sierra driver send_setup() autopm fix USB: serial: sierra driver autopm fixes Eric Anholt (1): Merge commit 'ickle/for-anholt' into drm-intel-next Eric Dumazet (13): x86: Don't generate cmpxchg8b_emu if CONFIG_X86_CMPXCHG64=y pktgen: Fix multiqueue handling pktgen: restore nanosec delays net: Add patchwork URL to MAINTAINERS net: Fix struct sock bitfield annotation udp: Fix udp_poll() and ioctl() virtio_net: use dev_kfree_skb_any() in free_old_xmit_skbs() net: Fix IP_MULTICAST_IF net: Fix struct inet_timewait_sock bitfield annotation ifb: should not use __dev_get_by_index() without locks pktgen: Dont leak kernel memory net: fix kmemcheck annotations net: fix sk_forward_alloc corruption Eric Paris (2): fsnotify: do not set group for a mark before it is on the i_list inotify: deprecate the inotify kernel interface Eric Sandeen (2): fix readahead calculations in xfs_dir2_leaf_getdents() xfs: free temporary cursor in xfs_dialloc Eric Van Hensbergen (1): 9p: fix readdir corner cases Felipe Contreras (2): kbuild: fix warning when domainname is not available kbuild: mkcompile_h: trivial cleanups Felix Beck (2): [S390] zcrypt: Fix sparse warning. [S390] zcrypt: Improve some comments Felix Fietkau (1): mac80211: fix logic error ibss merge bssid check Feng Tang (1): x86: Make EFI RTC function depend on 32bit again Florian Fainelli (6): MIPS: BCM63xx: Fix soft-reset lockup on BCM6345 MIPS: AU1000: Fix build failure for db1x00 configured for Au1100 SoC MIPS: BCM63xx: Make bcm63xx_uart_register an initfunc MIPS: BCM63xx: Prepare for watchdog support MIPS: AR7: register watchdog device only if enabled in hw configuration MIPS: bcm63xx: Set the correct BCM3302 CPU name Frank Mori Hess (2): Staging: comedi: ni_pcimio: Added device id for pxi-6225. Staging: comedi: pcmcia irq fixes Frans Pop (2): kbuild: fix the binrpm-pkg target to work with KBUILD_OUTPUT set pcmcia: properly close previous dev_printk if kzalloc fails in do_io_probe Frederic Weisbecker (2): tracing: Check total refcount before releasing bufs in profile_enable failure tracing: Use free_percpu instead of kfree Frederik Deweerdt (1): KVM: MMU: fix pointer cast Gabe Black (1): PCI quirk: TI XIO200a erroneously reports support for fast b2b transfers Gabor Gombas (1): net: Fix 'Re: PACKET_TX_RING: packet size is too long' George Nassar (1): USB: rndis_host: debug info clobbered before it is logged Gerald Schaefer (1): [S390] Add EX_TABLE for addressing exception in usercopy functions. Gergely Imreh (1): USB: usbtmc: fix timeout increase Giuseppe Cavallaro (1): net: add support for STMicroelectronics Ethernet controllers. Graf Yang (1): Blackfin: fix missed cache config renames Grant Likely (2): powerpc/5200: Update defconfigs MAINTAINERS: add Open Firmware / Flattened Device Tree entry Greg Kroah-Hartman (11): Staging: comedi: serial2002: fix include build issue Staging: remove agnx driver Staging: remove cowloop driver Staging: comedi: fix build on arches that don't want comedi drivers Staging: comedi: fix sched.h build breakage Staging: b3dfg: fix sched.h build breakage Staging: poch: fix sched.h build breakage Staging: vme: fix sched.h build breakage Staging: remove stlc45xx driver Staging: android: mark subsystem as broken Staging: wireless drivers Kconfig change Greg Ungerer (1): m68knommu: fix rename of pt_regs offset defines breakage Guennadi Liakhovetski (2): fix compilation of i.MX31 platforms fix pcm037_eet compilation with the new SPI driver Gwendal Grignou (1): sata_mv: Prevent PIO commands to be defered too long if traffic in progress. H Hartley Sweeten (1): Input: rotary_encoder - fix relative axis support H. Peter Anvin (1): x86: fix kernel panic on 32 bits when profiling Haavard Skinnemoen (1): atmel_serial: fix bad BUILD_BUG_ON() usage Haiyang Zhang (1): Staging: hv: Fix null pointer error after vmbus loading Hank Janssen (1): Staging: hv: Fix vmbus load hang caused by faulty data packing Hannes Reinecke (1): [SCSI] Retry ADD_TO_MLQUEUE return value for EH commands Harald Welte (1): ARM: S3C24XX: Introduce S3C2442B CPU Hartley Sweeten (10): ARM: 5744/1: ep93xx: add remaining phys offset selections ARM: 5745/1: Change ep93xx gpio_irq static inlines to macros ARM: 5729/1: ep93xx: define EP93XX_*_PHYS_BASE with macros ARM: 5753/1: ep93xx: remove old EP93XX_GPIO_* defines ARM: 5754/1: ep93xx: update i2c support ARM: 5756/1: ep93xx: introduce clk parent ARM: 5760/1: ep93xx: fix build error in edb93xx.c ARM: 5767/1: ep93xx: remove ep93xx_init_time() prototype ARM: 5768/1: ep93xx: remove dead code in ep93xx_gpio_ab_irq_handler() ARM: 5769/1: CPU_ARM920T: remove dead Maverick EP9312 URL Heiko Carstens (13): [S390] Enable kmemleak on s390. [S390] Provide arch specific mdelay implementation. [S390] compat: fix truncate system call wrapper [S390] ftrace: drop nmi protection [S390] perf_counter: fix vdso detection [S390] 64-bit register support for 31-bit processes [S390] call home support: fix proc handler [SCSI] zfcp: fix kfree handling in zfcp_init_device_setup [S390] smp: fix prefix handling of offlined cpus [S390] call home: fix error handling in init function [S390] call home: fix string length handling [S390] smp: fix sigp stop handling [S390] smp: fix sigp sense handling Heiko Schocher (3): powerpc/pci: Fix MODPOST warning mpc5200: support for the MAN mpc5200 based board uc101 mpc5200: support for the MAN mpc5200 based board mucmc52 Helge Deller (3): parisc: rename parisc's vmalloc_start to parisc_vmalloc_start parisc: Fix linker script breakage. agp: parisc-agp.c - use correct page_mask function Herbert Xu (3): crypto: padlock-sha - Fix stack alignment tcp: Try to catch MSG_PEEK bug gre: Fix dev_addr clobbering for gretap Herton Ronaldo Krzesinski (2): Input: atkbd - consolidate force release quirks for volume keys Staging: rtl8187se/rtl8192e/rtl8192su: allow module unload HighPoint Linux Team (1): [SCSI] hptiop: Add RR44xx adapter support Hiroshi DOYU (2): omap: iovmm: Fix incorrect spelling omap: iommu: fix wrong condition check for SUPERSECTION Hiroshi Shimamoto (1): trace: Fix missing assignment in trace_ctxwake_* Holger Schurig (1): libertas spi: fix sparse errors Huang Weiyi (1): m68knommu: remove duplicated #include Huang Ying (1): crypto: aesni-intel - Fix irq_fpu_usable usage Huaxu Wan (1): hwmon: (coretemp) Maintainer update Hubert Feurstein (3): ARM: 5749/1: ep93xx/micro9: Update maintainer ARM: 5750/1: ep93xx/micro9: Update platform code ARM: 5751/1: ep93xx/micro9: Add Micro9-Slim Hugh Dickins (5): ksm: more on default values HWPOISON: fix oops on ksm pages HWPOISON: fix/proc/meminfo alignment hwpoison: fix oops on ksm pages hwpoison: fix/proc/meminfo alignment Huzaifa Sidhpurwala (1): USB: option: Support for AIRPLUS MCD650 Datacard Ian Abbott (9): Staging: comedi: Corrected type of a printk argument in resize_async_buffer(). Staging: comedi: jr3_pci: Initialize transf variable fully in jr3_pci_poll_subdevice(). Staging: comedi: cb_pcidio: fix "section mismatch" error Staging: comedi: s526: Fix number of channels on DIO subdevice Staging: comedi: s526: Get rid of global variable 'cmReg'. Staging: comedi: s526: Take account of arch's byte order. Staging: comedi: s526: fixes for pulse generator Staging: comedi: ni_65xx.c: fix insn_bits shift calculation. Staging: comedi: ni_65xx.c: fix output inversion problem. Ian Campbell (1): Correct nr_processes() when CPUs have been unplugged Ian E. Morgan (1): lis3: add support for the HP HDX 18 Ilkka Koskinen (1): mfd: Do not dereference null pointer in twl4030 error path Imre Deak (1): ARM: 5742/1: ARM: add debug check for invalid kernel page faults Ingo Molnar (9): x86: EDAC: MCE: Fix MCE decoding callback logic Revert "x86, timers: Check for pending timers after (device) interrupts" perf tools: Fix the NO_64BIT build on pure 64-bit systems Merge branch 'urgent' of git://git.kernel.org/.../rric/oprofile into core/urgent headers: Fix build after <linux/sched.h> removal Merge branch 'linus' into x86/urgent Revert "x86: linker script syntax nits" x86: Document linker script ASSERT() quirk perf tools: Bump version to 0.0.2 Ira W. Snyder (1): edac: i5400 fix missing CONFIG_PCI define Izik Eidus (3): KVM: MMU: dont hold pagecount reference for mapped sptes pages KVM: MMU: add SPTE_HOST_WRITEABLE flag to the shadow ptes KVM: add support for change_pte mmu notifiers Jaidev Patwardhan (2): MIPS: GCMP: Avoid accessing registers when they are not present MIPS: SMTC: Avoid queing multiple reschedule IPIs James Bottomley (2): parisc: add me to Maintainers [SCSI] fix memory leak in initialization Jamie Lentin (1): Input: atkbd - add a quirk for OQO 01+ multimedia keys Jan Beulich (4): x86: Don't leak 64-bit kernel register values to 32-bit processes iSCSI/iBFT: use proper address translation x86: Fix Suspend to RAM freeze on Acer Aspire 1511Lmi laptop x86-64: Fix register leak in 32-bit syscall audting Jan Kara (1): ext3: Update documentation about ext3 quota mount options Janusz Krzysztofik (5): omap: Fix omap-keypad by restoring old keypad.h without breaking omap2 boards that use matrix_keypad omap1: Fix redundant UARTs pin muxing that can break other hardware support omap1: Fix DSP public peripherals support for ams-delta netdev: usb: dm9601.c can drive a device not supported yet, add support for it ASoC: OMAP: Don't try to set unsupported OMAP_DMA_DATA_BURST_16 on OMAP1 Jarkko Nikula (1): omap: McBSP: Fix incorrect receiver stop in omap_mcbsp_stop Jason Wessel (1): x86: earlyprintk: Fix regression to handle serial,ttySn as 1 arg Jasper Spaans (1): bonding: Modify hash transmit policies to use the packet's source MAC address Jassi Brar (1): ASoC: S3C64XX I2S: Enable audio-bus clock Jaswinder Singh Rajput (7): parisc: includecheck fix: signal.c x86, SLUB: Remove unused CONFIG FAST_CMPXCHG_LOCAL Blackfin: includecheck fix: mach-bf548, ezkit.c mm: includecheck fix: vmalloc.c fs: includecheck fix: proc, kcore.c video: includecheck fix: msm, mddi.c video: includecheck fix: da8xx-fb.c Jay Sternberg (1): iwlwifi: incorrect method used for finding valid OTP blocks Jayamohan Kallickal (3): [SCSI] be2iscsi: add 10Gbps iSCSI - BladeEngine 2 driver [SCSI] libiscsi: iscsi_session_setup to allow for private space [SCSI] be2iscsi: Moving to pci_pools v3 Jean Delvare (3): MAINTAINERS: Fix Riku Voipio's address hwmon: (dme1737) No vid attributes for SCH311x hwmon: (it87) Fix VID reading on IT8718F/IT8720F Jeff Mahoney (6): Staging: winbond: implement prepare_multicast and fix API usage Staging: iio: Don't build on s390 Staging: rtl8192e: Add #include <linux/vmalloc.h> staging: Complete sched.h removal from interrupt.h staging: more sched.h fixes hfs: fix oops on mount with corrupted btree extent records Jeff Roberson (1): edac: i5400 fix csrow mapping Jens Axboe (7): cfq-iosched: fix issue with rq-rq merging and fifo list ordering block: get rid of kblock_schedule_delayed_work() block: use proper BLK_RW_ASYNC in blk_queue_start_tag() cfq-iosched: abstract out the 'may this cfqq dispatch' logic cfq-iosched: fix the slice residual sign cfq-iosched: apply bool value where we return 0/1 backing-dev: ensure that a removed bdi no longer has super_block referencing it Jeremy Fitzhardinge (2): x86/paravirt: Use normal calling sequences for irq enable/disable xen: set up mmu_ops before trying to set any ptes Jerome Glisse (14): drm/radeon/kms: Convert RS400/RS480 to new init path & fix legacy VGA (V3) drm/radeon/kms: Convert R300 to new init path drm/radeon/kms: Convert R100 to new init path (V2) drm/radeon/kms: Convert RS690/RS740 to new init path (V2). drm/radeon/kms: Convert RS600 to new init path drm/radeon/kms: Remove old init path as no hw use it anymore drm/radeon/kms: Fix R600 write back buffer drm/radeon/kms: Fix R600/RV770 startup path & reset drm/radeon/kms: Fix R600/RV770 disable acceleration path drm/radeon/kms: R600/RV770 remove dead code and print message for wrong BIOS drm/radeon/kms: Fix irq handling on AVIVO hw drm/radeon/kms: Fix RS600/RV515/R520/RS690 IRQ drm/radeon/kms: Fallback to non AGP when acceleration fails to initialize (v2) drm/radeon/kms: Fix AGP support for R600/RV770 family (v2) Jesse Barnes (2): ACPI button: don't try to use a non-existent lid device Revert "PCI: get larger bridge ranges when space is available" Jing Huang (1): [SCSI] bfa: Brocade BFA FC SCSI driver Jiri Bohac (1): bonding: fix a race condition in calls to slave MII ioctls Jiri Kosina (4): HID: fix kerneldoc comment for hid_input_report() HID: fix possible deadlock in hidraw_read percpu: allow pcpu_alloc() to be called with IRQs off sched: move rq_weight data array out of .percpu Jiri Olsa (4): tracing: Update *ppos instead of filp->f_pos tracing: Fix trace_seq_printf() return value tracing: Fix comment typo and documentation example tracing: Remove cpu arg from the rb_time_stamp() function Jiri Pirko (1): netlink: fix typo in initialization Jiri Slaby (6): ACPI: Kconfig, fix proc aggregator text USB: usblcd, fix memory leak x86: crash_dump: Fix non-pae kdump kernel memory accesses PM / Hibernate: Fix blkdev refleaks PM / Hibernate: Fix error handling in save_image() PM / Hibernate: Add newline to load_image() fail path Joakim Tjernlund (1): i2c-mpc: Do not generate STOP after read. Joe Perches (13): MAINTAINERS: update GENERIC UIO FOR PCI DEVICES MAINTAINERS: update TRACING section MAINTAINERS: update OMAP Tony Lindgren email name MAINTAINERS: change ATM mailing list to moderated MAINTAINERS: use tab not spaces after field types MAINTAINERS: update Kernel Janitors after mismerge MAINTAINERS: update SCORE architecture name style and add file pattern MAINTAINERS: SIMPLE FIRMWARE INTERFACE: update email style MAINTAINERS: WINBOND CIR - Integrate P:/M: lines, fixup David Härdeman's name MAINTAINERS: fix up PERIPHERAL spelling MAINTAINERS: update WOLFSON MICROELECTRONICS scripts/get_maintainer.pl: add patch/file search for keywords MAINTAINERS: document new "K:" entry type Joerg Roedel (2): KVM: SVM: Fix tsc offset adjustment when running nested KVM: SVM: Handle tsc in svm_get_msr/svm_set_msr correctly Johan Hovold (6): USB: ftdi_sio: remove tty->low_latency USB: ftdi_sio: remove unused rx_byte counter USB: ftdi_sio: clean up read completion handler USB: ftdi_sio: re-implement read processing USB: pl2303: fix error characters not being reported to ldisc USB: digi_acceleport: Fix broken unthrottle. Johannes Berg (13): wext: let get_wireless_stats() sleep mac80211: fix vlan and optimise RX cfg80211: fix netns error unwinding bug mac80211: fix ibss race b43: fix ieee80211_rx() context mac80211: document ieee80211_rx() context requirement mac80211: keep auth state when assoc fails cfg80211: sme: deauthenticate on assoc failure mac80211: fix BSS leak mac80211: fix addba timer mac80211: fix reason code output endianness cfg80211: fix NULL ptr deref mac80211: check interface is down before type change Johannes Weiner (2): ARM: boolean bit testing vmscan: order evictable rescue in LRU putback John Bonesio (1): net/fec_mpc52xx: Fix kernel panic on FEC error John Stultz (1): Blackfin: convert to use arch_gettimeoffset() John W. Linville (1): rndis_host: support ETHTOOL_GPERMADDR John(Jung-Ik) Lee (1): pata_atp867x: clarifications in timings calculations and cable detection Jon Hunter (1): OMAP3: PM: Prevent hang in prcm_interrupt_handler Jonathan Brassow (1): dm snapshot: free exception store on init failure Jonathan Cameron (1): Staging: iio: Fix missing include <linux/sched.h> Jonathan Corbet (1): Update flex_arrays.txt Jonathan Woithe (1): fujitsu-laptop: address missed led-class ifdef fixup Joris van Rantwijk (1): USB: Fix throttling in generic usbserial driver Josef Bacik (5): Btrfs: fix possible softlockup in the allocator Btrfs: release delalloc reservations on extent item insertion Btrfs: async delalloc flushing under space pressure Btrfs: optimize fsync for the single writer case Btrfs: fix possible ENOSPC problems with truncate JosephChan(a)via.com.tw (1): pata_via: extend the rev_max for VT6330 Josh Boyer (1): powerpc/booke: Fix xmon single step on PowerPC Book-E Joyce Yu (1): niu: VLAN_ETH_HLEN should be used to make sure that the whole MAC header was copied to the head buffer in the Vlan packets case Julia Lawall (6): parisc: correct use of SHF_ALLOC [ARM] pxa/csb726: adjust duplicate structure field initialization drivers/serial/mpc52xx_uart.c: Use UPIO_MEM rather than SERIAL_IO_MEM ARM: S3C24XX: arch/arm/plat-s3c24xx: Move dereference after NULL test ALSA: sound: Move dereference after NULL test and drop unnecessary NULL tests ALSA: sound/parisc: Move dereference after NULL test Julian Anastasov (3): tcp: accept socket after TCP_DEFER_ACCEPT period tcp: reduce SYN-ACK retrans for TCP_DEFER_ACCEPT tcp: fix TCP_DEFER_ACCEPT retrans calculation Justin P. Mattock (1): ieee1394: update URLs in debugging-via-ohci1394.txt Jérôme Pouiller (1): of: Remove nested function KOSAKI Motohiro (6): elv_iosched_store(): fix strstrip() misuse congestion_wait(): don't use WRITE cgroup: fix strstrip() misuse strstrip(): mark as as must_check mbind(): fix leak of never putback pages do_mbind(): fix memory leak Kalle Jokiniemi (1): OMAP: Fix race condition with autodeps Kashyap, Desai (9): [SCSI] mpt2sas: Update driver to MPI2 REV K headers. [SCSI] mpt2sas: Added mpi2_history.txt for MPI2 headers. [SCSI] mpt2sas: Copyright change to 2009. [SCSI] mpt2sas: Added SCSIIO, Internal and high priority memory pools to support multiple TM [SCSI] mpt2sas: Target Reset will be issued from Interrupt context. [SCSI] mpt2sas: Call init_completion on a per request basis. [SCSI] mpt2sas: Timeout occurred within the HANDSHAKE logic while waiting on firmware to ACK. [SCSI] mpt2sas: Support dev remove when phy status is MPI2_EVENT_SAS_TOPO_PHYSTATUS_VACANT [SCSI] mpt2sas: Bump version 02.100.03.00 Keith Mannthey (2): amd64_edac: simple fix to allow reporting of CECC errors edac: i5100 fix initialization code Ken Kawasaki (3): pcnet_cs: add cis of National Semicondoctor's multifunction pcmcia card 3c574_cs: spin_lock the set_multicast_list function pcnet_cs: add cis of PreMax PE-200 ethernet pcmcia card Kenji Kaneshige (1): PCI: Prevent AER driver from being loaded on non-root port PCIE devices Kevin Cernekee (1): MIPS: Fix machine check exception in kmap_coherent() Kevin Hilman (3): OMAP3: PM: Enable GPIO module-level wakeups omap3: PM: enable UART3 module wakeups cpuidle: always return with interrupts enabled Kiyoshi Ueda (1): dm: dec_pending needs locking to save error value Komuro (1): pcmcia: do not load the pd6729 driver if io_base is NULL Krauth.Julien (1): serial: add ADDI-DATA GmbH PCI-Express communication cards in 8250_pci.c and pci_ids.h Krzysztof Halasa (1): WAN: fix Cisco HDLC handshaking. Krzysztof Helt (1): ALSA: opl3: circular locking in the snd_opl3_note_on() and snd_opl3_note_off() Kukjin Kim (1): ARM: S3C64XX: Fix S3C64XX_CLKDIV0_ARM_MASK value Kumar Gala (7): powerpc: Add a Book-3E 64-bit defconfig powerpc: Fix compile errors found by new ppc64e_defconfig powerpc: Limit hugetlbfs support to PPC64 Book-3S machines powerpc: Limit memory hotplug support to PPC64 Book-3S machines powerpc: Minor cleanup to init/Kconfig powerpc: Minor cleanup to sound/ppc/Kconfig powerpc: Minor cleanup to lib/Kconfig.debug Kuninori Morimoto (3): sh: mach-ecovec24: Add TouchScreen support sh: mach-ecovec24: modify 1st MTD area to read only sh: mach-ecovec24: Document DS2 switch settings. Kyle McMartin (7): parisc: tracehook_report_syscall parisc: tracehook_signal_handler parisc: add missing TI_TASK macro in syscall.S parisc: split syscall_trace into two halves parisc: stop using task->ptrace for {single,block}step flags parisc: add skeleton syscall.h parisc: HAVE_ARCH_TRACEHOOK Larry Finger (2): b43: Fix PPC crash in rfkill polling on unload b43: Fix Bugzilla #14181 and the bug from the previous 'fix' Len Brown (4): Merge branch 'bugzilla-14129' into release Merge branch 'eeepc-laptop' into release Merge branch 'launchpad-333386' into release Merge branch 'misc' into release Lennart Sorensen (1): m68knommu: show KiB rather than pages in "Freeing initrd memory:" message Leo Chen (2): ARM: 5748/1: bcmring: fix build warning messages ARM: 5764/1: bcmring: add oprofile pmu support Li Hong (1): x86, perf_event: Rename 'performance counter interrupt' Li Zefan (1): tracing/filters: Fix memory leak when setting a filter Linus Torvalds (148): x86: Optimize cmpxchg64() at build-time some more Merge branch 'for-linus' of git://git.kernel.org/.../gerg/m68knommu Merge branch 'x86-fixes-for-linus' of git://git.kernel.org/.../tip/linux-2.6-tip Merge branch 'tracing-fixes-for-linus' of git://git.kernel.org/.../tip/linux-2.6-tip Merge branch 'timers-fixes-for-linus' of git://git.kernel.org/.../tip/linux-2.6-tip Merge branch 'perf-fixes-for-linus' of git://git.kernel.org/.../tip/linux-2.6-tip Merge git://git.kernel.org/.../davem/sparc-2.6 Merge branch 'fixes-for-linus' of git://git.monstr.eu/linux-2.6-microblaze Merge branch 'kvm-updates/2.6.32' of git://git.kernel.org/pub/scm/virt/kvm/kvm Merge git://git.kernel.org/.../davem/ide-2.6 Merge branch 'fixes' of git://git.kernel.org/.../kyle/parisc-2.6 Merge git://git.kernel.org/.../davem/ide-2.6 Merge git://git.kernel.org/.../davem/net-2.6 Merge branch 'for-linus' of git://git.kernel.org/.../bp/bp Merge branch 'omap-fixes-for-linus' of git://git.kernel.org/.../tmlind/linux-omap-2.6 Merge branch 'drm-linus' of git://git.kernel.org/.../airlied/drm-2.6 Merge branch 'for-linus' of git://git.kernel.org/.../tiwai/sound-2.6 Merge branch 'timers-fixes-for-linus' of git://git.kernel.org/.../tip/linux-2.6-tip Merge branch 'perf-fixes-for-linus-2' of git://git.kernel.org/.../tip/linux-2.6-tip Merge branch 'sparc-perf-events-fixes-for-linus' of git://git.kernel.org/.../tip/linux-2.6-tip Merge branch 'tracing-fixes-for-linus' of git://git.kernel.org/.../tip/linux-2.6-tip Merge branch 'x86-fixes-for-linus' of git://git.kernel.org/.../tip/linux-2.6-tip Merge branch 'sched-fixes-for-linus' of git://git.kernel.org/.../tip/linux-2.6-tip Merge branch 'core-fixes-for-linus' of git://git.kernel.org/.../tip/linux-2.6-tip Merge branch 'upstream-linus' of git://git.kernel.org/.../jgarzik/libata-dev Merge branch 'bugfixes' of git://git.linux-nfs.org/projects/trondmy/nfs-2.6 Merge branch 'drm-intel-next' of git://git.kernel.org/.../anholt/drm-intel Merge branch 'sh/for-2.6.32' of git://git.kernel.org/.../lethal/sh-2.6 Merge branch 'upstream-linus' of git://git.kernel.org/.../jgarzik/libata-dev Merge branch 'for-linus' of git://oss.sgi.com/xfs/xfs Merge branch 'for-linus' of git://git.kernel.org/.../ecryptfs/ecryptfs-2.6 Merge branch 'for-linus' of git://git.kernel.org/.../jmorris/security-testing-2.6 Merge branch 'for-linus' of git://git.kernel.org/.../vapier/blackfin Merge branch 'for-linus' of git://git.kernel.org/.../dtor/input Merge branch 'for-linus' of git://git.kernel.org/.../roland/infiniband Merge git://git.kernel.org/.../jejb/scsi-rc-fixes-2.6 Merge git://git.kernel.org/.../mason/btrfs-unstable Merge branch 'hwmon-for-linus' of git://git.kernel.org/.../jdelvare/staging Merge git://git.kernel.org/.../gregkh/staging-2.6 Merge git://git.kernel.org/.../gregkh/usb-2.6 Merge branch 'for-linus' of git://git390.marist.edu/pub/scm/linux-2.6 Linux 2.6.32-rc4 Revert "USB: Work around BIOS bugs by quiescing USB controllers earlier" tty, serial: Fix race and NULL check in uart_close() Merge master.kernel.org:/home/rmk/linux-2.6-arm Merge branch 'for-linus' of git://git.kernel.org/.../jbarnes/pci-2.6 Merge git://git.infradead.org/~dwmw2/iommu-2.6.32 Merge branch 'for-linus' of git://git.kernel.org/.../sameo/mfd-2.6 Merge branch 'for_linus' of git://git.kernel.org/.../jack/linux-fs-2.6 Merge branch 'for-linus' of git://git.kernel.org/.../tiwai/sound-2.6 Merge branch 'for-linus' of git://git.kernel.org/.../jikos/hid Merge git://git.kernel.org/.../sam/kbuild-fixes Merge branch 'for-linus' of git://git.kernel.org/.../tj/percpu Merge branch 'for-linus' of git://git.kernel.dk/linux-2.6-block Make flush_to_ldisc properly handle parallel calls workqueue: add 'flush_delayed_work()' to run and wait for delayed work tty: use the new 'flush_delayed_work()' helper to do ldisc flush tty: Make flush_to_ldisc() locking more robust workqueue: add 'flush_delayed_work()' to run and wait for delayed work tty: use the new 'flush_delayed_work()' helper to do ldisc flush Merge branch 'x86-fixes-for-linus' of git://git.kernel.org/.../tip/linux-2.6-tip Merge branch 'tracing-fixes-for-linus' of git://git.kernel.org/.../tip/linux-2.6-tip Merge branch 'sched-fixes-for-linus' of git://git.kernel.org/.../tip/linux-2.6-tip Merge branch 'perf-fixes-for-linus' of git://git.kernel.org/.../tip/linux-2.6-tip Merge branch 'core-fixes-for-linus' of git://git.kernel.org/.../tip/linux-2.6-tip Merge branch 'sh/for-2.6.32' of git://git.kernel.org/.../lethal/sh-2.6 Merge branch 'for-linus' of git://git390.marist.edu/pub/scm/linux-2.6 Merge git://git.kernel.org/.../davem/sparc-2.6 Merge branch 'topic/x86-lds-nits' of git://git.kernel.org/.../frob/linux-2.6-roland Merge branch 'tty-fixes' Merge branch 'for-linus' of git://git.kernel.org/.../ieee1394/linux1394-2.6 Merge the right tty-fixes branch Merge git://git.kernel.org/.../davem/net-2.6 Merge git://git.kernel.org/.../gregkh/staging-2.6 Merge git://git.kernel.org/.../gregkh/usb-2.6 Merge git://git.kernel.org/.../gregkh/driver-core-2.6 Merge git://git.kernel.org/.../gregkh/tty-2.6 Merge branch 'master' of git://git.kernel.org/.../mason/btrfs-unstable Merge branch 'omap-fixes-for-linus' of git://git.kernel.org/.../tmlind/linux-omap-2.6 Merge branch 'release' of git://git.kernel.org/.../lenb/linux-acpi-2.6 Merge branch 'merge' of git://git.kernel.org/.../benh/powerpc Merge branch 'x86-fixes-for-linus' of git://git.kernel.org/.../tip/linux-2.6-tip Merge branch 'for-linus' of git://git.kernel.org/.../teigland/dlm Merge branch 'docs-next' of git://git.lwn.net/linux-2.6 Linux 2.6.32-rc5 Merge branch 'upstream-linus' of git://git.kernel.org/.../jgarzik/libata-dev Merge branch 'for-linus' of git://git.kernel.org/.../bp/bp Merge git://git.kernel.org/.../herbert/crypto-2.6 Merge branch 'sh/for-2.6.32' of git://git.kernel.org/.../lethal/sh-2.6 Merge git://git.kernel.org/.../agk/linux-2.6-dm Merge branch 'kvm-updates/2.6.32' of git://git.kernel.org/pub/scm/virt/kvm/kvm Merge branch 'for-linus' of git://git.kernel.org/.../dtor/input Merge branch 'for-linus' of git://git.infradead.org/users/eparis/notify Merge git://git.kernel.org/.../davem/net-2.6 Merge git://git.kernel.org/.../rusty/linux-2.6-for-linus Merge branch 'x86-fixes-for-linus' of git://git.kernel.org/.../tip/linux-2.6-tip Merge branch 'sched-fixes-for-linus' of git://git.kernel.org/.../tip/linux-2.6-tip Merge branch 'perf-fixes-for-linus' of git://git.kernel.org/.../tip/linux-2.6-tip Merge branch 'core-fixes-for-linus' of git://git.kernel.org/.../tip/linux-2.6-tip Merge master.kernel.org:/home/rmk/linux-2.6-arm Merge branch 'urgent-v2' of git://git.kernel.org/.../brodo/pcmcia-2.6 Merge branch 'hwmon-for-linus' of git://git.kernel.org/.../jdelvare/staging Merge branch 'for-linus' of git://git.infradead.org/ubi-2.6 Merge branch 'omap-fixes-for-linus' of git://git.kernel.org/.../tmlind/linux-omap-2.6 Merge branch 'for-linus' of git://oss.sgi.com/xfs/xfs Merge branch 'hwpoison-2.6.32' of git://git.kernel.org/.../ak/linux-mce-2.6 Merge branch 'for-linus' of git://git.kernel.org/.../sameo/mfd-2.6 Merge branch 'merge' of git://git.kernel.org/.../benh/powerpc Merge git://git.kernel.org/.../sfrench/cifs-2.6 Merge branch 'bugfixes' of git://git.linux-nfs.org/projects/trondmy/nfs-2.6 Merge branch 'sh/for-2.6.32' of git://git.kernel.org/.../lethal/sh-2.6 Merge branch 'drm-fixes' of git://git.kernel.org/.../airlied/drm-2.6 Merge git://git.kernel.org/.../jejb/scsi-rc-fixes-2.6 Merge branch 'for-linus' of git://git.kernel.org/.../roland/infiniband Merge branch 'for-linus' of git://git.kernel.org/.../jbarnes/pci-2.6 Merge branch 'for-linus' of git://git.kernel.dk/linux-2.6-block Merge git://git.kernel.org/.../rusty/linux-2.6-for-linus Merge git://git.kernel.org/.../rusty/linux-2.6-param-fixes Merge branch 'for-linus' of git://git.kernel.org/.../tj/percpu Merge git://git.kernel.org/.../davem/net-2.6 Merge git://git.kernel.org/.../davem/ide-2.6 Merge branch 'bugfix' of git://git.kernel.org/.../jeremy/xen Merge branch 'for-linus' of git://neil.brown.name/md Merge branch 'for-linus' of git://git.kernel.org/pub/scm/fs/xfs/xfs Merge branch 'for-linus' of git://git390.marist.edu/pub/scm/linux-2.6 Merge git://git.kernel.org/.../gregkh/driver-core-2.6 Merge git://git.kernel.org/.../gregkh/tty-2.6 Merge git://git.kernel.org/.../gregkh/usb-2.6 Merge git://git.kernel.org/.../gregkh/staging-2.6 i915: fix intel graphics suspend breakage due to resume/lid event confusion Merge branch 'x86-fixes-for-linus' of git://git.kernel.org/.../tip/linux-2.6-tip Merge branch 'tracing-fixes-for-linus' of git://git.kernel.org/.../tip/linux-2.6-tip Merge branch 'perf-fixes-for-linus' of git://git.kernel.org/.../tip/linux-2.6-tip Merge branch 'core-fixes-for-linus' of git://git.kernel.org/.../tip/linux-2.6-tip Merge branch 'for-linus' of git://git.kernel.org/.../tiwai/sound-2.6 Merge branch 'for-linus' of master.kernel.org:/home/rmk/linux-2.6-arm Revert "ext4: Remove journal_checksum mount option and enable it by default" Merge branch 'release' of git://git.kernel.org/.../aegl/linux-2.6 Merge branch 'for-linus' of git://git.kernel.org/.../ericvh/v9fs Merge git://git.kernel.org/.../davem/net-2.6 Merge branch 'for-linus' of git://git.kernel.org/.../ryusuke/nilfs2 Merge branch 'i2c-fixes' of git://git.fluff.org/bjdooks/linux Merge branch 'fixes-s3c-2632-rc5' of git://git.fluff.org/bjdooks/linux Merge branch 'for-linus' of git://git.kernel.org/.../dtor/input Merge branch 'pm-fixes' of git://git.kernel.org/.../rafael/suspend-2.6 Merge branch 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus Merge branch 'for-linus' of git://github.com/at91linux/linux-2.6-at91 Linux 2.6.32-rc6 Linus Walleij (1): ARM: 5765/1: Updated U300 defconfig Lubomir Rintel (2): sh: Build fix: export __movmem sh: Build fix: define more __movmem* symbols Luca Tettamanti (2): hwmon: (asus_atk0110) Refactor the code hwmon: (asus_atk0110) Enable the EC Luis R. Rodriguez (1): ath9k: fix misplaced semicolon on rate control Magnus Damm (5): usb: r8a66597-udc unaligned fifo fix sh: enable sleep state LEDs on Ecovec24 sh: disabled cache handling fix. sh: rsk7203 CONFIG_MTD=n fix sh: add uImage.bin target Manuel Lauss (2): net: au1000_eth: add missing capability.h MIPS: Alchemy: Fix hang with high-frequency edge interrupts Marcelo Tosatti (2): KVM: VMX: flush TLB with INVEPT on cpu migration KVM: use proper hrtimer function to retrieve expiration time Marcin Slusarz (2): ide: use printk_once [IA64] use printk_once() unaligned.c/io_common.c Marin Mitov (1): x86, pci: Correct spelling in a comment Mark Brown (7): hwmon: (s3c-hwmon) Disable build for S3C64xx ARM: S3C64XX: Set rate of crystal mux mfd: Always initialise WM831x IRQ mutex ASoC: Staticise wm8727 driver structure ASoC: Move sysfs and debugfs functions to head of soc-core.c ASoC: Factor out snd_soc_init_card() Merge branch 'for-2.6.32' into for-2.6.33 Mark Hills (3): ALSA: snd-usb-caiaq: Missing lock around use of buffer positions ALSA: snd-usb-caiaq: Lock on stream start/unpause ALSA: snd-usb-caiaq: Bump version number to 1.3.20 Mark Langsdorf (1): ACPI: add AC/DC notifier Mark McLoughlin (1): block: silently error unsupported empty barriers too Markus Trippelsdorf (1): ahci: Add ifdef wrapper to ahci_gtf_filter_workaround Marti Raudsepp (1): perf tools: Fix compatibility with libelf 0.8 and autodetect Martin K. Petersen (5): [SCSI] Deprecate SCSI_PROT_*_CONVERT operations [SCSI] sd: Detach DIF from block integrity infrastructure [SCSI] Fix protection scsi_data_buffer leak [SCSI] sd: Support disks formatted with DIF Type 2 [SCSI] scsi_debug: Implement support for DIF Type 2 Martin Schwidefsky (4): [S390] fix build breakage with CONFIG_AIO=n [S390] pm: ignore time spend in suspended state [S390] s/r: cmm resume fix [S390] cputime: fix overflow on 31 bit systems Martin Stava (2): 9p: fix a small bug in readdir for long directories 9p: fix readlink Matt Carlson (1): tg3: Fix phylib locking strategy Matt Fleming (7): sh: Don't enable interrupts in the page fault path tracing: Fix infinite recursion in ftrace_update_pid_func() sh: Sprinkle __uses_jump_to_uncached sh: Plug PMB alloc memory leak sh: Try PMB mapping based on physical address, not mapping size sh: Don't allocate smaller sized mappings on every iteration sh: Check for return_to_handler when unwinding the stack Matthew Wilcox (1): [IA64] Require SAL 3.2 in order to do extended config space ops Michael Buesch (3): b43: Don't use struct wldev after detach. b43: Protect sanity check against physical device removal b43: Fix DMA TX bounce buffer copying Michael Chan (1): cnic: Fix L2CTX_STATUSB_NUM offset in context memory. Michael Ellerman (1): powerpc: Fix memory leak in axon_msi.c Michael Ernst (1): [S390] cio: channel path memory leak Michael Hennerich (3): Input: ad7879 - pass up error codes from probe functions Blackfin: convert adv7393 resources to new i2c framework Blackfin: convert to GENERIC_HARDIRQS_NO__DO_IRQ Michael Holzheu (4): [S390] hibernate: Use correct place for CPU address in lowcore [S390] hypfs: Use subcode 6 if subcode 7 is not available [S390] tape390: Fix request queue handling in block driver [S390] sclp_vt220 build fix Michael Neuling (1): powerpc/perf_events: Fix priority of MSR HV vs PR bits Michael S. Tsirkin (3): virtio-net: fix data corruption with OOM virtio-pci: fix per-vq MSI-X request logic virtio: order used ring after used index read Michal Ostrowski (1): PPPoE: Fix flush/close races. Michal Simek (2): microblaze: UMS is used only for MMU kernel microblaze: Clear sticky FSR register after saving it to func parametr Miguel Boton (1): b43: add 'struct b43_wl' missing declaration Mike Frysinger (9): Blackfin: asm/irq.h: pull in mach/anomaly.h for anomaly defines Blackfin: cplbinfo: drop d_path() hacks Blackfin: bf533-ezkit: convert to physmap/jedec_probe Blackfin: drop cs_change_per_word setting Blackfin: drop all simple-gpio board resources USB: musb: make HAVE_CLK support optional USB: isp1362: fix build warnings on 64-bit systems USB: musb: invert arch depend string twl4030-gpio: remove __devexit markings from remove func Mike Galbraith (1): sched: Update the clock of runqueue select_task_rq() selected Mike Rapoport (1): [ARM] pxa/cm-x300: fix mmc numbering Mikulas Patocka (7): dm snapshot: sort by chunk size to fix race dm snapshot: require non zero chunk size by end of ctr dm exception store: fix failed set_chunk_size error path dm snapshot: lock snapshot while supplying status dm snapshot: use unsigned integer chunk size dm snapshot: allow chunk size to be less than page size ide: Serialize CMD643 and CMD646 to fix a hardware bug with SSD Milan Dadok (3): Staging: hv: fix oops in vmbus - udev events Staging: hv: fix oops in vmbus - netvsc list_head Staging: hv: fix oops in vmbus - missing #include Mimi Zohar (1): ima: ecryptfs fix imbalance message Moger, Babu (1): [SCSI] scsi_dh_rdac: Fix for returning correct mode select cmd return info Mulyadi Santosa (1): perf tools: Run generate-cmdlist.sh properly Neil Brown (2): sysfs: Allow sysfs_notify_dirent to be called from interrupt context. block: use after free bug in __blkdev_get Neil Horman (2): add maintainer for network drop monitor kernel service AF_RAW: Augment raw_send_hdrinc to expand skb to fit iphdr->ihl (v2) NeilBrown (8): Revert "md: do not progress the resync process if the stripe was blocked" md/raid1/raid10: add a cond_resched md: raid1/raid10: handle allocation errors during array setup. md: remove clumsy usage of do_sync_mapping_range from bitmap code md: fix problems with RAID6 calculations for DDF. md: Fix handling of raid5 array which is being reshaped to fewer devices. md/async: don't pass a memory pointer as a page pointer. raid6/async_tx: handle holes in block list in async_syndrome_val Nick Cheng (1): [SCSI] mvsas: Support Areca SAS/SATA HBA, ARC-1300/1320 Nicolas Ferre (2): avr32: add two new at91 to cpu.h definition at91: at91sam9g45 family: identify several chip versions Nigel Stephens (1): MIPS: Fix abs.[sd] and neg.[sd] emulation for NaN operands Nikanth Karthikesan (1): block: Seperate read and write statistics of in_flight requests v2 Nitin Gupta (1): ARM: force dcache flush if dcache_dirty bit set Nobuhiro Iwamatsu (1): sh_eth: Add asm/cacheflush.h OGAWA Hirofumi (1): dpt_i2o: Fix typo of EINVAL Oliver Neukum (7): USB: visor: fix trivial accounting bug in visor driver USB: small fix in error case of suspend in generic usbserial code USB: serial: fix race between unthrottle and completion handler in opticon USB: serial: fix race between unthrottle and completion handler in symbolserial USB: serial: fix assumption that throttle/unthrottle cannot sleep USB: serial: fix race between unthrottle and completion handler in visor USB: serial: no unnecessary GFP_ATOMIC in oti6858 Paul E. McKenney (13): rcu: Clean up code based on review feedback from Josh Triplett rcu: Clean up code based on review feedback from Josh Triplett, part 2 rcu: Clean up code to address Ingo's checkpatch feedback rcu: Fix rcu_lock_map build failure on CONFIG_PROVE_LOCKING=y rcu: Clean up code based on review feedback from Josh Triplett, part 3 rcu: Clean up code based on review feedback from Josh Triplett, part 4 rcu: Replace the rcu_barrier enum with pointer to call_rcu*() function rcu: Move rcu_barrier() to rcutree rcu: Make hot-unplugged CPU relinquish its own RCU callbacks rcu: Place root rcu_node structure in separate lockdep class rcu: Prevent RCU IPI storms in presence of high call_rcu() load rcu: Stopgap fix for synchronize_rcu_expedited() for TREE_PREEMPT_RCU rcu: Fix TREE_PREEMPT_RCU CPU_HOTPLUG bad-luck hang Paul Mackerras (1): perf_event: Adjust frequency and unthrottle for non-group-leader events Paul Menage (1): cgroups: update documentation of cgroups tasks and procs files Paul Mundt (18): sh: Handle ioport_map() cases for >= P1SEG addresses. sh: Set the default I/O port base to P2SEG. sh: magicpanelr2 and dreamcast can use the generic I/O base. sh: Disable unaligned kernel access printks by default. kmemtrace: Fix up tracer registration sh: update die() output. sh: force dcache flush if dcache_dirty bit set. sh: ftrace: Fix up syscall tracepoint support. sh: Use boot_cpu_data for FPU tests in sigcontext paths. sh: Tidy up SMP cpuinfo. sh: Populate initial secondary CPU info from boot_cpu_data. sh: Optimize the setup_rt_frame() I-cache flush. sh: Fix a TRACE_IRQS_OFF typo. sh: Kill off stray HAVE_FTRACE_SYSCALLS reference. sh: __irq_entry annotate do_IRQ(). perf tools: Remove -Wcast-align sh: Document uImage.bin target in archhelp. sh: Fix hugetlbfs dependencies for SH-3 && MMU configurations. Paul Walmsley (3): OMAP3: PM: PRCM interrupt: check MPUGRPSEL register OMAP3: PM: PRCM interrupt: only handle selected PRCM interrupts OMAP2xxx clock: set up clockdomain pointer in struct clk Pavel Herrmann (1): lis3: better support for hp 6730x Pavel Hofman (1): ALSA: ICE1712/24 - Change the Multi Track Peak control (level meters) from MIXER to PCM type Pavel Machek (1): PM: Remove some debug messages producing too much noise Pekka Enberg (1): Staging: w35und: Fix ->beacon_int breakage Peter Huewe (2): HID: add __init/__exit macros to twinhan.c Staging: Panel: prevent driver from calling misc_deregister twice on same ressource Peter Magdina (1): USB: option: Toshiba G450 device id Peter Oberparleiter (4): [S390] cio: make disconnected handling consistent [S390] cio: make not operational handling consistent [S390] cio: allow setting boxed devices offline [S390] cio: change misleading console logic Peter Williams (1): sched: Set correct normal_prio and prio values in sched_fork() Peter Zijlstra (5): perf_event: Provide vmalloc() based mmap() backing futex: Nullify robust lists after cleanup lockdep: Use cpu_clock() for lockstat sched: Disable SD_PREFER_LOCAL for MC/CPU domains sched: Do less agressive buddy clearing Philby John (2): ALSA: aaci: ARM1176 aaci-pl041 AC97 register read timeout ARM: 5774/1: Fix Realview ARM1176PB board reboot Rafael J. Wysocki (4): PCI PM: Read device power state from register after updating it ACPI / PCI: Fix NULL pointer dereference in acpi_get_pci_dev() (rev. 2) PM: Make warning in suspend_test_finish() less likely to happen PM / yenta: Split resume into early and late parts (rev. 4) Raimonds Cicans (1): r8169: Fix card drop incoming VLAN tagged MTU byte large jumbo frames Rajendra Nayak (1): omap: Lock DPLL5 at boot Rajiv Andrade (1): TPM: fix pcrread Rakib Mullick (2): hwmon: (sht15) Fix spurious section mismatch warning eeepc-laptop: Properly annote eeepc_enable_camera(). Ralf Baechle (12): IRQ: Change __softirq_pending to unsigned int in asm-generic/hardirq.h. MIPS: Extend COMMAND_LINE_SIZE MIPS: Don't write ones to reserved entryhi bits. MIPS: Cleanup CONFIG_DEBUG_STACK_USAGE version of alloc_thread_info. MIPS: IP27: Fix build MIPS: VPE: Remove stray unlock_kernel. MIPS: MTX-1: Fix build if CONFIG_PCI is disabled. MIPS: Kconfig: Fix duplicate default value for MIPS_L1_CACHE_SHIFT. MIPS: Malta: Enable PCI 2.1 compatibility in PIIX4 MIPS: 1004K: Enable SPRAM support. MIPS: Set S-cache linesize to 64-bytes for MTI's S-cache MIPS: Avoid potential hazard on Context register Ralf Roesch (1): MIPS: TXx9: Fix error handling / Fix for noenexisting gpio_remove. Ramax Lo (1): ARM: S3C24XX: Define a macro to avoid compilation error Randy Dunlap (13): [SCSI] scsi_transport_fc: fix missing kernel-doc PCI: pci.c: fix kernel-doc notation ecryptfs: depends on CRYPTO blk-settings: fix function parameter kernel-doc notation perf tools: Fix const char type propagation sched: Fix missing kernel-doc notation net: ks8851_mll uses mii interfaces vmxnet: fix 2 build problems [IA64] fix percpu warnings vmxnet3: use dev_dbg, fix build for CONFIG_BLOCK=n pcmcia: fix controller printk format warnings cpufreq: add cpufreq_get() stub for CONFIG_CPU_FREQ=n Staging: fix wireless drivers depends Reinette Chatre (3): iwlwifi: fix compile warning iwlagn: fix compile warning in iwl5000_gain_computation mac80211: fix ibss joining Richard Zhao (3): i2c: imx: check busy bit when START/STOP i2c: imx: only imx1 needs disable delay i2c: imx: disable clock when it's possible to save power. Robert Hancock (3): ahci: display all AHCI 1.3 HBA capability flags (v2) ALSA: ice1724: increase SPDIF and independent stereo buffer sizes ALSA: ice1724: Fix surround on Chaintech AV-710 Robert Noland (1): drm/r600: avoid assigning vb twice in blit code Robert Richter (1): oprofile: warn on freeing event buffer too early Robin Getz (1): Blackfin: mass clean up of copyright/licensing info Robin Holt (3): x86, UV: Fix information in __uv_hub_info structure x86, UV: Fix and clean up bau code to use uv_gpa_to_pnode() x86, UV: Set DELIVERY_MODE=4 for vector=NMI_VECTOR in uv_hub_send_ipi() Roel Kluin (10): drm/radeon: Fix setting of bits netxen: Fix Unlikely(x) > y mac80211: fix ADM8211_SYNCTL_RFtype define mac80211: use kfree_skb() to free struct sk_buff pointers [IA64] unsigned cannot be less than 0 in sn_hwperf_ioctl() Input: hp_sdc_rtc - fix test in hp_sdc_rtc_read_rt() UBI: fix check on unsigned long hwmon: (fschmd) Fix check on unsigned in watchdog_write() airo: Reorder tests, check bounds before element frv: fix check on unsigned in do_signal() Roger Quadros (2): mfd: Fix twl4030 boot with twl4030 usb transceiver enabled omap_hsmmc: add missing probe handler hook Roland Dreier (5): intel-iommu: Make "Unknown DMAR structure" message more informative intel-iommu: Decode (and ignore) RHSA entries hrtimer: Remove overly verbose "switch to high res mode" message Merge branches 'cxgb3', 'misc' and 'mlx4' into for-next x86: Don't print number of MCE banks for every CPU Roland McGrath (1): x86: linker script syntax nits Romit Dasgupta (1): PM: Fix warning on suspend errors Ron Mercer (12): qlge: Fix some bit definitions for reset register. qlge: Fix queueing of firmware handler in ISR. qlge: Fix lock/mutex warnings. qlge: Fix RSS hashing values. qlge: Fix frame routing issue related to bonding. qlge: Fix frame routing for multicast frames. qlge: Fix RX multicast filter settings. qlge: Fix chip reset process. qlge: Restore rx mode after internal reset. qlge: Add disable/enable firmare irqs to handler. qlge: Fix EEH handling. qlge: Fix firmware mailbox command timeout. Ronnie Furuskog (1): USB: option: Patch for Huawei Mobile Broadband E270+ Modem Russell King (15): ARM: Dump memory and backtrace as one printk per line ARM: Dump code/mem oops lines with the appropriate log level ARM: update die() output ARM: Add kmap_atomic type debugging Merge branch 'fix' of git://git.kernel.org/.../ycmiao/pxa-linux-2.6 Merge branch 'for-rmk-rc' of git://git.pengutronix.de/git/imx/linux-2.6 Merge branch 'fix' of git://git.kernel.org/.../ycmiao/pxa-linux-2.6 ARM: Fix lubbock defconfig build ARM: Fix signal restart issues with NX and OABI compat ARM: integrator: allow Integrator to be built with highmem ARM: Use GFP_DMA only for masks _less_ than 32-bit mm: fix sparsemem configuration ARM: Fix sparsemem with SPARSEMEM_EXTREME enabled ARM: Fix errata 411920 workarounds ARM: ensure initial page tables are setup for SMP systems Rusty Russell (5): virtio_blk: Revert serial number support x86: Side-step lguest problem by only building cmpxchg8b_emu for pre-Pentium param: fix lots of bugs with writing charp params from sysfs, by leaking mem. param: fix NULL comparison on oom param: fix setting arrays of bool Ryan Mallon (1): ARM: S3C: Fix adc function exports Ryota Yamauchi (1): xfs: fix xfs_quota remove error Ryusuke Konishi (3): nilfs2: fix dirty page accounting leak causing hang at write nilfs2: fix irregular checkpoint creation due to data flush nilfs2: add zero-fill for new btree node buffers Sam Ravnborg (1): kbuild: revert "save ARCH & CROSS_COMPILE ..." Samu Onkalo (1): lis3lv02d_spi: module unload didn't remove sysfs entry Samuel Thibault (1): x86: Fix csum_ipv6_magic asm memory clobber Sanjeev Premi (1): omap: CONFIG_ISP1301_OMAP redefined in Beagle defconfig Santosh Shilimkar (4): ARM: 5763/1: ARM: SMP: Fix the BUG with CONFIG_PREEMPT enabled omap: SDMA: Fix omap_stop_dma() API for channel linking omap4: Allow omap_serial_early_init() for OMAP4430 board omap4: Fix UART4 platform data on omap4 Sarah Sharp (6): USB: xhci: Stop debugging polling loop when HC dies. USB: xhci: Handle canceled URBs when HC dies. USB: xhci: Don't wait for a disable slot cmd when HC dies. USB: xhci: Fix dropping endpoints from the xHC schedule. USB: ehci: Fix isoc scheduling boundary checking. USB: ehci: Fix IST boundary checking interval math. Sascha Hauer (6): i.MX27 clock: rename spi clocks to match device mx25 devices: Add missing include mx25pdk: remove nand support as it is not present in current tree mx25: Add missing copyright / license header pcm038: Add SPI/MC13783 support pcm970 mmc: Fix ro switch Sathya Perla (2): be2net: fix promiscuous and multicast promiscuous modes being enabled always be2net: fix support for PCI hot plug Sean MacLennan (1): powerpc: warning: allocated section `.data_nosave' not in segment Sebastian Frei (1): Input: wistron_btns - add DMI entry for Medion WIM2030 laptop Sebastian Ott (2): [S390] 3270 console build fix [S390] call home: fix local buffer usage in proc handler Serge E. Hallyn (1): Staging: p9auth: a few fixes Sergey Pinaev (1): USB: storage: iRiver P7 UNUSUAL_DEV patch Sergio Aguirre (1): omapfb: Condition mutex acquisition Shane Huang (1): ahci / atiixp / pci quirks: rename AMD SB900 into Hudson-2 Shreyas Bhatewara (1): net: VMware virtual Ethernet NIC driver: vmxnet3 Simon Wunderlich (1): r8169: fix Ethernet Hangup for RTL8110SC rev d Soeren Sandmann (2): perf events: Fix swevent hrtimer sampling by keeping track of remaining time when enabling/disabling swevent hrtimers perf events: Don't generate events for the idle task when exclude_idle is set Srinidhi Kasagar (1): ARM: 5741/1: pl022: fix peripheral id for ST vendor Sriram (1): TI DaVinci EMAC: Clear statistics register properly. Stanislav Brabec (1): [ARM] pxa/spitz: add gpio button support (fixes regression) Stas Sergeev (2): ALSA: pcsp - Fix nforce workaround Driver core: fix driver_register() return value Stefan Bader (1): ACPI: video: Loosen strictness of video bus detection code Stefan Haberland (3): [S390] dasd: fix race condition in resume code [S390] dasd: fix locking bug [S390] dasd: use idal for device characteristics Stefan Richter (3): ieee1394: add documentation entry to MAINTAINERS NFS: suppress a build warning firewire: sbp2: provide fallback if mgt_ORB_timeout is missing Stefano Panella (1): USB: wusb: don't use the stack to read security descriptor Stephen Boyd (1): connector: Fix incompatible pointer type warning Stephen Hemminger (2): ipv4: arp_notify address list bug Staging: hv TODO patches Stephen M. Cameron (2): cciss: Fix multiple calls to pci_release_regions cciss: Add cciss_allow_hpsa module parameter Stephen Rothwell (2): sparc: using HZ needs an include of linux/param.h powerpc/iseries: Remove compiler version dependent hack Steve French (1): [CIFS] Fixing to avoid invalid kfree() in cifs_get_tcp_session() Steve Wise (2): RDMA/iwcm: Don't call provider reject func with irqs disabled RDMA/cxgb3: Handle NULL inetdev pointer in iwch_query_port() Steven King (1): net: fix section mismatch in fec.c Steven Rostedt (6): tracing: fix transposed numbers of lock_depth and preempt_count ftrace: check for failure for all conversions tracing: user local buffer variable for trace branch tracer tracing: fix trace_vprintk call powerpc/ftrace: show real return addresses in modules powerpc64/ftrace: use PACA to retrieve TOC in mod_return_to_handler Takao Indoh (1): [IA64] Restore registers in the stack on INIT Takashi Iwai (18): ALSA: hda - Fix invalid initializations for ALC861 auto mode ALSA: hda - Add a workaround for ASUS A7K ALSA: hda - Don't pick up invalid HP pins in alc_subsystem_id() ALSA: hda - Fix yet another auto-mic bug in ALC268 Merge branch 'fix/hda' into for-linus Merge branch 'fix/misc' into for-linus ALSA: hda - Add full rates/formats support for Nvidia HDMI ALSA: hda - Fix overflow of spec->init_verbs in patch_realtek.c ALSA: bt87x - Add a whitelist for Pinnacle PCTV (11bd:0012) ALSA: hda - Fix mute sound with STAC9227/9228 codecs ALSA: hda - Fix volume-knob setup for Dell laptops with STAC9228 ALSA: hda - Allow all formats as default for Nvidia HDMI Merge branch 'fix/hda' into for-linus ALSA: hda - Fix capture source checks for ALC662/663 codecs ALSA: dummy - Fix descriptions of pcm_substreams parameter ALSA: hda - Don't check invalid HP pin Merge branch 'fix/asoc' into for-linus Merge branch 'fix/hda' into for-linus Teerth Reddy (1): omap: Initialization of SDRC params on Zoom2 Tejun Heo (11): [SCSI] sr: consider the last written sector when determining media size ahci: disable 64bit DMA by default on SB600s libata: cosmetic updates libata: implement more acpi filtering options libata: make gtf_filter per-dev ahci: filter FPDMA non-zero offset enable for Aspire 3810T libata: fix incorrect link online check during probe percpu: fix compile warnings sata_nv: make sure link is brough up online when skipping hardreset libata: fix PMP initialization libata: fix internal command failure handling Terry Loftin (1): nfs: Panic when commit fails Tetsuo Handa (1): kmemleak: Use GFP_ATOMIC for early_alloc(). Theodore Ts'o (1): ext3: Don't update superblock write time when filesystem is read-only Thomas Chou (8): ethoc: fix typo to compute number of tx descriptors ethoc: fix buffer address mapping ethoc: align received packet to make IP header at word boundary ethoc: use system memory as buffer ethoc: limit the number of buffers to 128 Blackfin: fix framebuffer mmap bug for nommu ethoc: inline regs access ethoc: clear only pending irqs Thomas Gleixner (6): futex: Fix locking imbalance futex: Move exit_pi_state() call to release_mm() futex: Handle spurious wake up watchdog: Fix rio watchdog probe function sh: Remove BKL from landisk gio. futex: Fix spurious wakeup for requeue_pi really Thomas Gruber (1): Input: xpad - add BigBen Interactive XBOX 360 Controller Tilman Schmidt (12): Documentation: expand isdn/INTERFACE.CAPI document isdn: accept CAPI Informational Info values as success isdn: avoid races in capidrv isdn: make capidrv module parameter "debugmode" writeable gigaset: fix reject/hangup handling gigaset: linearize skb gigaset: handle isoc frame errors more gracefully gigaset: announce if built with debugging gigaset: fix device ERROR response handling gigaset: improve error recovery gigaset: correct debugging output selection gigaset: add kerneldoc comments Tim Abbott (1): parisc: Make THREAD_SIZE available to assembly files and linker scripts. Tim Blechmann (1): perf top: Fix --delay_secs 0 division by zero Tobias Klauser (1): USB: gadget: imx_udc: Use resource size Tom Zanussi (3): perf trace: Remove unused code in builtin-trace.c perf trace: Update eval_flag() flags array to match interrupt.h tracing/syscalls: Use long for syscall ret format and field definitions Tommi Rantala (2): omapfb: Blizzard: fix pointer to be const omapfb: Blizzard: constify register address tables Tomoki Sekiyama (1): AF_UNIX: Fix deadlock on connecting to shutdown socket Tony Lindgren (5): omap: Fix incorrect 730 vs 850 detection Merge branch 'pm-fixes-32' of git://git.kernel.org/.../khilman/linux-omap-pm into omap-fixes-for-linus Merge branch '2_6_32rc4_fixes' of git://git.pwsan.com/linux-2.6 into omap-fixes-for-linus omap2: Fix detection of n8x0 omap2: Fix console serial port number for n8x0 Tony Luck (6): [IA64] Squeeze ticket locks back into 4 bytes. [IA64] Re-implement spinaphores using ticket lock concepts [IA64] SMT friendly version of spin_unlock_wait() Pull ticket4byte into release branch Pull ticket-spinaphore into release branch Revert "[IA64] fix percpu warnings" Trond Myklebust (8): NFS: Fix a default mount regression... NFS: Fix port and mountport display in /proc/self/mountinfo NFS: Fix port initialisation in nfs_remount() NFSv4: Fix the referral mount code NFSv4: Kill nfs4_renewd_prepare_shutdown() NFSv4: Fix a bug when the server returns NFS4ERR_RESOURCE NFSv4: Fix two unbalanced put_rpccred() issues. NFSv4: The link() operation should return any delegation on the file Tyler Hicks (1): eCryptfs: Remove Kconfig NET dependency and select MD5 Uwe Kleine-König (4): Input: sparkspkr - move remove() functions to .devexit.text mmc: at91_mci: Don't include asm/mach/mmc.h move virtballoon_remove to .devexit.text move virtrng_remove to .devexit.text Valentin Longchamp (1): MXC: fix reset for mx31, mx35 and mx27 SoCs Valentin Sitdikov (1): sh: Fix up single page flushing to use PAGE_SIZE. Valentine Barshak (1): pasemi_mac: ethtool get settings fix Vikram Pandita (1): OMAP3: PM: USBHOST: clear wakeup events on both hosts Vincent Legoll (1): perf events: Update MAINTAINERS entry file patterns Vincent Sanders (1): net: Fix IXP 2000 network driver building. Vladimir Dronnikov (1): md: drivers/md/unroll.pl replaced with awk analog Wei Yongjun (1): inotify: fix coalesce duplicate events into a single event in special case Wey-Yi Guy (2): iwlwifi: fix EEPROM enhance tx power offset iwlwifi: change the order of freeing memory Willy Tarreau (1): tcp: fix tcp_defer_accept to consider the timeout Wolfram Sang (3): include/linux/netdevice.h: fix nanodoc mismatch powerpc/boot/dts: drop obsolete 'fsl5200-clocking' pcmcia: Fix possible printk format warnings Wu Fengguang (13): pagemap: export KPF_HWPOISON pagemap: document KPF_KSM and show it in page-types page-types: add GPL note page-types: introduce checked_open() page-types: make standalone pagemap/kpageflags read routines page-types: make voffset local variables page-types: introduce kpageflags_flags() page-types: add hwpoison/unpoison feature writeback: account IO throttling wait as iowait writeback: kill space in debugfs item name HWPOISON: return early on non-LRU pages HWPOISON: fix invalid page count in printk output vmscan: limit VM_EXEC protection to file pages Wu Zhangjin (6): ALSA: SND_CS5535AUDIO: Remove the X86 platform dependency MIPS: Loongson: Remove redundant local_irq_disable() MIPS: Add IRQF_TIMER flag for timer interrupts MIPS: 64-bit: Fix o32 lookup_dcookie syscall MIPS: Add IRQF_TIMER flag for timer interrupts MIPS: Oprofile: Rename cpu_type from godson2 to loongson2 Xiao Guangrong (2): perf_event: Fix event group handling in __perf_event_sched_*() perf_event: Clean up perf_event_init_task() Xiaotian Feng (1): isdn: fix possible circular locking dependency Xose Vazquez Perez (1): rt73usb.c : more ids Yan, Zheng (3): Btrfs: remove negative dentry when deleting subvolumne Btrfs: optimize back reference update during btrfs_drop_snapshot Btrfs: properly wait log writers during log sync Yegor Yefremov (1): ARM: 5766/1: Fix watchdog enabling for AT91SAM9G45 Yevgeny Petrilin (1): mlx4_core: Add 40GigE device ID Yinghai Lu (3): PCI: get larger bridge ranges when space is available pci: increase alignment to make more space for hidden code nfs: Fix nfs_parse_mount_options() kfree() leak Yoshihiro Shimoda (1): USB: r8a66597-hcd: fix cannot detect a device when uses_new_polling is set Zdenek Kabelac (1): dm: add missing del_gendisk to alloc_dev error path Zhang Le (1): MIPS: Loongson 2: Set cpu_has_dc_aliases and cpu_icache_snoops_remote_store Zhao Yakui (3): drm/i915: Multiply the refresh by 1000 in TV mode validatiion drm: Delete the DRM_DEBUG_KMS in drm_mode_cursor_ioctl drm: Add the basic check for the detailed timing in EDID Zhenwen Xu (1): tracing: fix warning on kernel/trace/trace_branch.c andtrace_hw_branches.c Zhu Yi (1): ipw2200: fix oops on missing firmware françois romieu (1): r8169: partial support and phy init for the 8168d jamal (2): pkt_sched: pedit use proper struct net: Fix RPF to work with policy routing jolsa(a)redhat.com (1): tracing: correct module boundaries for ftrace_release miaofng (1): Staging: vt6656: fix the memory free bug in vntwusb_disconnect() peer chen (2): ahci: Add the AHCI controller Linux Device ID for NVIDIA chipsets. ALSA: hda_intel: Add the Linux device ID for NVIDIA HDA controller roel kluin (2): au1000_eth: Duplicate test of RX_OVERLEN bit in update_rx_stats() ibmtr: possible Read buffer overflow? ye janboe (1): omap: SRAM: flush the right address after memcpy in omap_sram_push Éric Piel (2): USB: cp210x: Add support for the DW700 UART lis3: add support for the HP EliteBook 8530w ...fs-class-usb_host => sysfs-class-uwb_rc-wusbhc} | 4 +- .../ABI/testing/sysfs-devices-cache_disable | 18 - Documentation/ABI/testing/sysfs-devices-system-cpu | 156 + Documentation/cgroups/cgroups.txt | 11 +- Documentation/cputopology.txt | 47 +- Documentation/debugging-via-ohci1394.txt | 8 +- Documentation/feature-removal-schedule.txt | 38 + Documentation/filesystems/ext3.txt | 16 +- Documentation/filesystems/ext4.txt | 8 +- Documentation/flexible-arrays.txt | 43 +- Documentation/hwmon/sysfs-interface | 57 +- Documentation/infiniband/user_mad.txt | 4 +- Documentation/infiniband/user_verbs.txt | 2 +- Documentation/isdn/INTERFACE.CAPI | 83 +- Documentation/kernel-parameters.txt | 1 + Documentation/lguest/lguest.c | 1 - Documentation/networking/pktgen.txt | 8 + Documentation/scsi/hptiop.txt | 21 +- Documentation/sound/alsa/ALSA-Configuration.txt | 2 +- Documentation/sound/alsa/HD-Audio-Models.txt | 1 + Documentation/trace/ftrace.txt | 2 + Documentation/vm/hwpoison.txt | 136 + Documentation/vm/ksm.txt | 13 +- Documentation/vm/page-types.c | 304 ++- Documentation/vm/pagemap.txt | 8 + MAINTAINERS | 196 +- Makefile | 48 +- arch/arm/configs/n8x0_defconfig | 2 +- arch/arm/configs/omap3_beagle_defconfig | 1 - arch/arm/configs/u300_defconfig | 94 +- arch/arm/include/asm/bitops.h | 6 +- arch/arm/include/asm/cacheflush.h | 5 + arch/arm/include/asm/elf.h | 3 + arch/arm/include/asm/tlbflush.h | 3 +- arch/arm/kernel/entry-armv.S | 28 +- arch/arm/kernel/entry-header.S | 15 + arch/arm/kernel/process.c | 9 + arch/arm/kernel/signal.c | 41 +- arch/arm/kernel/signal.h | 4 +- arch/arm/kernel/time.c | 1 + arch/arm/kernel/traps.c | 80 +- arch/arm/kernel/unwind.c | 9 + arch/arm/mach-at91/at91sam9g45_devices.c | 2 +- arch/arm/mach-at91/include/mach/cpu.h | 9 + arch/arm/mach-bcmring/core.c | 4 +- arch/arm/mach-bcmring/include/mach/system.h | 2 +- arch/arm/mach-ep93xx/Kconfig | 44 +- arch/arm/mach-ep93xx/Makefile.boot | 9 + arch/arm/mach-ep93xx/clock.c | 166 +- arch/arm/mach-ep93xx/core.c | 32 +- arch/arm/mach-ep93xx/edb93xx.c | 31 +- arch/arm/mach-ep93xx/include/mach/ep93xx-regs.h | 42 +- arch/arm/mach-ep93xx/include/mach/gpio.h | 16 +- arch/arm/mach-ep93xx/include/mach/memory.h | 6 + arch/arm/mach-ep93xx/include/mach/platform.h | 5 +- arch/arm/mach-ep93xx/micro9.c | 132 +- arch/arm/mach-integrator/include/mach/memory.h | 1 + arch/arm/mach-integrator/pci_v3.c | 1 + arch/arm/mach-mx2/clock_imx27.c | 8 +- arch/arm/mach-mx2/pcm038.c | 96 +- arch/arm/mach-mx2/pcm970-baseboard.c | 2 +- arch/arm/mach-mx25/devices.c | 19 + arch/arm/mach-mx25/mx25pdk.c | 25 +- arch/arm/mach-mx3/clock-imx35.c | 2 +- arch/arm/mach-mx3/clock.c | 2 +- arch/arm/mach-mx3/devices.c | 24 +- arch/arm/mach-mx3/devices.h | 6 +- arch/arm/mach-mx3/mm.c | 2 + arch/arm/mach-omap1/board-ams-delta.c | 6 + arch/arm/mach-omap1/board-generic.c | 8 + arch/arm/mach-omap1/board-innovator.c | 20 + arch/arm/mach-omap1/board-palmte.c | 8 + arch/arm/mach-omap1/board-palmtt.c | 8 + arch/arm/mach-omap1/board-palmz71.c | 8 + arch/arm/mach-omap1/board-sx1.c | 8 + arch/arm/mach-omap1/board-voiceblue.c | 8 + arch/arm/mach-omap1/serial.c | 26 - arch/arm/mach-omap2/Kconfig | 12 + arch/arm/mach-omap2/board-3430sdp.c | 2 +- arch/arm/mach-omap2/board-4430sdp.c | 4 +- arch/arm/mach-omap2/board-ldp.c | 2 +- arch/arm/mach-omap2/board-omap3evm.c | 2 +- arch/arm/mach-omap2/board-omap3pandora.c | 2 +- arch/arm/mach-omap2/board-rx51-peripherals.c | 82 +- arch/arm/mach-omap2/board-rx51.c | 1 - arch/arm/mach-omap2/board-zoom2.c | 6 +- arch/arm/mach-omap2/clock24xx.c | 1 + arch/arm/mach-omap2/clock34xx.c | 35 + arch/arm/mach-omap2/clockdomain.c | 74 +- arch/arm/mach-omap2/io.c | 2 + arch/arm/mach-omap2/pm-debug.c | 4 +- arch/arm/mach-omap2/pm34xx.c | 188 +- arch/arm/mach-omap2/powerdomain.c | 39 +- arch/arm/mach-omap2/serial.c | 10 - arch/arm/mach-pxa/cm-x300.c | 38 +- arch/arm/mach-pxa/cpufreq-pxa2xx.c | 2 +- arch/arm/mach-pxa/csb726.c | 2 +- arch/arm/mach-pxa/spitz.c | 39 + arch/arm/mach-realview/core.h | 2 +- arch/arm/mach-realview/include/mach/board-pb1176.h | 5 + arch/arm/mach-realview/include/mach/board-pb11mp.h | 12 + arch/arm/mach-realview/include/mach/platform.h | 15 +- arch/arm/mach-realview/include/mach/system.h | 10 +- arch/arm/mach-realview/realview_pb1176.c | 11 + arch/arm/mach-realview/realview_pb11mp.c | 16 + arch/arm/mach-s3c2410/gpio.c | 1 + arch/arm/mach-s3c2410/include/mach/dma.h | 7 + arch/arm/mach-s3c2440/Kconfig | 1 + arch/arm/mach-s3c2440/mach-mini2440.c | 4 +- arch/arm/mach-s3c6400/include/mach/dma.h | 5 + arch/arm/mach-sa1100/Makefile | 1 + arch/arm/mm/Kconfig | 5 +- arch/arm/mm/cache-v6.S | 20 +- arch/arm/mm/cache-v7.S | 19 +- arch/arm/mm/context.c | 5 +- arch/arm/mm/dma-mapping.c | 4 +- arch/arm/mm/fault-armv.c | 9 +- arch/arm/mm/fault.c | 5 + arch/arm/mm/flush.c | 31 +- arch/arm/mm/highmem.c | 2 + arch/arm/mm/init.c | 22 +- arch/arm/mm/mmu.c | 7 + arch/arm/mm/proc-v6.S | 7 +- arch/arm/mm/proc-v7.S | 7 +- arch/arm/oprofile/op_model_v6.c | 3 + arch/arm/plat-omap/dma.c | 33 +- arch/arm/plat-omap/include/mach/cpu.h | 37 +- arch/arm/plat-omap/include/mach/keypad.h | 5 +- arch/arm/plat-omap/include/mach/powerdomain.h | 2 + arch/arm/plat-omap/iommu.c | 2 +- arch/arm/plat-omap/iovmm.c | 9 +- arch/arm/plat-omap/mcbsp.c | 2 +- arch/arm/plat-omap/sram.c | 3 +- arch/arm/plat-s3c24xx/adc.c | 3 +- arch/arm/plat-s3c24xx/cpu.c | 10 + arch/arm/plat-s3c24xx/dma.c | 6 +- arch/arm/plat-s3c24xx/gpio.c | 1 + arch/arm/plat-s3c24xx/include/plat/cpu-freq-core.h | 9 +- arch/arm/plat-s3c24xx/include/plat/s3c2410.h | 1 + arch/arm/plat-s3c64xx/include/plat/regs-clock.h | 4 +- arch/arm/plat-s3c64xx/s3c6400-clock.c | 3 + arch/avr32/mach-at32ap/include/mach/cpu.h | 3 + arch/blackfin/ADI_BSD.txt | 41 + arch/blackfin/Kconfig | 13 +- arch/blackfin/include/asm/atomic.h | 6 + arch/blackfin/include/asm/bfin-global.h | 26 +- arch/blackfin/include/asm/bfin5xx_spi.h | 2 - arch/blackfin/include/asm/bfin_rotary.h | 4 + arch/blackfin/include/asm/bfin_simple_timer.h | 6 + arch/blackfin/include/asm/bitops.h | 6 + arch/blackfin/include/asm/blackfin.h | 5 +- arch/blackfin/include/asm/bug.h | 6 + arch/blackfin/include/asm/byteorder.h | 5 - arch/blackfin/include/asm/cache.h | 9 +- arch/blackfin/include/asm/cacheflush.h | 27 +- arch/blackfin/include/asm/cdef_LPBlackfin.h | 32 +- arch/blackfin/include/asm/checksum.h | 9 +- arch/blackfin/include/asm/clocks.h | 27 +- arch/blackfin/include/asm/context.S | 27 +- arch/blackfin/include/asm/cplb.h | 27 +- arch/blackfin/include/asm/cplbinit.h | 27 +- arch/blackfin/include/asm/cpu.h | 21 +- arch/blackfin/include/asm/def_LPBlackfin.h | 36 +- arch/blackfin/include/asm/dma-mapping.h | 6 + arch/blackfin/include/asm/dpmc.h | 6 +- arch/blackfin/include/asm/early_printk.h | 22 +- arch/blackfin/include/asm/elf.h | 6 +- arch/blackfin/include/asm/entry.h | 6 + arch/blackfin/include/asm/fcntl.h | 6 + arch/blackfin/include/asm/fixed_code.h | 10 +- arch/blackfin/include/asm/flat.h | 5 +- arch/blackfin/include/asm/gpio.h | 27 +- arch/blackfin/include/asm/hardirq.h | 6 + arch/blackfin/include/asm/io.h | 6 + arch/blackfin/include/asm/irq.h | 19 +- arch/blackfin/include/asm/irq_handler.h | 6 + arch/blackfin/include/asm/l1layout.h | 5 +- arch/blackfin/include/asm/linkage.h | 6 + arch/blackfin/include/asm/mmu.h | 9 +- arch/blackfin/include/asm/mmu_context.h | 27 +- arch/blackfin/include/asm/module.h | 6 + arch/blackfin/include/asm/mutex.h | 4 + arch/blackfin/include/asm/nand.h | 12 +- arch/blackfin/include/asm/page.h | 6 + arch/blackfin/include/asm/page_offset.h | 9 +- arch/blackfin/include/asm/pda.h | 21 +- arch/blackfin/include/asm/pgtable.h | 12 + arch/blackfin/include/asm/poll.h | 7 + arch/blackfin/include/asm/portmux.h | 5 +- arch/blackfin/include/asm/posix_types.h | 6 + arch/blackfin/include/asm/processor.h | 6 + arch/blackfin/include/asm/ptrace.h | 6 + arch/blackfin/include/asm/sections.h | 6 + arch/blackfin/include/asm/segment.h | 6 + arch/blackfin/include/asm/sigcontext.h | 6 + arch/blackfin/include/asm/siginfo.h | 6 + arch/blackfin/include/asm/smp.h | 21 +- arch/blackfin/include/asm/spinlock.h | 6 + arch/blackfin/include/asm/spinlock_types.h | 6 + arch/blackfin/include/asm/stat.h | 6 + arch/blackfin/include/asm/string.h | 6 + arch/blackfin/include/asm/swab.h | 6 + arch/blackfin/include/asm/system.h | 32 +- arch/blackfin/include/asm/thread_info.h | 24 +- arch/blackfin/include/asm/tlb.h | 6 + arch/blackfin/include/asm/trace.h | 5 +- arch/blackfin/include/asm/traps.h | 13 +- arch/blackfin/include/asm/uaccess.h | 5 +- arch/blackfin/include/asm/unistd.h | 6 + arch/blackfin/kernel/asm-offsets.c | 27 +- arch/blackfin/kernel/bfin_dma_5xx.c | 1 + arch/blackfin/kernel/bfin_gpio.c | 27 +- arch/blackfin/kernel/cplb-mpu/cplbinit.c | 20 +- arch/blackfin/kernel/cplb-mpu/cplbmgr.c | 19 +- arch/blackfin/kernel/cplb-nompu/cplbinit.c | 19 +- arch/blackfin/kernel/cplb-nompu/cplbmgr.c | 16 +- arch/blackfin/kernel/cplbinfo.c | 26 +- arch/blackfin/kernel/dma-mapping.c | 27 +- arch/blackfin/kernel/early_printk.c | 23 +- arch/blackfin/kernel/entry.S | 27 +- arch/blackfin/kernel/fixed_code.S | 5 + arch/blackfin/kernel/flat.c | 18 +- arch/blackfin/kernel/init_task.c | 27 +- arch/blackfin/kernel/irqchip.c | 27 +- arch/blackfin/kernel/module.c | 27 +- arch/blackfin/kernel/process.c | 27 +- arch/blackfin/kernel/ptrace.c | 28 +- arch/blackfin/kernel/setup.c | 6 +- arch/blackfin/kernel/shadow_console.c | 2 - arch/blackfin/kernel/signal.c | 27 +- arch/blackfin/kernel/sys_bfin.c | 41 +- arch/blackfin/kernel/time-ts.c | 10 +- arch/blackfin/kernel/time.c | 64 +- arch/blackfin/kernel/traps.c | 27 +- arch/blackfin/kernel/vmlinux.lds.S | 27 +- arch/blackfin/lib/ashldi3.c | 27 +- arch/blackfin/lib/ashrdi3.c | 27 +- arch/blackfin/lib/checksum.c | 30 +- arch/blackfin/lib/divsi3.S | 28 +- arch/blackfin/lib/gcclib.h | 27 +- arch/blackfin/lib/lshrdi3.c | 27 +- arch/blackfin/lib/memchr.S | 27 +- arch/blackfin/lib/memcmp.S | 27 +- arch/blackfin/lib/memcpy.S | 37 +- arch/blackfin/lib/memmove.S | 27 +- arch/blackfin/lib/memset.S | 27 +- arch/blackfin/lib/modsi3.S | 36 +- arch/blackfin/lib/muldi3.S | 6 + arch/blackfin/lib/outs.S | 29 +- arch/blackfin/lib/smulsi3_highpart.S | 6 + arch/blackfin/lib/udivsi3.S | 27 +- arch/blackfin/lib/umodsi3.S | 27 +- arch/blackfin/lib/umulsi3_highpart.S | 6 + arch/blackfin/mach-bf518/boards/ezbrd.c | 45 +- arch/blackfin/mach-bf518/dma.c | 28 +- arch/blackfin/mach-bf518/include/mach/bf518.h | 27 +- .../mach-bf518/include/mach/bfin_serial_5xx.h | 29 +- arch/blackfin/mach-bf518/include/mach/blackfin.h | 29 +- arch/blackfin/mach-bf518/include/mach/cdefBF512.h | 29 +- arch/blackfin/mach-bf518/include/mach/cdefBF514.h | 29 +- arch/blackfin/mach-bf518/include/mach/cdefBF516.h | 29 +- arch/blackfin/mach-bf518/include/mach/cdefBF518.h | 70 +- .../mach-bf518/include/mach/cdefBF51x_base.h | 28 +- arch/blackfin/mach-bf518/include/mach/defBF512.h | 28 +- arch/blackfin/mach-bf518/include/mach/defBF514.h | 28 +- arch/blackfin/mach-bf518/include/mach/defBF516.h | 28 +- arch/blackfin/mach-bf518/include/mach/defBF518.h | 56 +- .../mach-bf518/include/mach/defBF51x_base.h | 28 +- arch/blackfin/mach-bf518/include/mach/gpio.h | 3 - arch/blackfin/mach-bf518/include/mach/irq.h | 29 +- arch/blackfin/mach-bf518/include/mach/portmux.h | 6 + arch/blackfin/mach-bf518/ints-priority.c | 27 +- arch/blackfin/mach-bf527/boards/cm_bf527.c | 61 +- arch/blackfin/mach-bf527/boards/ezbrd.c | 45 +- arch/blackfin/mach-bf527/boards/ezkit.c | 60 +- arch/blackfin/mach-bf527/dma.c | 28 +- arch/blackfin/mach-bf527/include/mach/bf527.h | 27 +- .../mach-bf527/include/mach/bfin_serial_5xx.h | 29 +- arch/blackfin/mach-bf527/include/mach/blackfin.h | 29 +- arch/blackfin/mach-bf527/include/mach/cdefBF522.h | 29 +- arch/blackfin/mach-bf527/include/mach/cdefBF525.h | 29 +- arch/blackfin/mach-bf527/include/mach/cdefBF527.h | 29 +- .../mach-bf527/include/mach/cdefBF52x_base.h | 28 +- arch/blackfin/mach-bf527/include/mach/defBF522.h | 28 +- arch/blackfin/mach-bf527/include/mach/defBF525.h | 28 +- arch/blackfin/mach-bf527/include/mach/defBF527.h | 28 +- .../mach-bf527/include/mach/defBF52x_base.h | 28 +- arch/blackfin/mach-bf527/include/mach/gpio.h | 3 - arch/blackfin/mach-bf527/include/mach/irq.h | 29 +- arch/blackfin/mach-bf527/include/mach/portmux.h | 6 + arch/blackfin/mach-bf527/ints-priority.c | 27 +- arch/blackfin/mach-bf533/boards/H8606.c | 33 +- arch/blackfin/mach-bf533/boards/blackstamp.c | 29 +- arch/blackfin/mach-bf533/boards/cm_bf533.c | 45 +- arch/blackfin/mach-bf533/boards/ezkit.c | 132 +- arch/blackfin/mach-bf533/boards/ip0x.c | 37 +- arch/blackfin/mach-bf533/boards/stamp.c | 60 +- arch/blackfin/mach-bf533/dma.c | 28 +- arch/blackfin/mach-bf533/include/mach/bf533.h | 27 +- .../mach-bf533/include/mach/bfin_serial_5xx.h | 29 +- arch/blackfin/mach-bf533/include/mach/blackfin.h | 28 +- arch/blackfin/mach-bf533/include/mach/cdefBF532.h | 28 +- arch/blackfin/mach-bf533/include/mach/defBF532.h | 44 +- arch/blackfin/mach-bf533/include/mach/gpio.h | 3 - arch/blackfin/mach-bf533/include/mach/irq.h | 28 +- arch/blackfin/mach-bf533/include/mach/portmux.h | 6 + arch/blackfin/mach-bf533/ints-priority.c | 27 +- arch/blackfin/mach-bf537/boards/cm_bf537e.c | 46 +- arch/blackfin/mach-bf537/boards/cm_bf537u.c | 46 +- arch/blackfin/mach-bf537/boards/minotaur.c | 6 + arch/blackfin/mach-bf537/boards/pnav10.c | 31 +- arch/blackfin/mach-bf537/boards/stamp.c | 60 +- arch/blackfin/mach-bf537/boards/tcm_bf537.c | 46 +- arch/blackfin/mach-bf537/dma.c | 28 +- arch/blackfin/mach-bf537/include/mach/bf537.h | 27 +- .../mach-bf537/include/mach/bfin_serial_5xx.h | 29 +- arch/blackfin/mach-bf537/include/mach/blackfin.h | 29 +- arch/blackfin/mach-bf537/include/mach/cdefBF534.h | 29 +- arch/blackfin/mach-bf537/include/mach/cdefBF537.h | 29 +- arch/blackfin/mach-bf537/include/mach/defBF534.h | 28 +- arch/blackfin/mach-bf537/include/mach/defBF537.h | 29 +- arch/blackfin/mach-bf537/include/mach/gpio.h | 3 - arch/blackfin/mach-bf537/include/mach/irq.h | 29 +- arch/blackfin/mach-bf537/include/mach/portmux.h | 6 + arch/blackfin/mach-bf537/ints-priority.c | 27 +- arch/blackfin/mach-bf538/boards/ezkit.c | 46 +- arch/blackfin/mach-bf538/dma.c | 28 +- arch/blackfin/mach-bf538/include/mach/bf538.h | 27 +- .../mach-bf538/include/mach/bfin_serial_5xx.h | 29 +- arch/blackfin/mach-bf538/include/mach/blackfin.h | 29 +- arch/blackfin/mach-bf538/include/mach/cdefBF538.h | 28 +- arch/blackfin/mach-bf538/include/mach/defBF539.h | 44 +- arch/blackfin/mach-bf538/include/mach/gpio.h | 3 - arch/blackfin/mach-bf538/include/mach/irq.h | 29 +- arch/blackfin/mach-bf538/include/mach/portmux.h | 6 + arch/blackfin/mach-bf538/ints-priority.c | 27 +- arch/blackfin/mach-bf548/boards/cm_bf548.c | 48 +- arch/blackfin/mach-bf548/boards/ezkit.c | 49 +- arch/blackfin/mach-bf548/dma.c | 27 +- arch/blackfin/mach-bf548/include/mach/bf548.h | 27 +- .../blackfin/mach-bf548/include/mach/bf54x-lq043.h | 6 + arch/blackfin/mach-bf548/include/mach/bf54x_keys.h | 6 + .../mach-bf548/include/mach/bfin_serial_5xx.h | 29 +- arch/blackfin/mach-bf548/include/mach/blackfin.h | 29 +- arch/blackfin/mach-bf548/include/mach/cdefBF542.h | 28 +- arch/blackfin/mach-bf548/include/mach/cdefBF544.h | 28 +- arch/blackfin/mach-bf548/include/mach/cdefBF547.h | 28 +- arch/blackfin/mach-bf548/include/mach/cdefBF548.h | 28 +- arch/blackfin/mach-bf548/include/mach/cdefBF549.h | 28 +- .../mach-bf548/include/mach/cdefBF54x_base.h | 28 +- arch/blackfin/mach-bf548/include/mach/defBF542.h | 28 +- arch/blackfin/mach-bf548/include/mach/defBF544.h | 28 +- arch/blackfin/mach-bf548/include/mach/defBF547.h | 28 +- arch/blackfin/mach-bf548/include/mach/defBF548.h | 28 +- arch/blackfin/mach-bf548/include/mach/defBF549.h | 28 +- .../mach-bf548/include/mach/defBF54x_base.h | 28 +- arch/blackfin/mach-bf548/include/mach/gpio.h | 30 +- arch/blackfin/mach-bf548/include/mach/irq.h | 29 +- arch/blackfin/mach-bf548/include/mach/portmux.h | 6 + arch/blackfin/mach-bf548/ints-priority.c | 27 +- arch/blackfin/mach-bf561/atomic.S | 21 +- arch/blackfin/mach-bf561/boards/cm_bf561.c | 45 +- arch/blackfin/mach-bf561/boards/ezkit.c | 44 +- arch/blackfin/mach-bf561/boards/tepla.c | 14 +- arch/blackfin/mach-bf561/dma.c | 28 +- arch/blackfin/mach-bf561/include/mach/bf561.h | 27 +- .../mach-bf561/include/mach/bfin_serial_5xx.h | 29 +- arch/blackfin/mach-bf561/include/mach/blackfin.h | 28 +- arch/blackfin/mach-bf561/include/mach/cdefBF561.h | 28 +- arch/blackfin/mach-bf561/include/mach/defBF561.h | 29 +- arch/blackfin/mach-bf561/include/mach/gpio.h | 3 - arch/blackfin/mach-bf561/include/mach/irq.h | 29 +- arch/blackfin/mach-bf561/include/mach/portmux.h | 6 + arch/blackfin/mach-bf561/include/mach/smp.h | 6 + arch/blackfin/mach-bf561/ints-priority.c | 27 +- arch/blackfin/mach-bf561/secondary.S | 24 +- arch/blackfin/mach-bf561/smp.c | 21 +- arch/blackfin/mach-common/arch_checks.c | 27 +- arch/blackfin/mach-common/cache-c.c | 2 - arch/blackfin/mach-common/cache.S | 2 - arch/blackfin/mach-common/cpufreq.c | 27 +- arch/blackfin/mach-common/entry.S | 31 +- arch/blackfin/mach-common/head.S | 2 - arch/blackfin/mach-common/interrupt.S | 30 +- arch/blackfin/mach-common/ints-priority.c | 35 +- arch/blackfin/mach-common/irqpanic.c | 27 +- arch/blackfin/mach-common/pm.c | 34 +- arch/blackfin/mach-common/smp.c | 22 +- arch/blackfin/mm/blackfin_sram.h | 27 +- arch/blackfin/mm/init.c | 27 +- arch/blackfin/mm/isram-driver.c | 14 +- arch/blackfin/mm/sram-alloc.c | 27 +- arch/frv/kernel/signal.c | 2 +- arch/ia64/include/asm/spinlock.h | 62 +- arch/ia64/include/asm/spinlock_types.h | 2 +- arch/ia64/kernel/mca.c | 104 +- arch/ia64/kernel/unaligned.c | 6 +- arch/ia64/mm/tlb.c | 24 +- arch/ia64/pci/pci.c | 9 +- arch/ia64/sn/kernel/io_common.c | 8 +- arch/ia64/sn/kernel/sn2/sn_hwperf.c | 7 +- arch/m32r/kernel/smp.c | 1 + arch/m68k/Kconfig | 6 +- arch/m68knommu/kernel/asm-offsets.c | 28 +- arch/m68knommu/kernel/entry.S | 6 +- arch/m68knommu/mm/init.c | 2 +- arch/m68knommu/platform/5206e/config.c | 1 - arch/m68knommu/platform/68328/entry.S | 32 +- arch/m68knommu/platform/68360/entry.S | 16 +- arch/m68knommu/platform/coldfire/entry.S | 20 +- arch/microblaze/kernel/entry.S | 2 + arch/microblaze/kernel/hw_exception_handler.S | 2 +- arch/microblaze/kernel/process.c | 2 + arch/mips/Kconfig | 4 +- arch/mips/alchemy/common/irq.c | 34 +- arch/mips/alchemy/mtx-1/board_setup.c | 3 +- arch/mips/ar7/platform.c | 9 +- arch/mips/bcm63xx/Makefile | 2 +- arch/mips/bcm63xx/boards/board_bcm963xx.c | 3 - arch/mips/bcm63xx/cpu.c | 3 + arch/mips/bcm63xx/dev-uart.c | 2 +- arch/mips/bcm63xx/dev-wdt.c | 37 + arch/mips/bcm63xx/setup.c | 4 +- arch/mips/cavium-octeon/octeon-irq.c | 224 ++- arch/mips/cavium-octeon/smp.c | 5 +- arch/mips/include/asm/fixmap.h | 4 +- arch/mips/include/asm/gcmpregs.h | 18 +- arch/mips/include/asm/gic.h | 188 +- arch/mips/include/asm/mach-ar7/ar7.h | 3 + arch/mips/include/asm/mach-au1x00/gpio-au1000.h | 2 + .../include/asm/mach-bcm63xx/bcm63xx_dev_uart.h | 6 - arch/mips/include/asm/mach-ip27/topology.h | 4 +- .../asm/mach-loongson/cpu-feature-overrides.h | 3 +- arch/mips/include/asm/mmu_context.h | 13 +- arch/mips/include/asm/setup.h | 2 +- arch/mips/include/asm/smtc_ipi.h | 1 + arch/mips/include/asm/spram.h | 10 + arch/mips/include/asm/thread_info.h | 9 +- arch/mips/jazz/irq.c | 2 +- arch/mips/kernel/cevt-bcm1480.c | 2 +- arch/mips/kernel/cevt-ds1287.c | 2 +- arch/mips/kernel/cevt-gt641xx.c | 2 +- arch/mips/kernel/cevt-r4k.c | 2 +- arch/mips/kernel/cevt-sb1250.c | 2 +- arch/mips/kernel/cevt-txx9.c | 2 +- arch/mips/kernel/cpu-probe.c | 8 +- arch/mips/kernel/head.S | 1 + arch/mips/kernel/i8253.c | 2 +- arch/mips/kernel/irq-gic.c | 114 +- arch/mips/kernel/linux32.c | 6 + arch/mips/kernel/scall64-o32.S | 4 +- arch/mips/kernel/smtc.c | 34 +- arch/mips/kernel/spram.c | 5 +- arch/mips/kernel/vpe.c | 2 - arch/mips/loongson/common/irq.c | 1 - arch/mips/math-emu/dp_simple.c | 13 +- arch/mips/math-emu/sp_simple.c | 11 +- arch/mips/mm/init.c | 6 +- arch/mips/mti-malta/malta-amon.c | 7 +- arch/mips/mti-malta/malta-int.c | 119 +- arch/mips/mti-malta/malta-pci.c | 27 +- arch/mips/nxp/pnx8550/common/int.c | 2 +- arch/mips/nxp/pnx8550/common/time.c | 4 +- arch/mips/oprofile/op_model_loongson2.c | 2 +- arch/mips/sgi-ip27/ip27-timer.c | 2 +- arch/mips/sni/time.c | 2 +- arch/mips/txx9/generic/setup.c | 5 +- arch/parisc/Kconfig | 1 + arch/parisc/include/asm/fixmap.h | 4 +- arch/parisc/include/asm/hardirq.h | 20 +- arch/parisc/include/asm/ptrace.h | 5 +- arch/parisc/include/asm/syscall.h | 40 + arch/parisc/include/asm/thread_info.h | 14 +- arch/parisc/kernel/asm-offsets.c | 4 +- arch/parisc/kernel/entry.S | 21 +- arch/parisc/kernel/irq.c | 5 - arch/parisc/kernel/module.c | 2 +- arch/parisc/kernel/ptrace.c | 42 +- arch/parisc/kernel/signal.c | 5 +- arch/parisc/kernel/syscall.S | 22 +- arch/parisc/kernel/vmlinux.lds.S | 10 + arch/parisc/mm/init.c | 11 +- arch/powerpc/boot/dts/cm5200.dts | 1 - arch/powerpc/boot/dts/digsy_mtc.dts | 1 - arch/powerpc/boot/dts/lite5200.dts | 2 - arch/powerpc/boot/dts/lite5200b.dts | 2 - arch/powerpc/boot/dts/media5200.dts | 2 - arch/powerpc/boot/dts/motionpro.dts | 1 - arch/powerpc/boot/dts/mpc5121ads.dts | 3 - arch/powerpc/boot/dts/mucmc52.dts | 332 ++ arch/powerpc/boot/dts/pcm030.dts | 2 - arch/powerpc/boot/dts/pcm032.dts | 2 - arch/powerpc/boot/dts/tqm5200.dts | 1 - arch/powerpc/boot/dts/uc101.dts | 284 ++ arch/powerpc/configs/52xx/cm5200_defconfig | 136 +- arch/powerpc/configs/52xx/lite5200b_defconfig | 153 +- arch/powerpc/configs/52xx/motionpro_defconfig | 146 +- arch/powerpc/configs/52xx/pcm030_defconfig | 142 +- arch/powerpc/configs/52xx/tqm5200_defconfig | 148 +- arch/powerpc/configs/mpc5200_defconfig | 192 +- arch/powerpc/configs/ppc64e_defconfig | 2199 +++++++++++++ arch/powerpc/include/asm/firmware.h | 10 +- arch/powerpc/kernel/cputable.c | 2 + arch/powerpc/kernel/entry_64.S | 44 +- arch/powerpc/kernel/kgdb.c | 6 - arch/powerpc/kernel/pci-common.c | 2 +- arch/powerpc/kernel/pci_64.c | 2 + arch/powerpc/kernel/perf_event.c | 17 +- arch/powerpc/kernel/process.c | 12 +- arch/powerpc/kernel/setup_64.c | 1 - arch/powerpc/kernel/vdso.c | 11 +- arch/powerpc/kernel/vdso32/vdso32.lds.S | 4 +- arch/powerpc/kernel/vmlinux.lds.S | 1 + arch/powerpc/mm/slb_low.S | 10 +- arch/powerpc/platforms/52xx/mpc5200_simple.c | 2 + arch/powerpc/platforms/cell/axon_msi.c | 2 +- arch/powerpc/platforms/iseries/Makefile | 11 +- arch/powerpc/platforms/iseries/dt.c | 56 +- arch/powerpc/platforms/powermac/low_i2c.c | 7 +- arch/powerpc/platforms/pseries/firmware.c | 3 +- arch/powerpc/xmon/xmon.c | 20 +- arch/s390/hypfs/hypfs_diag.c | 2 +- arch/s390/include/asm/cputime.h | 6 +- arch/s390/include/asm/delay.h | 7 +- arch/s390/include/asm/elf.h | 12 + arch/s390/include/asm/ptrace.h | 4 + arch/s390/include/asm/ucontext.h | 15 + arch/s390/kernel/compat_signal.c | 35 +- arch/s390/kernel/compat_wrapper.S | 2 +- arch/s390/kernel/ftrace.c | 3 - arch/s390/kernel/ipl.c | 7 +- arch/s390/kernel/module.c | 3 + arch/s390/kernel/processor.c | 6 +- arch/s390/kernel/ptrace.c | 70 + arch/s390/kernel/setup.c | 15 +- arch/s390/kernel/smp.c | 7 +- arch/s390/kernel/swsusp_asm64.S | 28 +- arch/s390/kernel/vdso.c | 16 +- arch/s390/kernel/vmlinux.lds.S | 1 + arch/s390/kvm/kvm-s390.h | 2 +- arch/s390/lib/delay.c | 27 +- arch/s390/lib/uaccess_mvcos.c | 12 +- arch/s390/lib/uaccess_std.c | 14 +- arch/s390/mm/pgtable.c | 10 +- arch/sh/Kconfig | 6 +- arch/sh/Makefile | 3 +- arch/sh/boards/board-magicpanelr2.c | 2 - arch/sh/boards/mach-dreamcast/setup.c | 2 - arch/sh/boards/mach-ecovec24/setup.c | 63 +- arch/sh/boards/mach-landisk/gio.c | 10 +- arch/sh/boards/mach-rsk/devices-rsk7203.c | 4 - arch/sh/boards/mach-rsk/setup.c | 23 +- arch/sh/boot/Makefile | 6 +- arch/sh/kernel/cpu/sh3/entry.S | 2 - arch/sh/kernel/dwarf.c | 22 + arch/sh/kernel/entry-common.S | 2 +- arch/sh/kernel/ftrace.c | 37 +- arch/sh/kernel/io_generic.c | 3 + arch/sh/kernel/irq.c | 3 +- arch/sh/kernel/machvec.c | 3 + arch/sh/kernel/setup.c | 2 + arch/sh/kernel/sh_ksyms_32.c | 15 + arch/sh/kernel/signal_32.c | 9 +- arch/sh/kernel/smp.c | 2 + arch/sh/kernel/traps_32.c | 11 +- arch/sh/mm/Kconfig | 2 +- arch/sh/mm/cache-sh4.c | 24 +- arch/sh/mm/cache-sh7705.c | 4 +- arch/sh/mm/cache.c | 12 +- arch/sh/mm/ioremap_32.c | 2 +- arch/sh/mm/pmb.c | 37 +- arch/sparc/Kconfig | 2 + arch/sparc/include/asm/hardirq_32.h | 12 +- arch/sparc/include/asm/irq_32.h | 4 +- arch/sparc/include/asm/pgtable_64.h | 4 +- arch/sparc/kernel/ktlb.S | 8 +- arch/sparc/kernel/ldc.c | 4 +- arch/sparc/kernel/perf_event.c | 579 ++++- arch/sparc/mm/init_64.c | 2 +- arch/sparc/oprofile/init.c | 1 + arch/um/drivers/line.c | 1 + arch/um/drivers/port_kern.c | 1 + arch/um/kernel/irq.c | 1 + arch/x86/Kconfig | 19 +- arch/x86/Kconfig.cpu | 3 +- arch/x86/Makefile | 1 - arch/x86/boot/setup.ld | 3 + arch/x86/crypto/aesni-intel_glue.c | 10 +- arch/x86/ia32/ia32entry.S | 41 +- arch/x86/include/asm/kvm_host.h | 1 + arch/x86/include/asm/mce.h | 2 + arch/x86/include/asm/paravirt.h | 28 +- arch/x86/include/asm/paravirt_types.h | 10 +- arch/x86/include/asm/topology.h | 1 + arch/x86/include/asm/uv/uv_hub.h | 23 +- arch/x86/kernel/acpi/realmode/wakeup.lds.S | 3 + arch/x86/kernel/apic/x2apic_uv_x.c | 8 +- arch/x86/kernel/cpu/mcheck/mce.c | 61 +- arch/x86/kernel/cpu/mcheck/mce_intel.c | 1 + arch/x86/kernel/cpu/mtrr/if.c | 17 +- arch/x86/kernel/crash_dump_32.c | 19 + arch/x86/kernel/e820.c | 4 +- arch/x86/kernel/early_printk.c | 5 +- arch/x86/kernel/efi.c | 2 + arch/x86/kernel/i386_ksyms_32.c | 2 + arch/x86/kernel/irq.c | 4 +- arch/x86/kernel/pci-dma.c | 4 +- arch/x86/kernel/pci-gart_64.c | 1 + arch/x86/kernel/reboot.c | 1 + arch/x86/kernel/time.c | 3 +- arch/x86/kernel/tlb_uv.c | 9 +- arch/x86/kernel/trampoline.c | 12 +- arch/x86/kernel/trampoline_64.S | 4 + arch/x86/kernel/vmi_32.c | 2 +- arch/x86/kernel/vmlinux.lds.S | 3 + arch/x86/kvm/i8254.c | 2 +- arch/x86/kvm/lapic.c | 4 +- arch/x86/kvm/mmu.c | 86 +- arch/x86/kvm/paging_tmpl.h | 18 +- arch/x86/kvm/svm.c | 25 +- arch/x86/kvm/vmx.c | 2 +- arch/x86/kvm/x86.c | 2 + arch/x86/lib/Makefile | 6 +- arch/x86/xen/enlighten.c | 3 +- arch/xtensa/kernel/time.c | 1 + block/blk-core.c | 18 +- block/blk-merge.c | 2 +- block/blk-settings.c | 2 +- block/blk-tag.c | 2 +- block/cfq-iosched.c | 259 +- block/elevator.c | 4 +- block/genhd.c | 4 +- crypto/aead.c | 1 + crypto/async_tx/async_pq.c | 60 +- crypto/async_tx/async_raid6_recov.c | 100 +- crypto/async_tx/async_xor.c | 18 +- drivers/acpi/Kconfig | 4 +- drivers/acpi/ac.c | 1 + drivers/acpi/button.c | 3 + drivers/acpi/pci_root.c | 11 + drivers/acpi/video.c | 7 +- drivers/acpi/video_detect.c | 2 +- drivers/ata/ahci.c | 201 +- drivers/ata/libata-acpi.c | 40 +- drivers/ata/libata-core.c | 15 +- drivers/ata/libata-eh.c | 56 +- drivers/ata/libata.h | 2 + drivers/ata/pata_ali.c | 2 +- drivers/ata/pata_atiixp.c | 2 +- drivers/ata/pata_atp867x.c | 101 +- drivers/ata/pata_sc1200.c | 3 +- drivers/ata/pata_via.c | 2 +- drivers/ata/sata_mv.c | 29 +- drivers/ata/sata_nv.c | 18 +- drivers/base/bus.c | 17 +- drivers/base/driver.c | 2 +- drivers/base/platform.c | 6 +- drivers/base/power/main.c | 1 + drivers/base/power/runtime.c | 4 - drivers/block/cciss.c | 79 +- drivers/block/loop.c | 2 +- drivers/block/virtio_blk.c | 39 +- drivers/char/Kconfig | 6 +- drivers/char/agp/parisc-agp.c | 2 +- drivers/char/applicom.c | 1 + drivers/char/epca.c | 1 + drivers/char/generic_serial.c | 1 + drivers/char/genrtc.c | 1 + drivers/char/hw_random/virtio-rng.c | 3 +- drivers/char/istallion.c | 1 + drivers/char/nozomi.c | 1 + drivers/char/pty.c | 1 + drivers/char/rio/riocmd.c | 1 + drivers/char/rio/rioctrl.c | 1 + drivers/char/rio/riotty.c | 1 + drivers/char/rtc.c | 1 + drivers/char/ser_a2232.c | 1 + drivers/char/sonypi.c | 1 + drivers/char/stallion.c | 1 + drivers/char/tlclk.c | 1 + drivers/char/tpm/tpm.c | 3 +- drivers/char/tty_buffer.c | 31 +- drivers/char/virtio_console.c | 1 - drivers/char/vt_ioctl.c | 2 +- drivers/connector/cn_proc.c | 3 +- drivers/cpuidle/cpuidle.c | 5 +- drivers/crypto/padlock-sha.c | 14 +- drivers/edac/Kconfig | 14 +- drivers/edac/Makefile | 5 +- drivers/edac/amd64_edac.c | 100 +- drivers/edac/amd64_edac.h | 23 +- drivers/edac/amd64_edac_inj.c | 49 +- drivers/edac/edac_mce_amd.c | 32 +- drivers/edac/i5000_edac.c | 7 +- drivers/edac/i5400_edac.c | 89 +- drivers/edac/mpc85xx_edac.c | 2 + drivers/firewire/sbp2.c | 39 +- drivers/firmware/iscsi_ibft.c | 2 +- drivers/firmware/iscsi_ibft_find.c | 4 +- drivers/gpio/twl4030-gpio.c | 5 +- drivers/gpu/drm/drm_crtc.c | 2 - drivers/gpu/drm/drm_edid.c | 15 + drivers/gpu/drm/drm_fb_helper.c | 154 +- drivers/gpu/drm/i915/i915_dma.c | 1 + drivers/gpu/drm/i915/i915_drv.c | 5 +- drivers/gpu/drm/i915/i915_drv.h | 4 +- drivers/gpu/drm/i915/i915_gem.c | 10 +- drivers/gpu/drm/i915/i915_irq.c | 10 + drivers/gpu/drm/i915/i915_trace.h | 49 +- drivers/gpu/drm/i915/intel_display.c | 15 +- drivers/gpu/drm/i915/intel_drv.h | 2 + drivers/gpu/drm/i915/intel_fb.c | 10 +- drivers/gpu/drm/i915/intel_hdmi.c | 2 +- drivers/gpu/drm/i915/intel_lvds.c | 25 +- drivers/gpu/drm/i915/intel_tv.c | 3 +- drivers/gpu/drm/radeon/atombios_crtc.c | 1 + drivers/gpu/drm/radeon/r100.c | 432 ++- drivers/gpu/drm/radeon/r100d.h | 145 +- drivers/gpu/drm/radeon/r200.c | 3 +- drivers/gpu/drm/radeon/r300.c | 308 ++- drivers/gpu/drm/radeon/r300d.h | 205 ++ drivers/gpu/drm/radeon/r420.c | 6 +- drivers/gpu/drm/radeon/r420d.h | 24 +- drivers/gpu/drm/radeon/r520.c | 3 +- drivers/gpu/drm/radeon/r600.c | 314 +- drivers/gpu/drm/radeon/r600_blit.c | 10 +- drivers/gpu/drm/radeon/r600_blit_kms.c | 3 +- drivers/gpu/drm/radeon/r600_cs.c | 2 +- drivers/gpu/drm/radeon/r600d.h | 1 + drivers/gpu/drm/radeon/radeon.h | 58 +- drivers/gpu/drm/radeon/radeon_asic.h | 253 +-- drivers/gpu/drm/radeon/radeon_bios.c | 49 +- drivers/gpu/drm/radeon/radeon_clocks.c | 8 +- drivers/gpu/drm/radeon/radeon_device.c | 244 +-- drivers/gpu/drm/radeon/radeon_display.c | 45 +- drivers/gpu/drm/radeon/radeon_encoders.c | 6 +- drivers/gpu/drm/radeon/radeon_fb.c | 18 +- drivers/gpu/drm/radeon/radeon_irq_kms.c | 6 +- drivers/gpu/drm/radeon/radeon_legacy_crtc.c | 1 + drivers/gpu/drm/radeon/radeon_legacy_encoders.c | 9 +- drivers/gpu/drm/radeon/radeon_mode.h | 2 + drivers/gpu/drm/radeon/radeon_object.c | 17 +- drivers/gpu/drm/radeon/rs100d.h | 40 + drivers/gpu/drm/radeon/rs400.c | 275 ++- drivers/gpu/drm/radeon/rs400d.h | 160 + drivers/gpu/drm/radeon/rs600.c | 481 ++-- drivers/gpu/drm/radeon/rs600d.h | 470 +++ drivers/gpu/drm/radeon/rs690.c | 355 ++- drivers/gpu/drm/radeon/rs690d.h | 307 ++ drivers/gpu/drm/radeon/rs690r.h | 99 - drivers/gpu/drm/radeon/rv200d.h | 36 + drivers/gpu/drm/radeon/rv250d.h | 123 + drivers/gpu/drm/radeon/rv350d.h | 52 + drivers/gpu/drm/radeon/rv515.c | 5 +- drivers/gpu/drm/radeon/rv770.c | 199 +- drivers/gpu/drm/ttm/ttm_global.c | 2 +- drivers/hid/hid-core.c | 2 +- drivers/hid/hid-twinhan.c | 4 +- drivers/hid/hidraw.c | 5 +- drivers/hwmon/Kconfig | 2 +- drivers/hwmon/asus_atk0110.c | 339 ++- drivers/hwmon/dme1737.c | 29 +- drivers/hwmon/fschmd.c | 2 +- drivers/hwmon/hp_accel.c | 5 +- drivers/hwmon/it87.c | 5 +- drivers/hwmon/lis3lv02d_spi.c | 3 +- drivers/hwmon/sht15.c | 8 +- drivers/i2c/busses/i2c-imx.c | 86 +- drivers/i2c/busses/i2c-mpc.c | 10 +- drivers/ide/atiixp.c | 2 +- drivers/ide/cmd64x.c | 6 +- drivers/ide/ide-proc.c | 8 +- drivers/ide/sis5513.c | 10 +- drivers/ieee1394/raw1394.c | 1 + drivers/ieee1394/video1394.c | 1 + drivers/infiniband/core/addr.c | 2 +- drivers/infiniband/core/iwcm.c | 3 + drivers/infiniband/core/ucma.c | 1 + drivers/infiniband/hw/cxgb3/iwch_provider.c | 12 +- drivers/infiniband/hw/cxgb3/iwch_qp.c | 1 + drivers/infiniband/hw/ipath/ipath_driver.c | 1 + drivers/infiniband/hw/ipath/ipath_iba7220.c | 1 + drivers/infiniband/hw/ipath/ipath_intr.c | 1 + drivers/infiniband/hw/ipath/ipath_qp.c | 1 + drivers/infiniband/hw/ipath/ipath_ruc.c | 1 + drivers/infiniband/hw/ipath/ipath_ud.c | 1 + drivers/infiniband/hw/ipath/ipath_user_pages.c | 1 + drivers/infiniband/hw/ipath/ipath_user_sdma.c | 1 + drivers/infiniband/hw/ipath/ipath_verbs_mcast.c | 1 + drivers/infiniband/ulp/iser/iscsi_iser.c | 2 +- drivers/input/input.c | 65 +- drivers/input/joystick/xpad.c | 2 + drivers/input/keyboard/atkbd.c | 132 +- drivers/input/keyboard/gpio_keys.c | 1 + drivers/input/keyboard/hilkbd.c | 1 + drivers/input/keyboard/sunkbd.c | 1 + drivers/input/misc/Kconfig | 1 + drivers/input/misc/hp_sdc_rtc.c | 2 +- drivers/input/misc/rotary_encoder.c | 4 +- drivers/input/misc/sparcspkr.c | 4 +- drivers/input/misc/wistron_btns.c | 9 + drivers/input/mouse/logips2pp.c | 2 +- drivers/input/mouse/synaptics.c | 10 + drivers/input/serio/Kconfig | 13 +- drivers/input/serio/i8042-x86ia64io.h | 13 +- drivers/input/serio/i8042.c | 38 +- drivers/input/serio/libps2.c | 1 + drivers/input/serio/serio_raw.c | 1 + drivers/input/serio/serport.c | 1 + drivers/input/touchscreen/ad7879.c | 4 +- drivers/isdn/capi/capi.c | 2 +- drivers/isdn/capi/capidrv.c | 27 +- drivers/isdn/capi/kcapi.c | 1 + drivers/isdn/gigaset/asyncdata.c | 28 +- drivers/isdn/gigaset/bas-gigaset.c | 87 +- drivers/isdn/gigaset/common.c | 134 +- drivers/isdn/gigaset/ev-layer.c | 30 +- drivers/isdn/gigaset/i4l.c | 23 + drivers/isdn/gigaset/interface.c | 9 + drivers/isdn/gigaset/isocdata.c | 30 +- drivers/isdn/hisax/arcofi.c | 1 + drivers/isdn/hisax/hfc_2bds0.c | 1 + drivers/isdn/hisax/hfc_pci.c | 1 + drivers/isdn/hysdn/hysdn_procconf.c | 1 + drivers/isdn/hysdn/hysdn_proclog.c | 1 + drivers/isdn/i4l/isdn_net.h | 6 +- drivers/isdn/pcbit/drv.c | 1 + drivers/isdn/pcbit/layer2.c | 1 + drivers/isdn/sc/init.c | 1 + drivers/lguest/interrupts_and_traps.c | 1 + drivers/macintosh/via-pmu.c | 40 +- drivers/md/Makefile | 22 +- drivers/md/bitmap.c | 9 +- drivers/md/dm-exception-store.c | 38 +- drivers/md/dm-exception-store.h | 8 +- drivers/md/dm-log-userspace-base.c | 2 +- drivers/md/dm-snap-persistent.c | 16 +- drivers/md/dm-snap.c | 25 +- drivers/md/dm.c | 27 +- drivers/md/md.c | 2 +- drivers/md/raid1.c | 6 +- drivers/md/raid10.c | 5 +- drivers/md/raid5.c | 182 +- drivers/md/raid5.h | 14 +- drivers/md/raid6altivec.uc | 2 +- drivers/md/raid6int.uc | 2 +- drivers/md/raid6test/Makefile | 42 +- drivers/md/unroll.awk | 20 + drivers/md/unroll.pl | 24 - drivers/media/dvb/dvb-core/dvb_net.c | 1 + drivers/media/video/meye.c | 1 + drivers/media/video/videobuf-core.c | 1 + drivers/media/video/videobuf-dma-sg.c | 1 + drivers/message/fusion/mptlan.c | 1 + drivers/mfd/twl4030-core.c | 91 +- drivers/mfd/ucb1x00-core.c | 1 + drivers/mfd/wm831x-irq.c | 3 +- drivers/misc/hpilo.c | 1 + drivers/misc/ibmasm/command.c | 1 + drivers/misc/ibmasm/event.c | 1 + drivers/misc/ibmasm/r_heartbeat.c | 1 + drivers/misc/phantom.c | 1 + drivers/mmc/core/sdio_cis.c | 7 +- drivers/mmc/host/at91_mci.c | 1 - drivers/mmc/host/omap_hsmmc.c | 2 +- drivers/mmc/host/pxamci.c | 4 +- drivers/mtd/devices/m25p80.c | 1 + drivers/mtd/devices/sst25l.c | 1 + drivers/mtd/ubi/build.c | 3 +- drivers/mtd/ubi/scan.c | 7 +- drivers/mtd/ubi/scan.h | 2 - drivers/net/Kconfig | 11 + drivers/net/Makefile | 10 +- drivers/net/acenic.c | 3 +- drivers/net/au1000_eth.c | 5 +- drivers/net/benet/be_cmds.c | 34 +- drivers/net/benet/be_cmds.h | 7 +- drivers/net/benet/be_ethtool.c | 2 +- drivers/net/benet/be_main.c | 33 +- drivers/net/bnx2.h | 9 +- drivers/net/bonding/bond_main.c | 10 +- drivers/net/bonding/bond_sysfs.c | 1 + drivers/net/can/sja1000/sja1000_of_platform.c | 1 + drivers/net/cnic.c | 6 +- drivers/net/davinci_emac.c | 36 +- drivers/net/depca.c | 1 + drivers/net/dm9000.h | 2 +- drivers/net/e100.c | 27 +- drivers/net/e1000e/82571.c | 4 +- drivers/net/e1000e/defines.h | 2 + drivers/net/e1000e/e1000.h | 26 + drivers/net/e1000e/hw.h | 3 + drivers/net/e1000e/ich8lan.c | 628 +++- drivers/net/e1000e/phy.c | 476 ++- drivers/net/eql.c | 1 + drivers/net/ethoc.c | 104 +- drivers/net/ewrk3.c | 1 + drivers/net/fec.c | 2 +- drivers/net/fec_mpc52xx.c | 6 - drivers/net/fec_mpc52xx_phy.c | 1 + drivers/net/forcedeth.c | 1 + drivers/net/fs_enet/fs_enet-main.c | 1 + drivers/net/fs_enet/mii-bitbang.c | 1 + drivers/net/fs_enet/mii-fec.c | 1 + drivers/net/fsl_pq_mdio.c | 1 + drivers/net/gianfar.c | 4 +- drivers/net/hamachi.c | 1 + drivers/net/hamradio/baycom_epp.c | 1 + drivers/net/hamradio/baycom_ser_fdx.c | 1 + drivers/net/hamradio/baycom_ser_hdx.c | 1 + drivers/net/hamradio/hdlcdrv.c | 1 + drivers/net/hp100.c | 1 + drivers/net/ibm_newemac/core.c | 9 +- drivers/net/ibm_newemac/emac.h | 1 + drivers/net/ifb.c | 3 +- drivers/net/igb/igb_ethtool.c | 36 +- drivers/net/igbvf/ethtool.c | 30 +- drivers/net/irda/sa1100_ir.c | 7 +- drivers/net/irda/toim3232-sir.c | 1 + drivers/net/ixgbe/ixgbe_82599.c | 2 + drivers/net/ixgbe/ixgbe_ethtool.c | 22 +- drivers/net/ixgbe/ixgbe_main.c | 4 + drivers/net/ixgbe/ixgbe_type.h | 2 + drivers/net/ixp2000/enp2611.c | 18 +- drivers/net/ixp2000/ixpdev.c | 11 + drivers/net/ks8851.c | 42 +- drivers/net/ks8851.h | 1 + drivers/net/mlx4/main.c | 2 + drivers/net/myri10ge/myri10ge.c | 17 +- drivers/net/netxen/netxen_nic_hdr.h | 1 + drivers/net/netxen/netxen_nic_hw.c | 14 +- drivers/net/netxen/netxen_nic_init.c | 8 +- drivers/net/netxen/netxen_nic_main.c | 6 +- drivers/net/niu.c | 2 +- drivers/net/ns83820.c | 1 + drivers/net/pasemi_mac_ethtool.c | 3 + drivers/net/pcmcia/3c574_cs.c | 13 +- drivers/net/pcmcia/pcnet_cs.c | 12 +- drivers/net/pcnet32.c | 1 + drivers/net/phy/mdio-gpio.c | 1 + drivers/net/pppoe.c | 129 +- drivers/net/qlge/qlge.h | 19 +- drivers/net/qlge/qlge_ethtool.c | 2 - drivers/net/qlge/qlge_main.c | 193 +- drivers/net/qlge/qlge_mpi.c | 128 +- drivers/net/r8169.c | 1002 ++++++- drivers/net/sb1000.c | 1 + drivers/net/sfc/rx.c | 9 +- drivers/net/sh_eth.c | 1 + drivers/net/sis900.c | 1 + drivers/net/skfp/skfddi.c | 1 + drivers/net/skge.c | 1 + drivers/net/sky2.c | 2 + drivers/net/slip.c | 1 + drivers/net/stmmac/Kconfig | 53 + drivers/net/stmmac/Makefile | 4 + drivers/net/stmmac/common.h | 330 ++ drivers/net/stmmac/descs.h | 163 + drivers/net/stmmac/gmac.c | 693 ++++ drivers/net/stmmac/gmac.h | 204 ++ drivers/net/stmmac/mac100.c | 517 +++ drivers/net/stmmac/mac100.h | 116 + drivers/net/stmmac/stmmac.h | 98 + drivers/net/stmmac/stmmac_ethtool.c | 395 +++ drivers/net/stmmac/stmmac_main.c | 2204 +++++++++++++ drivers/net/stmmac/stmmac_mdio.c | 217 ++ drivers/net/stmmac/stmmac_timer.c | 140 + drivers/net/stmmac/stmmac_timer.h | 41 + drivers/net/sungem.c | 1 + drivers/net/tg3.c | 41 +- drivers/net/tg3.h | 1 - drivers/net/tokenring/ibmtr.c | 12 +- drivers/net/typhoon.c | 1 + drivers/net/usb/dm9601.c | 4 + drivers/net/usb/pegasus.c | 13 + drivers/net/usb/pegasus.h | 6 +- drivers/net/usb/rndis_host.c | 7 +- drivers/net/virtio_net.c | 17 +- drivers/net/vmxnet3/Makefile | 35 + drivers/net/vmxnet3/upt1_defs.h | 96 + drivers/net/vmxnet3/vmxnet3_defs.h | 535 +++ drivers/net/vmxnet3/vmxnet3_drv.c | 2574 +++++++++++++++ drivers/net/vmxnet3/vmxnet3_ethtool.c | 566 ++++ drivers/net/vmxnet3/vmxnet3_int.h | 389 +++ drivers/net/wan/c101.c | 1 + drivers/net/wan/cosa.c | 1 + drivers/net/wan/cycx_x25.c | 1 + drivers/net/wan/dscc4.c | 1 + drivers/net/wan/farsync.c | 1 + drivers/net/wan/hdlc_cisco.c | 18 +- drivers/net/wan/n2.c | 1 + drivers/net/wan/pci200syn.c | 1 + drivers/net/wireless/adm8211.h | 2 +- drivers/net/wireless/airo.c | 5 +- drivers/net/wireless/ath/ath9k/rc.c | 2 +- drivers/net/wireless/b43/b43.h | 168 +- drivers/net/wireless/b43/dma.c | 15 +- drivers/net/wireless/b43/leds.c | 4 +- drivers/net/wireless/b43/leds.h | 5 +- drivers/net/wireless/b43/main.c | 6 +- drivers/net/wireless/b43/pio.c | 79 +- drivers/net/wireless/b43/rfkill.c | 3 +- drivers/net/wireless/b43/xmit.c | 5 +- drivers/net/wireless/b43legacy/main.c | 1 + drivers/net/wireless/b43legacy/phy.c | 1 + drivers/net/wireless/hostap/hostap_info.c | 1 + drivers/net/wireless/hostap/hostap_ioctl.c | 1 + drivers/net/wireless/ipw2x00/ipw2100.c | 5 +- drivers/net/wireless/ipw2x00/ipw2200.c | 3 + drivers/net/wireless/ipw2x00/libipw.h | 1 + drivers/net/wireless/ipw2x00/libipw_module.c | 14 +- drivers/net/wireless/iwlwifi/iwl-3945-rs.c | 2 +- drivers/net/wireless/iwlwifi/iwl-3945.c | 3 +- drivers/net/wireless/iwlwifi/iwl-4965.c | 1 + drivers/net/wireless/iwlwifi/iwl-5000.c | 3 +- drivers/net/wireless/iwlwifi/iwl-agn.c | 3 +- drivers/net/wireless/iwlwifi/iwl-commands.h | 2 +- drivers/net/wireless/iwlwifi/iwl-core.c | 1 + drivers/net/wireless/iwlwifi/iwl-eeprom.c | 23 +- drivers/net/wireless/iwlwifi/iwl-eeprom.h | 20 +- drivers/net/wireless/iwlwifi/iwl-hcmd.c | 1 + drivers/net/wireless/iwlwifi/iwl-rx.c | 2 +- drivers/net/wireless/iwlwifi/iwl-tx.c | 1 + drivers/net/wireless/iwlwifi/iwl3945-base.c | 3 +- drivers/net/wireless/iwmc3200wifi/cfg80211.c | 1 + drivers/net/wireless/iwmc3200wifi/commands.c | 1 + drivers/net/wireless/iwmc3200wifi/main.c | 1 + drivers/net/wireless/iwmc3200wifi/rx.c | 1 + drivers/net/wireless/libertas/cmd.c | 1 + drivers/net/wireless/libertas/cmdresp.c | 1 + drivers/net/wireless/libertas/if_spi.c | 10 +- drivers/net/wireless/libertas/if_usb.c | 2 +- drivers/net/wireless/libertas/tx.c | 1 + drivers/net/wireless/prism54/isl_ioctl.c | 1 + drivers/net/wireless/prism54/islpci_dev.c | 1 + drivers/net/wireless/prism54/islpci_mgt.c | 1 + drivers/net/wireless/ray_cs.c | 2 +- drivers/net/wireless/rt2x00/rt2800usb.c | 2 +- drivers/net/wireless/rt2x00/rt2x00debug.c | 1 + drivers/net/wireless/rt2x00/rt73usb.c | 5 + drivers/net/znet.c | 8 - drivers/of/of_mdio.c | 13 +- drivers/oprofile/event_buffer.c | 35 +- drivers/pci/dmar.c | 13 +- drivers/pci/hotplug/cpqphp.h | 1 + drivers/pci/intel-iommu.c | 82 +- drivers/pci/pci.c | 27 +- drivers/pci/pcie/aer/aerdrv.c | 3 +- drivers/pci/pcie/portdrv_pci.c | 3 +- drivers/pci/quirks.c | 38 +- drivers/pci/setup-res.c | 37 - drivers/pcmcia/cistpl.c | 20 +- drivers/pcmcia/cs.c | 69 +- drivers/pcmcia/cs_internal.h | 3 +- drivers/pcmcia/ds.c | 8 +- drivers/pcmcia/i82365.c | 4 +- drivers/pcmcia/m32r_cfc.c | 10 +- drivers/pcmcia/m32r_pcc.c | 10 +- drivers/pcmcia/m8xx_pcmcia.c | 15 +- drivers/pcmcia/pcmcia_ioctl.c | 2 +- drivers/pcmcia/pd6729.c | 6 + drivers/pcmcia/rsrc_nonstatic.c | 3 +- drivers/pcmcia/soc_common.c | 5 +- drivers/pcmcia/socket_sysfs.c | 2 +- drivers/pcmcia/tcic.c | 4 +- drivers/pcmcia/yenta_socket.c | 12 +- drivers/platform/x86/eeepc-laptop.c | 31 +- drivers/platform/x86/fujitsu-laptop.c | 2 +- drivers/rtc/interface.c | 1 + drivers/rtc/rtc-dev.c | 1 + drivers/s390/block/dasd.c | 18 +- drivers/s390/block/dasd_eckd.c | 13 +- drivers/s390/char/raw3270.c | 2 + drivers/s390/char/sclp_async.c | 51 +- drivers/s390/char/sclp_vt220.c | 30 +- drivers/s390/char/tape_block.c | 3 +- drivers/s390/cio/blacklist.c | 13 +- drivers/s390/cio/chp.c | 2 +- drivers/s390/cio/device.c | 13 +- drivers/s390/cio/device.h | 1 + drivers/s390/cio/device_fsm.c | 35 +- drivers/s390/crypto/zcrypt_pcixcc.c | 13 +- drivers/s390/net/smsgiucv.c | 7 +- drivers/s390/scsi/zfcp_aux.c | 44 +- drivers/s390/scsi/zfcp_ccw.c | 40 +- drivers/s390/scsi/zfcp_cfdc.c | 17 +- drivers/s390/scsi/zfcp_erp.c | 22 +- drivers/s390/scsi/zfcp_ext.h | 3 +- drivers/s390/scsi/zfcp_fc.c | 11 + drivers/s390/scsi/zfcp_fsf.c | 35 +- drivers/s390/scsi/zfcp_sysfs.c | 1 + drivers/scsi/Kconfig | 11 + drivers/scsi/Makefile | 2 + drivers/scsi/be2iscsi/Kconfig | 8 + drivers/scsi/be2iscsi/Makefile | 8 + drivers/scsi/be2iscsi/be.h | 183 ++ drivers/scsi/be2iscsi/be_cmds.c | 523 +++ drivers/scsi/be2iscsi/be_cmds.h | 877 +++++ drivers/scsi/be2iscsi/be_iscsi.c | 638 ++++ drivers/scsi/be2iscsi/be_iscsi.h | 75 + drivers/scsi/be2iscsi/be_main.c | 3390 ++++++++++++++++++++ drivers/scsi/be2iscsi/be_main.h | 837 +++++ drivers/scsi/be2iscsi/be_mgmt.c | 321 ++ drivers/scsi/be2iscsi/be_mgmt.h | 249 ++ drivers/scsi/bfa/Makefile | 15 + drivers/scsi/bfa/bfa_callback_priv.h | 57 + drivers/scsi/bfa/bfa_cb_ioim_macros.h | 205 ++ drivers/scsi/bfa/bfa_cee.c | 492 +++ drivers/scsi/bfa/bfa_core.c | 402 +++ drivers/scsi/bfa/bfa_csdebug.c | 58 + drivers/scsi/bfa/bfa_fcpim.c | 175 + drivers/scsi/bfa/bfa_fcpim_priv.h | 188 ++ drivers/scsi/bfa/bfa_fcport.c | 1671 ++++++++++ drivers/scsi/bfa/bfa_fcs.c | 182 ++ drivers/scsi/bfa/bfa_fcs_lport.c | 940 ++++++ drivers/scsi/bfa/bfa_fcs_port.c | 68 + drivers/scsi/bfa/bfa_fcs_uf.c | 105 + drivers/scsi/bfa/bfa_fcxp.c | 782 +++++ drivers/scsi/bfa/bfa_fcxp_priv.h | 138 + drivers/scsi/bfa/bfa_fwimg_priv.h | 31 + drivers/scsi/bfa/bfa_hw_cb.c | 142 + drivers/scsi/bfa/bfa_hw_ct.c | 162 + drivers/scsi/bfa/bfa_intr.c | 218 ++ drivers/scsi/bfa/bfa_intr_priv.h | 115 + drivers/scsi/bfa/bfa_ioc.c | 2382 ++++++++++++++ drivers/scsi/bfa/bfa_ioc.h | 259 ++ drivers/scsi/bfa/bfa_iocfc.c | 872 +++++ drivers/scsi/bfa/bfa_iocfc.h | 168 + drivers/scsi/bfa/bfa_iocfc_q.c | 44 + drivers/scsi/bfa/bfa_ioim.c | 1311 ++++++++ drivers/scsi/bfa/bfa_itnim.c | 1088 +++++++ drivers/scsi/bfa/bfa_log.c | 346 ++ drivers/scsi/bfa/bfa_log_module.c | 451 +++ drivers/scsi/bfa/bfa_lps.c | 782 +++++ drivers/scsi/bfa/bfa_lps_priv.h | 38 + drivers/scsi/bfa/bfa_module.c | 90 + drivers/scsi/bfa/bfa_modules_priv.h | 43 + drivers/scsi/bfa/bfa_os_inc.h | 222 ++ drivers/scsi/bfa/bfa_port.c | 460 +++ drivers/scsi/bfa/bfa_port_priv.h | 90 + drivers/scsi/bfa/bfa_priv.h | 113 + drivers/scsi/bfa/bfa_rport.c | 911 ++++++ drivers/scsi/bfa/bfa_rport_priv.h | 45 + drivers/scsi/bfa/bfa_sgpg.c | 231 ++ drivers/scsi/bfa/bfa_sgpg_priv.h | 79 + drivers/scsi/bfa/bfa_sm.c | 38 + drivers/scsi/bfa/bfa_timer.c | 90 + drivers/scsi/bfa/bfa_trcmod_priv.h | 66 + drivers/scsi/bfa/bfa_tskim.c | 689 ++++ drivers/scsi/bfa/bfa_uf.c | 345 ++ drivers/scsi/bfa/bfa_uf_priv.h | 47 + drivers/scsi/bfa/bfad.c | 1182 +++++++ drivers/scsi/bfa/bfad_attr.c | 649 ++++ drivers/scsi/bfa/bfad_attr.h | 65 + drivers/scsi/bfa/bfad_drv.h | 295 ++ drivers/scsi/bfa/bfad_fwimg.c | 95 + drivers/scsi/bfa/bfad_im.c | 1230 +++++++ drivers/scsi/bfa/bfad_im.h | 150 + drivers/scsi/bfa/bfad_im_compat.h | 46 + drivers/scsi/bfa/bfad_intr.c | 214 ++ drivers/scsi/bfa/bfad_ipfc.h | 42 + drivers/scsi/bfa/bfad_os.c | 50 + drivers/scsi/bfa/bfad_tm.h | 59 + drivers/scsi/bfa/bfad_trcmod.h | 52 + drivers/scsi/bfa/fab.c | 62 + drivers/scsi/bfa/fabric.c | 1278 ++++++++ drivers/scsi/bfa/fcbuild.c | 1449 +++++++++ drivers/scsi/bfa/fcbuild.h | 273 ++ drivers/scsi/bfa/fcpim.c | 844 +++++ drivers/scsi/bfa/fcptm.c | 68 + drivers/scsi/bfa/fcs.h | 30 + drivers/scsi/bfa/fcs_auth.h | 37 + drivers/scsi/bfa/fcs_fabric.h | 61 + drivers/scsi/bfa/fcs_fcpim.h | 44 + drivers/scsi/bfa/fcs_fcptm.h | 45 + drivers/scsi/bfa/fcs_fcxp.h | 29 + drivers/scsi/bfa/fcs_lport.h | 117 + drivers/scsi/bfa/fcs_ms.h | 35 + drivers/scsi/bfa/fcs_port.h | 32 + drivers/scsi/bfa/fcs_rport.h | 61 + drivers/scsi/bfa/fcs_trcmod.h | 56 + drivers/scsi/bfa/fcs_uf.h | 32 + drivers/scsi/bfa/fcs_vport.h | 39 + drivers/scsi/bfa/fdmi.c | 1223 +++++++ drivers/scsi/bfa/include/aen/bfa_aen.h | 92 + drivers/scsi/bfa/include/aen/bfa_aen_adapter.h | 31 + drivers/scsi/bfa/include/aen/bfa_aen_audit.h | 31 + drivers/scsi/bfa/include/aen/bfa_aen_ethport.h | 35 + drivers/scsi/bfa/include/aen/bfa_aen_ioc.h | 37 + drivers/scsi/bfa/include/aen/bfa_aen_itnim.h | 33 + drivers/scsi/bfa/include/aen/bfa_aen_lport.h | 51 + drivers/scsi/bfa/include/aen/bfa_aen_port.h | 57 + drivers/scsi/bfa/include/aen/bfa_aen_rport.h | 37 + drivers/scsi/bfa/include/bfa.h | 177 + drivers/scsi/bfa/include/bfa_fcpim.h | 159 + drivers/scsi/bfa/include/bfa_fcptm.h | 47 + drivers/scsi/bfa/include/bfa_svc.h | 324 ++ drivers/scsi/bfa/include/bfa_timer.h | 53 + drivers/scsi/bfa/include/bfi/bfi.h | 174 + drivers/scsi/bfa/include/bfi/bfi_boot.h | 34 + drivers/scsi/bfa/include/bfi/bfi_cbreg.h | 305 ++ drivers/scsi/bfa/include/bfi/bfi_cee.h | 119 + drivers/scsi/bfa/include/bfi/bfi_ctreg.h | 611 ++++ drivers/scsi/bfa/include/bfi/bfi_fabric.h | 92 + drivers/scsi/bfa/include/bfi/bfi_fcpim.h | 301 ++ drivers/scsi/bfa/include/bfi/bfi_fcxp.h | 71 + drivers/scsi/bfa/include/bfi/bfi_ioc.h | 202 ++ drivers/scsi/bfa/include/bfi/bfi_iocfc.h | 177 + drivers/scsi/bfa/include/bfi/bfi_lport.h | 89 + drivers/scsi/bfa/include/bfi/bfi_lps.h | 96 + drivers/scsi/bfa/include/bfi/bfi_port.h | 115 + drivers/scsi/bfa/include/bfi/bfi_pport.h | 184 ++ drivers/scsi/bfa/include/bfi/bfi_rport.h | 104 + drivers/scsi/bfa/include/bfi/bfi_uf.h | 52 + drivers/scsi/bfa/include/cna/bfa_cna_trcmod.h | 36 + drivers/scsi/bfa/include/cna/cee/bfa_cee.h | 77 + drivers/scsi/bfa/include/cna/port/bfa_port.h | 69 + drivers/scsi/bfa/include/cna/pstats/ethport_defs.h | 36 + drivers/scsi/bfa/include/cna/pstats/phyport_defs.h | 218 ++ drivers/scsi/bfa/include/cs/bfa_checksum.h | 60 + drivers/scsi/bfa/include/cs/bfa_debug.h | 44 + drivers/scsi/bfa/include/cs/bfa_log.h | 184 ++ drivers/scsi/bfa/include/cs/bfa_perf.h | 34 + drivers/scsi/bfa/include/cs/bfa_plog.h | 162 + drivers/scsi/bfa/include/cs/bfa_q.h | 81 + drivers/scsi/bfa/include/cs/bfa_sm.h | 69 + drivers/scsi/bfa/include/cs/bfa_trc.h | 176 + drivers/scsi/bfa/include/cs/bfa_wc.h | 68 + drivers/scsi/bfa/include/defs/bfa_defs_adapter.h | 82 + drivers/scsi/bfa/include/defs/bfa_defs_aen.h | 73 + drivers/scsi/bfa/include/defs/bfa_defs_audit.h | 38 + drivers/scsi/bfa/include/defs/bfa_defs_auth.h | 112 + drivers/scsi/bfa/include/defs/bfa_defs_boot.h | 71 + drivers/scsi/bfa/include/defs/bfa_defs_cee.h | 159 + drivers/scsi/bfa/include/defs/bfa_defs_driver.h | 40 + drivers/scsi/bfa/include/defs/bfa_defs_ethport.h | 98 + drivers/scsi/bfa/include/defs/bfa_defs_fcpim.h | 45 + drivers/scsi/bfa/include/defs/bfa_defs_im_common.h | 32 + drivers/scsi/bfa/include/defs/bfa_defs_im_team.h | 72 + drivers/scsi/bfa/include/defs/bfa_defs_ioc.h | 152 + drivers/scsi/bfa/include/defs/bfa_defs_iocfc.h | 310 ++ drivers/scsi/bfa/include/defs/bfa_defs_ipfc.h | 70 + drivers/scsi/bfa/include/defs/bfa_defs_itnim.h | 126 + drivers/scsi/bfa/include/defs/bfa_defs_led.h | 35 + drivers/scsi/bfa/include/defs/bfa_defs_lport.h | 68 + drivers/scsi/bfa/include/defs/bfa_defs_mfg.h | 58 + drivers/scsi/bfa/include/defs/bfa_defs_pci.h | 41 + drivers/scsi/bfa/include/defs/bfa_defs_pm.h | 33 + drivers/scsi/bfa/include/defs/bfa_defs_pom.h | 56 + drivers/scsi/bfa/include/defs/bfa_defs_port.h | 245 ++ drivers/scsi/bfa/include/defs/bfa_defs_pport.h | 383 +++ drivers/scsi/bfa/include/defs/bfa_defs_qos.h | 99 + drivers/scsi/bfa/include/defs/bfa_defs_rport.h | 199 ++ drivers/scsi/bfa/include/defs/bfa_defs_status.h | 255 ++ drivers/scsi/bfa/include/defs/bfa_defs_tin.h | 118 + drivers/scsi/bfa/include/defs/bfa_defs_tsensor.h | 43 + drivers/scsi/bfa/include/defs/bfa_defs_types.h | 30 + drivers/scsi/bfa/include/defs/bfa_defs_version.h | 22 + drivers/scsi/bfa/include/defs/bfa_defs_vf.h | 74 + drivers/scsi/bfa/include/defs/bfa_defs_vport.h | 91 + drivers/scsi/bfa/include/fcb/bfa_fcb.h | 33 + drivers/scsi/bfa/include/fcb/bfa_fcb_fcpim.h | 76 + drivers/scsi/bfa/include/fcb/bfa_fcb_port.h | 113 + drivers/scsi/bfa/include/fcb/bfa_fcb_rport.h | 80 + drivers/scsi/bfa/include/fcb/bfa_fcb_vf.h | 47 + drivers/scsi/bfa/include/fcb/bfa_fcb_vport.h | 47 + drivers/scsi/bfa/include/fcs/bfa_fcs.h | 73 + drivers/scsi/bfa/include/fcs/bfa_fcs_auth.h | 82 + drivers/scsi/bfa/include/fcs/bfa_fcs_fabric.h | 112 + drivers/scsi/bfa/include/fcs/bfa_fcs_fcpim.h | 131 + drivers/scsi/bfa/include/fcs/bfa_fcs_fdmi.h | 63 + drivers/scsi/bfa/include/fcs/bfa_fcs_lport.h | 226 ++ drivers/scsi/bfa/include/fcs/bfa_fcs_rport.h | 104 + drivers/scsi/bfa/include/fcs/bfa_fcs_vport.h | 63 + drivers/scsi/bfa/include/log/bfa_log_fcs.h | 28 + drivers/scsi/bfa/include/log/bfa_log_hal.h | 30 + drivers/scsi/bfa/include/log/bfa_log_linux.h | 44 + drivers/scsi/bfa/include/log/bfa_log_wdrv.h | 36 + drivers/scsi/bfa/include/protocol/ct.h | 492 +++ drivers/scsi/bfa/include/protocol/fc.h | 1105 +++++++ drivers/scsi/bfa/include/protocol/fc_sp.h | 224 ++ drivers/scsi/bfa/include/protocol/fcp.h | 186 ++ drivers/scsi/bfa/include/protocol/fdmi.h | 163 + drivers/scsi/bfa/include/protocol/pcifw.h | 75 + drivers/scsi/bfa/include/protocol/scsi.h | 1648 ++++++++++ drivers/scsi/bfa/include/protocol/types.h | 42 + drivers/scsi/bfa/loop.c | 422 +++ drivers/scsi/bfa/lport_api.c | 291 ++ drivers/scsi/bfa/lport_priv.h | 82 + drivers/scsi/bfa/ms.c | 759 +++++ drivers/scsi/bfa/n2n.c | 105 + drivers/scsi/bfa/ns.c | 1243 +++++++ drivers/scsi/bfa/plog.c | 184 ++ drivers/scsi/bfa/rport.c | 2618 +++++++++++++++ drivers/scsi/bfa/rport_api.c | 180 ++ drivers/scsi/bfa/rport_ftrs.c | 375 +++ drivers/scsi/bfa/scn.c | 482 +++ drivers/scsi/bfa/vfapi.c | 292 ++ drivers/scsi/bfa/vport.c | 891 +++++ drivers/scsi/bnx2i/bnx2i.h | 2 + drivers/scsi/bnx2i/bnx2i_hwi.c | 2 +- drivers/scsi/bnx2i/bnx2i_iscsi.c | 2 +- drivers/scsi/cxgb3i/cxgb3i_iscsi.c | 2 +- drivers/scsi/device_handler/scsi_dh_rdac.c | 2 - drivers/scsi/dpt_i2o.c | 4 + drivers/scsi/hptiop.c | 37 +- drivers/scsi/hptiop.h | 3 +- drivers/scsi/iscsi_tcp.c | 2 +- drivers/scsi/libiscsi.c | 6 +- drivers/scsi/lpfc/lpfc_scsi.c | 15 +- drivers/scsi/mpt2sas/Kconfig | 2 +- drivers/scsi/mpt2sas/mpi/mpi2.h | 103 +- drivers/scsi/mpt2sas/mpi/mpi2_cnfg.h | 200 ++- drivers/scsi/mpt2sas/mpi/mpi2_history.txt | 334 ++ drivers/scsi/mpt2sas/mpi/mpi2_init.h | 18 +- drivers/scsi/mpt2sas/mpi/mpi2_ioc.h | 65 +- drivers/scsi/mpt2sas/mpi/mpi2_tool.h | 134 +- drivers/scsi/mpt2sas/mpt2sas_base.c | 446 ++- drivers/scsi/mpt2sas/mpt2sas_base.h | 106 +- drivers/scsi/mpt2sas/mpt2sas_config.c | 22 +- drivers/scsi/mpt2sas/mpt2sas_ctl.c | 61 +- drivers/scsi/mpt2sas/mpt2sas_ctl.h | 2 +- drivers/scsi/mpt2sas/mpt2sas_debug.h | 2 +- drivers/scsi/mpt2sas/mpt2sas_scsih.c | 568 +++- drivers/scsi/mpt2sas/mpt2sas_transport.c | 26 +- drivers/scsi/mvsas/mv_defs.h | 4 + drivers/scsi/mvsas/mv_init.c | 4 + drivers/scsi/pmcraid.c | 58 +- drivers/scsi/qla2xxx/qla_mid.c | 6 +- drivers/scsi/scsi.c | 11 +- drivers/scsi/scsi_debug.c | 139 +- drivers/scsi/scsi_error.c | 3 + drivers/scsi/scsi_scan.c | 2 + drivers/scsi/scsi_sysfs.c | 7 +- drivers/scsi/scsi_transport_fc.c | 2 + drivers/scsi/sd.c | 140 +- drivers/scsi/sd.h | 9 +- drivers/scsi/sd_dif.c | 65 - drivers/scsi/sg.c | 10 +- drivers/scsi/sr.c | 22 +- drivers/scsi/st.c | 3 - drivers/serial/8250_pci.c | 78 + drivers/serial/atmel_serial.c | 2 +- drivers/serial/mpc52xx_uart.c | 2 +- drivers/serial/serial_core.c | 7 +- drivers/serial/serial_cs.c | 20 +- drivers/spi/amba-pl022.c | 2 +- drivers/staging/Kconfig | 6 - drivers/staging/Makefile | 3 - drivers/staging/agnx/Kconfig | 5 - drivers/staging/agnx/Makefile | 8 - drivers/staging/agnx/TODO | 22 - drivers/staging/agnx/agnx.h | 156 - drivers/staging/agnx/debug.h | 416 --- drivers/staging/agnx/pci.c | 635 ---- drivers/staging/agnx/phy.c | 960 ------ drivers/staging/agnx/phy.h | 409 --- drivers/staging/agnx/rf.c | 893 ------ drivers/staging/agnx/sta.c | 218 -- drivers/staging/agnx/sta.h | 222 -- drivers/staging/agnx/table.c | 168 - drivers/staging/agnx/table.h | 10 - drivers/staging/agnx/xmit.c | 836 ----- drivers/staging/agnx/xmit.h | 250 -- drivers/staging/android/Kconfig | 1 + drivers/staging/b3dfg/b3dfg.c | 1 + drivers/staging/comedi/Kconfig | 2 +- drivers/staging/comedi/comedi_fops.c | 2 +- drivers/staging/comedi/drivers/cb_das16_cs.c | 2 +- drivers/staging/comedi/drivers/cb_pcidio.c | 8 +- drivers/staging/comedi/drivers/jr3_pci.c | 18 +- drivers/staging/comedi/drivers/me_daq.c | 1 + drivers/staging/comedi/drivers/ni_65xx.c | 12 +- drivers/staging/comedi/drivers/ni_daq_700.c | 2 +- drivers/staging/comedi/drivers/ni_daq_dio24.c | 2 +- drivers/staging/comedi/drivers/ni_labpc_cs.c | 2 +- drivers/staging/comedi/drivers/ni_mio_common.c | 1 + drivers/staging/comedi/drivers/ni_mio_cs.c | 2 +- drivers/staging/comedi/drivers/ni_pcidio.c | 1 + drivers/staging/comedi/drivers/ni_pcimio.c | 22 +- drivers/staging/comedi/drivers/quatech_daqp_cs.c | 2 +- drivers/staging/comedi/drivers/s526.c | 109 +- drivers/staging/comedi/drivers/serial2002.c | 1 + drivers/staging/cowloop/Kconfig | 16 - drivers/staging/cowloop/Makefile | 1 - drivers/staging/cowloop/TODO | 11 - drivers/staging/cowloop/cowloop.c | 2842 ---------------- drivers/staging/cowloop/cowloop.h | 66 - drivers/staging/et131x/et1310_address_map.h | 2 +- drivers/staging/et131x/et1310_rx.c | 20 +- drivers/staging/hv/ChannelMgmt.h | 3 +- drivers/staging/hv/NetVsc.c | 10 +- drivers/staging/hv/TODO | 6 + drivers/staging/hv/osd.c | 1 + drivers/staging/hv/osd.h | 1 + drivers/staging/hv/vmbus_drv.c | 28 +- drivers/staging/iio/Kconfig | 1 + drivers/staging/iio/industrialio-core.c | 2 + drivers/staging/otus/Kconfig | 2 +- drivers/staging/p9auth/p9auth.c | 14 +- drivers/staging/panel/panel.c | 13 +- drivers/staging/poch/poch.c | 1 + drivers/staging/rt2860/Kconfig | 2 +- drivers/staging/rt2860/common/cmm_data_2860.c | 2 + drivers/staging/rt2860/common/cmm_info.c | 1 + drivers/staging/rt2860/rt_linux.c | 1 + drivers/staging/rt2870/Kconfig | 2 +- drivers/staging/rt3090/Kconfig | 2 +- drivers/staging/rt3090/common/cmm_info.c | 1 + drivers/staging/rt3090/rt_linux.c | 1 + drivers/staging/rtl8187se/Kconfig | 2 +- .../staging/rtl8187se/ieee80211/ieee80211_crypt.c | 4 +- .../staging/rtl8187se/ieee80211/ieee80211_module.c | 4 +- .../rtl8187se/ieee80211/ieee80211_softmac.c | 12 +- drivers/staging/rtl8187se/ieee80211/ieee80211_wx.c | 17 +- drivers/staging/rtl8192e/Kconfig | 2 +- .../staging/rtl8192e/ieee80211/ieee80211_crypt.c | 8 +- .../staging/rtl8192e/ieee80211/ieee80211_module.c | 8 +- .../staging/rtl8192e/ieee80211/ieee80211_softmac.c | 19 +- drivers/staging/rtl8192e/ieee80211/ieee80211_wx.c | 21 +- drivers/staging/rtl8192e/r8192E_core.c | 1 + drivers/staging/rtl8192su/Kconfig | 2 +- .../staging/rtl8192su/ieee80211/ieee80211_crypt.c | 4 +- .../staging/rtl8192su/ieee80211/ieee80211_module.c | 4 +- .../rtl8192su/ieee80211/ieee80211_softmac.c | 15 +- drivers/staging/rtl8192su/ieee80211/ieee80211_wx.c | 17 +- drivers/staging/sep/sep_driver.c | 1 + drivers/staging/stlc45xx/Kconfig | 8 - drivers/staging/stlc45xx/Makefile | 1 - drivers/staging/stlc45xx/stlc45xx.c | 2594 --------------- drivers/staging/stlc45xx/stlc45xx.h | 283 -- drivers/staging/stlc45xx/stlc45xx_lmac.h | 434 --- drivers/staging/vme/bridges/vme_ca91cx42.c | 1 + drivers/staging/vme/bridges/vme_tsi148.c | 1 + drivers/staging/vt6656/main_usb.c | 1 - drivers/staging/winbond/Kconfig | 2 +- drivers/staging/winbond/wbusb.c | 44 +- drivers/staging/wlan-ng/Kconfig | 2 +- drivers/uio/uio.c | 1 + drivers/usb/class/usbtmc.c | 2 +- drivers/usb/gadget/Kconfig | 1 + drivers/usb/gadget/ether.c | 9 +- drivers/usb/gadget/fsl_udc_core.c | 2 +- drivers/usb/gadget/imx_udc.c | 8 +- drivers/usb/gadget/r8a66597-udc.h | 105 +- drivers/usb/host/ehci-sched.c | 13 +- drivers/usb/host/isp1362-hcd.c | 18 +- drivers/usb/host/isp1362.h | 12 +- drivers/usb/host/pci-quirks.c | 2 +- drivers/usb/host/r8a66597-hcd.c | 23 +- drivers/usb/host/whci/asl.c | 23 +- drivers/usb/host/whci/pzl.c | 24 +- drivers/usb/host/xhci-hcd.c | 29 +- drivers/usb/misc/usblcd.c | 3 +- drivers/usb/musb/Kconfig | 4 +- drivers/usb/musb/blackfin.c | 1 - drivers/usb/musb/musb_core.h | 7 + drivers/usb/musb/musb_regs.h | 9 - drivers/usb/serial/aircable.c | 10 +- drivers/usb/serial/cp210x.c | 1 + drivers/usb/serial/cypress_m8.c | 12 +- drivers/usb/serial/digi_acceleport.c | 8 +- drivers/usb/serial/empeg.c | 2 +- drivers/usb/serial/ftdi_sio.c | 422 +-- drivers/usb/serial/garmin_gps.c | 12 +- drivers/usb/serial/generic.c | 2 +- drivers/usb/serial/ipaq.c | 9 + drivers/usb/serial/keyspan_pda.c | 2 +- drivers/usb/serial/kl5kusb105.c | 2 +- drivers/usb/serial/mct_u232.c | 14 +- drivers/usb/serial/opticon.c | 13 +- drivers/usb/serial/option.c | 12 + drivers/usb/serial/oti6858.c | 6 +- drivers/usb/serial/pl2303.c | 8 +- drivers/usb/serial/sierra.c | 40 +- drivers/usb/serial/symbolserial.c | 22 +- drivers/usb/serial/usb-serial.c | 10 +- drivers/usb/serial/visor.c | 28 +- drivers/usb/serial/whiteheat.c | 10 +- drivers/usb/storage/transport.c | 46 +- drivers/usb/storage/unusual_devs.h | 7 + drivers/usb/wusbcore/security.c | 41 +- drivers/uwb/whc-rc.c | 1 + drivers/video/da8xx-fb.c | 1 - drivers/video/msm/mddi.c | 2 - drivers/video/omap/blizzard.c | 10 +- drivers/video/omap/omapfb_main.c | 22 +- drivers/virtio/virtio_balloon.c | 3 +- drivers/virtio/virtio_pci.c | 27 +- drivers/virtio/virtio_ring.c | 3 + drivers/watchdog/riowd.c | 2 +- firmware/Makefile | 9 +- firmware/WHENCE | 9 + firmware/cis/COMpad2.cis.ihex | 11 + firmware/cis/COMpad4.cis.ihex | 9 + firmware/cis/DP83903.cis.ihex | 14 + firmware/cis/NE2K.cis.ihex | 8 + firmware/cis/PE-200.cis.ihex | 9 + firmware/cis/SW_555_SER.cis.ihex | 12 + firmware/cis/SW_7xx_SER.cis.ihex | 13 + firmware/cis/SW_8xx_SER.cis.ihex | 13 + firmware/cis/tamarack.cis.ihex | 10 + fs/9p/vfs_dir.c | 93 +- fs/9p/vfs_inode.c | 5 +- fs/Kconfig | 4 +- fs/block_dev.c | 2 +- fs/btrfs/acl.c | 6 +- fs/btrfs/async-thread.c | 81 +- fs/btrfs/async-thread.h | 10 +- fs/btrfs/btrfs_inode.h | 18 +- fs/btrfs/ctree.h | 19 +- fs/btrfs/disk-io.c | 50 +- fs/btrfs/extent-tree.c | 252 ++- fs/btrfs/extent_io.c | 42 +- fs/btrfs/extent_io.h | 18 +- fs/btrfs/file.c | 44 +- fs/btrfs/inode.c | 144 +- fs/btrfs/ioctl.c | 7 +- fs/btrfs/ordered-data.c | 6 + fs/btrfs/relocation.c | 4 +- fs/btrfs/super.c | 9 +- fs/btrfs/transaction.c | 45 +- fs/btrfs/transaction.h | 5 + fs/btrfs/tree-log.c | 56 +- fs/btrfs/tree-log.h | 3 + fs/btrfs/xattr.c | 2 +- fs/cifs/connect.c | 3 +- fs/dlm/lowcomms.c | 36 +- fs/ecryptfs/Kconfig | 3 +- fs/ecryptfs/main.c | 7 +- fs/ext3/super.c | 13 +- fs/ext4/ext4.h | 1 + fs/ext4/super.c | 20 +- fs/file.c | 1 + fs/hfs/btree.c | 5 + fs/hfsplus/wrapper.c | 4 + fs/nfs/client.c | 2 +- fs/nfs/dir.c | 2 + fs/nfs/direct.c | 1 + fs/nfs/nfs4namespace.c | 12 +- fs/nfs/nfs4proc.c | 15 +- fs/nfs/nfs4renewd.c | 6 - fs/nfs/nfs4xdr.c | 1 - fs/nfs/super.c | 37 +- fs/nilfs2/btnode.c | 4 +- fs/nilfs2/segment.c | 19 +- fs/notify/dnotify/dnotify.c | 3 +- fs/notify/inode_mark.c | 6 +- fs/notify/notification.c | 2 +- fs/partitions/check.c | 12 +- fs/pipe.c | 41 +- fs/proc/kcore.c | 1 - fs/proc/meminfo.c | 2 +- fs/proc/page.c | 5 + fs/romfs/storage.c | 4 +- fs/sysfs/dir.c | 3 +- fs/sysfs/file.c | 14 +- fs/xfs/linux-2.6/xfs_aops.c | 38 +- fs/xfs/linux-2.6/xfs_file.c | 9 +- fs/xfs/linux-2.6/xfs_iops.c | 41 +- fs/xfs/linux-2.6/xfs_lrw.c | 2 +- fs/xfs/linux-2.6/xfs_quotaops.c | 2 +- fs/xfs/linux-2.6/xfs_super.c | 59 +- fs/xfs/linux-2.6/xfs_sync.c | 36 +- fs/xfs/quota/xfs_qm_syscalls.c | 1 - fs/xfs/xfs_dfrag.c | 8 +- fs/xfs/xfs_dir2_leaf.c | 4 +- fs/xfs/xfs_ialloc.c | 1 + fs/xfs/xfs_inode.c | 4 +- fs/xfs/xfs_inode.h | 2 +- fs/xfs/xfs_inode_item.c | 18 +- fs/xfs/xfs_itable.c | 21 +- fs/xfs/xfs_vnodeops.c | 6 - include/asm-generic/hardirq.h | 2 +- include/drm/drm_crtc_helper.h | 3 + include/drm/drm_fb_helper.h | 7 +- include/drm/drm_pciids.h | 4 +- include/linux/Kbuild | 2 + include/linux/ata.h | 9 +- include/linux/blkdev.h | 4 - include/linux/cpufreq.h | 7 + include/linux/device.h | 4 +- include/linux/elf.h | 1 + include/linux/ftrace.h | 2 +- include/linux/futex.h | 4 +- include/linux/genhd.h | 21 +- include/linux/i2c/twl4030.h | 6 +- include/linux/init.h | 1 + include/linux/interrupt.h | 2 +- include/linux/kernel.h | 6 + include/linux/libata.h | 12 + include/linux/mmc/host.h | 1 + include/linux/moduleparam.h | 1 - include/linux/netdevice.h | 2 +- include/linux/pci_ids.h | 14 +- include/linux/perf_event.h | 9 +- include/linux/prctl.h | 12 + include/linux/rcupdate.h | 18 +- include/linux/rcutree.h | 19 +- include/linux/skbuff.h | 6 +- include/linux/socket.h | 21 +- include/linux/string.h | 2 +- include/linux/topology.h | 4 +- include/linux/trace_seq.h | 2 +- include/linux/usb/serial.h | 1 + include/linux/virtio_9p.h | 1 + include/linux/virtio_balloon.h | 1 + include/linux/virtio_blk.h | 5 +- include/linux/virtio_console.h | 1 + include/linux/virtio_net.h | 1 + include/linux/virtio_rng.h | 1 + include/linux/workqueue.h | 1 + include/net/9p/client.h | 7 +- include/net/inet_timewait_sock.h | 8 +- include/net/ip_fib.h | 3 +- include/net/mac80211.h | 2 + include/net/sock.h | 10 +- include/pcmcia/ss.h | 4 + include/scsi/libiscsi.h | 3 +- include/scsi/scsi.h | 3 + include/scsi/scsi_cmnd.h | 4 - include/scsi/scsi_host.h | 15 +- include/sound/soc.h | 1 - init/Kconfig | 20 +- init/main.c | 1 - kernel/cgroup.c | 8 +- kernel/exit.c | 6 +- kernel/fork.c | 12 +- kernel/futex.c | 23 +- kernel/hrtimer.c | 2 - kernel/irq/handle.c | 1 + kernel/lockdep.c | 20 +- kernel/mutex-debug.c | 1 + kernel/panic.c | 3 +- kernel/params.c | 17 +- kernel/perf_event.c | 350 ++- kernel/power/hibernate.c | 11 +- kernel/power/suspend_test.c | 5 +- kernel/power/swap.c | 43 +- kernel/rcupdate.c | 140 +- kernel/rcutorture.c | 4 +- kernel/rcutree.c | 374 ++- kernel/rcutree.h | 90 +- kernel/rcutree_plugin.h | 149 +- kernel/rcutree_trace.c | 4 +- kernel/sched.c | 55 +- kernel/sched_fair.c | 27 +- kernel/sys.c | 25 +- kernel/sysctl_check.c | 2 +- kernel/time/tick-sched.c | 9 +- kernel/time/timekeeping.c | 1 + kernel/trace/ftrace.c | 29 +- kernel/trace/kmemtrace.c | 2 +- kernel/trace/ring_buffer.c | 12 +- kernel/trace/trace.c | 10 +- kernel/trace/trace_branch.c | 8 +- kernel/trace/trace_event_profile.c | 15 +- kernel/trace/trace_events_filter.c | 3 +- kernel/trace/trace_hw_branches.c | 8 +- kernel/trace/trace_output.c | 23 +- kernel/trace/trace_syscalls.c | 4 +- kernel/workqueue.c | 39 +- lib/Kconfig.debug | 9 +- lib/debugobjects.c | 1 + lib/fault-inject.c | 1 + mm/Kconfig | 8 +- mm/backing-dev.c | 18 +- mm/kmemleak.c | 5 +- mm/ksm.c | 10 +- mm/memory-failure.c | 59 +- mm/memory.c | 14 +- mm/mempolicy.c | 13 +- mm/nommu.c | 6 +- mm/page-writeback.c | 3 +- mm/page_alloc.c | 3 +- mm/percpu.c | 35 +- mm/swapfile.c | 3 +- mm/vmalloc.c | 50 +- mm/vmscan.c | 14 +- net/9p/client.c | 5 +- net/9p/trans_virtio.c | 1 - net/bluetooth/hci_sysfs.c | 4 +- net/bluetooth/l2cap.c | 9 +- net/core/datagram.c | 10 +- net/core/net-sysfs.c | 4 +- net/core/pktgen.c | 19 +- net/ipv4/devinet.c | 16 +- net/ipv4/fib_frontend.c | 5 +- net/ipv4/inet_connection_sock.c | 34 +- net/ipv4/ip_gre.c | 28 +- net/ipv4/ip_sockglue.c | 7 +- net/ipv4/raw.c | 24 +- net/ipv4/route.c | 8 +- net/ipv4/tcp.c | 59 +- net/ipv4/tcp_minisocks.c | 4 +- net/ipv4/udp.c | 77 +- net/ipv6/ipv6_sockglue.c | 6 +- net/ipv6/udp.c | 4 +- net/irda/ircomm/ircomm_tty_attach.c | 1 + net/irda/irlan/irlan_common.c | 1 + net/irda/irlan/irlan_eth.c | 1 + net/irda/irnet/irnet_irda.c | 1 + net/irda/irnet/irnet_ppp.c | 1 + net/mac80211/agg-tx.c | 19 +- net/mac80211/cfg.c | 6 +- net/mac80211/ht.c | 2 +- net/mac80211/ibss.c | 14 +- net/mac80211/mesh_hwmp.c | 2 +- net/mac80211/mlme.c | 3 +- net/mac80211/rc80211_pid_debugfs.c | 1 + net/mac80211/rx.c | 12 +- net/mac80211/sta_info.c | 2 + net/mac80211/tx.c | 5 +- net/mac80211/util.c | 4 +- net/netfilter/nf_conntrack_core.c | 1 + net/packet/af_packet.c | 5 +- net/sched/act_pedit.c | 2 +- net/sched/cls_api.c | 2 +- net/sunrpc/svcsock.c | 10 +- net/sunrpc/xprtrdma/svc_rdma_transport.c | 1 + net/unix/af_unix.c | 2 + net/wireless/core.c | 1 + net/wireless/core.h | 1 + net/wireless/mlme.c | 9 + net/wireless/nl80211.c | 3 +- net/wireless/sme.c | 24 +- scripts/Kbuild.include | 2 +- scripts/Makefile.lib | 2 +- scripts/checkkconfigsymbols.sh | 4 +- scripts/checkpatch.pl | 84 +- scripts/get_maintainer.pl | 37 +- scripts/headers_install.pl | 2 +- scripts/mkcompile_h | 12 +- scripts/package/Makefile | 11 +- scripts/package/mkspec | 2 +- security/keys/keyctl.c | 2 +- sound/arm/aaci.c | 1 + sound/core/pcm.c | 5 +- sound/drivers/dummy.c | 4 +- sound/drivers/opl3/opl3_midi.c | 28 +- sound/drivers/pcsp/pcsp_lib.c | 65 +- sound/drivers/pcsp/pcsp_mixer.c | 2 +- sound/parisc/harmony.c | 6 +- sound/pci/Kconfig | 1 - sound/pci/ali5451/ali5451.c | 2 +- sound/pci/bt87x.c | 2 + sound/pci/hda/hda_intel.c | 1 + sound/pci/hda/patch_nvhdmi.c | 31 +- sound/pci/hda/patch_realtek.c | 98 +- sound/pci/hda/patch_sigmatel.c | 29 +- sound/pci/ice1712/amp.c | 8 +- sound/pci/ice1712/ice1712.c | 2 +- sound/pci/ice1712/ice1724.c | 8 +- sound/pci/via82xx.c | 86 +- sound/pcmcia/pdaudiocf/pdaudiocf.c | 21 +- sound/pcmcia/vx/vxpocket.c | 21 +- sound/ppc/Kconfig | 2 +- sound/soc/codecs/ac97.c | 3 - sound/soc/codecs/ad1836.c | 6 - sound/soc/codecs/ad1938.c | 6 - sound/soc/codecs/ad1980.c | 5 - sound/soc/codecs/ad73311.c | 8 - sound/soc/codecs/ak4104.c | 8 - sound/soc/codecs/ak4535.c | 8 - sound/soc/codecs/ak4642.c | 9 - sound/soc/codecs/ak4671.c | 9 - sound/soc/codecs/cs4270.c | 7 - sound/soc/codecs/cx20442.c | 6 - sound/soc/codecs/pcm3008.c | 9 - sound/soc/codecs/ssm2602.c | 8 - sound/soc/codecs/stac9766.c | 3 - sound/soc/codecs/tlv320aic23.c | 8 - sound/soc/codecs/tlv320aic26.c | 11 - sound/soc/codecs/tlv320aic3x.c | 10 - sound/soc/codecs/tlv320dac33.c | 10 +- sound/soc/codecs/twl4030.c | 12 - sound/soc/codecs/uda134x.c | 9 - sound/soc/codecs/uda1380.c | 8 - sound/soc/codecs/wm8350.c | 11 - sound/soc/codecs/wm8400.c | 6 - sound/soc/codecs/wm8510.c | 9 +- sound/soc/codecs/wm8523.c | 8 - sound/soc/codecs/wm8580.c | 8 - sound/soc/codecs/wm8711.c | 8 - sound/soc/codecs/wm8727.c | 10 +- sound/soc/codecs/wm8728.c | 8 - sound/soc/codecs/wm8731.c | 8 - sound/soc/codecs/wm8750.c | 8 - sound/soc/codecs/wm8753.c | 9 - sound/soc/codecs/wm8776.c | 9 - sound/soc/codecs/wm8900.c | 6 - sound/soc/codecs/wm8903.c | 9 - sound/soc/codecs/wm8940.c | 6 - sound/soc/codecs/wm8960.c | 8 - sound/soc/codecs/wm8961.c | 9 - sound/soc/codecs/wm8971.c | 9 +- sound/soc/codecs/wm8974.c | 8 - sound/soc/codecs/wm8988.c | 9 - sound/soc/codecs/wm8990.c | 9 +- sound/soc/codecs/wm8993.c | 9 - sound/soc/codecs/wm9081.c | 9 - sound/soc/codecs/wm9705.c | 8 - sound/soc/codecs/wm9712.c | 8 - sound/soc/codecs/wm9713.c | 7 +- sound/soc/s3c24xx/s3c24xx-pcm.c | 17 +- sound/soc/s3c24xx/s3c64xx-i2s.c | 2 + sound/soc/soc-core.c | 475 ++-- sound/usb/caiaq/audio.c | 16 +- sound/usb/caiaq/device.c | 2 +- tools/perf/Documentation/perf-timechart.txt | 3 + tools/perf/Makefile | 32 +- tools/perf/builtin-record.c | 6 + tools/perf/builtin-sched.c | 4 +- tools/perf/builtin-stat.c | 8 +- tools/perf/builtin-timechart.c | 38 +- tools/perf/builtin-top.c | 3 + tools/perf/builtin-trace.c | 6 - tools/perf/design.txt | 3 + tools/perf/util/PERF-VERSION-GEN | 2 +- tools/perf/util/parse-events.c | 5 +- tools/perf/util/svghelper.c | 16 +- tools/perf/util/symbol.c | 9 +- tools/perf/util/symbol.h | 10 + tools/perf/util/trace-event-parse.c | 17 +- virt/kvm/kvm_main.c | 21 +- 1825 files changed, 90249 insertions(+), 26409 deletions(-) rename Documentation/ABI/testing/{sysfs-class-usb_host => sysfs-class-uwb_rc-wusbhc} (88%) delete mode 100644 Documentation/ABI/testing/sysfs-devices-cache_disable create mode 100644 Documentation/ABI/testing/sysfs-devices-system-cpu create mode 100644 Documentation/vm/hwpoison.txt create mode 100644 arch/blackfin/ADI_BSD.txt create mode 100644 arch/mips/bcm63xx/dev-wdt.c delete mode 100644 arch/mips/include/asm/mach-bcm63xx/bcm63xx_dev_uart.h create mode 100644 arch/mips/include/asm/spram.h create mode 100644 arch/parisc/include/asm/syscall.h create mode 100644 arch/powerpc/boot/dts/mucmc52.dts create mode 100644 arch/powerpc/boot/dts/uc101.dts create mode 100644 arch/powerpc/configs/ppc64e_defconfig create mode 100644 drivers/gpu/drm/radeon/rs100d.h create mode 100644 drivers/gpu/drm/radeon/rs400d.h create mode 100644 drivers/gpu/drm/radeon/rs600d.h create mode 100644 drivers/gpu/drm/radeon/rs690d.h delete mode 100644 drivers/gpu/drm/radeon/rs690r.h create mode 100644 drivers/gpu/drm/radeon/rv200d.h create mode 100644 drivers/gpu/drm/radeon/rv250d.h create mode 100644 drivers/gpu/drm/radeon/rv350d.h create mode 100644 drivers/md/unroll.awk delete mode 100644 drivers/md/unroll.pl create mode 100644 drivers/net/stmmac/Kconfig create mode 100644 drivers/net/stmmac/Makefile create mode 100644 drivers/net/stmmac/common.h create mode 100644 drivers/net/stmmac/descs.h create mode 100644 drivers/net/stmmac/gmac.c create mode 100644 drivers/net/stmmac/gmac.h create mode 100644 drivers/net/stmmac/mac100.c create mode 100644 drivers/net/stmmac/mac100.h create mode 100644 drivers/net/stmmac/stmmac.h create mode 100644 drivers/net/stmmac/stmmac_ethtool.c create mode 100644 drivers/net/stmmac/stmmac_main.c create mode 100644 drivers/net/stmmac/stmmac_mdio.c create mode 100644 drivers/net/stmmac/stmmac_timer.c create mode 100644 drivers/net/stmmac/stmmac_timer.h create mode 100644 drivers/net/vmxnet3/Makefile create mode 100644 drivers/net/vmxnet3/upt1_defs.h create mode 100644 drivers/net/vmxnet3/vmxnet3_defs.h create mode 100644 drivers/net/vmxnet3/vmxnet3_drv.c create mode 100644 drivers/net/vmxnet3/vmxnet3_ethtool.c create mode 100644 drivers/net/vmxnet3/vmxnet3_int.h create mode 100644 drivers/scsi/be2iscsi/Kconfig create mode 100644 drivers/scsi/be2iscsi/Makefile create mode 100644 drivers/scsi/be2iscsi/be.h create mode 100644 drivers/scsi/be2iscsi/be_cmds.c create mode 100644 drivers/scsi/be2iscsi/be_cmds.h create mode 100644 drivers/scsi/be2iscsi/be_iscsi.c create mode 100644 drivers/scsi/be2iscsi/be_iscsi.h create mode 100644 drivers/scsi/be2iscsi/be_main.c create mode 100644 drivers/scsi/be2iscsi/be_main.h create mode 100644 drivers/scsi/be2iscsi/be_mgmt.c create mode 100644 drivers/scsi/be2iscsi/be_mgmt.h create mode 100644 drivers/scsi/bfa/Makefile create mode 100644 drivers/scsi/bfa/bfa_callback_priv.h create mode 100644 drivers/scsi/bfa/bfa_cb_ioim_macros.h create mode 100644 drivers/scsi/bfa/bfa_cee.c create mode 100644 drivers/scsi/bfa/bfa_core.c create mode 100644 drivers/scsi/bfa/bfa_csdebug.c create mode 100644 drivers/scsi/bfa/bfa_fcpim.c create mode 100644 drivers/scsi/bfa/bfa_fcpim_priv.h create mode 100644 drivers/scsi/bfa/bfa_fcport.c create mode 100644 drivers/scsi/bfa/bfa_fcs.c create mode 100644 drivers/scsi/bfa/bfa_fcs_lport.c create mode 100644 drivers/scsi/bfa/bfa_fcs_port.c create mode 100644 drivers/scsi/bfa/bfa_fcs_uf.c create mode 100644 drivers/scsi/bfa/bfa_fcxp.c create mode 100644 drivers/scsi/bfa/bfa_fcxp_priv.h create mode 100644 drivers/scsi/bfa/bfa_fwimg_priv.h create mode 100644 drivers/scsi/bfa/bfa_hw_cb.c create mode 100644 drivers/scsi/bfa/bfa_hw_ct.c create mode 100644 drivers/scsi/bfa/bfa_intr.c create mode 100644 drivers/scsi/bfa/bfa_intr_priv.h create mode 100644 drivers/scsi/bfa/bfa_ioc.c create mode 100644 drivers/scsi/bfa/bfa_ioc.h create mode 100644 drivers/scsi/bfa/bfa_iocfc.c create mode 100644 drivers/scsi/bfa/bfa_iocfc.h create mode 100644 drivers/scsi/bfa/bfa_iocfc_q.c create mode 100644 drivers/scsi/bfa/bfa_ioim.c create mode 100644 drivers/scsi/bfa/bfa_itnim.c create mode 100644 drivers/scsi/bfa/bfa_log.c create mode 100644 drivers/scsi/bfa/bfa_log_module.c create mode 100644 drivers/scsi/bfa/bfa_lps.c create mode 100644 drivers/scsi/bfa/bfa_lps_priv.h create mode 100644 drivers/scsi/bfa/bfa_module.c create mode 100644 drivers/scsi/bfa/bfa_modules_priv.h create mode 100644 drivers/scsi/bfa/bfa_os_inc.h create mode 100644 drivers/scsi/bfa/bfa_port.c create mode 100644 drivers/scsi/bfa/bfa_port_priv.h create mode 100644 drivers/scsi/bfa/bfa_priv.h create mode 100644 drivers/scsi/bfa/bfa_rport.c create mode 100644 drivers/scsi/bfa/bfa_rport_priv.h create mode 100644 drivers/scsi/bfa/bfa_sgpg.c create mode 100644 drivers/scsi/bfa/bfa_sgpg_priv.h create mode 100644 drivers/scsi/bfa/bfa_sm.c create mode 100644 drivers/scsi/bfa/bfa_timer.c create mode 100644 drivers/scsi/bfa/bfa_trcmod_priv.h create mode 100644 drivers/scsi/bfa/bfa_tskim.c create mode 100644 drivers/scsi/bfa/bfa_uf.c create mode 100644 drivers/scsi/bfa/bfa_uf_priv.h create mode 100644 drivers/scsi/bfa/bfad.c create mode 100644 drivers/scsi/bfa/bfad_attr.c create mode 100644 drivers/scsi/bfa/bfad_attr.h create mode 100644 drivers/scsi/bfa/bfad_drv.h create mode 100644 drivers/scsi/bfa/bfad_fwimg.c create mode 100644 drivers/scsi/bfa/bfad_im.c create mode 100644 drivers/scsi/bfa/bfad_im.h create mode 100644 drivers/scsi/bfa/bfad_im_compat.h create mode 100644 drivers/scsi/bfa/bfad_intr.c create mode 100644 drivers/scsi/bfa/bfad_ipfc.h create mode 100644 drivers/scsi/bfa/bfad_os.c create mode 100644 drivers/scsi/bfa/bfad_tm.h create mode 100644 drivers/scsi/bfa/bfad_trcmod.h create mode 100644 drivers/scsi/bfa/fab.c create mode 100644 drivers/scsi/bfa/fabric.c create mode 100644 drivers/scsi/bfa/fcbuild.c create mode 100644 drivers/scsi/bfa/fcbuild.h create mode 100644 drivers/scsi/bfa/fcpim.c create mode 100644 drivers/scsi/bfa/fcptm.c create mode 100644 drivers/scsi/bfa/fcs.h create mode 100644 drivers/scsi/bfa/fcs_auth.h create mode 100644 drivers/scsi/bfa/fcs_fabric.h create mode 100644 drivers/scsi/bfa/fcs_fcpim.h create mode 100644 drivers/scsi/bfa/fcs_fcptm.h create mode 100644 drivers/scsi/bfa/fcs_fcxp.h create mode 100644 drivers/scsi/bfa/fcs_lport.h create mode 100644 drivers/scsi/bfa/fcs_ms.h create mode 100644 drivers/scsi/bfa/fcs_port.h create mode 100644 drivers/scsi/bfa/fcs_rport.h create mode 100644 drivers/scsi/bfa/fcs_trcmod.h create mode 100644 drivers/scsi/bfa/fcs_uf.h create mode 100644 drivers/scsi/bfa/fcs_vport.h create mode 100644 drivers/scsi/bfa/fdmi.c create mode 100644 drivers/scsi/bfa/include/aen/bfa_aen.h create mode 100644 drivers/scsi/bfa/include/aen/bfa_aen_adapter.h create mode 100644 drivers/scsi/bfa/include/aen/bfa_aen_audit.h create mode 100644 drivers/scsi/bfa/include/aen/bfa_aen_ethport.h create mode 100644 drivers/scsi/bfa/include/aen/bfa_aen_ioc.h create mode 100644 drivers/scsi/bfa/include/aen/bfa_aen_itnim.h create mode 100644 drivers/scsi/bfa/include/aen/bfa_aen_lport.h create mode 100644 drivers/scsi/bfa/include/aen/bfa_aen_port.h create mode 100644 drivers/scsi/bfa/include/aen/bfa_aen_rport.h create mode 100644 drivers/scsi/bfa/include/bfa.h create mode 100644 drivers/scsi/bfa/include/bfa_fcpim.h create mode 100644 drivers/scsi/bfa/include/bfa_fcptm.h create mode 100644 drivers/scsi/bfa/include/bfa_svc.h create mode 100644 drivers/scsi/bfa/include/bfa_timer.h create mode 100644 drivers/scsi/bfa/include/bfi/bfi.h create mode 100644 drivers/scsi/bfa/include/bfi/bfi_boot.h create mode 100644 drivers/scsi/bfa/include/bfi/bfi_cbreg.h create mode 100644 drivers/scsi/bfa/include/bfi/bfi_cee.h create mode 100644 drivers/scsi/bfa/include/bfi/bfi_ctreg.h create mode 100644 drivers/scsi/bfa/include/bfi/bfi_fabric.h create mode 100644 drivers/scsi/bfa/include/bfi/bfi_fcpim.h create mode 100644 drivers/scsi/bfa/include/bfi/bfi_fcxp.h create mode 100644 drivers/scsi/bfa/include/bfi/bfi_ioc.h create mode 100644 drivers/scsi/bfa/include/bfi/bfi_iocfc.h create mode 100644 drivers/scsi/bfa/include/bfi/bfi_lport.h create mode 100644 drivers/scsi/bfa/include/bfi/bfi_lps.h create mode 100644 drivers/scsi/bfa/include/bfi/bfi_port.h create mode 100644 drivers/scsi/bfa/include/bfi/bfi_pport.h create mode 100644 drivers/scsi/bfa/include/bfi/bfi_rport.h create mode 100644 drivers/scsi/bfa/include/bfi/bfi_uf.h create mode 100644 drivers/scsi/bfa/include/cna/bfa_cna_trcmod.h create mode 100644 drivers/scsi/bfa/include/cna/cee/bfa_cee.h create mode 100644 drivers/scsi/bfa/include/cna/port/bfa_port.h create mode 100644 drivers/scsi/bfa/include/cna/pstats/ethport_defs.h create mode 100644 drivers/scsi/bfa/include/cna/pstats/phyport_defs.h create mode 100644 drivers/scsi/bfa/include/cs/bfa_checksum.h create mode 100644 drivers/scsi/bfa/include/cs/bfa_debug.h create mode 100644 drivers/scsi/bfa/include/cs/bfa_log.h create mode 100644 drivers/scsi/bfa/include/cs/bfa_perf.h create mode 100644 drivers/scsi/bfa/include/cs/bfa_plog.h create mode 100644 drivers/scsi/bfa/include/cs/bfa_q.h create mode 100644 drivers/scsi/bfa/include/cs/bfa_sm.h create mode 100644 drivers/scsi/bfa/include/cs/bfa_trc.h create mode 100644 drivers/scsi/bfa/include/cs/bfa_wc.h create mode 100644 drivers/scsi/bfa/include/defs/bfa_defs_adapter.h create mode 100644 drivers/scsi/bfa/include/defs/bfa_defs_aen.h create mode 100644 drivers/scsi/bfa/include/defs/bfa_defs_audit.h create mode 100644 drivers/scsi/bfa/include/defs/bfa_defs_auth.h create mode 100644 drivers/scsi/bfa/include/defs/bfa_defs_boot.h create mode 100644 drivers/scsi/bfa/include/defs/bfa_defs_cee.h create mode 100644 drivers/scsi/bfa/include/defs/bfa_defs_driver.h create mode 100644 drivers/scsi/bfa/include/defs/bfa_defs_ethport.h create mode 100644 drivers/scsi/bfa/include/defs/bfa_defs_fcpim.h create mode 100644 drivers/scsi/bfa/include/defs/bfa_defs_im_common.h create mode 100644 drivers/scsi/bfa/include/defs/bfa_defs_im_team.h create mode 100644 drivers/scsi/bfa/include/defs/bfa_defs_ioc.h create mode 100644 drivers/scsi/bfa/include/defs/bfa_defs_iocfc.h create mode 100644 drivers/scsi/bfa/include/defs/bfa_defs_ipfc.h create mode 100644 drivers/scsi/bfa/include/defs/bfa_defs_itnim.h create mode 100644 drivers/scsi/bfa/include/defs/bfa_defs_led.h create mode 100644 drivers/scsi/bfa/include/defs/bfa_defs_lport.h create mode 100644 drivers/scsi/bfa/include/defs/bfa_defs_mfg.h create mode 100644 drivers/scsi/bfa/include/defs/bfa_defs_pci.h create mode 100644 drivers/scsi/bfa/include/defs/bfa_defs_pm.h create mode 100644 drivers/scsi/bfa/include/defs/bfa_defs_pom.h create mode 100644 drivers/scsi/bfa/include/defs/bfa_defs_port.h create mode 100644 drivers/scsi/bfa/include/defs/bfa_defs_pport.h create mode 100644 drivers/scsi/bfa/include/defs/bfa_defs_qos.h create mode 100644 drivers/scsi/bfa/include/defs/bfa_defs_rport.h create mode 100644 drivers/scsi/bfa/include/defs/bfa_defs_status.h create mode 100644 drivers/scsi/bfa/include/defs/bfa_defs_tin.h create mode 100644 drivers/scsi/bfa/include/defs/bfa_defs_tsensor.h create mode 100644 drivers/scsi/bfa/include/defs/bfa_defs_types.h create mode 100644 drivers/scsi/bfa/include/defs/bfa_defs_version.h create mode 100644 drivers/scsi/bfa/include/defs/bfa_defs_vf.h create mode 100644 drivers/scsi/bfa/include/defs/bfa_defs_vport.h create mode 100644 drivers/scsi/bfa/include/fcb/bfa_fcb.h create mode 100644 drivers/scsi/bfa/include/fcb/bfa_fcb_fcpim.h create mode 100644 drivers/scsi/bfa/include/fcb/bfa_fcb_port.h create mode 100644 drivers/scsi/bfa/include/fcb/bfa_fcb_rport.h create mode 100644 drivers/scsi/bfa/include/fcb/bfa_fcb_vf.h create mode 100644 drivers/scsi/bfa/include/fcb/bfa_fcb_vport.h create mode 100644 drivers/scsi/bfa/include/fcs/bfa_fcs.h create mode 100644 drivers/scsi/bfa/include/fcs/bfa_fcs_auth.h create mode 100644 drivers/scsi/bfa/include/fcs/bfa_fcs_fabric.h create mode 100644 drivers/scsi/bfa/include/fcs/bfa_fcs_fcpim.h create mode 100644 drivers/scsi/bfa/include/fcs/bfa_fcs_fdmi.h create mode 100644 drivers/scsi/bfa/include/fcs/bfa_fcs_lport.h create mode 100644 drivers/scsi/bfa/include/fcs/bfa_fcs_rport.h create mode 100644 drivers/scsi/bfa/include/fcs/bfa_fcs_vport.h create mode 100644 drivers/scsi/bfa/include/log/bfa_log_fcs.h create mode 100644 drivers/scsi/bfa/include/log/bfa_log_hal.h create mode 100644 drivers/scsi/bfa/include/log/bfa_log_linux.h create mode 100644 drivers/scsi/bfa/include/log/bfa_log_wdrv.h create mode 100644 drivers/scsi/bfa/include/protocol/ct.h create mode 100644 drivers/scsi/bfa/include/protocol/fc.h create mode 100644 drivers/scsi/bfa/include/protocol/fc_sp.h create mode 100644 drivers/scsi/bfa/include/protocol/fcp.h create mode 100644 drivers/scsi/bfa/include/protocol/fdmi.h create mode 100644 drivers/scsi/bfa/include/protocol/pcifw.h create mode 100644 drivers/scsi/bfa/include/protocol/scsi.h create mode 100644 drivers/scsi/bfa/include/protocol/types.h create mode 100644 drivers/scsi/bfa/loop.c create mode 100644 drivers/scsi/bfa/lport_api.c create mode 100644 drivers/scsi/bfa/lport_priv.h create mode 100644 drivers/scsi/bfa/ms.c create mode 100644 drivers/scsi/bfa/n2n.c create mode 100644 drivers/scsi/bfa/ns.c create mode 100644 drivers/scsi/bfa/plog.c create mode 100644 drivers/scsi/bfa/rport.c create mode 100644 drivers/scsi/bfa/rport_api.c create mode 100644 drivers/scsi/bfa/rport_ftrs.c create mode 100644 drivers/scsi/bfa/scn.c create mode 100644 drivers/scsi/bfa/vfapi.c create mode 100644 drivers/scsi/bfa/vport.c create mode 100644 drivers/scsi/mpt2sas/mpi/mpi2_history.txt delete mode 100644 drivers/staging/agnx/Kconfig delete mode 100644 drivers/staging/agnx/Makefile delete mode 100644 drivers/staging/agnx/TODO delete mode 100644 drivers/staging/agnx/agnx.h delete mode 100644 drivers/staging/agnx/debug.h delete mode 100644 drivers/staging/agnx/pci.c delete mode 100644 drivers/staging/agnx/phy.c delete mode 100644 drivers/staging/agnx/phy.h delete mode 100644 drivers/staging/agnx/rf.c delete mode 100644 drivers/staging/agnx/sta.c delete mode 100644 drivers/staging/agnx/sta.h delete mode 100644 drivers/staging/agnx/table.c delete mode 100644 drivers/staging/agnx/table.h delete mode 100644 drivers/staging/agnx/xmit.c delete mode 100644 drivers/staging/agnx/xmit.h delete mode 100644 drivers/staging/cowloop/Kconfig delete mode 100644 drivers/staging/cowloop/Makefile delete mode 100644 drivers/staging/cowloop/TODO delete mode 100644 drivers/staging/cowloop/cowloop.c delete mode 100644 drivers/staging/cowloop/cowloop.h delete mode 100644 drivers/staging/stlc45xx/Kconfig delete mode 100644 drivers/staging/stlc45xx/Makefile delete mode 100644 drivers/staging/stlc45xx/stlc45xx.c delete mode 100644 drivers/staging/stlc45xx/stlc45xx.h delete mode 100644 drivers/staging/stlc45xx/stlc45xx_lmac.h create mode 100644 firmware/cis/COMpad2.cis.ihex create mode 100644 firmware/cis/COMpad4.cis.ihex create mode 100644 firmware/cis/DP83903.cis.ihex create mode 100644 firmware/cis/NE2K.cis.ihex create mode 100644 firmware/cis/PE-200.cis.ihex create mode 100644 firmware/cis/SW_555_SER.cis.ihex create mode 100644 firmware/cis/SW_7xx_SER.cis.ihex create mode 100644 firmware/cis/SW_8xx_SER.cis.ihex create mode 100644 firmware/cis/tamarack.cis.ihex

2 1

[alsa-devel] (SCH Poulsbo) HD Audio Controller
by Victor Stinner 07 Nov '09

07 Nov '09

Hi, I bought a new Eee PC 1101HA. It uses the "Intel System Controller Hub (SCH) US15W" chipset which includes the "ALC269" (Intel "HD" audio chipset). The pci identifier of the audio sound card is 8086:811b. On Fedora, the snd-hda-intel kernel (from ALSA 1.0.20) module is loaded, but i don't hear anything. On IRC (#alsa on Freenode), gnubien gave me the trick to make it working: write the following configuration in /etc/modprobe.d/alsa.conf file: options snd-hda-intel model=eeepc-p901 Without the model trick, my playback controls are: - Master - Headphone - PCM - Front - Front Mic - Front Mic Boost - Beep With model=eeepc-p901, playback controls are: - LineOut - Mic Boost - Beep - iSpeaker Thanks to model=eeepc-p901, the sound works correctly. Here is the output of alsa-info.sh script: http://www.alsa-project.org/db/?f=3ae0754e841558e9b88a51ceebd5e7a491639750 PS: Please "CC" me to your anwsers. Victor Stinner

2 2

[alsa-devel] [PATCH 4/7] S3C64XX PCM: Added PCLK clock source for the PCM controllers
by Jassi Brar 07 Nov '09

07 Nov '09

Signed-off-by: Jassi Brar <jassi.brar(a)samsung.com> --- arch/arm/plat-s3c64xx/clock.c | 12 ++++++++++++ 1 files changed, 12 insertions(+), 0 deletions(-) diff --git a/arch/arm/plat-s3c64xx/clock.c b/arch/arm/plat-s3c64xx/clock.c index 7a36e89..3ab564e 100644 --- a/arch/arm/plat-s3c64xx/clock.c +++ b/arch/arm/plat-s3c64xx/clock.c @@ -129,6 +129,18 @@ static struct clk init_clocks_disable[] = { .enable = s3c64xx_pclk_ctrl, .ctrlbit = S3C_CLKCON_PCLK_IIS1, }, { + .name = "pcm", + .id = 0, + .parent = &clk_p, + .enable = s3c64xx_pclk_ctrl, + .ctrlbit = S3C_CLKCON_PCLK_PCM0, + }, { + .name = "pcm", + .id = 1, + .parent = &clk_p, + .enable = s3c64xx_pclk_ctrl, + .ctrlbit = S3C_CLKCON_PCLK_PCM1, + }, { .name = "spi", .id = 0, .parent = &clk_p, -- 1.6.2.5

3 2

[alsa-devel] ASoC updates for 2.6.32
by Mark Brown 06 Nov '09

06 Nov '09

The following changes since commit b3f5a272a33ef06a37cd44703c46ec916b8a1c93: Peter Ujfalusi (1): ASoC: TWL4030: Make sure, that the codec is powered on startup are available in the git repository at: git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound-2.6.git for-2.6.32 This looks enormous since it contains a merge up of 2.6.32-rc6 in order to get build fixes needed for my one platform that usefully runs unmodified mainline. The two new commits are: Jassi Brar (1): ASoC: S3C64XX I2S: Enable audio-bus clock Janusz Krzysztofik (1): ASoC: OMAP: Don't try to set unsupported OMAP_DMA_DATA_BURST_16 on OMAP1 all the rest are from mainline: Aaro Koskinen (2): panic: Fix panic message visibility by calling bust_spinlocks(0) before dying omap: RX-51: Drop I2C-1 speed to 2200 Adam Jackson (1): drm/i915: Initialize HDMI outputs as HDMI connectors, not DVI. Ajit Khaparde (4): be2net: Fix a bug in preparation of mcc wrb which was causing flash operation to fail be2net: Bug Fix while accounting of multicast frames during netdev stats update be2net: Fix a typo in be_cmds.h be2net: Bug fix to properly update ethtool tx-checksumming after ethtool -K <ifname> tx off Alan Cox (9): libertas: fix build libertas: fix build ethoc: fix warning from 32bit build Staging: et131x: Correct WRAP bit handling Staging: et131x: Fix the add_10bit macro pata_sc1200: Fix crash on boot dpt_i2o: Fix up copy*user ray_cs: Fix copy_from_user handling tty: Mark generic_serial users as BROKEN Alan Stern (3): USB: serial: don't call release without attach USB: ipaq: fix oops when device is plugged in USB: storage: When a device returns no sense data, call it a Hardware Error Albert Herranz (1): b43: do not stack-allocate pio rx/tx header and tail buffers Alek Du (1): kbuild: Fix size_append issue for bzip2/lzma kernel Alex Chiang (7): Documentation: ABI: rename sysfs-devices-cache_disable properly Documentation: ABI: document /sys/devices/system/cpu/ Documentation: ABI: /sys/devices/system/cpu/ topology files Documentation: ABI: /sys/devices/system/cpu/cpu#/ topology files Documentation: ABI: /sys/devices/system/cpu/sched_[mc|smt]_power_savings Documentation: ABI: /sys/devices/system/cpu/cpuidle/ Documentation: ABI: /sys/devices/system/cpu/cpu#/node Alex Deucher (1): drm/radeon/kms: add support for "Surround View" Alex Elder (2): Merge branch 'master' into for-linus Merge branch 'master' of ssh://oss.sgi.com/oss/git/xfs/xfs into for-linus Alexander Duyck (4): e1000e: swap max hw supported frame size between 82574 and 82583 igb: fix memory leak when setting ring size while interface is down ixgbe: fix memory leak when resizing rings while interface is down igbvf: fix memory leak when ring size changed while interface down Alexey Dobriyan (4): Btrfs: constify dentry_operations headers: remove sched.h from interrupt.h loop: fix NULL dereference if mount fails sysctl: fix false positives when PROC_SYSCTL=n Alok Kataria (1): x86, vmi: Mark VMI deprecated and schedule it for removal Amerigo Wang (1): kbuild,scripts: use non-builtin echo for '-e' Amit Kucheria (1): Input: fix rx51 board keymap Amit Kumar Salecha (1): netxen: fix tx timeout handling on firmware hang Andi Kleen (4): HWPOISON: Clean up PR_MCE_KILL interface HWPOISON: Add brief hwpoison description to Documentation HWPOISON: Fix page count leak in hwpoison late kill in do_swap_page HWPOISON: Allow schedule_on_each_cpu() from keventd Andreas Gruenbacher (1): dnotify: ignore FS_EVENT_ON_CHILD Andreas Krebbel (1): [S390] Add highgprs facility to /proc/cpuinfo Andreas Schwab (3): tty: fix vt_compat_ioctl powerpc: Fix segment mapping in vdso32 powerpc: Align vDSO base address Andrew Morton (2): dm log: userspace fix incorrect luid cast in userspace_ctr revert "mm: oom analysis: add buffer cache information to show_free_areas()" Andrey Yurovsky (1): mac80211: trivial: fix spelling in mesh_hwmp Andy Whitcroft (7): checkpatch: possible types -- prevent illegal modifiers being added checkpatch: correctly stop scanning at the bottom of a hunk checkpatch: update copyright dates checkpatch: fix false errors due to macro concatenation checkpatch: fix __attribute__ matching checkpatch: fix false EXPORT_SYMBOL warning checkpatch: version 0.30 Anil Ravindranath (1): [SCSI] pmcraid: Changed driver prints to scmd/sdev_printk Anil Veerabhadrappa (1): [SCSI] bnx2i: Fix context mapping issue for architectures with PAGE_SIZE != 4096 Anirban Chakraborty (1): [SCSI] qla2xxx: Fix NULL ptr deref bug in fail path during queue create Anton Blanchard (2): futex: Fix typo in FUTEX_WAIT/WAKE_BITSET_PRIVATE definitions powerpc: Fix hypervisor TLB batching Anton Vorontsov (3): powerpc/kgdb: Fix build failure caused by "kgdb.c: unused variable 'acc'" net: Fix OF platform drivers coldplug/hotplug when compiled as modules USB: fsl_udc_core: Fix kernel oops on module removal Antonio Ospite (1): [ARM] pxamci: fix printing gpio numbers in pxamci_probe Anuj Aggarwal (1): omap: SDMA: Fixing bug in omap_dma_set_global_params() Arjan van de Ven (7): perf timechart: Add a power-only mode x86: Simplify bound checks in the MTRR code x86, timers: Check for pending timers after (device) interrupts perf timechart: Fix the wakeup-arrows that point to non-visible processes perf timechart: Improve the visual appearance of scheduler delays net: use WARN() for the WARN_ON in commit b6b39e8f3fbbb x86: Remove STACKPROTECTOR_ALL Arnaldo Carvalho de Melo (2): perf top: Add poll_idle to the skip list perf tools: elf_sym__is_function() should accept "zero" sized functions Arnaud Patard (1): MIPS: O32: Fix ppoll Arnd Bergmann (1): warn about use of uninstalled kernel headers Artem Bityutskiy (3): OMAP3: PM: introduce a new powerdomain walk helper ARM: 5759/1: Add register information of threads to coredump UBI: fix backward compatibility Ashwin Chaugule (1): perf tools: Remove static debugfs path from parse-events Atsushi Nemoto (1): MIPS: TXx9: Fix spi-baseclk value Aurelien Jarno (1): KVM: fix LAPIC timer period overflow Avi Kivity (1): KVM: Prevent overflow in KVM_GET_SUPPORTED_CPUID Barry Song (1): Blackfin: BF51x: add PTP MMR defines Bart Van Assche (1): IB: Fix typo in udev rule documentation Bartlomiej Zolnierkiewicz (7): pata_atp867x: fix it to not claim MWDMA support pata_atp867x: PIO support fixes pata_atp867x: add Power Management support sis5513: fix PIO setup for ATAPI devices Revert "Revert "ide: try to use PIO Mode 0 during probe if possible"" MAINTAINERS: rt2x00 list is moderated MAINTAINERS: rt2x00 list is moderated Ben Dooks (12): KS8851: Add soft reset at probe time KS8851: Fix MAC address write order KS8851: Fix ks8851_set_rx_mode() for IFF_MULTICAST DM9000: Fix revision ID for DM9000B ARM: S3C: Add info for supporting circular DMA buffers ARM: S3C2410: Fix link if CONFIG_S3C2410_IOTIMING is not set ARM: Merge fixes-s3c64xx ARM: Merge fixes-s3c64xx-dma ARM: S3C2440: mini2440: Fix missing CONFIG_S3C_DEV_USB_HOST ARM: S3C24XX: Fix warnings in arch/arm/plat-s3c24xx/gpio.c ARM: S3C2440: mini2440: Fix spare warnings ARM: S3C2410: Fix sparse warnings in arch/arm/mach-s3c2410/gpio.c Ben Hutchings (5): net: Support inclusion of <linux/socket.h> before <sys/socket.h> nfs: Avoid overrun when copying client IP address string acenic: Pass up error code from ace_load_firmware() sfc: Set ip_summed correctly for page buffers passed to GRO hfsplus: refuse to mount volumes larger than 2TB Benjamin Herrenschmidt (7): powerpc/pmac: Fix issues with sleep on some powerbooks powerpc/mm: Fix hang accessing top of vmalloc space usb-storage: Workaround devices with bogus sense size Merge commit 'ftrace/ppc' into merge powerpc/ppc64: Use preempt_schedule_irq instead of preempt_schedule Merge commit 'gcl/merge' into merge 8250_pci: add IBM Saturn serial card Benoit PAPILLAULT (1): rt2x00: Fix crypto in TX frame for rt2800usb Bernd Schmidt (1): ROMFS: fix length used with romfs_dev_strnlen() function Bjorn Helgaas (3): PCI: PCIe portdrv: remove "-driver" from driver name PCI: remove pci_assign_resource_fixed() iwlwifi: use %pM for formatted MAC addresses Björn Smedman (1): mac80211: fix for incorrect sequence number on hostapd injected frames Bo Liu (1): mm: remove incorrect swap_count() from try_to_unuse() Borislav Petkov (10): initcalls: Add early_initcall() for modules x86: EDAC: carve out AMD MCE decoding logic amd64_edac: fix driver instance lookup table allocation amd64_edac: fix DRAM base and limit address extraction amd64_edac: fix interleave enable tests amd64_edac: fix K8 intlv_sel check amd64_edac: fix chip select handling amd64_edac: fix DRAM base and limit extraction amd64_edac: beef up DRAM error injection amd64_edac: fix DRAM base and limit extraction masks, v2 Brandon Philips (1): sky2: set carrier off in probe Brian Niebuhr (1): USB: gadget: Fix EEM driver comments and VID/PID Brian Rogers (1): drm/i915: Don't call intel_update_fbc from intel_crtc_cursor_set Brice Goglin (1): myri10ge: improve port type reporting in ethtool Bruce Allan (9): e1000e: reset the PHY on 82577/82578 when going to Sx e1000e: clear PHY wakeup bit after LCD reset on 82577/82578 e1000e: increase swflag acquisition timeout for ICHx/PCH e1000e: 82577/82578 requires a different method to configure LPLU e1000e: separate mutex usage between NVM and PHY/CSR register for ICHx/PCH e1000e: allow for swflag to be held over consecutive PHY accesses e100: e100_phy_init() isolates selected PHY, causes 10 second boot delay e1000e: config PHY via software after resets e1000e: rework disable K1 at 1000Mbps for 82577/82578 Bryan Wu (1): USB: option: TLAYTECH TUE800 support Catalin Marinas (4): ARM: 5746/1: Handle possible translation errors in ARMv6/v7 coherent_user_range ARM: 5747/1: Fix the start_pg value in free_memmap() kmemleak: Check for NULL pointer returned by create_object() ARM: 5757/1: Thumb-2: Correct "mov.w pc, lr" instruction which is unpredictable Chris Dearman (4): MIPS: MTI: Fix accesses to device registers on MIPS boards MIPS: SPRAM: Clean up support code a little MIPS: CMP: Fix memory barriers for correct operation of amon_cpu_start MIPS: GIC: Random fixes and enhancements. Chris Mason (10): Btrfs: fix deadlock on async thread startup Btrfs: cleanup extent_clear_unlock_delalloc flags Btrfs: delay clearing EXTENT_DELALLOC for compressed extents Btrfs: fix uninit compiler warning in cow_file_range_nocow Btrfs: fix file clone ioctl for bookend extents Btrfs: only write one super copy during fsync Btrfs: avoid tree log commit when there are no changes Btrfs: streamline tree-log btree block writeout Btrfs: fix btrfs acl #ifdef checks Btrfs: always pin metadata in discard mode Chris Rankin (1): net: Teach pegasus driver to ignore bluetoother adapters with clashing Vendor:Product IDs Chris Wilson (4): drm/i915: Record device minor rather than pointer in TRACE_EVENT drm/i915: batch submit seqno off-by-one. drm/i915: Enable irq to trace batch buffer completion. perf: Propagate term signal to child Christian Borntraeger (6): KVM: s390: fix memsize >= 4G [S390] module: fix memory leak in s390 module loader [S390] Fix memory leak in /proc/cio_ignore [S390] Fix enabled udelay for short delays. virtio: let header files include virtio_ids.h connector: fix regression introduced by sid connector Christof Schmitt (10): [SCSI] sg: Free data buffers after calling blk_rq_unmap_user [SCSI] zfcp: correctly initialize unchained requests [SCSI] zfcp: Fix initial device and cfdc for delayed adapter allocation [SCSI] zfcp: Fix oops during shutdown of offline device [SCSI] zfcp: Fix lockdep warning when offlining device with offline chpid [SCSI] zfcp: Fix hang when offlining device with offline chpid [SCSI] zfcp: Handle WWPN mismatch in PLOGI payload [SCSI] zfcp: Warn about storage devices with broken PLOGI data [SCSI] zfcp: Fix timer initialization for ct and els requests [SCSI] zfcp: Flush SCSI registration work when adding unit Christoph Hellwig (9): parisc: convert to asm-generic/hardirq.h sparc32: convert to asm-generic/hardirq.h xfs: implement ->dirty_inode to fix timestamp handling xfs: cleanup ->sync_fs xfs: stop calling filemap_fdatawait inside ->fsync xfs: fix double IRELE in xfs_dqrele_inode Btrfs: add -o discard option Btrfs: enable discard support virtio_blk: revert QUEUE_FLAG_VIRT addition Chuck Ebbert (1): perf_events: Make ABI definitions available to userspace Claudio Scordino (1): ARM: 5776/1: Check compiler version and EABI support when adding ARM unwind support. Clemens Ladisch (2): sound: via82xx: move DXS volume controls to PCM interface sound: via82xx: deactivate DXS controls of inactive streams Cornelia Huck (1): sysfs: Allow sysfs_move_dir(..., NULL) again. Corrado Zoccolo (3): cfq-iosched: fix possible problem with jiffies wraparound cfq-iosched: fix think time allowed for seekers cfq-iosched: avoid probable slice overrun when idling Daisuke Nishimura (1): mm: don't call pte_unmap() against an improper pte Dan Williams (6): md/raid5: initialize conf->device_lock earlier md/raid456: downlevel multicore operations to raid_run_ops md/raid6: kill a gcc-4.0.1 'uninitialized variable' warning async_pq: kill a stray dma_map() call and other cleanups async_pq: rename scribble page async_tx: fix asynchronous raid6 recovery for ddf layouts Daniel T Chen (1): ALSA: hda: Use quirk mask for Dell Inspiron Mini9/Vostro A90 using ALC268 Daniel Walker (1): omap: iovmm: Add missing mutex_unlock Darren Hart (3): futex: fix requeue_pi key imbalance futex: Check for NULL keys in match_futex futex: Move drop_futex_key_refs out of spinlock'ed region Darren Salt (2): eeepc-laptop: Prevent a panic when disabling RT2860 wireless when associated Staging: rt2860sta: prevent a panic when disabling when associated Darrick J. Wong (2): KVM: Prevent kvm_init from corrupting debugfs structures hwmon: enhance the sysfs API for power meters Dave Airlie (9): drm/radeon/kms: respect single crtc cards, only create one crtc. (v2) drm/fb: add setcmap and fix 8-bit support. drm/fb: add more correct 8/16/24/32 bpp fb support. drm/ttm: fix refcounting in ttm global code. drm/radeon: use list_for_each_entry instead of list_for_each drm/radeon/kms: fix vline register for second head. Merge branch 'drm-next' of ../drm-next into drm-linus drm/radeon/kms: ignore vga arbiter return. drm/kms: fix kms/fbdev colormap support properly. Dave Chinner (3): xfs: fix xfs_quiesce_data xfs: mark inodes dirty before issuing I/O xfs: make sure xfs_sync_fsdata covers the log Dave Mitchell (1): ibm_newemac: Added 16K Tx FIFO size support for EMAC4 Dave Young (2): bluetooth: scheduling while atomic bug fix bluetooth: static lock key fix David Daney (3): MIPS: Octeon: Fix compile error in arch/mips/cavium-octeon/smp.c MIPS: Octeon: Use write_{un,}lock_irq{restore,save} to set irq affinity MIPS: Octeon: Use lockless interrupt controller operations when possible. David Henningsson (1): ALSA: ice1724 - Make call to set hw params succeed on ESI Juli@ David Howells (2): KEYS: get_instantiation_keyring() should inc the keyring refcount in all cases NOMMU: Don't pass NULL pointers to fput() in do_mmap_pgoff() David Härdeman (1): Input: winbond-cir - select LEDS_TRIGGERS David J. Wilder (1): RDMA/addr: Fix resolution of local IPv6 addresses David Jeffery (1): [SCSI] st: fix possible memory use after free after MTSETBLK ioctl David Miller (1): mm, perf_event: Make vmalloc_user() align base kernel virtual address to SHMLBA David Rientjes (1): oprofile: fix race condition in event_buffer free David S. Miller (21): sparc: Support HW cache events. sparc: Support all ultra3 and ultra4 derivatives. sparc: Add Niagara2 HW cache event support. sparc: Niagara1 perf event support. sparc64: Add initial perf event conflict resolution and checks. sparc64: Increase vmalloc size to fix percpu regressions. sparc64: Add a basic conflict engine in preparation for multi-counter support. sparc64: Minor coding style fixups in perf code. sparc64: Fix comment typo in perf_event.c sparc64: Cache per-cpu %pcr register value in perf code. Revert "ide: try to use PIO Mode 0 during probe if possible" znet: Don't claim DMA lock around free_dma() calls. Merge branch 'master' of git://git.kernel.org/.../linville/wireless-2.6 sparc64: Fix niagara2 perf IRQ bits. net: Link in PHY drivers before others. sparc64: Fix D-cache flushing on swapin from SW devices. sparc64: Set IRQF_DISABLED on LDC channel IRQs. Merge branch 'master' of git://git.kernel.org/.../linville/wireless-2.6 Revert "tcp: fix tcp_defer_accept to consider the timeout" Merge branch 'master' of git://git.kernel.org/.../linville/wireless-2.6 Merge branch 'master' of git://git.kernel.org/.../linville/wireless-2.6 David Teigland (2): dlm: fix lowcomms_connect_node for sctp dlm: fix socket fd translation David Vrabel (4): mmc: sdio: don't require CISTPL_VERS_1 to contain 4 strings USB: rename Documentation/ABI/.../sysfs-class-usb_host USB: whci-hcd: handle early deletion of endpoints USB: whci-hcd: always do an update after processing a halted qTD David Woodhouse (6): intel-iommu: Yet another BIOS workaround: Isoch DMAR unit with no TLB space Rename pci_init() to pci_apply_final_quirks(), move it to quirks.c Mark pci_apply_final_quirks() __init rather than __devinit Run pci_apply_final_quirks() sooner. x86: Move pci_iommu_init to rootfs_initcall() libertas if_usb: Fix crash on 64-bit machines Dennis O'Brien (1): [ARM] pxa: workaround errata #37 by not using half turbo switching Dhananjay Phadke (3): netxen: fix pci bar mapping netxen: fix i2c init netxen: avoid undue board config check Dirk Hohndel (1): pata_ali: trivial fix of a very frequent spelling mistake Dmitry Artamonow (2): ARM: 5752/1: SA1100: fix building of h3100 irda/sa1100_ir: check return value of startup hook Dmitry Eremin-Solenikov (1): Input: gpio-keys - use IRQF_SHARED Dmitry Torokhov (12): Input: libps2 - fix dependancy on i8042 Input: i8042 - print debug data when testing AUX IRQ delivery Input: synaptics - add another Protege M300 to rate blacklist Input: i8042 - make pnp_data_busted variable boolean instead of int Input: atkbd - restore resetting LED state at startup Input: atkbd - postpone restoring LED/repeat rate at resume Input: fix locking issue in /proc/bus/input/ handlers Input: i8042 - add Sony Vaio VGN-FZ240E to the nomux list Input: logips2pp - model 73 is actually TrackMan FX Driver core: allow certain drivers prohibit bind/unbind via sysfs Merge commit 'v2.6.32-rc5' into for-linus Input: i8042 - try to get stable CTR value when initializing Dominik Brodowski (3): pcmcia: pccard_read_tuple and TUPLE_RETURN_COMMON cleanup pcmcia: do not try to store more than 4 version strings ALSA: pcmcia: use dynamic debug infrastructure, deprecate CS_CHECK (sound) Don Skidmore (2): ixgbe: add support for 82599 Combined Backplane ixgbe: add support for 82599 based X520 10G Dual KX4 Mezz card Dragos Tatulea (1): powerpc/oprofile: Add ppc750 CL as supported by oprofile Earl Chew (1): fs: pipe.c null pointer dereference Eero Nurkkala (1): NOHZ: update idle state also when NOHZ is inactive Eli Cohen (1): mlx4_core: Add a new supported 40 GigE device ID Elina Pasheva (3): USB: serial: sierra driver version change to 1.3.8 USB: serial: sierra driver send_setup() autopm fix USB: serial: sierra driver autopm fixes Eric Anholt (1): Merge commit 'ickle/for-anholt' into drm-intel-next Eric Dumazet (13): x86: Don't generate cmpxchg8b_emu if CONFIG_X86_CMPXCHG64=y pktgen: Fix multiqueue handling pktgen: restore nanosec delays net: Add patchwork URL to MAINTAINERS net: Fix struct sock bitfield annotation udp: Fix udp_poll() and ioctl() virtio_net: use dev_kfree_skb_any() in free_old_xmit_skbs() net: Fix IP_MULTICAST_IF net: Fix struct inet_timewait_sock bitfield annotation ifb: should not use __dev_get_by_index() without locks pktgen: Dont leak kernel memory net: fix kmemcheck annotations net: fix sk_forward_alloc corruption Eric Paris (2): fsnotify: do not set group for a mark before it is on the i_list inotify: deprecate the inotify kernel interface Eric Sandeen (2): fix readahead calculations in xfs_dir2_leaf_getdents() xfs: free temporary cursor in xfs_dialloc Eric Van Hensbergen (1): 9p: fix readdir corner cases Felipe Contreras (2): kbuild: fix warning when domainname is not available kbuild: mkcompile_h: trivial cleanups Felix Beck (2): [S390] zcrypt: Fix sparse warning. [S390] zcrypt: Improve some comments Felix Fietkau (1): mac80211: fix logic error ibss merge bssid check Feng Tang (1): x86: Make EFI RTC function depend on 32bit again Florian Fainelli (6): MIPS: BCM63xx: Fix soft-reset lockup on BCM6345 MIPS: AU1000: Fix build failure for db1x00 configured for Au1100 SoC MIPS: BCM63xx: Make bcm63xx_uart_register an initfunc MIPS: BCM63xx: Prepare for watchdog support MIPS: AR7: register watchdog device only if enabled in hw configuration MIPS: bcm63xx: Set the correct BCM3302 CPU name Frank Mori Hess (2): Staging: comedi: ni_pcimio: Added device id for pxi-6225. Staging: comedi: pcmcia irq fixes Frans Pop (2): kbuild: fix the binrpm-pkg target to work with KBUILD_OUTPUT set pcmcia: properly close previous dev_printk if kzalloc fails in do_io_probe Frederic Weisbecker (2): tracing: Check total refcount before releasing bufs in profile_enable failure tracing: Use free_percpu instead of kfree Frederik Deweerdt (1): KVM: MMU: fix pointer cast Gabe Black (1): PCI quirk: TI XIO200a erroneously reports support for fast b2b transfers Gabor Gombas (1): net: Fix 'Re: PACKET_TX_RING: packet size is too long' George Nassar (1): USB: rndis_host: debug info clobbered before it is logged Gerald Schaefer (1): [S390] Add EX_TABLE for addressing exception in usercopy functions. Gergely Imreh (1): USB: usbtmc: fix timeout increase Giuseppe Cavallaro (1): net: add support for STMicroelectronics Ethernet controllers. Graf Yang (1): Blackfin: fix missed cache config renames Grant Likely (2): powerpc/5200: Update defconfigs MAINTAINERS: add Open Firmware / Flattened Device Tree entry Greg Kroah-Hartman (11): Staging: comedi: serial2002: fix include build issue Staging: remove agnx driver Staging: remove cowloop driver Staging: comedi: fix build on arches that don't want comedi drivers Staging: comedi: fix sched.h build breakage Staging: b3dfg: fix sched.h build breakage Staging: poch: fix sched.h build breakage Staging: vme: fix sched.h build breakage Staging: remove stlc45xx driver Staging: android: mark subsystem as broken Staging: wireless drivers Kconfig change Greg Ungerer (1): m68knommu: fix rename of pt_regs offset defines breakage Guennadi Liakhovetski (2): fix compilation of i.MX31 platforms fix pcm037_eet compilation with the new SPI driver Gwendal Grignou (1): sata_mv: Prevent PIO commands to be defered too long if traffic in progress. H Hartley Sweeten (1): Input: rotary_encoder - fix relative axis support H. Peter Anvin (1): x86: fix kernel panic on 32 bits when profiling Haavard Skinnemoen (1): atmel_serial: fix bad BUILD_BUG_ON() usage Haiyang Zhang (1): Staging: hv: Fix null pointer error after vmbus loading Hank Janssen (1): Staging: hv: Fix vmbus load hang caused by faulty data packing Hannes Reinecke (1): [SCSI] Retry ADD_TO_MLQUEUE return value for EH commands Harald Welte (1): ARM: S3C24XX: Introduce S3C2442B CPU Hartley Sweeten (10): ARM: 5744/1: ep93xx: add remaining phys offset selections ARM: 5745/1: Change ep93xx gpio_irq static inlines to macros ARM: 5729/1: ep93xx: define EP93XX_*_PHYS_BASE with macros ARM: 5753/1: ep93xx: remove old EP93XX_GPIO_* defines ARM: 5754/1: ep93xx: update i2c support ARM: 5756/1: ep93xx: introduce clk parent ARM: 5760/1: ep93xx: fix build error in edb93xx.c ARM: 5767/1: ep93xx: remove ep93xx_init_time() prototype ARM: 5768/1: ep93xx: remove dead code in ep93xx_gpio_ab_irq_handler() ARM: 5769/1: CPU_ARM920T: remove dead Maverick EP9312 URL Heiko Carstens (13): [S390] Enable kmemleak on s390. [S390] Provide arch specific mdelay implementation. [S390] compat: fix truncate system call wrapper [S390] ftrace: drop nmi protection [S390] perf_counter: fix vdso detection [S390] 64-bit register support for 31-bit processes [S390] call home support: fix proc handler [SCSI] zfcp: fix kfree handling in zfcp_init_device_setup [S390] smp: fix prefix handling of offlined cpus [S390] call home: fix error handling in init function [S390] call home: fix string length handling [S390] smp: fix sigp stop handling [S390] smp: fix sigp sense handling Heiko Schocher (3): powerpc/pci: Fix MODPOST warning mpc5200: support for the MAN mpc5200 based board uc101 mpc5200: support for the MAN mpc5200 based board mucmc52 Helge Deller (3): parisc: rename parisc's vmalloc_start to parisc_vmalloc_start parisc: Fix linker script breakage. agp: parisc-agp.c - use correct page_mask function Herbert Xu (3): crypto: padlock-sha - Fix stack alignment tcp: Try to catch MSG_PEEK bug gre: Fix dev_addr clobbering for gretap Herton Ronaldo Krzesinski (2): Input: atkbd - consolidate force release quirks for volume keys Staging: rtl8187se/rtl8192e/rtl8192su: allow module unload HighPoint Linux Team (1): [SCSI] hptiop: Add RR44xx adapter support Hiroshi DOYU (2): omap: iovmm: Fix incorrect spelling omap: iommu: fix wrong condition check for SUPERSECTION Hiroshi Shimamoto (1): trace: Fix missing assignment in trace_ctxwake_* Holger Schurig (1): libertas spi: fix sparse errors Huang Weiyi (1): m68knommu: remove duplicated #include Huang Ying (1): crypto: aesni-intel - Fix irq_fpu_usable usage Huaxu Wan (1): hwmon: (coretemp) Maintainer update Hubert Feurstein (3): ARM: 5749/1: ep93xx/micro9: Update maintainer ARM: 5750/1: ep93xx/micro9: Update platform code ARM: 5751/1: ep93xx/micro9: Add Micro9-Slim Hugh Dickins (5): ksm: more on default values HWPOISON: fix oops on ksm pages HWPOISON: fix/proc/meminfo alignment hwpoison: fix oops on ksm pages hwpoison: fix/proc/meminfo alignment Huzaifa Sidhpurwala (1): USB: option: Support for AIRPLUS MCD650 Datacard Ian Abbott (9): Staging: comedi: Corrected type of a printk argument in resize_async_buffer(). Staging: comedi: jr3_pci: Initialize transf variable fully in jr3_pci_poll_subdevice(). Staging: comedi: cb_pcidio: fix "section mismatch" error Staging: comedi: s526: Fix number of channels on DIO subdevice Staging: comedi: s526: Get rid of global variable 'cmReg'. Staging: comedi: s526: Take account of arch's byte order. Staging: comedi: s526: fixes for pulse generator Staging: comedi: ni_65xx.c: fix insn_bits shift calculation. Staging: comedi: ni_65xx.c: fix output inversion problem. Ian Campbell (1): Correct nr_processes() when CPUs have been unplugged Ian E. Morgan (1): lis3: add support for the HP HDX 18 Ilkka Koskinen (1): mfd: Do not dereference null pointer in twl4030 error path Imre Deak (1): ARM: 5742/1: ARM: add debug check for invalid kernel page faults Ingo Molnar (9): x86: EDAC: MCE: Fix MCE decoding callback logic Revert "x86, timers: Check for pending timers after (device) interrupts" perf tools: Fix the NO_64BIT build on pure 64-bit systems Merge branch 'urgent' of git://git.kernel.org/.../rric/oprofile into core/urgent headers: Fix build after <linux/sched.h> removal Merge branch 'linus' into x86/urgent Revert "x86: linker script syntax nits" x86: Document linker script ASSERT() quirk perf tools: Bump version to 0.0.2 Ira W. Snyder (1): edac: i5400 fix missing CONFIG_PCI define Izik Eidus (3): KVM: MMU: dont hold pagecount reference for mapped sptes pages KVM: MMU: add SPTE_HOST_WRITEABLE flag to the shadow ptes KVM: add support for change_pte mmu notifiers Jaidev Patwardhan (2): MIPS: GCMP: Avoid accessing registers when they are not present MIPS: SMTC: Avoid queing multiple reschedule IPIs James Bottomley (2): parisc: add me to Maintainers [SCSI] fix memory leak in initialization Jamie Lentin (1): Input: atkbd - add a quirk for OQO 01+ multimedia keys Jan Beulich (4): x86: Don't leak 64-bit kernel register values to 32-bit processes iSCSI/iBFT: use proper address translation x86: Fix Suspend to RAM freeze on Acer Aspire 1511Lmi laptop x86-64: Fix register leak in 32-bit syscall audting Jan Kara (1): ext3: Update documentation about ext3 quota mount options Janusz Krzysztofik (5): omap: Fix omap-keypad by restoring old keypad.h without breaking omap2 boards that use matrix_keypad omap1: Fix redundant UARTs pin muxing that can break other hardware support omap1: Fix DSP public peripherals support for ams-delta netdev: usb: dm9601.c can drive a device not supported yet, add support for it ASoC: OMAP: Don't try to set unsupported OMAP_DMA_DATA_BURST_16 on OMAP1 Jarkko Nikula (1): omap: McBSP: Fix incorrect receiver stop in omap_mcbsp_stop Jason Wessel (1): x86: earlyprintk: Fix regression to handle serial,ttySn as 1 arg Jasper Spaans (1): bonding: Modify hash transmit policies to use the packet's source MAC address Jassi Brar (1): ASoC: S3C64XX I2S: Enable audio-bus clock Jaswinder Singh Rajput (7): parisc: includecheck fix: signal.c x86, SLUB: Remove unused CONFIG FAST_CMPXCHG_LOCAL Blackfin: includecheck fix: mach-bf548, ezkit.c mm: includecheck fix: vmalloc.c fs: includecheck fix: proc, kcore.c video: includecheck fix: msm, mddi.c video: includecheck fix: da8xx-fb.c Jay Sternberg (1): iwlwifi: incorrect method used for finding valid OTP blocks Jayamohan Kallickal (3): [SCSI] be2iscsi: add 10Gbps iSCSI - BladeEngine 2 driver [SCSI] libiscsi: iscsi_session_setup to allow for private space [SCSI] be2iscsi: Moving to pci_pools v3 Jean Delvare (3): MAINTAINERS: Fix Riku Voipio's address hwmon: (dme1737) No vid attributes for SCH311x hwmon: (it87) Fix VID reading on IT8718F/IT8720F Jeff Mahoney (6): Staging: winbond: implement prepare_multicast and fix API usage Staging: iio: Don't build on s390 Staging: rtl8192e: Add #include <linux/vmalloc.h> staging: Complete sched.h removal from interrupt.h staging: more sched.h fixes hfs: fix oops on mount with corrupted btree extent records Jeff Roberson (1): edac: i5400 fix csrow mapping Jens Axboe (7): cfq-iosched: fix issue with rq-rq merging and fifo list ordering block: get rid of kblock_schedule_delayed_work() block: use proper BLK_RW_ASYNC in blk_queue_start_tag() cfq-iosched: abstract out the 'may this cfqq dispatch' logic cfq-iosched: fix the slice residual sign cfq-iosched: apply bool value where we return 0/1 backing-dev: ensure that a removed bdi no longer has super_block referencing it Jeremy Fitzhardinge (2): x86/paravirt: Use normal calling sequences for irq enable/disable xen: set up mmu_ops before trying to set any ptes Jerome Glisse (14): drm/radeon/kms: Convert RS400/RS480 to new init path & fix legacy VGA (V3) drm/radeon/kms: Convert R300 to new init path drm/radeon/kms: Convert R100 to new init path (V2) drm/radeon/kms: Convert RS690/RS740 to new init path (V2). drm/radeon/kms: Convert RS600 to new init path drm/radeon/kms: Remove old init path as no hw use it anymore drm/radeon/kms: Fix R600 write back buffer drm/radeon/kms: Fix R600/RV770 startup path & reset drm/radeon/kms: Fix R600/RV770 disable acceleration path drm/radeon/kms: R600/RV770 remove dead code and print message for wrong BIOS drm/radeon/kms: Fix irq handling on AVIVO hw drm/radeon/kms: Fix RS600/RV515/R520/RS690 IRQ drm/radeon/kms: Fallback to non AGP when acceleration fails to initialize (v2) drm/radeon/kms: Fix AGP support for R600/RV770 family (v2) Jesse Barnes (2): ACPI button: don't try to use a non-existent lid device Revert "PCI: get larger bridge ranges when space is available" Jing Huang (1): [SCSI] bfa: Brocade BFA FC SCSI driver Jiri Bohac (1): bonding: fix a race condition in calls to slave MII ioctls Jiri Kosina (4): HID: fix kerneldoc comment for hid_input_report() HID: fix possible deadlock in hidraw_read percpu: allow pcpu_alloc() to be called with IRQs off sched: move rq_weight data array out of .percpu Jiri Olsa (4): tracing: Update *ppos instead of filp->f_pos tracing: Fix trace_seq_printf() return value tracing: Fix comment typo and documentation example tracing: Remove cpu arg from the rb_time_stamp() function Jiri Pirko (1): netlink: fix typo in initialization Jiri Slaby (6): ACPI: Kconfig, fix proc aggregator text USB: usblcd, fix memory leak x86: crash_dump: Fix non-pae kdump kernel memory accesses PM / Hibernate: Fix blkdev refleaks PM / Hibernate: Fix error handling in save_image() PM / Hibernate: Add newline to load_image() fail path Joakim Tjernlund (1): i2c-mpc: Do not generate STOP after read. Joe Perches (13): MAINTAINERS: update GENERIC UIO FOR PCI DEVICES MAINTAINERS: update TRACING section MAINTAINERS: update OMAP Tony Lindgren email name MAINTAINERS: change ATM mailing list to moderated MAINTAINERS: use tab not spaces after field types MAINTAINERS: update Kernel Janitors after mismerge MAINTAINERS: update SCORE architecture name style and add file pattern MAINTAINERS: SIMPLE FIRMWARE INTERFACE: update email style MAINTAINERS: WINBOND CIR - Integrate P:/M: lines, fixup David Härdeman's name MAINTAINERS: fix up PERIPHERAL spelling MAINTAINERS: update WOLFSON MICROELECTRONICS scripts/get_maintainer.pl: add patch/file search for keywords MAINTAINERS: document new "K:" entry type Joerg Roedel (2): KVM: SVM: Fix tsc offset adjustment when running nested KVM: SVM: Handle tsc in svm_get_msr/svm_set_msr correctly Johan Hovold (6): USB: ftdi_sio: remove tty->low_latency USB: ftdi_sio: remove unused rx_byte counter USB: ftdi_sio: clean up read completion handler USB: ftdi_sio: re-implement read processing USB: pl2303: fix error characters not being reported to ldisc USB: digi_acceleport: Fix broken unthrottle. Johannes Berg (13): wext: let get_wireless_stats() sleep mac80211: fix vlan and optimise RX cfg80211: fix netns error unwinding bug mac80211: fix ibss race b43: fix ieee80211_rx() context mac80211: document ieee80211_rx() context requirement mac80211: keep auth state when assoc fails cfg80211: sme: deauthenticate on assoc failure mac80211: fix BSS leak mac80211: fix addba timer mac80211: fix reason code output endianness cfg80211: fix NULL ptr deref mac80211: check interface is down before type change Johannes Weiner (2): ARM: boolean bit testing vmscan: order evictable rescue in LRU putback John Bonesio (1): net/fec_mpc52xx: Fix kernel panic on FEC error John Stultz (1): Blackfin: convert to use arch_gettimeoffset() John W. Linville (1): rndis_host: support ETHTOOL_GPERMADDR John(Jung-Ik) Lee (1): pata_atp867x: clarifications in timings calculations and cable detection Jon Hunter (1): OMAP3: PM: Prevent hang in prcm_interrupt_handler Jonathan Brassow (1): dm snapshot: free exception store on init failure Jonathan Cameron (1): Staging: iio: Fix missing include <linux/sched.h> Jonathan Corbet (1): Update flex_arrays.txt Jonathan Woithe (1): fujitsu-laptop: address missed led-class ifdef fixup Joris van Rantwijk (1): USB: Fix throttling in generic usbserial driver Josef Bacik (5): Btrfs: fix possible softlockup in the allocator Btrfs: release delalloc reservations on extent item insertion Btrfs: async delalloc flushing under space pressure Btrfs: optimize fsync for the single writer case Btrfs: fix possible ENOSPC problems with truncate JosephChan(a)via.com.tw (1): pata_via: extend the rev_max for VT6330 Josh Boyer (1): powerpc/booke: Fix xmon single step on PowerPC Book-E Joyce Yu (1): niu: VLAN_ETH_HLEN should be used to make sure that the whole MAC header was copied to the head buffer in the Vlan packets case Julia Lawall (6): parisc: correct use of SHF_ALLOC [ARM] pxa/csb726: adjust duplicate structure field initialization drivers/serial/mpc52xx_uart.c: Use UPIO_MEM rather than SERIAL_IO_MEM ARM: S3C24XX: arch/arm/plat-s3c24xx: Move dereference after NULL test ALSA: sound: Move dereference after NULL test and drop unnecessary NULL tests ALSA: sound/parisc: Move dereference after NULL test Julian Anastasov (3): tcp: accept socket after TCP_DEFER_ACCEPT period tcp: reduce SYN-ACK retrans for TCP_DEFER_ACCEPT tcp: fix TCP_DEFER_ACCEPT retrans calculation Justin P. Mattock (1): ieee1394: update URLs in debugging-via-ohci1394.txt Jérôme Pouiller (1): of: Remove nested function KOSAKI Motohiro (6): elv_iosched_store(): fix strstrip() misuse congestion_wait(): don't use WRITE cgroup: fix strstrip() misuse strstrip(): mark as as must_check mbind(): fix leak of never putback pages do_mbind(): fix memory leak Kalle Jokiniemi (1): OMAP: Fix race condition with autodeps Kashyap, Desai (9): [SCSI] mpt2sas: Update driver to MPI2 REV K headers. [SCSI] mpt2sas: Added mpi2_history.txt for MPI2 headers. [SCSI] mpt2sas: Copyright change to 2009. [SCSI] mpt2sas: Added SCSIIO, Internal and high priority memory pools to support multiple TM [SCSI] mpt2sas: Target Reset will be issued from Interrupt context. [SCSI] mpt2sas: Call init_completion on a per request basis. [SCSI] mpt2sas: Timeout occurred within the HANDSHAKE logic while waiting on firmware to ACK. [SCSI] mpt2sas: Support dev remove when phy status is MPI2_EVENT_SAS_TOPO_PHYSTATUS_VACANT [SCSI] mpt2sas: Bump version 02.100.03.00 Keith Mannthey (2): amd64_edac: simple fix to allow reporting of CECC errors edac: i5100 fix initialization code Ken Kawasaki (3): pcnet_cs: add cis of National Semicondoctor's multifunction pcmcia card 3c574_cs: spin_lock the set_multicast_list function pcnet_cs: add cis of PreMax PE-200 ethernet pcmcia card Kenji Kaneshige (1): PCI: Prevent AER driver from being loaded on non-root port PCIE devices Kevin Cernekee (1): MIPS: Fix machine check exception in kmap_coherent() Kevin Hilman (3): OMAP3: PM: Enable GPIO module-level wakeups omap3: PM: enable UART3 module wakeups cpuidle: always return with interrupts enabled Kiyoshi Ueda (1): dm: dec_pending needs locking to save error value Komuro (1): pcmcia: do not load the pd6729 driver if io_base is NULL Krauth.Julien (1): serial: add ADDI-DATA GmbH PCI-Express communication cards in 8250_pci.c and pci_ids.h Krzysztof Halasa (1): WAN: fix Cisco HDLC handshaking. Krzysztof Helt (1): ALSA: opl3: circular locking in the snd_opl3_note_on() and snd_opl3_note_off() Kukjin Kim (1): ARM: S3C64XX: Fix S3C64XX_CLKDIV0_ARM_MASK value Kumar Gala (7): powerpc: Add a Book-3E 64-bit defconfig powerpc: Fix compile errors found by new ppc64e_defconfig powerpc: Limit hugetlbfs support to PPC64 Book-3S machines powerpc: Limit memory hotplug support to PPC64 Book-3S machines powerpc: Minor cleanup to init/Kconfig powerpc: Minor cleanup to sound/ppc/Kconfig powerpc: Minor cleanup to lib/Kconfig.debug Kuninori Morimoto (3): sh: mach-ecovec24: Add TouchScreen support sh: mach-ecovec24: modify 1st MTD area to read only sh: mach-ecovec24: Document DS2 switch settings. Kyle McMartin (7): parisc: tracehook_report_syscall parisc: tracehook_signal_handler parisc: add missing TI_TASK macro in syscall.S parisc: split syscall_trace into two halves parisc: stop using task->ptrace for {single,block}step flags parisc: add skeleton syscall.h parisc: HAVE_ARCH_TRACEHOOK Larry Finger (2): b43: Fix PPC crash in rfkill polling on unload b43: Fix Bugzilla #14181 and the bug from the previous 'fix' Len Brown (4): Merge branch 'bugzilla-14129' into release Merge branch 'eeepc-laptop' into release Merge branch 'launchpad-333386' into release Merge branch 'misc' into release Lennart Sorensen (1): m68knommu: show KiB rather than pages in "Freeing initrd memory:" message Leo Chen (2): ARM: 5748/1: bcmring: fix build warning messages ARM: 5764/1: bcmring: add oprofile pmu support Li Hong (1): x86, perf_event: Rename 'performance counter interrupt' Li Zefan (1): tracing/filters: Fix memory leak when setting a filter Linus Torvalds (148): x86: Optimize cmpxchg64() at build-time some more Merge branch 'for-linus' of git://git.kernel.org/.../gerg/m68knommu Merge branch 'x86-fixes-for-linus' of git://git.kernel.org/.../tip/linux-2.6-tip Merge branch 'tracing-fixes-for-linus' of git://git.kernel.org/.../tip/linux-2.6-tip Merge branch 'timers-fixes-for-linus' of git://git.kernel.org/.../tip/linux-2.6-tip Merge branch 'perf-fixes-for-linus' of git://git.kernel.org/.../tip/linux-2.6-tip Merge git://git.kernel.org/.../davem/sparc-2.6 Merge branch 'fixes-for-linus' of git://git.monstr.eu/linux-2.6-microblaze Merge branch 'kvm-updates/2.6.32' of git://git.kernel.org/pub/scm/virt/kvm/kvm Merge git://git.kernel.org/.../davem/ide-2.6 Merge branch 'fixes' of git://git.kernel.org/.../kyle/parisc-2.6 Merge git://git.kernel.org/.../davem/ide-2.6 Merge git://git.kernel.org/.../davem/net-2.6 Merge branch 'for-linus' of git://git.kernel.org/.../bp/bp Merge branch 'omap-fixes-for-linus' of git://git.kernel.org/.../tmlind/linux-omap-2.6 Merge branch 'drm-linus' of git://git.kernel.org/.../airlied/drm-2.6 Merge branch 'for-linus' of git://git.kernel.org/.../tiwai/sound-2.6 Merge branch 'timers-fixes-for-linus' of git://git.kernel.org/.../tip/linux-2.6-tip Merge branch 'perf-fixes-for-linus-2' of git://git.kernel.org/.../tip/linux-2.6-tip Merge branch 'sparc-perf-events-fixes-for-linus' of git://git.kernel.org/.../tip/linux-2.6-tip Merge branch 'tracing-fixes-for-linus' of git://git.kernel.org/.../tip/linux-2.6-tip Merge branch 'x86-fixes-for-linus' of git://git.kernel.org/.../tip/linux-2.6-tip Merge branch 'sched-fixes-for-linus' of git://git.kernel.org/.../tip/linux-2.6-tip Merge branch 'core-fixes-for-linus' of git://git.kernel.org/.../tip/linux-2.6-tip Merge branch 'upstream-linus' of git://git.kernel.org/.../jgarzik/libata-dev Merge branch 'bugfixes' of git://git.linux-nfs.org/projects/trondmy/nfs-2.6 Merge branch 'drm-intel-next' of git://git.kernel.org/.../anholt/drm-intel Merge branch 'sh/for-2.6.32' of git://git.kernel.org/.../lethal/sh-2.6 Merge branch 'upstream-linus' of git://git.kernel.org/.../jgarzik/libata-dev Merge branch 'for-linus' of git://oss.sgi.com/xfs/xfs Merge branch 'for-linus' of git://git.kernel.org/.../ecryptfs/ecryptfs-2.6 Merge branch 'for-linus' of git://git.kernel.org/.../jmorris/security-testing-2.6 Merge branch 'for-linus' of git://git.kernel.org/.../vapier/blackfin Merge branch 'for-linus' of git://git.kernel.org/.../dtor/input Merge branch 'for-linus' of git://git.kernel.org/.../roland/infiniband Merge git://git.kernel.org/.../jejb/scsi-rc-fixes-2.6 Merge git://git.kernel.org/.../mason/btrfs-unstable Merge branch 'hwmon-for-linus' of git://git.kernel.org/.../jdelvare/staging Merge git://git.kernel.org/.../gregkh/staging-2.6 Merge git://git.kernel.org/.../gregkh/usb-2.6 Merge branch 'for-linus' of git://git390.marist.edu/pub/scm/linux-2.6 Linux 2.6.32-rc4 Revert "USB: Work around BIOS bugs by quiescing USB controllers earlier" tty, serial: Fix race and NULL check in uart_close() Merge master.kernel.org:/home/rmk/linux-2.6-arm Merge branch 'for-linus' of git://git.kernel.org/.../jbarnes/pci-2.6 Merge git://git.infradead.org/~dwmw2/iommu-2.6.32 Merge branch 'for-linus' of git://git.kernel.org/.../sameo/mfd-2.6 Merge branch 'for_linus' of git://git.kernel.org/.../jack/linux-fs-2.6 Merge branch 'for-linus' of git://git.kernel.org/.../tiwai/sound-2.6 Merge branch 'for-linus' of git://git.kernel.org/.../jikos/hid Merge git://git.kernel.org/.../sam/kbuild-fixes Merge branch 'for-linus' of git://git.kernel.org/.../tj/percpu Merge branch 'for-linus' of git://git.kernel.dk/linux-2.6-block Make flush_to_ldisc properly handle parallel calls workqueue: add 'flush_delayed_work()' to run and wait for delayed work tty: use the new 'flush_delayed_work()' helper to do ldisc flush tty: Make flush_to_ldisc() locking more robust workqueue: add 'flush_delayed_work()' to run and wait for delayed work tty: use the new 'flush_delayed_work()' helper to do ldisc flush Merge branch 'x86-fixes-for-linus' of git://git.kernel.org/.../tip/linux-2.6-tip Merge branch 'tracing-fixes-for-linus' of git://git.kernel.org/.../tip/linux-2.6-tip Merge branch 'sched-fixes-for-linus' of git://git.kernel.org/.../tip/linux-2.6-tip Merge branch 'perf-fixes-for-linus' of git://git.kernel.org/.../tip/linux-2.6-tip Merge branch 'core-fixes-for-linus' of git://git.kernel.org/.../tip/linux-2.6-tip Merge branch 'sh/for-2.6.32' of git://git.kernel.org/.../lethal/sh-2.6 Merge branch 'for-linus' of git://git390.marist.edu/pub/scm/linux-2.6 Merge git://git.kernel.org/.../davem/sparc-2.6 Merge branch 'topic/x86-lds-nits' of git://git.kernel.org/.../frob/linux-2.6-roland Merge branch 'tty-fixes' Merge branch 'for-linus' of git://git.kernel.org/.../ieee1394/linux1394-2.6 Merge the right tty-fixes branch Merge git://git.kernel.org/.../davem/net-2.6 Merge git://git.kernel.org/.../gregkh/staging-2.6 Merge git://git.kernel.org/.../gregkh/usb-2.6 Merge git://git.kernel.org/.../gregkh/driver-core-2.6 Merge git://git.kernel.org/.../gregkh/tty-2.6 Merge branch 'master' of git://git.kernel.org/.../mason/btrfs-unstable Merge branch 'omap-fixes-for-linus' of git://git.kernel.org/.../tmlind/linux-omap-2.6 Merge branch 'release' of git://git.kernel.org/.../lenb/linux-acpi-2.6 Merge branch 'merge' of git://git.kernel.org/.../benh/powerpc Merge branch 'x86-fixes-for-linus' of git://git.kernel.org/.../tip/linux-2.6-tip Merge branch 'for-linus' of git://git.kernel.org/.../teigland/dlm Merge branch 'docs-next' of git://git.lwn.net/linux-2.6 Linux 2.6.32-rc5 Merge branch 'upstream-linus' of git://git.kernel.org/.../jgarzik/libata-dev Merge branch 'for-linus' of git://git.kernel.org/.../bp/bp Merge git://git.kernel.org/.../herbert/crypto-2.6 Merge branch 'sh/for-2.6.32' of git://git.kernel.org/.../lethal/sh-2.6 Merge git://git.kernel.org/.../agk/linux-2.6-dm Merge branch 'kvm-updates/2.6.32' of git://git.kernel.org/pub/scm/virt/kvm/kvm Merge branch 'for-linus' of git://git.kernel.org/.../dtor/input Merge branch 'for-linus' of git://git.infradead.org/users/eparis/notify Merge git://git.kernel.org/.../davem/net-2.6 Merge git://git.kernel.org/.../rusty/linux-2.6-for-linus Merge branch 'x86-fixes-for-linus' of git://git.kernel.org/.../tip/linux-2.6-tip Merge branch 'sched-fixes-for-linus' of git://git.kernel.org/.../tip/linux-2.6-tip Merge branch 'perf-fixes-for-linus' of git://git.kernel.org/.../tip/linux-2.6-tip Merge branch 'core-fixes-for-linus' of git://git.kernel.org/.../tip/linux-2.6-tip Merge master.kernel.org:/home/rmk/linux-2.6-arm Merge branch 'urgent-v2' of git://git.kernel.org/.../brodo/pcmcia-2.6 Merge branch 'hwmon-for-linus' of git://git.kernel.org/.../jdelvare/staging Merge branch 'for-linus' of git://git.infradead.org/ubi-2.6 Merge branch 'omap-fixes-for-linus' of git://git.kernel.org/.../tmlind/linux-omap-2.6 Merge branch 'for-linus' of git://oss.sgi.com/xfs/xfs Merge branch 'hwpoison-2.6.32' of git://git.kernel.org/.../ak/linux-mce-2.6 Merge branch 'for-linus' of git://git.kernel.org/.../sameo/mfd-2.6 Merge branch 'merge' of git://git.kernel.org/.../benh/powerpc Merge git://git.kernel.org/.../sfrench/cifs-2.6 Merge branch 'bugfixes' of git://git.linux-nfs.org/projects/trondmy/nfs-2.6 Merge branch 'sh/for-2.6.32' of git://git.kernel.org/.../lethal/sh-2.6 Merge branch 'drm-fixes' of git://git.kernel.org/.../airlied/drm-2.6 Merge git://git.kernel.org/.../jejb/scsi-rc-fixes-2.6 Merge branch 'for-linus' of git://git.kernel.org/.../roland/infiniband Merge branch 'for-linus' of git://git.kernel.org/.../jbarnes/pci-2.6 Merge branch 'for-linus' of git://git.kernel.dk/linux-2.6-block Merge git://git.kernel.org/.../rusty/linux-2.6-for-linus Merge git://git.kernel.org/.../rusty/linux-2.6-param-fixes Merge branch 'for-linus' of git://git.kernel.org/.../tj/percpu Merge git://git.kernel.org/.../davem/net-2.6 Merge git://git.kernel.org/.../davem/ide-2.6 Merge branch 'bugfix' of git://git.kernel.org/.../jeremy/xen Merge branch 'for-linus' of git://neil.brown.name/md Merge branch 'for-linus' of git://git.kernel.org/pub/scm/fs/xfs/xfs Merge branch 'for-linus' of git://git390.marist.edu/pub/scm/linux-2.6 Merge git://git.kernel.org/.../gregkh/driver-core-2.6 Merge git://git.kernel.org/.../gregkh/tty-2.6 Merge git://git.kernel.org/.../gregkh/usb-2.6 Merge git://git.kernel.org/.../gregkh/staging-2.6 i915: fix intel graphics suspend breakage due to resume/lid event confusion Merge branch 'x86-fixes-for-linus' of git://git.kernel.org/.../tip/linux-2.6-tip Merge branch 'tracing-fixes-for-linus' of git://git.kernel.org/.../tip/linux-2.6-tip Merge branch 'perf-fixes-for-linus' of git://git.kernel.org/.../tip/linux-2.6-tip Merge branch 'core-fixes-for-linus' of git://git.kernel.org/.../tip/linux-2.6-tip Merge branch 'for-linus' of git://git.kernel.org/.../tiwai/sound-2.6 Merge branch 'for-linus' of master.kernel.org:/home/rmk/linux-2.6-arm Revert "ext4: Remove journal_checksum mount option and enable it by default" Merge branch 'release' of git://git.kernel.org/.../aegl/linux-2.6 Merge branch 'for-linus' of git://git.kernel.org/.../ericvh/v9fs Merge git://git.kernel.org/.../davem/net-2.6 Merge branch 'for-linus' of git://git.kernel.org/.../ryusuke/nilfs2 Merge branch 'i2c-fixes' of git://git.fluff.org/bjdooks/linux Merge branch 'fixes-s3c-2632-rc5' of git://git.fluff.org/bjdooks/linux Merge branch 'for-linus' of git://git.kernel.org/.../dtor/input Merge branch 'pm-fixes' of git://git.kernel.org/.../rafael/suspend-2.6 Merge branch 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus Merge branch 'for-linus' of git://github.com/at91linux/linux-2.6-at91 Linux 2.6.32-rc6 Linus Walleij (1): ARM: 5765/1: Updated U300 defconfig Lubomir Rintel (2): sh: Build fix: export __movmem sh: Build fix: define more __movmem* symbols Luca Tettamanti (2): hwmon: (asus_atk0110) Refactor the code hwmon: (asus_atk0110) Enable the EC Luis R. Rodriguez (1): ath9k: fix misplaced semicolon on rate control Magnus Damm (5): usb: r8a66597-udc unaligned fifo fix sh: enable sleep state LEDs on Ecovec24 sh: disabled cache handling fix. sh: rsk7203 CONFIG_MTD=n fix sh: add uImage.bin target Manuel Lauss (2): net: au1000_eth: add missing capability.h MIPS: Alchemy: Fix hang with high-frequency edge interrupts Marcelo Tosatti (2): KVM: VMX: flush TLB with INVEPT on cpu migration KVM: use proper hrtimer function to retrieve expiration time Marcin Slusarz (2): ide: use printk_once [IA64] use printk_once() unaligned.c/io_common.c Marin Mitov (1): x86, pci: Correct spelling in a comment Mark Brown (4): hwmon: (s3c-hwmon) Disable build for S3C64xx ARM: S3C64XX: Set rate of crystal mux mfd: Always initialise WM831x IRQ mutex Merge commit 'v2.6.32-rc6' into for-2.6.32 Mark Hills (3): ALSA: snd-usb-caiaq: Missing lock around use of buffer positions ALSA: snd-usb-caiaq: Lock on stream start/unpause ALSA: snd-usb-caiaq: Bump version number to 1.3.20 Mark Langsdorf (1): ACPI: add AC/DC notifier Mark McLoughlin (1): block: silently error unsupported empty barriers too Markus Trippelsdorf (1): ahci: Add ifdef wrapper to ahci_gtf_filter_workaround Marti Raudsepp (1): perf tools: Fix compatibility with libelf 0.8 and autodetect Martin K. Petersen (5): [SCSI] Deprecate SCSI_PROT_*_CONVERT operations [SCSI] sd: Detach DIF from block integrity infrastructure [SCSI] Fix protection scsi_data_buffer leak [SCSI] sd: Support disks formatted with DIF Type 2 [SCSI] scsi_debug: Implement support for DIF Type 2 Martin Schwidefsky (4): [S390] fix build breakage with CONFIG_AIO=n [S390] pm: ignore time spend in suspended state [S390] s/r: cmm resume fix [S390] cputime: fix overflow on 31 bit systems Martin Stava (2): 9p: fix a small bug in readdir for long directories 9p: fix readlink Matt Carlson (1): tg3: Fix phylib locking strategy Matt Fleming (7): sh: Don't enable interrupts in the page fault path tracing: Fix infinite recursion in ftrace_update_pid_func() sh: Sprinkle __uses_jump_to_uncached sh: Plug PMB alloc memory leak sh: Try PMB mapping based on physical address, not mapping size sh: Don't allocate smaller sized mappings on every iteration sh: Check for return_to_handler when unwinding the stack Matthew Wilcox (1): [IA64] Require SAL 3.2 in order to do extended config space ops Michael Buesch (3): b43: Don't use struct wldev after detach. b43: Protect sanity check against physical device removal b43: Fix DMA TX bounce buffer copying Michael Chan (1): cnic: Fix L2CTX_STATUSB_NUM offset in context memory. Michael Ellerman (1): powerpc: Fix memory leak in axon_msi.c Michael Ernst (1): [S390] cio: channel path memory leak Michael Hennerich (3): Input: ad7879 - pass up error codes from probe functions Blackfin: convert adv7393 resources to new i2c framework Blackfin: convert to GENERIC_HARDIRQS_NO__DO_IRQ Michael Holzheu (4): [S390] hibernate: Use correct place for CPU address in lowcore [S390] hypfs: Use subcode 6 if subcode 7 is not available [S390] tape390: Fix request queue handling in block driver [S390] sclp_vt220 build fix Michael Neuling (1): powerpc/perf_events: Fix priority of MSR HV vs PR bits Michael S. Tsirkin (3): virtio-net: fix data corruption with OOM virtio-pci: fix per-vq MSI-X request logic virtio: order used ring after used index read Michal Ostrowski (1): PPPoE: Fix flush/close races. Michal Simek (2): microblaze: UMS is used only for MMU kernel microblaze: Clear sticky FSR register after saving it to func parametr Miguel Boton (1): b43: add 'struct b43_wl' missing declaration Mike Frysinger (9): Blackfin: asm/irq.h: pull in mach/anomaly.h for anomaly defines Blackfin: cplbinfo: drop d_path() hacks Blackfin: bf533-ezkit: convert to physmap/jedec_probe Blackfin: drop cs_change_per_word setting Blackfin: drop all simple-gpio board resources USB: musb: make HAVE_CLK support optional USB: isp1362: fix build warnings on 64-bit systems USB: musb: invert arch depend string twl4030-gpio: remove __devexit markings from remove func Mike Galbraith (1): sched: Update the clock of runqueue select_task_rq() selected Mike Rapoport (1): [ARM] pxa/cm-x300: fix mmc numbering Mikulas Patocka (7): dm snapshot: sort by chunk size to fix race dm snapshot: require non zero chunk size by end of ctr dm exception store: fix failed set_chunk_size error path dm snapshot: lock snapshot while supplying status dm snapshot: use unsigned integer chunk size dm snapshot: allow chunk size to be less than page size ide: Serialize CMD643 and CMD646 to fix a hardware bug with SSD Milan Dadok (3): Staging: hv: fix oops in vmbus - udev events Staging: hv: fix oops in vmbus - netvsc list_head Staging: hv: fix oops in vmbus - missing #include Mimi Zohar (1): ima: ecryptfs fix imbalance message Moger, Babu (1): [SCSI] scsi_dh_rdac: Fix for returning correct mode select cmd return info Mulyadi Santosa (1): perf tools: Run generate-cmdlist.sh properly Neil Brown (2): sysfs: Allow sysfs_notify_dirent to be called from interrupt context. block: use after free bug in __blkdev_get Neil Horman (2): add maintainer for network drop monitor kernel service AF_RAW: Augment raw_send_hdrinc to expand skb to fit iphdr->ihl (v2) NeilBrown (8): Revert "md: do not progress the resync process if the stripe was blocked" md/raid1/raid10: add a cond_resched md: raid1/raid10: handle allocation errors during array setup. md: remove clumsy usage of do_sync_mapping_range from bitmap code md: fix problems with RAID6 calculations for DDF. md: Fix handling of raid5 array which is being reshaped to fewer devices. md/async: don't pass a memory pointer as a page pointer. raid6/async_tx: handle holes in block list in async_syndrome_val Nick Cheng (1): [SCSI] mvsas: Support Areca SAS/SATA HBA, ARC-1300/1320 Nicolas Ferre (2): avr32: add two new at91 to cpu.h definition at91: at91sam9g45 family: identify several chip versions Nigel Stephens (1): MIPS: Fix abs.[sd] and neg.[sd] emulation for NaN operands Nikanth Karthikesan (1): block: Seperate read and write statistics of in_flight requests v2 Nitin Gupta (1): ARM: force dcache flush if dcache_dirty bit set Nobuhiro Iwamatsu (1): sh_eth: Add asm/cacheflush.h OGAWA Hirofumi (1): dpt_i2o: Fix typo of EINVAL Oliver Neukum (7): USB: visor: fix trivial accounting bug in visor driver USB: small fix in error case of suspend in generic usbserial code USB: serial: fix race between unthrottle and completion handler in opticon USB: serial: fix race between unthrottle and completion handler in symbolserial USB: serial: fix assumption that throttle/unthrottle cannot sleep USB: serial: fix race between unthrottle and completion handler in visor USB: serial: no unnecessary GFP_ATOMIC in oti6858 Paul E. McKenney (13): rcu: Clean up code based on review feedback from Josh Triplett rcu: Clean up code based on review feedback from Josh Triplett, part 2 rcu: Clean up code to address Ingo's checkpatch feedback rcu: Fix rcu_lock_map build failure on CONFIG_PROVE_LOCKING=y rcu: Clean up code based on review feedback from Josh Triplett, part 3 rcu: Clean up code based on review feedback from Josh Triplett, part 4 rcu: Replace the rcu_barrier enum with pointer to call_rcu*() function rcu: Move rcu_barrier() to rcutree rcu: Make hot-unplugged CPU relinquish its own RCU callbacks rcu: Place root rcu_node structure in separate lockdep class rcu: Prevent RCU IPI storms in presence of high call_rcu() load rcu: Stopgap fix for synchronize_rcu_expedited() for TREE_PREEMPT_RCU rcu: Fix TREE_PREEMPT_RCU CPU_HOTPLUG bad-luck hang Paul Mackerras (1): perf_event: Adjust frequency and unthrottle for non-group-leader events Paul Menage (1): cgroups: update documentation of cgroups tasks and procs files Paul Mundt (18): sh: Handle ioport_map() cases for >= P1SEG addresses. sh: Set the default I/O port base to P2SEG. sh: magicpanelr2 and dreamcast can use the generic I/O base. sh: Disable unaligned kernel access printks by default. kmemtrace: Fix up tracer registration sh: update die() output. sh: force dcache flush if dcache_dirty bit set. sh: ftrace: Fix up syscall tracepoint support. sh: Use boot_cpu_data for FPU tests in sigcontext paths. sh: Tidy up SMP cpuinfo. sh: Populate initial secondary CPU info from boot_cpu_data. sh: Optimize the setup_rt_frame() I-cache flush. sh: Fix a TRACE_IRQS_OFF typo. sh: Kill off stray HAVE_FTRACE_SYSCALLS reference. sh: __irq_entry annotate do_IRQ(). perf tools: Remove -Wcast-align sh: Document uImage.bin target in archhelp. sh: Fix hugetlbfs dependencies for SH-3 && MMU configurations. Paul Walmsley (3): OMAP3: PM: PRCM interrupt: check MPUGRPSEL register OMAP3: PM: PRCM interrupt: only handle selected PRCM interrupts OMAP2xxx clock: set up clockdomain pointer in struct clk Pavel Herrmann (1): lis3: better support for hp 6730x Pavel Hofman (1): ALSA: ICE1712/24 - Change the Multi Track Peak control (level meters) from MIXER to PCM type Pavel Machek (1): PM: Remove some debug messages producing too much noise Pekka Enberg (1): Staging: w35und: Fix ->beacon_int breakage Peter Huewe (2): HID: add __init/__exit macros to twinhan.c Staging: Panel: prevent driver from calling misc_deregister twice on same ressource Peter Magdina (1): USB: option: Toshiba G450 device id Peter Oberparleiter (4): [S390] cio: make disconnected handling consistent [S390] cio: make not operational handling consistent [S390] cio: allow setting boxed devices offline [S390] cio: change misleading console logic Peter Williams (1): sched: Set correct normal_prio and prio values in sched_fork() Peter Zijlstra (5): perf_event: Provide vmalloc() based mmap() backing futex: Nullify robust lists after cleanup lockdep: Use cpu_clock() for lockstat sched: Disable SD_PREFER_LOCAL for MC/CPU domains sched: Do less agressive buddy clearing Philby John (2): ALSA: aaci: ARM1176 aaci-pl041 AC97 register read timeout ARM: 5774/1: Fix Realview ARM1176PB board reboot Rafael J. Wysocki (4): PCI PM: Read device power state from register after updating it ACPI / PCI: Fix NULL pointer dereference in acpi_get_pci_dev() (rev. 2) PM: Make warning in suspend_test_finish() less likely to happen PM / yenta: Split resume into early and late parts (rev. 4) Raimonds Cicans (1): r8169: Fix card drop incoming VLAN tagged MTU byte large jumbo frames Rajendra Nayak (1): omap: Lock DPLL5 at boot Rajiv Andrade (1): TPM: fix pcrread Rakib Mullick (2): hwmon: (sht15) Fix spurious section mismatch warning eeepc-laptop: Properly annote eeepc_enable_camera(). Ralf Baechle (12): IRQ: Change __softirq_pending to unsigned int in asm-generic/hardirq.h. MIPS: Extend COMMAND_LINE_SIZE MIPS: Don't write ones to reserved entryhi bits. MIPS: Cleanup CONFIG_DEBUG_STACK_USAGE version of alloc_thread_info. MIPS: IP27: Fix build MIPS: VPE: Remove stray unlock_kernel. MIPS: MTX-1: Fix build if CONFIG_PCI is disabled. MIPS: Kconfig: Fix duplicate default value for MIPS_L1_CACHE_SHIFT. MIPS: Malta: Enable PCI 2.1 compatibility in PIIX4 MIPS: 1004K: Enable SPRAM support. MIPS: Set S-cache linesize to 64-bytes for MTI's S-cache MIPS: Avoid potential hazard on Context register Ralf Roesch (1): MIPS: TXx9: Fix error handling / Fix for noenexisting gpio_remove. Ramax Lo (1): ARM: S3C24XX: Define a macro to avoid compilation error Randy Dunlap (13): [SCSI] scsi_transport_fc: fix missing kernel-doc PCI: pci.c: fix kernel-doc notation ecryptfs: depends on CRYPTO blk-settings: fix function parameter kernel-doc notation perf tools: Fix const char type propagation sched: Fix missing kernel-doc notation net: ks8851_mll uses mii interfaces vmxnet: fix 2 build problems [IA64] fix percpu warnings vmxnet3: use dev_dbg, fix build for CONFIG_BLOCK=n pcmcia: fix controller printk format warnings cpufreq: add cpufreq_get() stub for CONFIG_CPU_FREQ=n Staging: fix wireless drivers depends Reinette Chatre (3): iwlwifi: fix compile warning iwlagn: fix compile warning in iwl5000_gain_computation mac80211: fix ibss joining Richard Zhao (3): i2c: imx: check busy bit when START/STOP i2c: imx: only imx1 needs disable delay i2c: imx: disable clock when it's possible to save power. Robert Hancock (3): ahci: display all AHCI 1.3 HBA capability flags (v2) ALSA: ice1724: increase SPDIF and independent stereo buffer sizes ALSA: ice1724: Fix surround on Chaintech AV-710 Robert Noland (1): drm/r600: avoid assigning vb twice in blit code Robert Richter (1): oprofile: warn on freeing event buffer too early Robin Getz (1): Blackfin: mass clean up of copyright/licensing info Robin Holt (3): x86, UV: Fix information in __uv_hub_info structure x86, UV: Fix and clean up bau code to use uv_gpa_to_pnode() x86, UV: Set DELIVERY_MODE=4 for vector=NMI_VECTOR in uv_hub_send_ipi() Roel Kluin (10): drm/radeon: Fix setting of bits netxen: Fix Unlikely(x) > y mac80211: fix ADM8211_SYNCTL_RFtype define mac80211: use kfree_skb() to free struct sk_buff pointers [IA64] unsigned cannot be less than 0 in sn_hwperf_ioctl() Input: hp_sdc_rtc - fix test in hp_sdc_rtc_read_rt() UBI: fix check on unsigned long hwmon: (fschmd) Fix check on unsigned in watchdog_write() airo: Reorder tests, check bounds before element frv: fix check on unsigned in do_signal() Roger Quadros (2): mfd: Fix twl4030 boot with twl4030 usb transceiver enabled omap_hsmmc: add missing probe handler hook Roland Dreier (5): intel-iommu: Make "Unknown DMAR structure" message more informative intel-iommu: Decode (and ignore) RHSA entries hrtimer: Remove overly verbose "switch to high res mode" message Merge branches 'cxgb3', 'misc' and 'mlx4' into for-next x86: Don't print number of MCE banks for every CPU Roland McGrath (1): x86: linker script syntax nits Romit Dasgupta (1): PM: Fix warning on suspend errors Ron Mercer (12): qlge: Fix some bit definitions for reset register. qlge: Fix queueing of firmware handler in ISR. qlge: Fix lock/mutex warnings. qlge: Fix RSS hashing values. qlge: Fix frame routing issue related to bonding. qlge: Fix frame routing for multicast frames. qlge: Fix RX multicast filter settings. qlge: Fix chip reset process. qlge: Restore rx mode after internal reset. qlge: Add disable/enable firmare irqs to handler. qlge: Fix EEH handling. qlge: Fix firmware mailbox command timeout. Ronnie Furuskog (1): USB: option: Patch for Huawei Mobile Broadband E270+ Modem Russell King (15): ARM: Dump memory and backtrace as one printk per line ARM: Dump code/mem oops lines with the appropriate log level ARM: update die() output ARM: Add kmap_atomic type debugging Merge branch 'fix' of git://git.kernel.org/.../ycmiao/pxa-linux-2.6 Merge branch 'for-rmk-rc' of git://git.pengutronix.de/git/imx/linux-2.6 Merge branch 'fix' of git://git.kernel.org/.../ycmiao/pxa-linux-2.6 ARM: Fix lubbock defconfig build ARM: Fix signal restart issues with NX and OABI compat ARM: integrator: allow Integrator to be built with highmem ARM: Use GFP_DMA only for masks _less_ than 32-bit mm: fix sparsemem configuration ARM: Fix sparsemem with SPARSEMEM_EXTREME enabled ARM: Fix errata 411920 workarounds ARM: ensure initial page tables are setup for SMP systems Rusty Russell (5): virtio_blk: Revert serial number support x86: Side-step lguest problem by only building cmpxchg8b_emu for pre-Pentium param: fix lots of bugs with writing charp params from sysfs, by leaking mem. param: fix NULL comparison on oom param: fix setting arrays of bool Ryan Mallon (1): ARM: S3C: Fix adc function exports Ryota Yamauchi (1): xfs: fix xfs_quota remove error Ryusuke Konishi (3): nilfs2: fix dirty page accounting leak causing hang at write nilfs2: fix irregular checkpoint creation due to data flush nilfs2: add zero-fill for new btree node buffers Sam Ravnborg (1): kbuild: revert "save ARCH & CROSS_COMPILE ..." Samu Onkalo (1): lis3lv02d_spi: module unload didn't remove sysfs entry Samuel Thibault (1): x86: Fix csum_ipv6_magic asm memory clobber Sanjeev Premi (1): omap: CONFIG_ISP1301_OMAP redefined in Beagle defconfig Santosh Shilimkar (4): ARM: 5763/1: ARM: SMP: Fix the BUG with CONFIG_PREEMPT enabled omap: SDMA: Fix omap_stop_dma() API for channel linking omap4: Allow omap_serial_early_init() for OMAP4430 board omap4: Fix UART4 platform data on omap4 Sarah Sharp (6): USB: xhci: Stop debugging polling loop when HC dies. USB: xhci: Handle canceled URBs when HC dies. USB: xhci: Don't wait for a disable slot cmd when HC dies. USB: xhci: Fix dropping endpoints from the xHC schedule. USB: ehci: Fix isoc scheduling boundary checking. USB: ehci: Fix IST boundary checking interval math. Sascha Hauer (6): i.MX27 clock: rename spi clocks to match device mx25 devices: Add missing include mx25pdk: remove nand support as it is not present in current tree mx25: Add missing copyright / license header pcm038: Add SPI/MC13783 support pcm970 mmc: Fix ro switch Sathya Perla (2): be2net: fix promiscuous and multicast promiscuous modes being enabled always be2net: fix support for PCI hot plug Sean MacLennan (1): powerpc: warning: allocated section `.data_nosave' not in segment Sebastian Frei (1): Input: wistron_btns - add DMI entry for Medion WIM2030 laptop Sebastian Ott (2): [S390] 3270 console build fix [S390] call home: fix local buffer usage in proc handler Serge E. Hallyn (1): Staging: p9auth: a few fixes Sergey Pinaev (1): USB: storage: iRiver P7 UNUSUAL_DEV patch Sergio Aguirre (1): omapfb: Condition mutex acquisition Shane Huang (1): ahci / atiixp / pci quirks: rename AMD SB900 into Hudson-2 Shreyas Bhatewara (1): net: VMware virtual Ethernet NIC driver: vmxnet3 Simon Wunderlich (1): r8169: fix Ethernet Hangup for RTL8110SC rev d Soeren Sandmann (2): perf events: Fix swevent hrtimer sampling by keeping track of remaining time when enabling/disabling swevent hrtimers perf events: Don't generate events for the idle task when exclude_idle is set Srinidhi Kasagar (1): ARM: 5741/1: pl022: fix peripheral id for ST vendor Sriram (1): TI DaVinci EMAC: Clear statistics register properly. Stanislav Brabec (1): [ARM] pxa/spitz: add gpio button support (fixes regression) Stas Sergeev (2): ALSA: pcsp - Fix nforce workaround Driver core: fix driver_register() return value Stefan Bader (1): ACPI: video: Loosen strictness of video bus detection code Stefan Haberland (3): [S390] dasd: fix race condition in resume code [S390] dasd: fix locking bug [S390] dasd: use idal for device characteristics Stefan Richter (3): ieee1394: add documentation entry to MAINTAINERS NFS: suppress a build warning firewire: sbp2: provide fallback if mgt_ORB_timeout is missing Stefano Panella (1): USB: wusb: don't use the stack to read security descriptor Stephen Boyd (1): connector: Fix incompatible pointer type warning Stephen Hemminger (2): ipv4: arp_notify address list bug Staging: hv TODO patches Stephen M. Cameron (2): cciss: Fix multiple calls to pci_release_regions cciss: Add cciss_allow_hpsa module parameter Stephen Rothwell (2): sparc: using HZ needs an include of linux/param.h powerpc/iseries: Remove compiler version dependent hack Steve French (1): [CIFS] Fixing to avoid invalid kfree() in cifs_get_tcp_session() Steve Wise (2): RDMA/iwcm: Don't call provider reject func with irqs disabled RDMA/cxgb3: Handle NULL inetdev pointer in iwch_query_port() Steven King (1): net: fix section mismatch in fec.c Steven Rostedt (6): tracing: fix transposed numbers of lock_depth and preempt_count ftrace: check for failure for all conversions tracing: user local buffer variable for trace branch tracer tracing: fix trace_vprintk call powerpc/ftrace: show real return addresses in modules powerpc64/ftrace: use PACA to retrieve TOC in mod_return_to_handler Takao Indoh (1): [IA64] Restore registers in the stack on INIT Takashi Iwai (18): ALSA: hda - Fix invalid initializations for ALC861 auto mode ALSA: hda - Add a workaround for ASUS A7K ALSA: hda - Don't pick up invalid HP pins in alc_subsystem_id() ALSA: hda - Fix yet another auto-mic bug in ALC268 Merge branch 'fix/hda' into for-linus Merge branch 'fix/misc' into for-linus ALSA: hda - Add full rates/formats support for Nvidia HDMI ALSA: hda - Fix overflow of spec->init_verbs in patch_realtek.c ALSA: bt87x - Add a whitelist for Pinnacle PCTV (11bd:0012) ALSA: hda - Fix mute sound with STAC9227/9228 codecs ALSA: hda - Fix volume-knob setup for Dell laptops with STAC9228 ALSA: hda - Allow all formats as default for Nvidia HDMI Merge branch 'fix/hda' into for-linus ALSA: hda - Fix capture source checks for ALC662/663 codecs ALSA: dummy - Fix descriptions of pcm_substreams parameter ALSA: hda - Don't check invalid HP pin Merge branch 'fix/asoc' into for-linus Merge branch 'fix/hda' into for-linus Teerth Reddy (1): omap: Initialization of SDRC params on Zoom2 Tejun Heo (11): [SCSI] sr: consider the last written sector when determining media size ahci: disable 64bit DMA by default on SB600s libata: cosmetic updates libata: implement more acpi filtering options libata: make gtf_filter per-dev ahci: filter FPDMA non-zero offset enable for Aspire 3810T libata: fix incorrect link online check during probe percpu: fix compile warnings sata_nv: make sure link is brough up online when skipping hardreset libata: fix PMP initialization libata: fix internal command failure handling Terry Loftin (1): nfs: Panic when commit fails Tetsuo Handa (1): kmemleak: Use GFP_ATOMIC for early_alloc(). Theodore Ts'o (1): ext3: Don't update superblock write time when filesystem is read-only Thomas Chou (8): ethoc: fix typo to compute number of tx descriptors ethoc: fix buffer address mapping ethoc: align received packet to make IP header at word boundary ethoc: use system memory as buffer ethoc: limit the number of buffers to 128 Blackfin: fix framebuffer mmap bug for nommu ethoc: inline regs access ethoc: clear only pending irqs Thomas Gleixner (6): futex: Fix locking imbalance futex: Move exit_pi_state() call to release_mm() futex: Handle spurious wake up watchdog: Fix rio watchdog probe function sh: Remove BKL from landisk gio. futex: Fix spurious wakeup for requeue_pi really Thomas Gruber (1): Input: xpad - add BigBen Interactive XBOX 360 Controller Tilman Schmidt (12): Documentation: expand isdn/INTERFACE.CAPI document isdn: accept CAPI Informational Info values as success isdn: avoid races in capidrv isdn: make capidrv module parameter "debugmode" writeable gigaset: fix reject/hangup handling gigaset: linearize skb gigaset: handle isoc frame errors more gracefully gigaset: announce if built with debugging gigaset: fix device ERROR response handling gigaset: improve error recovery gigaset: correct debugging output selection gigaset: add kerneldoc comments Tim Abbott (1): parisc: Make THREAD_SIZE available to assembly files and linker scripts. Tim Blechmann (1): perf top: Fix --delay_secs 0 division by zero Tobias Klauser (1): USB: gadget: imx_udc: Use resource size Tom Zanussi (3): perf trace: Remove unused code in builtin-trace.c perf trace: Update eval_flag() flags array to match interrupt.h tracing/syscalls: Use long for syscall ret format and field definitions Tommi Rantala (2): omapfb: Blizzard: fix pointer to be const omapfb: Blizzard: constify register address tables Tomoki Sekiyama (1): AF_UNIX: Fix deadlock on connecting to shutdown socket Tony Lindgren (5): omap: Fix incorrect 730 vs 850 detection Merge branch 'pm-fixes-32' of git://git.kernel.org/.../khilman/linux-omap-pm into omap-fixes-for-linus Merge branch '2_6_32rc4_fixes' of git://git.pwsan.com/linux-2.6 into omap-fixes-for-linus omap2: Fix detection of n8x0 omap2: Fix console serial port number for n8x0 Tony Luck (6): [IA64] Squeeze ticket locks back into 4 bytes. [IA64] Re-implement spinaphores using ticket lock concepts [IA64] SMT friendly version of spin_unlock_wait() Pull ticket4byte into release branch Pull ticket-spinaphore into release branch Revert "[IA64] fix percpu warnings" Trond Myklebust (8): NFS: Fix a default mount regression... NFS: Fix port and mountport display in /proc/self/mountinfo NFS: Fix port initialisation in nfs_remount() NFSv4: Fix the referral mount code NFSv4: Kill nfs4_renewd_prepare_shutdown() NFSv4: Fix a bug when the server returns NFS4ERR_RESOURCE NFSv4: Fix two unbalanced put_rpccred() issues. NFSv4: The link() operation should return any delegation on the file Tyler Hicks (1): eCryptfs: Remove Kconfig NET dependency and select MD5 Uwe Kleine-König (4): Input: sparkspkr - move remove() functions to .devexit.text mmc: at91_mci: Don't include asm/mach/mmc.h move virtballoon_remove to .devexit.text move virtrng_remove to .devexit.text Valentin Longchamp (1): MXC: fix reset for mx31, mx35 and mx27 SoCs Valentin Sitdikov (1): sh: Fix up single page flushing to use PAGE_SIZE. Valentine Barshak (1): pasemi_mac: ethtool get settings fix Vikram Pandita (1): OMAP3: PM: USBHOST: clear wakeup events on both hosts Vincent Legoll (1): perf events: Update MAINTAINERS entry file patterns Vincent Sanders (1): net: Fix IXP 2000 network driver building. Vladimir Dronnikov (1): md: drivers/md/unroll.pl replaced with awk analog Wei Yongjun (1): inotify: fix coalesce duplicate events into a single event in special case Wey-Yi Guy (2): iwlwifi: fix EEPROM enhance tx power offset iwlwifi: change the order of freeing memory Willy Tarreau (1): tcp: fix tcp_defer_accept to consider the timeout Wolfram Sang (3): include/linux/netdevice.h: fix nanodoc mismatch powerpc/boot/dts: drop obsolete 'fsl5200-clocking' pcmcia: Fix possible printk format warnings Wu Fengguang (13): pagemap: export KPF_HWPOISON pagemap: document KPF_KSM and show it in page-types page-types: add GPL note page-types: introduce checked_open() page-types: make standalone pagemap/kpageflags read routines page-types: make voffset local variables page-types: introduce kpageflags_flags() page-types: add hwpoison/unpoison feature writeback: account IO throttling wait as iowait writeback: kill space in debugfs item name HWPOISON: return early on non-LRU pages HWPOISON: fix invalid page count in printk output vmscan: limit VM_EXEC protection to file pages Wu Zhangjin (6): ALSA: SND_CS5535AUDIO: Remove the X86 platform dependency MIPS: Loongson: Remove redundant local_irq_disable() MIPS: Add IRQF_TIMER flag for timer interrupts MIPS: 64-bit: Fix o32 lookup_dcookie syscall MIPS: Add IRQF_TIMER flag for timer interrupts MIPS: Oprofile: Rename cpu_type from godson2 to loongson2 Xiao Guangrong (2): perf_event: Fix event group handling in __perf_event_sched_*() perf_event: Clean up perf_event_init_task() Xiaotian Feng (1): isdn: fix possible circular locking dependency Xose Vazquez Perez (1): rt73usb.c : more ids Yan, Zheng (3): Btrfs: remove negative dentry when deleting subvolumne Btrfs: optimize back reference update during btrfs_drop_snapshot Btrfs: properly wait log writers during log sync Yegor Yefremov (1): ARM: 5766/1: Fix watchdog enabling for AT91SAM9G45 Yevgeny Petrilin (1): mlx4_core: Add 40GigE device ID Yinghai Lu (3): PCI: get larger bridge ranges when space is available pci: increase alignment to make more space for hidden code nfs: Fix nfs_parse_mount_options() kfree() leak Yoshihiro Shimoda (1): USB: r8a66597-hcd: fix cannot detect a device when uses_new_polling is set Zdenek Kabelac (1): dm: add missing del_gendisk to alloc_dev error path Zhang Le (1): MIPS: Loongson 2: Set cpu_has_dc_aliases and cpu_icache_snoops_remote_store Zhao Yakui (3): drm/i915: Multiply the refresh by 1000 in TV mode validatiion drm: Delete the DRM_DEBUG_KMS in drm_mode_cursor_ioctl drm: Add the basic check for the detailed timing in EDID Zhenwen Xu (1): tracing: fix warning on kernel/trace/trace_branch.c andtrace_hw_branches.c Zhu Yi (1): ipw2200: fix oops on missing firmware françois romieu (1): r8169: partial support and phy init for the 8168d jamal (2): pkt_sched: pedit use proper struct net: Fix RPF to work with policy routing jolsa(a)redhat.com (1): tracing: correct module boundaries for ftrace_release miaofng (1): Staging: vt6656: fix the memory free bug in vntwusb_disconnect() peer chen (2): ahci: Add the AHCI controller Linux Device ID for NVIDIA chipsets. ALSA: hda_intel: Add the Linux device ID for NVIDIA HDA controller roel kluin (2): au1000_eth: Duplicate test of RX_OVERLEN bit in update_rx_stats() ibmtr: possible Read buffer overflow? ye janboe (1): omap: SRAM: flush the right address after memcpy in omap_sram_push Éric Piel (2): USB: cp210x: Add support for the DW700 UART lis3: add support for the HP EliteBook 8530w ...fs-class-usb_host => sysfs-class-uwb_rc-wusbhc} | 4 +- .../ABI/testing/sysfs-devices-cache_disable | 18 - Documentation/ABI/testing/sysfs-devices-system-cpu | 156 + Documentation/cgroups/cgroups.txt | 11 +- Documentation/cputopology.txt | 47 +- Documentation/debugging-via-ohci1394.txt | 8 +- Documentation/feature-removal-schedule.txt | 38 + Documentation/filesystems/ext3.txt | 16 +- Documentation/filesystems/ext4.txt | 8 +- Documentation/flexible-arrays.txt | 43 +- Documentation/hwmon/sysfs-interface | 57 +- Documentation/infiniband/user_mad.txt | 4 +- Documentation/infiniband/user_verbs.txt | 2 +- Documentation/isdn/INTERFACE.CAPI | 83 +- Documentation/kernel-parameters.txt | 1 + Documentation/lguest/lguest.c | 1 - Documentation/networking/pktgen.txt | 8 + Documentation/scsi/hptiop.txt | 21 +- Documentation/sound/alsa/ALSA-Configuration.txt | 2 +- Documentation/sound/alsa/HD-Audio-Models.txt | 1 + Documentation/trace/ftrace.txt | 2 + Documentation/vm/hwpoison.txt | 136 + Documentation/vm/ksm.txt | 13 +- Documentation/vm/page-types.c | 304 ++- Documentation/vm/pagemap.txt | 8 + MAINTAINERS | 196 +- Makefile | 48 +- arch/arm/configs/n8x0_defconfig | 2 +- arch/arm/configs/omap3_beagle_defconfig | 1 - arch/arm/configs/u300_defconfig | 94 +- arch/arm/include/asm/bitops.h | 6 +- arch/arm/include/asm/cacheflush.h | 5 + arch/arm/include/asm/elf.h | 3 + arch/arm/include/asm/tlbflush.h | 3 +- arch/arm/kernel/entry-armv.S | 28 +- arch/arm/kernel/entry-header.S | 15 + arch/arm/kernel/process.c | 9 + arch/arm/kernel/signal.c | 41 +- arch/arm/kernel/signal.h | 4 +- arch/arm/kernel/time.c | 1 + arch/arm/kernel/traps.c | 80 +- arch/arm/kernel/unwind.c | 9 + arch/arm/mach-at91/at91sam9g45_devices.c | 2 +- arch/arm/mach-at91/include/mach/cpu.h | 9 + arch/arm/mach-bcmring/core.c | 4 +- arch/arm/mach-bcmring/include/mach/system.h | 2 +- arch/arm/mach-ep93xx/Kconfig | 44 +- arch/arm/mach-ep93xx/Makefile.boot | 9 + arch/arm/mach-ep93xx/clock.c | 166 +- arch/arm/mach-ep93xx/core.c | 32 +- arch/arm/mach-ep93xx/edb93xx.c | 31 +- arch/arm/mach-ep93xx/include/mach/ep93xx-regs.h | 42 +- arch/arm/mach-ep93xx/include/mach/gpio.h | 16 +- arch/arm/mach-ep93xx/include/mach/memory.h | 6 + arch/arm/mach-ep93xx/include/mach/platform.h | 5 +- arch/arm/mach-ep93xx/micro9.c | 132 +- arch/arm/mach-integrator/include/mach/memory.h | 1 + arch/arm/mach-integrator/pci_v3.c | 1 + arch/arm/mach-mx2/clock_imx27.c | 8 +- arch/arm/mach-mx2/pcm038.c | 96 +- arch/arm/mach-mx2/pcm970-baseboard.c | 2 +- arch/arm/mach-mx25/devices.c | 19 + arch/arm/mach-mx25/mx25pdk.c | 25 +- arch/arm/mach-mx3/clock-imx35.c | 2 +- arch/arm/mach-mx3/clock.c | 2 +- arch/arm/mach-mx3/devices.c | 24 +- arch/arm/mach-mx3/devices.h | 6 +- arch/arm/mach-mx3/mm.c | 2 + arch/arm/mach-omap1/board-ams-delta.c | 6 + arch/arm/mach-omap1/board-generic.c | 8 + arch/arm/mach-omap1/board-innovator.c | 20 + arch/arm/mach-omap1/board-palmte.c | 8 + arch/arm/mach-omap1/board-palmtt.c | 8 + arch/arm/mach-omap1/board-palmz71.c | 8 + arch/arm/mach-omap1/board-sx1.c | 8 + arch/arm/mach-omap1/board-voiceblue.c | 8 + arch/arm/mach-omap1/serial.c | 26 - arch/arm/mach-omap2/Kconfig | 12 + arch/arm/mach-omap2/board-3430sdp.c | 2 +- arch/arm/mach-omap2/board-4430sdp.c | 4 +- arch/arm/mach-omap2/board-ldp.c | 2 +- arch/arm/mach-omap2/board-omap3evm.c | 2 +- arch/arm/mach-omap2/board-omap3pandora.c | 2 +- arch/arm/mach-omap2/board-rx51-peripherals.c | 82 +- arch/arm/mach-omap2/board-rx51.c | 1 - arch/arm/mach-omap2/board-zoom2.c | 6 +- arch/arm/mach-omap2/clock24xx.c | 1 + arch/arm/mach-omap2/clock34xx.c | 35 + arch/arm/mach-omap2/clockdomain.c | 74 +- arch/arm/mach-omap2/io.c | 2 + arch/arm/mach-omap2/pm-debug.c | 4 +- arch/arm/mach-omap2/pm34xx.c | 188 +- arch/arm/mach-omap2/powerdomain.c | 39 +- arch/arm/mach-omap2/serial.c | 10 - arch/arm/mach-pxa/cm-x300.c | 38 +- arch/arm/mach-pxa/cpufreq-pxa2xx.c | 2 +- arch/arm/mach-pxa/csb726.c | 2 +- arch/arm/mach-pxa/spitz.c | 39 + arch/arm/mach-realview/core.h | 2 +- arch/arm/mach-realview/include/mach/board-pb1176.h | 5 + arch/arm/mach-realview/include/mach/board-pb11mp.h | 12 + arch/arm/mach-realview/include/mach/platform.h | 15 +- arch/arm/mach-realview/include/mach/system.h | 10 +- arch/arm/mach-realview/realview_pb1176.c | 11 + arch/arm/mach-realview/realview_pb11mp.c | 16 + arch/arm/mach-s3c2410/gpio.c | 1 + arch/arm/mach-s3c2410/include/mach/dma.h | 7 + arch/arm/mach-s3c2440/Kconfig | 1 + arch/arm/mach-s3c2440/mach-mini2440.c | 4 +- arch/arm/mach-s3c6400/include/mach/dma.h | 5 + arch/arm/mach-sa1100/Makefile | 1 + arch/arm/mm/Kconfig | 5 +- arch/arm/mm/cache-v6.S | 20 +- arch/arm/mm/cache-v7.S | 19 +- arch/arm/mm/context.c | 5 +- arch/arm/mm/dma-mapping.c | 4 +- arch/arm/mm/fault-armv.c | 9 +- arch/arm/mm/fault.c | 5 + arch/arm/mm/flush.c | 31 +- arch/arm/mm/highmem.c | 2 + arch/arm/mm/init.c | 22 +- arch/arm/mm/mmu.c | 7 + arch/arm/mm/proc-v6.S | 7 +- arch/arm/mm/proc-v7.S | 7 +- arch/arm/oprofile/op_model_v6.c | 3 + arch/arm/plat-omap/dma.c | 33 +- arch/arm/plat-omap/include/mach/cpu.h | 37 +- arch/arm/plat-omap/include/mach/keypad.h | 5 +- arch/arm/plat-omap/include/mach/powerdomain.h | 2 + arch/arm/plat-omap/iommu.c | 2 +- arch/arm/plat-omap/iovmm.c | 9 +- arch/arm/plat-omap/mcbsp.c | 2 +- arch/arm/plat-omap/sram.c | 3 +- arch/arm/plat-s3c24xx/adc.c | 3 +- arch/arm/plat-s3c24xx/cpu.c | 10 + arch/arm/plat-s3c24xx/dma.c | 6 +- arch/arm/plat-s3c24xx/gpio.c | 1 + arch/arm/plat-s3c24xx/include/plat/cpu-freq-core.h | 9 +- arch/arm/plat-s3c24xx/include/plat/s3c2410.h | 1 + arch/arm/plat-s3c64xx/include/plat/regs-clock.h | 4 +- arch/arm/plat-s3c64xx/s3c6400-clock.c | 3 + arch/avr32/mach-at32ap/include/mach/cpu.h | 3 + arch/blackfin/ADI_BSD.txt | 41 + arch/blackfin/Kconfig | 13 +- arch/blackfin/include/asm/atomic.h | 6 + arch/blackfin/include/asm/bfin-global.h | 26 +- arch/blackfin/include/asm/bfin5xx_spi.h | 2 - arch/blackfin/include/asm/bfin_rotary.h | 4 + arch/blackfin/include/asm/bfin_simple_timer.h | 6 + arch/blackfin/include/asm/bitops.h | 6 + arch/blackfin/include/asm/blackfin.h | 5 +- arch/blackfin/include/asm/bug.h | 6 + arch/blackfin/include/asm/byteorder.h | 5 - arch/blackfin/include/asm/cache.h | 9 +- arch/blackfin/include/asm/cacheflush.h | 27 +- arch/blackfin/include/asm/cdef_LPBlackfin.h | 32 +- arch/blackfin/include/asm/checksum.h | 9 +- arch/blackfin/include/asm/clocks.h | 27 +- arch/blackfin/include/asm/context.S | 27 +- arch/blackfin/include/asm/cplb.h | 27 +- arch/blackfin/include/asm/cplbinit.h | 27 +- arch/blackfin/include/asm/cpu.h | 21 +- arch/blackfin/include/asm/def_LPBlackfin.h | 36 +- arch/blackfin/include/asm/dma-mapping.h | 6 + arch/blackfin/include/asm/dpmc.h | 6 +- arch/blackfin/include/asm/early_printk.h | 22 +- arch/blackfin/include/asm/elf.h | 6 +- arch/blackfin/include/asm/entry.h | 6 + arch/blackfin/include/asm/fcntl.h | 6 + arch/blackfin/include/asm/fixed_code.h | 10 +- arch/blackfin/include/asm/flat.h | 5 +- arch/blackfin/include/asm/gpio.h | 27 +- arch/blackfin/include/asm/hardirq.h | 6 + arch/blackfin/include/asm/io.h | 6 + arch/blackfin/include/asm/irq.h | 19 +- arch/blackfin/include/asm/irq_handler.h | 6 + arch/blackfin/include/asm/l1layout.h | 5 +- arch/blackfin/include/asm/linkage.h | 6 + arch/blackfin/include/asm/mmu.h | 9 +- arch/blackfin/include/asm/mmu_context.h | 27 +- arch/blackfin/include/asm/module.h | 6 + arch/blackfin/include/asm/mutex.h | 4 + arch/blackfin/include/asm/nand.h | 12 +- arch/blackfin/include/asm/page.h | 6 + arch/blackfin/include/asm/page_offset.h | 9 +- arch/blackfin/include/asm/pda.h | 21 +- arch/blackfin/include/asm/pgtable.h | 12 + arch/blackfin/include/asm/poll.h | 7 + arch/blackfin/include/asm/portmux.h | 5 +- arch/blackfin/include/asm/posix_types.h | 6 + arch/blackfin/include/asm/processor.h | 6 + arch/blackfin/include/asm/ptrace.h | 6 + arch/blackfin/include/asm/sections.h | 6 + arch/blackfin/include/asm/segment.h | 6 + arch/blackfin/include/asm/sigcontext.h | 6 + arch/blackfin/include/asm/siginfo.h | 6 + arch/blackfin/include/asm/smp.h | 21 +- arch/blackfin/include/asm/spinlock.h | 6 + arch/blackfin/include/asm/spinlock_types.h | 6 + arch/blackfin/include/asm/stat.h | 6 + arch/blackfin/include/asm/string.h | 6 + arch/blackfin/include/asm/swab.h | 6 + arch/blackfin/include/asm/system.h | 32 +- arch/blackfin/include/asm/thread_info.h | 24 +- arch/blackfin/include/asm/tlb.h | 6 + arch/blackfin/include/asm/trace.h | 5 +- arch/blackfin/include/asm/traps.h | 13 +- arch/blackfin/include/asm/uaccess.h | 5 +- arch/blackfin/include/asm/unistd.h | 6 + arch/blackfin/kernel/asm-offsets.c | 27 +- arch/blackfin/kernel/bfin_dma_5xx.c | 1 + arch/blackfin/kernel/bfin_gpio.c | 27 +- arch/blackfin/kernel/cplb-mpu/cplbinit.c | 20 +- arch/blackfin/kernel/cplb-mpu/cplbmgr.c | 19 +- arch/blackfin/kernel/cplb-nompu/cplbinit.c | 19 +- arch/blackfin/kernel/cplb-nompu/cplbmgr.c | 16 +- arch/blackfin/kernel/cplbinfo.c | 26 +- arch/blackfin/kernel/dma-mapping.c | 27 +- arch/blackfin/kernel/early_printk.c | 23 +- arch/blackfin/kernel/entry.S | 27 +- arch/blackfin/kernel/fixed_code.S | 5 + arch/blackfin/kernel/flat.c | 18 +- arch/blackfin/kernel/init_task.c | 27 +- arch/blackfin/kernel/irqchip.c | 27 +- arch/blackfin/kernel/module.c | 27 +- arch/blackfin/kernel/process.c | 27 +- arch/blackfin/kernel/ptrace.c | 28 +- arch/blackfin/kernel/setup.c | 6 +- arch/blackfin/kernel/shadow_console.c | 2 - arch/blackfin/kernel/signal.c | 27 +- arch/blackfin/kernel/sys_bfin.c | 41 +- arch/blackfin/kernel/time-ts.c | 10 +- arch/blackfin/kernel/time.c | 64 +- arch/blackfin/kernel/traps.c | 27 +- arch/blackfin/kernel/vmlinux.lds.S | 27 +- arch/blackfin/lib/ashldi3.c | 27 +- arch/blackfin/lib/ashrdi3.c | 27 +- arch/blackfin/lib/checksum.c | 30 +- arch/blackfin/lib/divsi3.S | 28 +- arch/blackfin/lib/gcclib.h | 27 +- arch/blackfin/lib/lshrdi3.c | 27 +- arch/blackfin/lib/memchr.S | 27 +- arch/blackfin/lib/memcmp.S | 27 +- arch/blackfin/lib/memcpy.S | 37 +- arch/blackfin/lib/memmove.S | 27 +- arch/blackfin/lib/memset.S | 27 +- arch/blackfin/lib/modsi3.S | 36 +- arch/blackfin/lib/muldi3.S | 6 + arch/blackfin/lib/outs.S | 29 +- arch/blackfin/lib/smulsi3_highpart.S | 6 + arch/blackfin/lib/udivsi3.S | 27 +- arch/blackfin/lib/umodsi3.S | 27 +- arch/blackfin/lib/umulsi3_highpart.S | 6 + arch/blackfin/mach-bf518/boards/ezbrd.c | 45 +- arch/blackfin/mach-bf518/dma.c | 28 +- arch/blackfin/mach-bf518/include/mach/bf518.h | 27 +- .../mach-bf518/include/mach/bfin_serial_5xx.h | 29 +- arch/blackfin/mach-bf518/include/mach/blackfin.h | 29 +- arch/blackfin/mach-bf518/include/mach/cdefBF512.h | 29 +- arch/blackfin/mach-bf518/include/mach/cdefBF514.h | 29 +- arch/blackfin/mach-bf518/include/mach/cdefBF516.h | 29 +- arch/blackfin/mach-bf518/include/mach/cdefBF518.h | 70 +- .../mach-bf518/include/mach/cdefBF51x_base.h | 28 +- arch/blackfin/mach-bf518/include/mach/defBF512.h | 28 +- arch/blackfin/mach-bf518/include/mach/defBF514.h | 28 +- arch/blackfin/mach-bf518/include/mach/defBF516.h | 28 +- arch/blackfin/mach-bf518/include/mach/defBF518.h | 56 +- .../mach-bf518/include/mach/defBF51x_base.h | 28 +- arch/blackfin/mach-bf518/include/mach/gpio.h | 3 - arch/blackfin/mach-bf518/include/mach/irq.h | 29 +- arch/blackfin/mach-bf518/include/mach/portmux.h | 6 + arch/blackfin/mach-bf518/ints-priority.c | 27 +- arch/blackfin/mach-bf527/boards/cm_bf527.c | 61 +- arch/blackfin/mach-bf527/boards/ezbrd.c | 45 +- arch/blackfin/mach-bf527/boards/ezkit.c | 60 +- arch/blackfin/mach-bf527/dma.c | 28 +- arch/blackfin/mach-bf527/include/mach/bf527.h | 27 +- .../mach-bf527/include/mach/bfin_serial_5xx.h | 29 +- arch/blackfin/mach-bf527/include/mach/blackfin.h | 29 +- arch/blackfin/mach-bf527/include/mach/cdefBF522.h | 29 +- arch/blackfin/mach-bf527/include/mach/cdefBF525.h | 29 +- arch/blackfin/mach-bf527/include/mach/cdefBF527.h | 29 +- .../mach-bf527/include/mach/cdefBF52x_base.h | 28 +- arch/blackfin/mach-bf527/include/mach/defBF522.h | 28 +- arch/blackfin/mach-bf527/include/mach/defBF525.h | 28 +- arch/blackfin/mach-bf527/include/mach/defBF527.h | 28 +- .../mach-bf527/include/mach/defBF52x_base.h | 28 +- arch/blackfin/mach-bf527/include/mach/gpio.h | 3 - arch/blackfin/mach-bf527/include/mach/irq.h | 29 +- arch/blackfin/mach-bf527/include/mach/portmux.h | 6 + arch/blackfin/mach-bf527/ints-priority.c | 27 +- arch/blackfin/mach-bf533/boards/H8606.c | 33 +- arch/blackfin/mach-bf533/boards/blackstamp.c | 29 +- arch/blackfin/mach-bf533/boards/cm_bf533.c | 45 +- arch/blackfin/mach-bf533/boards/ezkit.c | 132 +- arch/blackfin/mach-bf533/boards/ip0x.c | 37 +- arch/blackfin/mach-bf533/boards/stamp.c | 60 +- arch/blackfin/mach-bf533/dma.c | 28 +- arch/blackfin/mach-bf533/include/mach/bf533.h | 27 +- .../mach-bf533/include/mach/bfin_serial_5xx.h | 29 +- arch/blackfin/mach-bf533/include/mach/blackfin.h | 28 +- arch/blackfin/mach-bf533/include/mach/cdefBF532.h | 28 +- arch/blackfin/mach-bf533/include/mach/defBF532.h | 44 +- arch/blackfin/mach-bf533/include/mach/gpio.h | 3 - arch/blackfin/mach-bf533/include/mach/irq.h | 28 +- arch/blackfin/mach-bf533/include/mach/portmux.h | 6 + arch/blackfin/mach-bf533/ints-priority.c | 27 +- arch/blackfin/mach-bf537/boards/cm_bf537e.c | 46 +- arch/blackfin/mach-bf537/boards/cm_bf537u.c | 46 +- arch/blackfin/mach-bf537/boards/minotaur.c | 6 + arch/blackfin/mach-bf537/boards/pnav10.c | 31 +- arch/blackfin/mach-bf537/boards/stamp.c | 60 +- arch/blackfin/mach-bf537/boards/tcm_bf537.c | 46 +- arch/blackfin/mach-bf537/dma.c | 28 +- arch/blackfin/mach-bf537/include/mach/bf537.h | 27 +- .../mach-bf537/include/mach/bfin_serial_5xx.h | 29 +- arch/blackfin/mach-bf537/include/mach/blackfin.h | 29 +- arch/blackfin/mach-bf537/include/mach/cdefBF534.h | 29 +- arch/blackfin/mach-bf537/include/mach/cdefBF537.h | 29 +- arch/blackfin/mach-bf537/include/mach/defBF534.h | 28 +- arch/blackfin/mach-bf537/include/mach/defBF537.h | 29 +- arch/blackfin/mach-bf537/include/mach/gpio.h | 3 - arch/blackfin/mach-bf537/include/mach/irq.h | 29 +- arch/blackfin/mach-bf537/include/mach/portmux.h | 6 + arch/blackfin/mach-bf537/ints-priority.c | 27 +- arch/blackfin/mach-bf538/boards/ezkit.c | 46 +- arch/blackfin/mach-bf538/dma.c | 28 +- arch/blackfin/mach-bf538/include/mach/bf538.h | 27 +- .../mach-bf538/include/mach/bfin_serial_5xx.h | 29 +- arch/blackfin/mach-bf538/include/mach/blackfin.h | 29 +- arch/blackfin/mach-bf538/include/mach/cdefBF538.h | 28 +- arch/blackfin/mach-bf538/include/mach/defBF539.h | 44 +- arch/blackfin/mach-bf538/include/mach/gpio.h | 3 - arch/blackfin/mach-bf538/include/mach/irq.h | 29 +- arch/blackfin/mach-bf538/include/mach/portmux.h | 6 + arch/blackfin/mach-bf538/ints-priority.c | 27 +- arch/blackfin/mach-bf548/boards/cm_bf548.c | 48 +- arch/blackfin/mach-bf548/boards/ezkit.c | 49 +- arch/blackfin/mach-bf548/dma.c | 27 +- arch/blackfin/mach-bf548/include/mach/bf548.h | 27 +- .../blackfin/mach-bf548/include/mach/bf54x-lq043.h | 6 + arch/blackfin/mach-bf548/include/mach/bf54x_keys.h | 6 + .../mach-bf548/include/mach/bfin_serial_5xx.h | 29 +- arch/blackfin/mach-bf548/include/mach/blackfin.h | 29 +- arch/blackfin/mach-bf548/include/mach/cdefBF542.h | 28 +- arch/blackfin/mach-bf548/include/mach/cdefBF544.h | 28 +- arch/blackfin/mach-bf548/include/mach/cdefBF547.h | 28 +- arch/blackfin/mach-bf548/include/mach/cdefBF548.h | 28 +- arch/blackfin/mach-bf548/include/mach/cdefBF549.h | 28 +- .../mach-bf548/include/mach/cdefBF54x_base.h | 28 +- arch/blackfin/mach-bf548/include/mach/defBF542.h | 28 +- arch/blackfin/mach-bf548/include/mach/defBF544.h | 28 +- arch/blackfin/mach-bf548/include/mach/defBF547.h | 28 +- arch/blackfin/mach-bf548/include/mach/defBF548.h | 28 +- arch/blackfin/mach-bf548/include/mach/defBF549.h | 28 +- .../mach-bf548/include/mach/defBF54x_base.h | 28 +- arch/blackfin/mach-bf548/include/mach/gpio.h | 30 +- arch/blackfin/mach-bf548/include/mach/irq.h | 29 +- arch/blackfin/mach-bf548/include/mach/portmux.h | 6 + arch/blackfin/mach-bf548/ints-priority.c | 27 +- arch/blackfin/mach-bf561/atomic.S | 21 +- arch/blackfin/mach-bf561/boards/cm_bf561.c | 45 +- arch/blackfin/mach-bf561/boards/ezkit.c | 44 +- arch/blackfin/mach-bf561/boards/tepla.c | 14 +- arch/blackfin/mach-bf561/dma.c | 28 +- arch/blackfin/mach-bf561/include/mach/bf561.h | 27 +- .../mach-bf561/include/mach/bfin_serial_5xx.h | 29 +- arch/blackfin/mach-bf561/include/mach/blackfin.h | 28 +- arch/blackfin/mach-bf561/include/mach/cdefBF561.h | 28 +- arch/blackfin/mach-bf561/include/mach/defBF561.h | 29 +- arch/blackfin/mach-bf561/include/mach/gpio.h | 3 - arch/blackfin/mach-bf561/include/mach/irq.h | 29 +- arch/blackfin/mach-bf561/include/mach/portmux.h | 6 + arch/blackfin/mach-bf561/include/mach/smp.h | 6 + arch/blackfin/mach-bf561/ints-priority.c | 27 +- arch/blackfin/mach-bf561/secondary.S | 24 +- arch/blackfin/mach-bf561/smp.c | 21 +- arch/blackfin/mach-common/arch_checks.c | 27 +- arch/blackfin/mach-common/cache-c.c | 2 - arch/blackfin/mach-common/cache.S | 2 - arch/blackfin/mach-common/cpufreq.c | 27 +- arch/blackfin/mach-common/entry.S | 31 +- arch/blackfin/mach-common/head.S | 2 - arch/blackfin/mach-common/interrupt.S | 30 +- arch/blackfin/mach-common/ints-priority.c | 35 +- arch/blackfin/mach-common/irqpanic.c | 27 +- arch/blackfin/mach-common/pm.c | 34 +- arch/blackfin/mach-common/smp.c | 22 +- arch/blackfin/mm/blackfin_sram.h | 27 +- arch/blackfin/mm/init.c | 27 +- arch/blackfin/mm/isram-driver.c | 14 +- arch/blackfin/mm/sram-alloc.c | 27 +- arch/frv/kernel/signal.c | 2 +- arch/ia64/include/asm/spinlock.h | 62 +- arch/ia64/include/asm/spinlock_types.h | 2 +- arch/ia64/kernel/mca.c | 104 +- arch/ia64/kernel/unaligned.c | 6 +- arch/ia64/mm/tlb.c | 24 +- arch/ia64/pci/pci.c | 9 +- arch/ia64/sn/kernel/io_common.c | 8 +- arch/ia64/sn/kernel/sn2/sn_hwperf.c | 7 +- arch/m32r/kernel/smp.c | 1 + arch/m68k/Kconfig | 6 +- arch/m68knommu/kernel/asm-offsets.c | 28 +- arch/m68knommu/kernel/entry.S | 6 +- arch/m68knommu/mm/init.c | 2 +- arch/m68knommu/platform/5206e/config.c | 1 - arch/m68knommu/platform/68328/entry.S | 32 +- arch/m68knommu/platform/68360/entry.S | 16 +- arch/m68knommu/platform/coldfire/entry.S | 20 +- arch/microblaze/kernel/entry.S | 2 + arch/microblaze/kernel/hw_exception_handler.S | 2 +- arch/microblaze/kernel/process.c | 2 + arch/mips/Kconfig | 4 +- arch/mips/alchemy/common/irq.c | 34 +- arch/mips/alchemy/mtx-1/board_setup.c | 3 +- arch/mips/ar7/platform.c | 9 +- arch/mips/bcm63xx/Makefile | 2 +- arch/mips/bcm63xx/boards/board_bcm963xx.c | 3 - arch/mips/bcm63xx/cpu.c | 3 + arch/mips/bcm63xx/dev-uart.c | 2 +- arch/mips/bcm63xx/dev-wdt.c | 37 + arch/mips/bcm63xx/setup.c | 4 +- arch/mips/cavium-octeon/octeon-irq.c | 224 ++- arch/mips/cavium-octeon/smp.c | 5 +- arch/mips/include/asm/fixmap.h | 4 +- arch/mips/include/asm/gcmpregs.h | 18 +- arch/mips/include/asm/gic.h | 188 +- arch/mips/include/asm/mach-ar7/ar7.h | 3 + arch/mips/include/asm/mach-au1x00/gpio-au1000.h | 2 + .../include/asm/mach-bcm63xx/bcm63xx_dev_uart.h | 6 - arch/mips/include/asm/mach-ip27/topology.h | 4 +- .../asm/mach-loongson/cpu-feature-overrides.h | 3 +- arch/mips/include/asm/mmu_context.h | 13 +- arch/mips/include/asm/setup.h | 2 +- arch/mips/include/asm/smtc_ipi.h | 1 + arch/mips/include/asm/spram.h | 10 + arch/mips/include/asm/thread_info.h | 9 +- arch/mips/jazz/irq.c | 2 +- arch/mips/kernel/cevt-bcm1480.c | 2 +- arch/mips/kernel/cevt-ds1287.c | 2 +- arch/mips/kernel/cevt-gt641xx.c | 2 +- arch/mips/kernel/cevt-r4k.c | 2 +- arch/mips/kernel/cevt-sb1250.c | 2 +- arch/mips/kernel/cevt-txx9.c | 2 +- arch/mips/kernel/cpu-probe.c | 8 +- arch/mips/kernel/head.S | 1 + arch/mips/kernel/i8253.c | 2 +- arch/mips/kernel/irq-gic.c | 114 +- arch/mips/kernel/linux32.c | 6 + arch/mips/kernel/scall64-o32.S | 4 +- arch/mips/kernel/smtc.c | 34 +- arch/mips/kernel/spram.c | 5 +- arch/mips/kernel/vpe.c | 2 - arch/mips/loongson/common/irq.c | 1 - arch/mips/math-emu/dp_simple.c | 13 +- arch/mips/math-emu/sp_simple.c | 11 +- arch/mips/mm/init.c | 6 +- arch/mips/mti-malta/malta-amon.c | 7 +- arch/mips/mti-malta/malta-int.c | 119 +- arch/mips/mti-malta/malta-pci.c | 27 +- arch/mips/nxp/pnx8550/common/int.c | 2 +- arch/mips/nxp/pnx8550/common/time.c | 4 +- arch/mips/oprofile/op_model_loongson2.c | 2 +- arch/mips/sgi-ip27/ip27-timer.c | 2 +- arch/mips/sni/time.c | 2 +- arch/mips/txx9/generic/setup.c | 5 +- arch/parisc/Kconfig | 1 + arch/parisc/include/asm/fixmap.h | 4 +- arch/parisc/include/asm/hardirq.h | 20 +- arch/parisc/include/asm/ptrace.h | 5 +- arch/parisc/include/asm/syscall.h | 40 + arch/parisc/include/asm/thread_info.h | 14 +- arch/parisc/kernel/asm-offsets.c | 4 +- arch/parisc/kernel/entry.S | 21 +- arch/parisc/kernel/irq.c | 5 - arch/parisc/kernel/module.c | 2 +- arch/parisc/kernel/ptrace.c | 42 +- arch/parisc/kernel/signal.c | 5 +- arch/parisc/kernel/syscall.S | 22 +- arch/parisc/kernel/vmlinux.lds.S | 10 + arch/parisc/mm/init.c | 11 +- arch/powerpc/boot/dts/cm5200.dts | 1 - arch/powerpc/boot/dts/digsy_mtc.dts | 1 - arch/powerpc/boot/dts/lite5200.dts | 2 - arch/powerpc/boot/dts/lite5200b.dts | 2 - arch/powerpc/boot/dts/media5200.dts | 2 - arch/powerpc/boot/dts/motionpro.dts | 1 - arch/powerpc/boot/dts/mpc5121ads.dts | 3 - arch/powerpc/boot/dts/mucmc52.dts | 332 ++ arch/powerpc/boot/dts/pcm030.dts | 2 - arch/powerpc/boot/dts/pcm032.dts | 2 - arch/powerpc/boot/dts/tqm5200.dts | 1 - arch/powerpc/boot/dts/uc101.dts | 284 ++ arch/powerpc/configs/52xx/cm5200_defconfig | 136 +- arch/powerpc/configs/52xx/lite5200b_defconfig | 153 +- arch/powerpc/configs/52xx/motionpro_defconfig | 146 +- arch/powerpc/configs/52xx/pcm030_defconfig | 142 +- arch/powerpc/configs/52xx/tqm5200_defconfig | 148 +- arch/powerpc/configs/mpc5200_defconfig | 192 +- arch/powerpc/configs/ppc64e_defconfig | 2199 +++++++++++++ arch/powerpc/include/asm/firmware.h | 10 +- arch/powerpc/kernel/cputable.c | 2 + arch/powerpc/kernel/entry_64.S | 44 +- arch/powerpc/kernel/kgdb.c | 6 - arch/powerpc/kernel/pci-common.c | 2 +- arch/powerpc/kernel/pci_64.c | 2 + arch/powerpc/kernel/perf_event.c | 17 +- arch/powerpc/kernel/process.c | 12 +- arch/powerpc/kernel/setup_64.c | 1 - arch/powerpc/kernel/vdso.c | 11 +- arch/powerpc/kernel/vdso32/vdso32.lds.S | 4 +- arch/powerpc/kernel/vmlinux.lds.S | 1 + arch/powerpc/mm/slb_low.S | 10 +- arch/powerpc/platforms/52xx/mpc5200_simple.c | 2 + arch/powerpc/platforms/cell/axon_msi.c | 2 +- arch/powerpc/platforms/iseries/Makefile | 11 +- arch/powerpc/platforms/iseries/dt.c | 56 +- arch/powerpc/platforms/powermac/low_i2c.c | 7 +- arch/powerpc/platforms/pseries/firmware.c | 3 +- arch/powerpc/xmon/xmon.c | 20 +- arch/s390/hypfs/hypfs_diag.c | 2 +- arch/s390/include/asm/cputime.h | 6 +- arch/s390/include/asm/delay.h | 7 +- arch/s390/include/asm/elf.h | 12 + arch/s390/include/asm/ptrace.h | 4 + arch/s390/include/asm/ucontext.h | 15 + arch/s390/kernel/compat_signal.c | 35 +- arch/s390/kernel/compat_wrapper.S | 2 +- arch/s390/kernel/ftrace.c | 3 - arch/s390/kernel/ipl.c | 7 +- arch/s390/kernel/module.c | 3 + arch/s390/kernel/processor.c | 6 +- arch/s390/kernel/ptrace.c | 70 + arch/s390/kernel/setup.c | 15 +- arch/s390/kernel/smp.c | 7 +- arch/s390/kernel/swsusp_asm64.S | 28 +- arch/s390/kernel/vdso.c | 16 +- arch/s390/kernel/vmlinux.lds.S | 1 + arch/s390/kvm/kvm-s390.h | 2 +- arch/s390/lib/delay.c | 27 +- arch/s390/lib/uaccess_mvcos.c | 12 +- arch/s390/lib/uaccess_std.c | 14 +- arch/s390/mm/pgtable.c | 10 +- arch/sh/Kconfig | 6 +- arch/sh/Makefile | 3 +- arch/sh/boards/board-magicpanelr2.c | 2 - arch/sh/boards/mach-dreamcast/setup.c | 2 - arch/sh/boards/mach-ecovec24/setup.c | 63 +- arch/sh/boards/mach-landisk/gio.c | 10 +- arch/sh/boards/mach-rsk/devices-rsk7203.c | 4 - arch/sh/boards/mach-rsk/setup.c | 23 +- arch/sh/boot/Makefile | 6 +- arch/sh/kernel/cpu/sh3/entry.S | 2 - arch/sh/kernel/dwarf.c | 22 + arch/sh/kernel/entry-common.S | 2 +- arch/sh/kernel/ftrace.c | 37 +- arch/sh/kernel/io_generic.c | 3 + arch/sh/kernel/irq.c | 3 +- arch/sh/kernel/machvec.c | 3 + arch/sh/kernel/setup.c | 2 + arch/sh/kernel/sh_ksyms_32.c | 15 + arch/sh/kernel/signal_32.c | 9 +- arch/sh/kernel/smp.c | 2 + arch/sh/kernel/traps_32.c | 11 +- arch/sh/mm/Kconfig | 2 +- arch/sh/mm/cache-sh4.c | 24 +- arch/sh/mm/cache-sh7705.c | 4 +- arch/sh/mm/cache.c | 12 +- arch/sh/mm/ioremap_32.c | 2 +- arch/sh/mm/pmb.c | 37 +- arch/sparc/Kconfig | 2 + arch/sparc/include/asm/hardirq_32.h | 12 +- arch/sparc/include/asm/irq_32.h | 4 +- arch/sparc/include/asm/pgtable_64.h | 4 +- arch/sparc/kernel/ktlb.S | 8 +- arch/sparc/kernel/ldc.c | 4 +- arch/sparc/kernel/perf_event.c | 579 ++++- arch/sparc/mm/init_64.c | 2 +- arch/sparc/oprofile/init.c | 1 + arch/um/drivers/line.c | 1 + arch/um/drivers/port_kern.c | 1 + arch/um/kernel/irq.c | 1 + arch/x86/Kconfig | 19 +- arch/x86/Kconfig.cpu | 3 +- arch/x86/Makefile | 1 - arch/x86/boot/setup.ld | 3 + arch/x86/crypto/aesni-intel_glue.c | 10 +- arch/x86/ia32/ia32entry.S | 41 +- arch/x86/include/asm/kvm_host.h | 1 + arch/x86/include/asm/mce.h | 2 + arch/x86/include/asm/paravirt.h | 28 +- arch/x86/include/asm/paravirt_types.h | 10 +- arch/x86/include/asm/topology.h | 1 + arch/x86/include/asm/uv/uv_hub.h | 23 +- arch/x86/kernel/acpi/realmode/wakeup.lds.S | 3 + arch/x86/kernel/apic/x2apic_uv_x.c | 8 +- arch/x86/kernel/cpu/mcheck/mce.c | 61 +- arch/x86/kernel/cpu/mcheck/mce_intel.c | 1 + arch/x86/kernel/cpu/mtrr/if.c | 17 +- arch/x86/kernel/crash_dump_32.c | 19 + arch/x86/kernel/e820.c | 4 +- arch/x86/kernel/early_printk.c | 5 +- arch/x86/kernel/efi.c | 2 + arch/x86/kernel/i386_ksyms_32.c | 2 + arch/x86/kernel/irq.c | 4 +- arch/x86/kernel/pci-dma.c | 4 +- arch/x86/kernel/pci-gart_64.c | 1 + arch/x86/kernel/reboot.c | 1 + arch/x86/kernel/time.c | 3 +- arch/x86/kernel/tlb_uv.c | 9 +- arch/x86/kernel/trampoline.c | 12 +- arch/x86/kernel/trampoline_64.S | 4 + arch/x86/kernel/vmi_32.c | 2 +- arch/x86/kernel/vmlinux.lds.S | 3 + arch/x86/kvm/i8254.c | 2 +- arch/x86/kvm/lapic.c | 4 +- arch/x86/kvm/mmu.c | 86 +- arch/x86/kvm/paging_tmpl.h | 18 +- arch/x86/kvm/svm.c | 25 +- arch/x86/kvm/vmx.c | 2 +- arch/x86/kvm/x86.c | 2 + arch/x86/lib/Makefile | 6 +- arch/x86/xen/enlighten.c | 3 +- arch/xtensa/kernel/time.c | 1 + block/blk-core.c | 18 +- block/blk-merge.c | 2 +- block/blk-settings.c | 2 +- block/blk-tag.c | 2 +- block/cfq-iosched.c | 259 +- block/elevator.c | 4 +- block/genhd.c | 4 +- crypto/aead.c | 1 + crypto/async_tx/async_pq.c | 60 +- crypto/async_tx/async_raid6_recov.c | 100 +- crypto/async_tx/async_xor.c | 18 +- drivers/acpi/Kconfig | 4 +- drivers/acpi/ac.c | 1 + drivers/acpi/button.c | 3 + drivers/acpi/pci_root.c | 11 + drivers/acpi/video.c | 7 +- drivers/acpi/video_detect.c | 2 +- drivers/ata/ahci.c | 201 +- drivers/ata/libata-acpi.c | 40 +- drivers/ata/libata-core.c | 15 +- drivers/ata/libata-eh.c | 56 +- drivers/ata/libata.h | 2 + drivers/ata/pata_ali.c | 2 +- drivers/ata/pata_atiixp.c | 2 +- drivers/ata/pata_atp867x.c | 101 +- drivers/ata/pata_sc1200.c | 3 +- drivers/ata/pata_via.c | 2 +- drivers/ata/sata_mv.c | 29 +- drivers/ata/sata_nv.c | 18 +- drivers/base/bus.c | 17 +- drivers/base/driver.c | 2 +- drivers/base/platform.c | 6 +- drivers/base/power/main.c | 1 + drivers/base/power/runtime.c | 4 - drivers/block/cciss.c | 79 +- drivers/block/loop.c | 2 +- drivers/block/virtio_blk.c | 39 +- drivers/char/Kconfig | 6 +- drivers/char/agp/parisc-agp.c | 2 +- drivers/char/applicom.c | 1 + drivers/char/epca.c | 1 + drivers/char/generic_serial.c | 1 + drivers/char/genrtc.c | 1 + drivers/char/hw_random/virtio-rng.c | 3 +- drivers/char/istallion.c | 1 + drivers/char/nozomi.c | 1 + drivers/char/pty.c | 1 + drivers/char/rio/riocmd.c | 1 + drivers/char/rio/rioctrl.c | 1 + drivers/char/rio/riotty.c | 1 + drivers/char/rtc.c | 1 + drivers/char/ser_a2232.c | 1 + drivers/char/sonypi.c | 1 + drivers/char/stallion.c | 1 + drivers/char/tlclk.c | 1 + drivers/char/tpm/tpm.c | 3 +- drivers/char/tty_buffer.c | 31 +- drivers/char/virtio_console.c | 1 - drivers/char/vt_ioctl.c | 2 +- drivers/connector/cn_proc.c | 3 +- drivers/cpuidle/cpuidle.c | 5 +- drivers/crypto/padlock-sha.c | 14 +- drivers/edac/Kconfig | 14 +- drivers/edac/Makefile | 5 +- drivers/edac/amd64_edac.c | 100 +- drivers/edac/amd64_edac.h | 23 +- drivers/edac/amd64_edac_inj.c | 49 +- drivers/edac/edac_mce_amd.c | 32 +- drivers/edac/i5000_edac.c | 7 +- drivers/edac/i5400_edac.c | 89 +- drivers/edac/mpc85xx_edac.c | 2 + drivers/firewire/sbp2.c | 39 +- drivers/firmware/iscsi_ibft.c | 2 +- drivers/firmware/iscsi_ibft_find.c | 4 +- drivers/gpio/twl4030-gpio.c | 5 +- drivers/gpu/drm/drm_crtc.c | 2 - drivers/gpu/drm/drm_edid.c | 15 + drivers/gpu/drm/drm_fb_helper.c | 154 +- drivers/gpu/drm/i915/i915_dma.c | 1 + drivers/gpu/drm/i915/i915_drv.c | 5 +- drivers/gpu/drm/i915/i915_drv.h | 4 +- drivers/gpu/drm/i915/i915_gem.c | 10 +- drivers/gpu/drm/i915/i915_irq.c | 10 + drivers/gpu/drm/i915/i915_trace.h | 49 +- drivers/gpu/drm/i915/intel_display.c | 15 +- drivers/gpu/drm/i915/intel_drv.h | 2 + drivers/gpu/drm/i915/intel_fb.c | 10 +- drivers/gpu/drm/i915/intel_hdmi.c | 2 +- drivers/gpu/drm/i915/intel_lvds.c | 25 +- drivers/gpu/drm/i915/intel_tv.c | 3 +- drivers/gpu/drm/radeon/atombios_crtc.c | 1 + drivers/gpu/drm/radeon/r100.c | 432 ++- drivers/gpu/drm/radeon/r100d.h | 145 +- drivers/gpu/drm/radeon/r200.c | 3 +- drivers/gpu/drm/radeon/r300.c | 308 ++- drivers/gpu/drm/radeon/r300d.h | 205 ++ drivers/gpu/drm/radeon/r420.c | 6 +- drivers/gpu/drm/radeon/r420d.h | 24 +- drivers/gpu/drm/radeon/r520.c | 3 +- drivers/gpu/drm/radeon/r600.c | 314 +- drivers/gpu/drm/radeon/r600_blit.c | 10 +- drivers/gpu/drm/radeon/r600_blit_kms.c | 3 +- drivers/gpu/drm/radeon/r600_cs.c | 2 +- drivers/gpu/drm/radeon/r600d.h | 1 + drivers/gpu/drm/radeon/radeon.h | 58 +- drivers/gpu/drm/radeon/radeon_asic.h | 253 +-- drivers/gpu/drm/radeon/radeon_bios.c | 49 +- drivers/gpu/drm/radeon/radeon_clocks.c | 8 +- drivers/gpu/drm/radeon/radeon_device.c | 244 +-- drivers/gpu/drm/radeon/radeon_display.c | 45 +- drivers/gpu/drm/radeon/radeon_encoders.c | 6 +- drivers/gpu/drm/radeon/radeon_fb.c | 18 +- drivers/gpu/drm/radeon/radeon_irq_kms.c | 6 +- drivers/gpu/drm/radeon/radeon_legacy_crtc.c | 1 + drivers/gpu/drm/radeon/radeon_legacy_encoders.c | 9 +- drivers/gpu/drm/radeon/radeon_mode.h | 2 + drivers/gpu/drm/radeon/radeon_object.c | 17 +- drivers/gpu/drm/radeon/rs100d.h | 40 + drivers/gpu/drm/radeon/rs400.c | 275 ++- drivers/gpu/drm/radeon/rs400d.h | 160 + drivers/gpu/drm/radeon/rs600.c | 481 ++-- drivers/gpu/drm/radeon/rs600d.h | 470 +++ drivers/gpu/drm/radeon/rs690.c | 355 ++- drivers/gpu/drm/radeon/rs690d.h | 307 ++ drivers/gpu/drm/radeon/rs690r.h | 99 - drivers/gpu/drm/radeon/rv200d.h | 36 + drivers/gpu/drm/radeon/rv250d.h | 123 + drivers/gpu/drm/radeon/rv350d.h | 52 + drivers/gpu/drm/radeon/rv515.c | 5 +- drivers/gpu/drm/radeon/rv770.c | 199 +- drivers/gpu/drm/ttm/ttm_global.c | 2 +- drivers/hid/hid-core.c | 2 +- drivers/hid/hid-twinhan.c | 4 +- drivers/hid/hidraw.c | 5 +- drivers/hwmon/Kconfig | 2 +- drivers/hwmon/asus_atk0110.c | 339 ++- drivers/hwmon/dme1737.c | 29 +- drivers/hwmon/fschmd.c | 2 +- drivers/hwmon/hp_accel.c | 5 +- drivers/hwmon/it87.c | 5 +- drivers/hwmon/lis3lv02d_spi.c | 3 +- drivers/hwmon/sht15.c | 8 +- drivers/i2c/busses/i2c-imx.c | 86 +- drivers/i2c/busses/i2c-mpc.c | 10 +- drivers/ide/atiixp.c | 2 +- drivers/ide/cmd64x.c | 6 +- drivers/ide/ide-proc.c | 8 +- drivers/ide/sis5513.c | 10 +- drivers/ieee1394/raw1394.c | 1 + drivers/ieee1394/video1394.c | 1 + drivers/infiniband/core/addr.c | 2 +- drivers/infiniband/core/iwcm.c | 3 + drivers/infiniband/core/ucma.c | 1 + drivers/infiniband/hw/cxgb3/iwch_provider.c | 12 +- drivers/infiniband/hw/cxgb3/iwch_qp.c | 1 + drivers/infiniband/hw/ipath/ipath_driver.c | 1 + drivers/infiniband/hw/ipath/ipath_iba7220.c | 1 + drivers/infiniband/hw/ipath/ipath_intr.c | 1 + drivers/infiniband/hw/ipath/ipath_qp.c | 1 + drivers/infiniband/hw/ipath/ipath_ruc.c | 1 + drivers/infiniband/hw/ipath/ipath_ud.c | 1 + drivers/infiniband/hw/ipath/ipath_user_pages.c | 1 + drivers/infiniband/hw/ipath/ipath_user_sdma.c | 1 + drivers/infiniband/hw/ipath/ipath_verbs_mcast.c | 1 + drivers/infiniband/ulp/iser/iscsi_iser.c | 2 +- drivers/input/input.c | 65 +- drivers/input/joystick/xpad.c | 2 + drivers/input/keyboard/atkbd.c | 132 +- drivers/input/keyboard/gpio_keys.c | 1 + drivers/input/keyboard/hilkbd.c | 1 + drivers/input/keyboard/sunkbd.c | 1 + drivers/input/misc/Kconfig | 1 + drivers/input/misc/hp_sdc_rtc.c | 2 +- drivers/input/misc/rotary_encoder.c | 4 +- drivers/input/misc/sparcspkr.c | 4 +- drivers/input/misc/wistron_btns.c | 9 + drivers/input/mouse/logips2pp.c | 2 +- drivers/input/mouse/synaptics.c | 10 + drivers/input/serio/Kconfig | 13 +- drivers/input/serio/i8042-x86ia64io.h | 13 +- drivers/input/serio/i8042.c | 38 +- drivers/input/serio/libps2.c | 1 + drivers/input/serio/serio_raw.c | 1 + drivers/input/serio/serport.c | 1 + drivers/input/touchscreen/ad7879.c | 4 +- drivers/isdn/capi/capi.c | 2 +- drivers/isdn/capi/capidrv.c | 27 +- drivers/isdn/capi/kcapi.c | 1 + drivers/isdn/gigaset/asyncdata.c | 28 +- drivers/isdn/gigaset/bas-gigaset.c | 87 +- drivers/isdn/gigaset/common.c | 134 +- drivers/isdn/gigaset/ev-layer.c | 30 +- drivers/isdn/gigaset/i4l.c | 23 + drivers/isdn/gigaset/interface.c | 9 + drivers/isdn/gigaset/isocdata.c | 30 +- drivers/isdn/hisax/arcofi.c | 1 + drivers/isdn/hisax/hfc_2bds0.c | 1 + drivers/isdn/hisax/hfc_pci.c | 1 + drivers/isdn/hysdn/hysdn_procconf.c | 1 + drivers/isdn/hysdn/hysdn_proclog.c | 1 + drivers/isdn/i4l/isdn_net.h | 6 +- drivers/isdn/pcbit/drv.c | 1 + drivers/isdn/pcbit/layer2.c | 1 + drivers/isdn/sc/init.c | 1 + drivers/lguest/interrupts_and_traps.c | 1 + drivers/macintosh/via-pmu.c | 40 +- drivers/md/Makefile | 22 +- drivers/md/bitmap.c | 9 +- drivers/md/dm-exception-store.c | 38 +- drivers/md/dm-exception-store.h | 8 +- drivers/md/dm-log-userspace-base.c | 2 +- drivers/md/dm-snap-persistent.c | 16 +- drivers/md/dm-snap.c | 25 +- drivers/md/dm.c | 27 +- drivers/md/md.c | 2 +- drivers/md/raid1.c | 6 +- drivers/md/raid10.c | 5 +- drivers/md/raid5.c | 182 +- drivers/md/raid5.h | 14 +- drivers/md/raid6altivec.uc | 2 +- drivers/md/raid6int.uc | 2 +- drivers/md/raid6test/Makefile | 42 +- drivers/md/unroll.awk | 20 + drivers/md/unroll.pl | 24 - drivers/media/dvb/dvb-core/dvb_net.c | 1 + drivers/media/video/meye.c | 1 + drivers/media/video/videobuf-core.c | 1 + drivers/media/video/videobuf-dma-sg.c | 1 + drivers/message/fusion/mptlan.c | 1 + drivers/mfd/twl4030-core.c | 91 +- drivers/mfd/ucb1x00-core.c | 1 + drivers/mfd/wm831x-irq.c | 3 +- drivers/misc/hpilo.c | 1 + drivers/misc/ibmasm/command.c | 1 + drivers/misc/ibmasm/event.c | 1 + drivers/misc/ibmasm/r_heartbeat.c | 1 + drivers/misc/phantom.c | 1 + drivers/mmc/core/sdio_cis.c | 7 +- drivers/mmc/host/at91_mci.c | 1 - drivers/mmc/host/omap_hsmmc.c | 2 +- drivers/mmc/host/pxamci.c | 4 +- drivers/mtd/devices/m25p80.c | 1 + drivers/mtd/devices/sst25l.c | 1 + drivers/mtd/ubi/build.c | 3 +- drivers/mtd/ubi/scan.c | 7 +- drivers/mtd/ubi/scan.h | 2 - drivers/net/Kconfig | 11 + drivers/net/Makefile | 10 +- drivers/net/acenic.c | 3 +- drivers/net/au1000_eth.c | 5 +- drivers/net/benet/be_cmds.c | 34 +- drivers/net/benet/be_cmds.h | 7 +- drivers/net/benet/be_ethtool.c | 2 +- drivers/net/benet/be_main.c | 33 +- drivers/net/bnx2.h | 9 +- drivers/net/bonding/bond_main.c | 10 +- drivers/net/bonding/bond_sysfs.c | 1 + drivers/net/can/sja1000/sja1000_of_platform.c | 1 + drivers/net/cnic.c | 6 +- drivers/net/davinci_emac.c | 36 +- drivers/net/depca.c | 1 + drivers/net/dm9000.h | 2 +- drivers/net/e100.c | 27 +- drivers/net/e1000e/82571.c | 4 +- drivers/net/e1000e/defines.h | 2 + drivers/net/e1000e/e1000.h | 26 + drivers/net/e1000e/hw.h | 3 + drivers/net/e1000e/ich8lan.c | 628 +++- drivers/net/e1000e/phy.c | 476 ++- drivers/net/eql.c | 1 + drivers/net/ethoc.c | 104 +- drivers/net/ewrk3.c | 1 + drivers/net/fec.c | 2 +- drivers/net/fec_mpc52xx.c | 6 - drivers/net/fec_mpc52xx_phy.c | 1 + drivers/net/forcedeth.c | 1 + drivers/net/fs_enet/fs_enet-main.c | 1 + drivers/net/fs_enet/mii-bitbang.c | 1 + drivers/net/fs_enet/mii-fec.c | 1 + drivers/net/fsl_pq_mdio.c | 1 + drivers/net/gianfar.c | 4 +- drivers/net/hamachi.c | 1 + drivers/net/hamradio/baycom_epp.c | 1 + drivers/net/hamradio/baycom_ser_fdx.c | 1 + drivers/net/hamradio/baycom_ser_hdx.c | 1 + drivers/net/hamradio/hdlcdrv.c | 1 + drivers/net/hp100.c | 1 + drivers/net/ibm_newemac/core.c | 9 +- drivers/net/ibm_newemac/emac.h | 1 + drivers/net/ifb.c | 3 +- drivers/net/igb/igb_ethtool.c | 36 +- drivers/net/igbvf/ethtool.c | 30 +- drivers/net/irda/sa1100_ir.c | 7 +- drivers/net/irda/toim3232-sir.c | 1 + drivers/net/ixgbe/ixgbe_82599.c | 2 + drivers/net/ixgbe/ixgbe_ethtool.c | 22 +- drivers/net/ixgbe/ixgbe_main.c | 4 + drivers/net/ixgbe/ixgbe_type.h | 2 + drivers/net/ixp2000/enp2611.c | 18 +- drivers/net/ixp2000/ixpdev.c | 11 + drivers/net/ks8851.c | 42 +- drivers/net/ks8851.h | 1 + drivers/net/mlx4/main.c | 2 + drivers/net/myri10ge/myri10ge.c | 17 +- drivers/net/netxen/netxen_nic_hdr.h | 1 + drivers/net/netxen/netxen_nic_hw.c | 14 +- drivers/net/netxen/netxen_nic_init.c | 8 +- drivers/net/netxen/netxen_nic_main.c | 6 +- drivers/net/niu.c | 2 +- drivers/net/ns83820.c | 1 + drivers/net/pasemi_mac_ethtool.c | 3 + drivers/net/pcmcia/3c574_cs.c | 13 +- drivers/net/pcmcia/pcnet_cs.c | 12 +- drivers/net/pcnet32.c | 1 + drivers/net/phy/mdio-gpio.c | 1 + drivers/net/pppoe.c | 129 +- drivers/net/qlge/qlge.h | 19 +- drivers/net/qlge/qlge_ethtool.c | 2 - drivers/net/qlge/qlge_main.c | 193 +- drivers/net/qlge/qlge_mpi.c | 128 +- drivers/net/r8169.c | 1002 ++++++- drivers/net/sb1000.c | 1 + drivers/net/sfc/rx.c | 9 +- drivers/net/sh_eth.c | 1 + drivers/net/sis900.c | 1 + drivers/net/skfp/skfddi.c | 1 + drivers/net/skge.c | 1 + drivers/net/sky2.c | 2 + drivers/net/slip.c | 1 + drivers/net/stmmac/Kconfig | 53 + drivers/net/stmmac/Makefile | 4 + drivers/net/stmmac/common.h | 330 ++ drivers/net/stmmac/descs.h | 163 + drivers/net/stmmac/gmac.c | 693 ++++ drivers/net/stmmac/gmac.h | 204 ++ drivers/net/stmmac/mac100.c | 517 +++ drivers/net/stmmac/mac100.h | 116 + drivers/net/stmmac/stmmac.h | 98 + drivers/net/stmmac/stmmac_ethtool.c | 395 +++ drivers/net/stmmac/stmmac_main.c | 2204 +++++++++++++ drivers/net/stmmac/stmmac_mdio.c | 217 ++ drivers/net/stmmac/stmmac_timer.c | 140 + drivers/net/stmmac/stmmac_timer.h | 41 + drivers/net/sungem.c | 1 + drivers/net/tg3.c | 41 +- drivers/net/tg3.h | 1 - drivers/net/tokenring/ibmtr.c | 12 +- drivers/net/typhoon.c | 1 + drivers/net/usb/dm9601.c | 4 + drivers/net/usb/pegasus.c | 13 + drivers/net/usb/pegasus.h | 6 +- drivers/net/usb/rndis_host.c | 7 +- drivers/net/virtio_net.c | 17 +- drivers/net/vmxnet3/Makefile | 35 + drivers/net/vmxnet3/upt1_defs.h | 96 + drivers/net/vmxnet3/vmxnet3_defs.h | 535 +++ drivers/net/vmxnet3/vmxnet3_drv.c | 2574 +++++++++++++++ drivers/net/vmxnet3/vmxnet3_ethtool.c | 566 ++++ drivers/net/vmxnet3/vmxnet3_int.h | 389 +++ drivers/net/wan/c101.c | 1 + drivers/net/wan/cosa.c | 1 + drivers/net/wan/cycx_x25.c | 1 + drivers/net/wan/dscc4.c | 1 + drivers/net/wan/farsync.c | 1 + drivers/net/wan/hdlc_cisco.c | 18 +- drivers/net/wan/n2.c | 1 + drivers/net/wan/pci200syn.c | 1 + drivers/net/wireless/adm8211.h | 2 +- drivers/net/wireless/airo.c | 5 +- drivers/net/wireless/ath/ath9k/rc.c | 2 +- drivers/net/wireless/b43/b43.h | 168 +- drivers/net/wireless/b43/dma.c | 15 +- drivers/net/wireless/b43/leds.c | 4 +- drivers/net/wireless/b43/leds.h | 5 +- drivers/net/wireless/b43/main.c | 6 +- drivers/net/wireless/b43/pio.c | 79 +- drivers/net/wireless/b43/rfkill.c | 3 +- drivers/net/wireless/b43/xmit.c | 5 +- drivers/net/wireless/b43legacy/main.c | 1 + drivers/net/wireless/b43legacy/phy.c | 1 + drivers/net/wireless/hostap/hostap_info.c | 1 + drivers/net/wireless/hostap/hostap_ioctl.c | 1 + drivers/net/wireless/ipw2x00/ipw2100.c | 5 +- drivers/net/wireless/ipw2x00/ipw2200.c | 3 + drivers/net/wireless/ipw2x00/libipw.h | 1 + drivers/net/wireless/ipw2x00/libipw_module.c | 14 +- drivers/net/wireless/iwlwifi/iwl-3945-rs.c | 2 +- drivers/net/wireless/iwlwifi/iwl-3945.c | 3 +- drivers/net/wireless/iwlwifi/iwl-4965.c | 1 + drivers/net/wireless/iwlwifi/iwl-5000.c | 3 +- drivers/net/wireless/iwlwifi/iwl-agn.c | 3 +- drivers/net/wireless/iwlwifi/iwl-commands.h | 2 +- drivers/net/wireless/iwlwifi/iwl-core.c | 1 + drivers/net/wireless/iwlwifi/iwl-eeprom.c | 23 +- drivers/net/wireless/iwlwifi/iwl-eeprom.h | 20 +- drivers/net/wireless/iwlwifi/iwl-hcmd.c | 1 + drivers/net/wireless/iwlwifi/iwl-rx.c | 2 +- drivers/net/wireless/iwlwifi/iwl-tx.c | 1 + drivers/net/wireless/iwlwifi/iwl3945-base.c | 3 +- drivers/net/wireless/iwmc3200wifi/cfg80211.c | 1 + drivers/net/wireless/iwmc3200wifi/commands.c | 1 + drivers/net/wireless/iwmc3200wifi/main.c | 1 + drivers/net/wireless/iwmc3200wifi/rx.c | 1 + drivers/net/wireless/libertas/cmd.c | 1 + drivers/net/wireless/libertas/cmdresp.c | 1 + drivers/net/wireless/libertas/if_spi.c | 10 +- drivers/net/wireless/libertas/if_usb.c | 2 +- drivers/net/wireless/libertas/tx.c | 1 + drivers/net/wireless/prism54/isl_ioctl.c | 1 + drivers/net/wireless/prism54/islpci_dev.c | 1 + drivers/net/wireless/prism54/islpci_mgt.c | 1 + drivers/net/wireless/ray_cs.c | 2 +- drivers/net/wireless/rt2x00/rt2800usb.c | 2 +- drivers/net/wireless/rt2x00/rt2x00debug.c | 1 + drivers/net/wireless/rt2x00/rt73usb.c | 5 + drivers/net/znet.c | 8 - drivers/of/of_mdio.c | 13 +- drivers/oprofile/event_buffer.c | 35 +- drivers/pci/dmar.c | 13 +- drivers/pci/hotplug/cpqphp.h | 1 + drivers/pci/intel-iommu.c | 82 +- drivers/pci/pci.c | 27 +- drivers/pci/pcie/aer/aerdrv.c | 3 +- drivers/pci/pcie/portdrv_pci.c | 3 +- drivers/pci/quirks.c | 38 +- drivers/pci/setup-res.c | 37 - drivers/pcmcia/cistpl.c | 20 +- drivers/pcmcia/cs.c | 69 +- drivers/pcmcia/cs_internal.h | 3 +- drivers/pcmcia/ds.c | 8 +- drivers/pcmcia/i82365.c | 4 +- drivers/pcmcia/m32r_cfc.c | 10 +- drivers/pcmcia/m32r_pcc.c | 10 +- drivers/pcmcia/m8xx_pcmcia.c | 15 +- drivers/pcmcia/pcmcia_ioctl.c | 2 +- drivers/pcmcia/pd6729.c | 6 + drivers/pcmcia/rsrc_nonstatic.c | 3 +- drivers/pcmcia/soc_common.c | 5 +- drivers/pcmcia/socket_sysfs.c | 2 +- drivers/pcmcia/tcic.c | 4 +- drivers/pcmcia/yenta_socket.c | 12 +- drivers/platform/x86/eeepc-laptop.c | 31 +- drivers/platform/x86/fujitsu-laptop.c | 2 +- drivers/rtc/interface.c | 1 + drivers/rtc/rtc-dev.c | 1 + drivers/s390/block/dasd.c | 18 +- drivers/s390/block/dasd_eckd.c | 13 +- drivers/s390/char/raw3270.c | 2 + drivers/s390/char/sclp_async.c | 51 +- drivers/s390/char/sclp_vt220.c | 30 +- drivers/s390/char/tape_block.c | 3 +- drivers/s390/cio/blacklist.c | 13 +- drivers/s390/cio/chp.c | 2 +- drivers/s390/cio/device.c | 13 +- drivers/s390/cio/device.h | 1 + drivers/s390/cio/device_fsm.c | 35 +- drivers/s390/crypto/zcrypt_pcixcc.c | 13 +- drivers/s390/net/smsgiucv.c | 7 +- drivers/s390/scsi/zfcp_aux.c | 44 +- drivers/s390/scsi/zfcp_ccw.c | 40 +- drivers/s390/scsi/zfcp_cfdc.c | 17 +- drivers/s390/scsi/zfcp_erp.c | 22 +- drivers/s390/scsi/zfcp_ext.h | 3 +- drivers/s390/scsi/zfcp_fc.c | 11 + drivers/s390/scsi/zfcp_fsf.c | 35 +- drivers/s390/scsi/zfcp_sysfs.c | 1 + drivers/scsi/Kconfig | 11 + drivers/scsi/Makefile | 2 + drivers/scsi/be2iscsi/Kconfig | 8 + drivers/scsi/be2iscsi/Makefile | 8 + drivers/scsi/be2iscsi/be.h | 183 ++ drivers/scsi/be2iscsi/be_cmds.c | 523 +++ drivers/scsi/be2iscsi/be_cmds.h | 877 +++++ drivers/scsi/be2iscsi/be_iscsi.c | 638 ++++ drivers/scsi/be2iscsi/be_iscsi.h | 75 + drivers/scsi/be2iscsi/be_main.c | 3390 ++++++++++++++++++++ drivers/scsi/be2iscsi/be_main.h | 837 +++++ drivers/scsi/be2iscsi/be_mgmt.c | 321 ++ drivers/scsi/be2iscsi/be_mgmt.h | 249 ++ drivers/scsi/bfa/Makefile | 15 + drivers/scsi/bfa/bfa_callback_priv.h | 57 + drivers/scsi/bfa/bfa_cb_ioim_macros.h | 205 ++ drivers/scsi/bfa/bfa_cee.c | 492 +++ drivers/scsi/bfa/bfa_core.c | 402 +++ drivers/scsi/bfa/bfa_csdebug.c | 58 + drivers/scsi/bfa/bfa_fcpim.c | 175 + drivers/scsi/bfa/bfa_fcpim_priv.h | 188 ++ drivers/scsi/bfa/bfa_fcport.c | 1671 ++++++++++ drivers/scsi/bfa/bfa_fcs.c | 182 ++ drivers/scsi/bfa/bfa_fcs_lport.c | 940 ++++++ drivers/scsi/bfa/bfa_fcs_port.c | 68 + drivers/scsi/bfa/bfa_fcs_uf.c | 105 + drivers/scsi/bfa/bfa_fcxp.c | 782 +++++ drivers/scsi/bfa/bfa_fcxp_priv.h | 138 + drivers/scsi/bfa/bfa_fwimg_priv.h | 31 + drivers/scsi/bfa/bfa_hw_cb.c | 142 + drivers/scsi/bfa/bfa_hw_ct.c | 162 + drivers/scsi/bfa/bfa_intr.c | 218 ++ drivers/scsi/bfa/bfa_intr_priv.h | 115 + drivers/scsi/bfa/bfa_ioc.c | 2382 ++++++++++++++ drivers/scsi/bfa/bfa_ioc.h | 259 ++ drivers/scsi/bfa/bfa_iocfc.c | 872 +++++ drivers/scsi/bfa/bfa_iocfc.h | 168 + drivers/scsi/bfa/bfa_iocfc_q.c | 44 + drivers/scsi/bfa/bfa_ioim.c | 1311 ++++++++ drivers/scsi/bfa/bfa_itnim.c | 1088 +++++++ drivers/scsi/bfa/bfa_log.c | 346 ++ drivers/scsi/bfa/bfa_log_module.c | 451 +++ drivers/scsi/bfa/bfa_lps.c | 782 +++++ drivers/scsi/bfa/bfa_lps_priv.h | 38 + drivers/scsi/bfa/bfa_module.c | 90 + drivers/scsi/bfa/bfa_modules_priv.h | 43 + drivers/scsi/bfa/bfa_os_inc.h | 222 ++ drivers/scsi/bfa/bfa_port.c | 460 +++ drivers/scsi/bfa/bfa_port_priv.h | 90 + drivers/scsi/bfa/bfa_priv.h | 113 + drivers/scsi/bfa/bfa_rport.c | 911 ++++++ drivers/scsi/bfa/bfa_rport_priv.h | 45 + drivers/scsi/bfa/bfa_sgpg.c | 231 ++ drivers/scsi/bfa/bfa_sgpg_priv.h | 79 + drivers/scsi/bfa/bfa_sm.c | 38 + drivers/scsi/bfa/bfa_timer.c | 90 + drivers/scsi/bfa/bfa_trcmod_priv.h | 66 + drivers/scsi/bfa/bfa_tskim.c | 689 ++++ drivers/scsi/bfa/bfa_uf.c | 345 ++ drivers/scsi/bfa/bfa_uf_priv.h | 47 + drivers/scsi/bfa/bfad.c | 1182 +++++++ drivers/scsi/bfa/bfad_attr.c | 649 ++++ drivers/scsi/bfa/bfad_attr.h | 65 + drivers/scsi/bfa/bfad_drv.h | 295 ++ drivers/scsi/bfa/bfad_fwimg.c | 95 + drivers/scsi/bfa/bfad_im.c | 1230 +++++++ drivers/scsi/bfa/bfad_im.h | 150 + drivers/scsi/bfa/bfad_im_compat.h | 46 + drivers/scsi/bfa/bfad_intr.c | 214 ++ drivers/scsi/bfa/bfad_ipfc.h | 42 + drivers/scsi/bfa/bfad_os.c | 50 + drivers/scsi/bfa/bfad_tm.h | 59 + drivers/scsi/bfa/bfad_trcmod.h | 52 + drivers/scsi/bfa/fab.c | 62 + drivers/scsi/bfa/fabric.c | 1278 ++++++++ drivers/scsi/bfa/fcbuild.c | 1449 +++++++++ drivers/scsi/bfa/fcbuild.h | 273 ++ drivers/scsi/bfa/fcpim.c | 844 +++++ drivers/scsi/bfa/fcptm.c | 68 + drivers/scsi/bfa/fcs.h | 30 + drivers/scsi/bfa/fcs_auth.h | 37 + drivers/scsi/bfa/fcs_fabric.h | 61 + drivers/scsi/bfa/fcs_fcpim.h | 44 + drivers/scsi/bfa/fcs_fcptm.h | 45 + drivers/scsi/bfa/fcs_fcxp.h | 29 + drivers/scsi/bfa/fcs_lport.h | 117 + drivers/scsi/bfa/fcs_ms.h | 35 + drivers/scsi/bfa/fcs_port.h | 32 + drivers/scsi/bfa/fcs_rport.h | 61 + drivers/scsi/bfa/fcs_trcmod.h | 56 + drivers/scsi/bfa/fcs_uf.h | 32 + drivers/scsi/bfa/fcs_vport.h | 39 + drivers/scsi/bfa/fdmi.c | 1223 +++++++ drivers/scsi/bfa/include/aen/bfa_aen.h | 92 + drivers/scsi/bfa/include/aen/bfa_aen_adapter.h | 31 + drivers/scsi/bfa/include/aen/bfa_aen_audit.h | 31 + drivers/scsi/bfa/include/aen/bfa_aen_ethport.h | 35 + drivers/scsi/bfa/include/aen/bfa_aen_ioc.h | 37 + drivers/scsi/bfa/include/aen/bfa_aen_itnim.h | 33 + drivers/scsi/bfa/include/aen/bfa_aen_lport.h | 51 + drivers/scsi/bfa/include/aen/bfa_aen_port.h | 57 + drivers/scsi/bfa/include/aen/bfa_aen_rport.h | 37 + drivers/scsi/bfa/include/bfa.h | 177 + drivers/scsi/bfa/include/bfa_fcpim.h | 159 + drivers/scsi/bfa/include/bfa_fcptm.h | 47 + drivers/scsi/bfa/include/bfa_svc.h | 324 ++ drivers/scsi/bfa/include/bfa_timer.h | 53 + drivers/scsi/bfa/include/bfi/bfi.h | 174 + drivers/scsi/bfa/include/bfi/bfi_boot.h | 34 + drivers/scsi/bfa/include/bfi/bfi_cbreg.h | 305 ++ drivers/scsi/bfa/include/bfi/bfi_cee.h | 119 + drivers/scsi/bfa/include/bfi/bfi_ctreg.h | 611 ++++ drivers/scsi/bfa/include/bfi/bfi_fabric.h | 92 + drivers/scsi/bfa/include/bfi/bfi_fcpim.h | 301 ++ drivers/scsi/bfa/include/bfi/bfi_fcxp.h | 71 + drivers/scsi/bfa/include/bfi/bfi_ioc.h | 202 ++ drivers/scsi/bfa/include/bfi/bfi_iocfc.h | 177 + drivers/scsi/bfa/include/bfi/bfi_lport.h | 89 + drivers/scsi/bfa/include/bfi/bfi_lps.h | 96 + drivers/scsi/bfa/include/bfi/bfi_port.h | 115 + drivers/scsi/bfa/include/bfi/bfi_pport.h | 184 ++ drivers/scsi/bfa/include/bfi/bfi_rport.h | 104 + drivers/scsi/bfa/include/bfi/bfi_uf.h | 52 + drivers/scsi/bfa/include/cna/bfa_cna_trcmod.h | 36 + drivers/scsi/bfa/include/cna/cee/bfa_cee.h | 77 + drivers/scsi/bfa/include/cna/port/bfa_port.h | 69 + drivers/scsi/bfa/include/cna/pstats/ethport_defs.h | 36 + drivers/scsi/bfa/include/cna/pstats/phyport_defs.h | 218 ++ drivers/scsi/bfa/include/cs/bfa_checksum.h | 60 + drivers/scsi/bfa/include/cs/bfa_debug.h | 44 + drivers/scsi/bfa/include/cs/bfa_log.h | 184 ++ drivers/scsi/bfa/include/cs/bfa_perf.h | 34 + drivers/scsi/bfa/include/cs/bfa_plog.h | 162 + drivers/scsi/bfa/include/cs/bfa_q.h | 81 + drivers/scsi/bfa/include/cs/bfa_sm.h | 69 + drivers/scsi/bfa/include/cs/bfa_trc.h | 176 + drivers/scsi/bfa/include/cs/bfa_wc.h | 68 + drivers/scsi/bfa/include/defs/bfa_defs_adapter.h | 82 + drivers/scsi/bfa/include/defs/bfa_defs_aen.h | 73 + drivers/scsi/bfa/include/defs/bfa_defs_audit.h | 38 + drivers/scsi/bfa/include/defs/bfa_defs_auth.h | 112 + drivers/scsi/bfa/include/defs/bfa_defs_boot.h | 71 + drivers/scsi/bfa/include/defs/bfa_defs_cee.h | 159 + drivers/scsi/bfa/include/defs/bfa_defs_driver.h | 40 + drivers/scsi/bfa/include/defs/bfa_defs_ethport.h | 98 + drivers/scsi/bfa/include/defs/bfa_defs_fcpim.h | 45 + drivers/scsi/bfa/include/defs/bfa_defs_im_common.h | 32 + drivers/scsi/bfa/include/defs/bfa_defs_im_team.h | 72 + drivers/scsi/bfa/include/defs/bfa_defs_ioc.h | 152 + drivers/scsi/bfa/include/defs/bfa_defs_iocfc.h | 310 ++ drivers/scsi/bfa/include/defs/bfa_defs_ipfc.h | 70 + drivers/scsi/bfa/include/defs/bfa_defs_itnim.h | 126 + drivers/scsi/bfa/include/defs/bfa_defs_led.h | 35 + drivers/scsi/bfa/include/defs/bfa_defs_lport.h | 68 + drivers/scsi/bfa/include/defs/bfa_defs_mfg.h | 58 + drivers/scsi/bfa/include/defs/bfa_defs_pci.h | 41 + drivers/scsi/bfa/include/defs/bfa_defs_pm.h | 33 + drivers/scsi/bfa/include/defs/bfa_defs_pom.h | 56 + drivers/scsi/bfa/include/defs/bfa_defs_port.h | 245 ++ drivers/scsi/bfa/include/defs/bfa_defs_pport.h | 383 +++ drivers/scsi/bfa/include/defs/bfa_defs_qos.h | 99 + drivers/scsi/bfa/include/defs/bfa_defs_rport.h | 199 ++ drivers/scsi/bfa/include/defs/bfa_defs_status.h | 255 ++ drivers/scsi/bfa/include/defs/bfa_defs_tin.h | 118 + drivers/scsi/bfa/include/defs/bfa_defs_tsensor.h | 43 + drivers/scsi/bfa/include/defs/bfa_defs_types.h | 30 + drivers/scsi/bfa/include/defs/bfa_defs_version.h | 22 + drivers/scsi/bfa/include/defs/bfa_defs_vf.h | 74 + drivers/scsi/bfa/include/defs/bfa_defs_vport.h | 91 + drivers/scsi/bfa/include/fcb/bfa_fcb.h | 33 + drivers/scsi/bfa/include/fcb/bfa_fcb_fcpim.h | 76 + drivers/scsi/bfa/include/fcb/bfa_fcb_port.h | 113 + drivers/scsi/bfa/include/fcb/bfa_fcb_rport.h | 80 + drivers/scsi/bfa/include/fcb/bfa_fcb_vf.h | 47 + drivers/scsi/bfa/include/fcb/bfa_fcb_vport.h | 47 + drivers/scsi/bfa/include/fcs/bfa_fcs.h | 73 + drivers/scsi/bfa/include/fcs/bfa_fcs_auth.h | 82 + drivers/scsi/bfa/include/fcs/bfa_fcs_fabric.h | 112 + drivers/scsi/bfa/include/fcs/bfa_fcs_fcpim.h | 131 + drivers/scsi/bfa/include/fcs/bfa_fcs_fdmi.h | 63 + drivers/scsi/bfa/include/fcs/bfa_fcs_lport.h | 226 ++ drivers/scsi/bfa/include/fcs/bfa_fcs_rport.h | 104 + drivers/scsi/bfa/include/fcs/bfa_fcs_vport.h | 63 + drivers/scsi/bfa/include/log/bfa_log_fcs.h | 28 + drivers/scsi/bfa/include/log/bfa_log_hal.h | 30 + drivers/scsi/bfa/include/log/bfa_log_linux.h | 44 + drivers/scsi/bfa/include/log/bfa_log_wdrv.h | 36 + drivers/scsi/bfa/include/protocol/ct.h | 492 +++ drivers/scsi/bfa/include/protocol/fc.h | 1105 +++++++ drivers/scsi/bfa/include/protocol/fc_sp.h | 224 ++ drivers/scsi/bfa/include/protocol/fcp.h | 186 ++ drivers/scsi/bfa/include/protocol/fdmi.h | 163 + drivers/scsi/bfa/include/protocol/pcifw.h | 75 + drivers/scsi/bfa/include/protocol/scsi.h | 1648 ++++++++++ drivers/scsi/bfa/include/protocol/types.h | 42 + drivers/scsi/bfa/loop.c | 422 +++ drivers/scsi/bfa/lport_api.c | 291 ++ drivers/scsi/bfa/lport_priv.h | 82 + drivers/scsi/bfa/ms.c | 759 +++++ drivers/scsi/bfa/n2n.c | 105 + drivers/scsi/bfa/ns.c | 1243 +++++++ drivers/scsi/bfa/plog.c | 184 ++ drivers/scsi/bfa/rport.c | 2618 +++++++++++++++ drivers/scsi/bfa/rport_api.c | 180 ++ drivers/scsi/bfa/rport_ftrs.c | 375 +++ drivers/scsi/bfa/scn.c | 482 +++ drivers/scsi/bfa/vfapi.c | 292 ++ drivers/scsi/bfa/vport.c | 891 +++++ drivers/scsi/bnx2i/bnx2i.h | 2 + drivers/scsi/bnx2i/bnx2i_hwi.c | 2 +- drivers/scsi/bnx2i/bnx2i_iscsi.c | 2 +- drivers/scsi/cxgb3i/cxgb3i_iscsi.c | 2 +- drivers/scsi/device_handler/scsi_dh_rdac.c | 2 - drivers/scsi/dpt_i2o.c | 4 + drivers/scsi/hptiop.c | 37 +- drivers/scsi/hptiop.h | 3 +- drivers/scsi/iscsi_tcp.c | 2 +- drivers/scsi/libiscsi.c | 6 +- drivers/scsi/lpfc/lpfc_scsi.c | 15 +- drivers/scsi/mpt2sas/Kconfig | 2 +- drivers/scsi/mpt2sas/mpi/mpi2.h | 103 +- drivers/scsi/mpt2sas/mpi/mpi2_cnfg.h | 200 ++- drivers/scsi/mpt2sas/mpi/mpi2_history.txt | 334 ++ drivers/scsi/mpt2sas/mpi/mpi2_init.h | 18 +- drivers/scsi/mpt2sas/mpi/mpi2_ioc.h | 65 +- drivers/scsi/mpt2sas/mpi/mpi2_tool.h | 134 +- drivers/scsi/mpt2sas/mpt2sas_base.c | 446 ++- drivers/scsi/mpt2sas/mpt2sas_base.h | 106 +- drivers/scsi/mpt2sas/mpt2sas_config.c | 22 +- drivers/scsi/mpt2sas/mpt2sas_ctl.c | 61 +- drivers/scsi/mpt2sas/mpt2sas_ctl.h | 2 +- drivers/scsi/mpt2sas/mpt2sas_debug.h | 2 +- drivers/scsi/mpt2sas/mpt2sas_scsih.c | 568 +++- drivers/scsi/mpt2sas/mpt2sas_transport.c | 26 +- drivers/scsi/mvsas/mv_defs.h | 4 + drivers/scsi/mvsas/mv_init.c | 4 + drivers/scsi/pmcraid.c | 58 +- drivers/scsi/qla2xxx/qla_mid.c | 6 +- drivers/scsi/scsi.c | 11 +- drivers/scsi/scsi_debug.c | 139 +- drivers/scsi/scsi_error.c | 3 + drivers/scsi/scsi_scan.c | 2 + drivers/scsi/scsi_sysfs.c | 7 +- drivers/scsi/scsi_transport_fc.c | 2 + drivers/scsi/sd.c | 140 +- drivers/scsi/sd.h | 9 +- drivers/scsi/sd_dif.c | 65 - drivers/scsi/sg.c | 10 +- drivers/scsi/sr.c | 22 +- drivers/scsi/st.c | 3 - drivers/serial/8250_pci.c | 78 + drivers/serial/atmel_serial.c | 2 +- drivers/serial/mpc52xx_uart.c | 2 +- drivers/serial/serial_core.c | 7 +- drivers/serial/serial_cs.c | 20 +- drivers/spi/amba-pl022.c | 2 +- drivers/staging/Kconfig | 6 - drivers/staging/Makefile | 3 - drivers/staging/agnx/Kconfig | 5 - drivers/staging/agnx/Makefile | 8 - drivers/staging/agnx/TODO | 22 - drivers/staging/agnx/agnx.h | 156 - drivers/staging/agnx/debug.h | 416 --- drivers/staging/agnx/pci.c | 635 ---- drivers/staging/agnx/phy.c | 960 ------ drivers/staging/agnx/phy.h | 409 --- drivers/staging/agnx/rf.c | 893 ------ drivers/staging/agnx/sta.c | 218 -- drivers/staging/agnx/sta.h | 222 -- drivers/staging/agnx/table.c | 168 - drivers/staging/agnx/table.h | 10 - drivers/staging/agnx/xmit.c | 836 ----- drivers/staging/agnx/xmit.h | 250 -- drivers/staging/android/Kconfig | 1 + drivers/staging/b3dfg/b3dfg.c | 1 + drivers/staging/comedi/Kconfig | 2 +- drivers/staging/comedi/comedi_fops.c | 2 +- drivers/staging/comedi/drivers/cb_das16_cs.c | 2 +- drivers/staging/comedi/drivers/cb_pcidio.c | 8 +- drivers/staging/comedi/drivers/jr3_pci.c | 18 +- drivers/staging/comedi/drivers/me_daq.c | 1 + drivers/staging/comedi/drivers/ni_65xx.c | 12 +- drivers/staging/comedi/drivers/ni_daq_700.c | 2 +- drivers/staging/comedi/drivers/ni_daq_dio24.c | 2 +- drivers/staging/comedi/drivers/ni_labpc_cs.c | 2 +- drivers/staging/comedi/drivers/ni_mio_common.c | 1 + drivers/staging/comedi/drivers/ni_mio_cs.c | 2 +- drivers/staging/comedi/drivers/ni_pcidio.c | 1 + drivers/staging/comedi/drivers/ni_pcimio.c | 22 +- drivers/staging/comedi/drivers/quatech_daqp_cs.c | 2 +- drivers/staging/comedi/drivers/s526.c | 109 +- drivers/staging/comedi/drivers/serial2002.c | 1 + drivers/staging/cowloop/Kconfig | 16 - drivers/staging/cowloop/Makefile | 1 - drivers/staging/cowloop/TODO | 11 - drivers/staging/cowloop/cowloop.c | 2842 ---------------- drivers/staging/cowloop/cowloop.h | 66 - drivers/staging/et131x/et1310_address_map.h | 2 +- drivers/staging/et131x/et1310_rx.c | 20 +- drivers/staging/hv/ChannelMgmt.h | 3 +- drivers/staging/hv/NetVsc.c | 10 +- drivers/staging/hv/TODO | 6 + drivers/staging/hv/osd.c | 1 + drivers/staging/hv/osd.h | 1 + drivers/staging/hv/vmbus_drv.c | 28 +- drivers/staging/iio/Kconfig | 1 + drivers/staging/iio/industrialio-core.c | 2 + drivers/staging/otus/Kconfig | 2 +- drivers/staging/p9auth/p9auth.c | 14 +- drivers/staging/panel/panel.c | 13 +- drivers/staging/poch/poch.c | 1 + drivers/staging/rt2860/Kconfig | 2 +- drivers/staging/rt2860/common/cmm_data_2860.c | 2 + drivers/staging/rt2860/common/cmm_info.c | 1 + drivers/staging/rt2860/rt_linux.c | 1 + drivers/staging/rt2870/Kconfig | 2 +- drivers/staging/rt3090/Kconfig | 2 +- drivers/staging/rt3090/common/cmm_info.c | 1 + drivers/staging/rt3090/rt_linux.c | 1 + drivers/staging/rtl8187se/Kconfig | 2 +- .../staging/rtl8187se/ieee80211/ieee80211_crypt.c | 4 +- .../staging/rtl8187se/ieee80211/ieee80211_module.c | 4 +- .../rtl8187se/ieee80211/ieee80211_softmac.c | 12 +- drivers/staging/rtl8187se/ieee80211/ieee80211_wx.c | 17 +- drivers/staging/rtl8192e/Kconfig | 2 +- .../staging/rtl8192e/ieee80211/ieee80211_crypt.c | 8 +- .../staging/rtl8192e/ieee80211/ieee80211_module.c | 8 +- .../staging/rtl8192e/ieee80211/ieee80211_softmac.c | 19 +- drivers/staging/rtl8192e/ieee80211/ieee80211_wx.c | 21 +- drivers/staging/rtl8192e/r8192E_core.c | 1 + drivers/staging/rtl8192su/Kconfig | 2 +- .../staging/rtl8192su/ieee80211/ieee80211_crypt.c | 4 +- .../staging/rtl8192su/ieee80211/ieee80211_module.c | 4 +- .../rtl8192su/ieee80211/ieee80211_softmac.c | 15 +- drivers/staging/rtl8192su/ieee80211/ieee80211_wx.c | 17 +- drivers/staging/sep/sep_driver.c | 1 + drivers/staging/stlc45xx/Kconfig | 8 - drivers/staging/stlc45xx/Makefile | 1 - drivers/staging/stlc45xx/stlc45xx.c | 2594 --------------- drivers/staging/stlc45xx/stlc45xx.h | 283 -- drivers/staging/stlc45xx/stlc45xx_lmac.h | 434 --- drivers/staging/vme/bridges/vme_ca91cx42.c | 1 + drivers/staging/vme/bridges/vme_tsi148.c | 1 + drivers/staging/vt6656/main_usb.c | 1 - drivers/staging/winbond/Kconfig | 2 +- drivers/staging/winbond/wbusb.c | 44 +- drivers/staging/wlan-ng/Kconfig | 2 +- drivers/uio/uio.c | 1 + drivers/usb/class/usbtmc.c | 2 +- drivers/usb/gadget/Kconfig | 1 + drivers/usb/gadget/ether.c | 9 +- drivers/usb/gadget/fsl_udc_core.c | 2 +- drivers/usb/gadget/imx_udc.c | 8 +- drivers/usb/gadget/r8a66597-udc.h | 105 +- drivers/usb/host/ehci-sched.c | 13 +- drivers/usb/host/isp1362-hcd.c | 18 +- drivers/usb/host/isp1362.h | 12 +- drivers/usb/host/pci-quirks.c | 2 +- drivers/usb/host/r8a66597-hcd.c | 23 +- drivers/usb/host/whci/asl.c | 23 +- drivers/usb/host/whci/pzl.c | 24 +- drivers/usb/host/xhci-hcd.c | 29 +- drivers/usb/misc/usblcd.c | 3 +- drivers/usb/musb/Kconfig | 4 +- drivers/usb/musb/blackfin.c | 1 - drivers/usb/musb/musb_core.h | 7 + drivers/usb/musb/musb_regs.h | 9 - drivers/usb/serial/aircable.c | 10 +- drivers/usb/serial/cp210x.c | 1 + drivers/usb/serial/cypress_m8.c | 12 +- drivers/usb/serial/digi_acceleport.c | 8 +- drivers/usb/serial/empeg.c | 2 +- drivers/usb/serial/ftdi_sio.c | 422 +-- drivers/usb/serial/garmin_gps.c | 12 +- drivers/usb/serial/generic.c | 2 +- drivers/usb/serial/ipaq.c | 9 + drivers/usb/serial/keyspan_pda.c | 2 +- drivers/usb/serial/kl5kusb105.c | 2 +- drivers/usb/serial/mct_u232.c | 14 +- drivers/usb/serial/opticon.c | 13 +- drivers/usb/serial/option.c | 12 + drivers/usb/serial/oti6858.c | 6 +- drivers/usb/serial/pl2303.c | 8 +- drivers/usb/serial/sierra.c | 40 +- drivers/usb/serial/symbolserial.c | 22 +- drivers/usb/serial/usb-serial.c | 10 +- drivers/usb/serial/visor.c | 28 +- drivers/usb/serial/whiteheat.c | 10 +- drivers/usb/storage/transport.c | 46 +- drivers/usb/storage/unusual_devs.h | 7 + drivers/usb/wusbcore/security.c | 41 +- drivers/uwb/whc-rc.c | 1 + drivers/video/da8xx-fb.c | 1 - drivers/video/msm/mddi.c | 2 - drivers/video/omap/blizzard.c | 10 +- drivers/video/omap/omapfb_main.c | 22 +- drivers/virtio/virtio_balloon.c | 3 +- drivers/virtio/virtio_pci.c | 27 +- drivers/virtio/virtio_ring.c | 3 + drivers/watchdog/riowd.c | 2 +- firmware/Makefile | 9 +- firmware/WHENCE | 9 + firmware/cis/COMpad2.cis.ihex | 11 + firmware/cis/COMpad4.cis.ihex | 9 + firmware/cis/DP83903.cis.ihex | 14 + firmware/cis/NE2K.cis.ihex | 8 + firmware/cis/PE-200.cis.ihex | 9 + firmware/cis/SW_555_SER.cis.ihex | 12 + firmware/cis/SW_7xx_SER.cis.ihex | 13 + firmware/cis/SW_8xx_SER.cis.ihex | 13 + firmware/cis/tamarack.cis.ihex | 10 + fs/9p/vfs_dir.c | 93 +- fs/9p/vfs_inode.c | 5 +- fs/Kconfig | 4 +- fs/block_dev.c | 2 +- fs/btrfs/acl.c | 6 +- fs/btrfs/async-thread.c | 81 +- fs/btrfs/async-thread.h | 10 +- fs/btrfs/btrfs_inode.h | 18 +- fs/btrfs/ctree.h | 19 +- fs/btrfs/disk-io.c | 50 +- fs/btrfs/extent-tree.c | 252 ++- fs/btrfs/extent_io.c | 42 +- fs/btrfs/extent_io.h | 18 +- fs/btrfs/file.c | 44 +- fs/btrfs/inode.c | 144 +- fs/btrfs/ioctl.c | 7 +- fs/btrfs/ordered-data.c | 6 + fs/btrfs/relocation.c | 4 +- fs/btrfs/super.c | 9 +- fs/btrfs/transaction.c | 45 +- fs/btrfs/transaction.h | 5 + fs/btrfs/tree-log.c | 56 +- fs/btrfs/tree-log.h | 3 + fs/btrfs/xattr.c | 2 +- fs/cifs/connect.c | 3 +- fs/dlm/lowcomms.c | 36 +- fs/ecryptfs/Kconfig | 3 +- fs/ecryptfs/main.c | 7 +- fs/ext3/super.c | 13 +- fs/ext4/ext4.h | 1 + fs/ext4/super.c | 20 +- fs/file.c | 1 + fs/hfs/btree.c | 5 + fs/hfsplus/wrapper.c | 4 + fs/nfs/client.c | 2 +- fs/nfs/dir.c | 2 + fs/nfs/direct.c | 1 + fs/nfs/nfs4namespace.c | 12 +- fs/nfs/nfs4proc.c | 15 +- fs/nfs/nfs4renewd.c | 6 - fs/nfs/nfs4xdr.c | 1 - fs/nfs/super.c | 37 +- fs/nilfs2/btnode.c | 4 +- fs/nilfs2/segment.c | 19 +- fs/notify/dnotify/dnotify.c | 3 +- fs/notify/inode_mark.c | 6 +- fs/notify/notification.c | 2 +- fs/partitions/check.c | 12 +- fs/pipe.c | 41 +- fs/proc/kcore.c | 1 - fs/proc/meminfo.c | 2 +- fs/proc/page.c | 5 + fs/romfs/storage.c | 4 +- fs/sysfs/dir.c | 3 +- fs/sysfs/file.c | 14 +- fs/xfs/linux-2.6/xfs_aops.c | 38 +- fs/xfs/linux-2.6/xfs_file.c | 9 +- fs/xfs/linux-2.6/xfs_iops.c | 41 +- fs/xfs/linux-2.6/xfs_lrw.c | 2 +- fs/xfs/linux-2.6/xfs_quotaops.c | 2 +- fs/xfs/linux-2.6/xfs_super.c | 59 +- fs/xfs/linux-2.6/xfs_sync.c | 36 +- fs/xfs/quota/xfs_qm_syscalls.c | 1 - fs/xfs/xfs_dfrag.c | 8 +- fs/xfs/xfs_dir2_leaf.c | 4 +- fs/xfs/xfs_ialloc.c | 1 + fs/xfs/xfs_inode.c | 4 +- fs/xfs/xfs_inode.h | 2 +- fs/xfs/xfs_inode_item.c | 18 +- fs/xfs/xfs_itable.c | 21 +- fs/xfs/xfs_vnodeops.c | 6 - include/asm-generic/hardirq.h | 2 +- include/drm/drm_crtc_helper.h | 3 + include/drm/drm_fb_helper.h | 7 +- include/drm/drm_pciids.h | 4 +- include/linux/Kbuild | 2 + include/linux/ata.h | 9 +- include/linux/blkdev.h | 4 - include/linux/cpufreq.h | 7 + include/linux/device.h | 4 +- include/linux/elf.h | 1 + include/linux/ftrace.h | 2 +- include/linux/futex.h | 4 +- include/linux/genhd.h | 21 +- include/linux/i2c/twl4030.h | 6 +- include/linux/init.h | 1 + include/linux/interrupt.h | 2 +- include/linux/kernel.h | 6 + include/linux/libata.h | 12 + include/linux/mmc/host.h | 1 + include/linux/moduleparam.h | 1 - include/linux/netdevice.h | 2 +- include/linux/pci_ids.h | 14 +- include/linux/perf_event.h | 9 +- include/linux/prctl.h | 12 + include/linux/rcupdate.h | 18 +- include/linux/rcutree.h | 19 +- include/linux/skbuff.h | 6 +- include/linux/socket.h | 21 +- include/linux/string.h | 2 +- include/linux/topology.h | 4 +- include/linux/trace_seq.h | 2 +- include/linux/usb/serial.h | 1 + include/linux/virtio_9p.h | 1 + include/linux/virtio_balloon.h | 1 + include/linux/virtio_blk.h | 5 +- include/linux/virtio_console.h | 1 + include/linux/virtio_net.h | 1 + include/linux/virtio_rng.h | 1 + include/linux/workqueue.h | 1 + include/net/9p/client.h | 7 +- include/net/inet_timewait_sock.h | 8 +- include/net/ip_fib.h | 3 +- include/net/mac80211.h | 2 + include/net/sock.h | 10 +- include/pcmcia/ss.h | 4 + include/scsi/libiscsi.h | 3 +- include/scsi/scsi.h | 3 + include/scsi/scsi_cmnd.h | 4 - include/scsi/scsi_host.h | 15 +- init/Kconfig | 20 +- init/main.c | 1 - kernel/cgroup.c | 8 +- kernel/exit.c | 6 +- kernel/fork.c | 12 +- kernel/futex.c | 23 +- kernel/hrtimer.c | 2 - kernel/irq/handle.c | 1 + kernel/lockdep.c | 20 +- kernel/mutex-debug.c | 1 + kernel/panic.c | 3 +- kernel/params.c | 17 +- kernel/perf_event.c | 350 ++- kernel/power/hibernate.c | 11 +- kernel/power/suspend_test.c | 5 +- kernel/power/swap.c | 43 +- kernel/rcupdate.c | 140 +- kernel/rcutorture.c | 4 +- kernel/rcutree.c | 374 ++- kernel/rcutree.h | 90 +- kernel/rcutree_plugin.h | 149 +- kernel/rcutree_trace.c | 4 +- kernel/sched.c | 55 +- kernel/sched_fair.c | 27 +- kernel/sys.c | 25 +- kernel/sysctl_check.c | 2 +- kernel/time/tick-sched.c | 9 +- kernel/time/timekeeping.c | 1 + kernel/trace/ftrace.c | 29 +- kernel/trace/kmemtrace.c | 2 +- kernel/trace/ring_buffer.c | 12 +- kernel/trace/trace.c | 10 +- kernel/trace/trace_branch.c | 8 +- kernel/trace/trace_event_profile.c | 15 +- kernel/trace/trace_events_filter.c | 3 +- kernel/trace/trace_hw_branches.c | 8 +- kernel/trace/trace_output.c | 23 +- kernel/trace/trace_syscalls.c | 4 +- kernel/workqueue.c | 39 +- lib/Kconfig.debug | 9 +- lib/debugobjects.c | 1 + lib/fault-inject.c | 1 + mm/Kconfig | 8 +- mm/backing-dev.c | 18 +- mm/kmemleak.c | 5 +- mm/ksm.c | 10 +- mm/memory-failure.c | 59 +- mm/memory.c | 14 +- mm/mempolicy.c | 13 +- mm/nommu.c | 6 +- mm/page-writeback.c | 3 +- mm/page_alloc.c | 3 +- mm/percpu.c | 35 +- mm/swapfile.c | 3 +- mm/vmalloc.c | 50 +- mm/vmscan.c | 14 +- net/9p/client.c | 5 +- net/9p/trans_virtio.c | 1 - net/bluetooth/hci_sysfs.c | 4 +- net/bluetooth/l2cap.c | 9 +- net/core/datagram.c | 10 +- net/core/net-sysfs.c | 4 +- net/core/pktgen.c | 19 +- net/ipv4/devinet.c | 16 +- net/ipv4/fib_frontend.c | 5 +- net/ipv4/inet_connection_sock.c | 34 +- net/ipv4/ip_gre.c | 28 +- net/ipv4/ip_sockglue.c | 7 +- net/ipv4/raw.c | 24 +- net/ipv4/route.c | 8 +- net/ipv4/tcp.c | 59 +- net/ipv4/tcp_minisocks.c | 4 +- net/ipv4/udp.c | 77 +- net/ipv6/ipv6_sockglue.c | 6 +- net/ipv6/udp.c | 4 +- net/irda/ircomm/ircomm_tty_attach.c | 1 + net/irda/irlan/irlan_common.c | 1 + net/irda/irlan/irlan_eth.c | 1 + net/irda/irnet/irnet_irda.c | 1 + net/irda/irnet/irnet_ppp.c | 1 + net/mac80211/agg-tx.c | 19 +- net/mac80211/cfg.c | 6 +- net/mac80211/ht.c | 2 +- net/mac80211/ibss.c | 14 +- net/mac80211/mesh_hwmp.c | 2 +- net/mac80211/mlme.c | 3 +- net/mac80211/rc80211_pid_debugfs.c | 1 + net/mac80211/rx.c | 12 +- net/mac80211/sta_info.c | 2 + net/mac80211/tx.c | 5 +- net/mac80211/util.c | 4 +- net/netfilter/nf_conntrack_core.c | 1 + net/packet/af_packet.c | 5 +- net/sched/act_pedit.c | 2 +- net/sched/cls_api.c | 2 +- net/sunrpc/svcsock.c | 10 +- net/sunrpc/xprtrdma/svc_rdma_transport.c | 1 + net/unix/af_unix.c | 2 + net/wireless/core.c | 1 + net/wireless/core.h | 1 + net/wireless/mlme.c | 9 + net/wireless/nl80211.c | 3 +- net/wireless/sme.c | 24 +- scripts/Kbuild.include | 2 +- scripts/Makefile.lib | 2 +- scripts/checkkconfigsymbols.sh | 4 +- scripts/checkpatch.pl | 84 +- scripts/get_maintainer.pl | 37 +- scripts/headers_install.pl | 2 +- scripts/mkcompile_h | 12 +- scripts/package/Makefile | 11 +- scripts/package/mkspec | 2 +- security/keys/keyctl.c | 2 +- sound/arm/aaci.c | 1 + sound/core/pcm.c | 5 +- sound/drivers/dummy.c | 4 +- sound/drivers/opl3/opl3_midi.c | 28 +- sound/drivers/pcsp/pcsp_lib.c | 65 +- sound/drivers/pcsp/pcsp_mixer.c | 2 +- sound/parisc/harmony.c | 6 +- sound/pci/Kconfig | 1 - sound/pci/ali5451/ali5451.c | 2 +- sound/pci/bt87x.c | 2 + sound/pci/hda/hda_intel.c | 1 + sound/pci/hda/patch_nvhdmi.c | 31 +- sound/pci/hda/patch_realtek.c | 98 +- sound/pci/hda/patch_sigmatel.c | 29 +- sound/pci/ice1712/amp.c | 8 +- sound/pci/ice1712/ice1712.c | 2 +- sound/pci/ice1712/ice1724.c | 8 +- sound/pci/via82xx.c | 86 +- sound/pcmcia/pdaudiocf/pdaudiocf.c | 21 +- sound/pcmcia/vx/vxpocket.c | 21 +- sound/ppc/Kconfig | 2 +- sound/soc/omap/omap-pcm.c | 8 +- sound/soc/s3c24xx/s3c24xx-pcm.c | 17 +- sound/soc/s3c24xx/s3c64xx-i2s.c | 2 + sound/usb/caiaq/audio.c | 16 +- sound/usb/caiaq/device.c | 2 +- tools/perf/Documentation/perf-timechart.txt | 3 + tools/perf/Makefile | 32 +- tools/perf/builtin-record.c | 6 + tools/perf/builtin-sched.c | 4 +- tools/perf/builtin-stat.c | 8 +- tools/perf/builtin-timechart.c | 38 +- tools/perf/builtin-top.c | 3 + tools/perf/builtin-trace.c | 6 - tools/perf/design.txt | 3 + tools/perf/util/PERF-VERSION-GEN | 2 +- tools/perf/util/parse-events.c | 5 +- tools/perf/util/svghelper.c | 16 +- tools/perf/util/symbol.c | 9 +- tools/perf/util/symbol.h | 10 + tools/perf/util/trace-event-parse.c | 17 +- virt/kvm/kvm_main.c | 21 +- 1777 files changed, 90018 insertions(+), 25793 deletions(-) rename Documentation/ABI/testing/{sysfs-class-usb_host => sysfs-class-uwb_rc-wusbhc} (88%) delete mode 100644 Documentation/ABI/testing/sysfs-devices-cache_disable create mode 100644 Documentation/ABI/testing/sysfs-devices-system-cpu create mode 100644 Documentation/vm/hwpoison.txt create mode 100644 arch/blackfin/ADI_BSD.txt create mode 100644 arch/mips/bcm63xx/dev-wdt.c delete mode 100644 arch/mips/include/asm/mach-bcm63xx/bcm63xx_dev_uart.h create mode 100644 arch/mips/include/asm/spram.h create mode 100644 arch/parisc/include/asm/syscall.h create mode 100644 arch/powerpc/boot/dts/mucmc52.dts create mode 100644 arch/powerpc/boot/dts/uc101.dts create mode 100644 arch/powerpc/configs/ppc64e_defconfig create mode 100644 drivers/gpu/drm/radeon/rs100d.h create mode 100644 drivers/gpu/drm/radeon/rs400d.h create mode 100644 drivers/gpu/drm/radeon/rs600d.h create mode 100644 drivers/gpu/drm/radeon/rs690d.h delete mode 100644 drivers/gpu/drm/radeon/rs690r.h create mode 100644 drivers/gpu/drm/radeon/rv200d.h create mode 100644 drivers/gpu/drm/radeon/rv250d.h create mode 100644 drivers/gpu/drm/radeon/rv350d.h create mode 100644 drivers/md/unroll.awk delete mode 100644 drivers/md/unroll.pl create mode 100644 drivers/net/stmmac/Kconfig create mode 100644 drivers/net/stmmac/Makefile create mode 100644 drivers/net/stmmac/common.h create mode 100644 drivers/net/stmmac/descs.h create mode 100644 drivers/net/stmmac/gmac.c create mode 100644 drivers/net/stmmac/gmac.h create mode 100644 drivers/net/stmmac/mac100.c create mode 100644 drivers/net/stmmac/mac100.h create mode 100644 drivers/net/stmmac/stmmac.h create mode 100644 drivers/net/stmmac/stmmac_ethtool.c create mode 100644 drivers/net/stmmac/stmmac_main.c create mode 100644 drivers/net/stmmac/stmmac_mdio.c create mode 100644 drivers/net/stmmac/stmmac_timer.c create mode 100644 drivers/net/stmmac/stmmac_timer.h create mode 100644 drivers/net/vmxnet3/Makefile create mode 100644 drivers/net/vmxnet3/upt1_defs.h create mode 100644 drivers/net/vmxnet3/vmxnet3_defs.h create mode 100644 drivers/net/vmxnet3/vmxnet3_drv.c create mode 100644 drivers/net/vmxnet3/vmxnet3_ethtool.c create mode 100644 drivers/net/vmxnet3/vmxnet3_int.h create mode 100644 drivers/scsi/be2iscsi/Kconfig create mode 100644 drivers/scsi/be2iscsi/Makefile create mode 100644 drivers/scsi/be2iscsi/be.h create mode 100644 drivers/scsi/be2iscsi/be_cmds.c create mode 100644 drivers/scsi/be2iscsi/be_cmds.h create mode 100644 drivers/scsi/be2iscsi/be_iscsi.c create mode 100644 drivers/scsi/be2iscsi/be_iscsi.h create mode 100644 drivers/scsi/be2iscsi/be_main.c create mode 100644 drivers/scsi/be2iscsi/be_main.h create mode 100644 drivers/scsi/be2iscsi/be_mgmt.c create mode 100644 drivers/scsi/be2iscsi/be_mgmt.h create mode 100644 drivers/scsi/bfa/Makefile create mode 100644 drivers/scsi/bfa/bfa_callback_priv.h create mode 100644 drivers/scsi/bfa/bfa_cb_ioim_macros.h create mode 100644 drivers/scsi/bfa/bfa_cee.c create mode 100644 drivers/scsi/bfa/bfa_core.c create mode 100644 drivers/scsi/bfa/bfa_csdebug.c create mode 100644 drivers/scsi/bfa/bfa_fcpim.c create mode 100644 drivers/scsi/bfa/bfa_fcpim_priv.h create mode 100644 drivers/scsi/bfa/bfa_fcport.c create mode 100644 drivers/scsi/bfa/bfa_fcs.c create mode 100644 drivers/scsi/bfa/bfa_fcs_lport.c create mode 100644 drivers/scsi/bfa/bfa_fcs_port.c create mode 100644 drivers/scsi/bfa/bfa_fcs_uf.c create mode 100644 drivers/scsi/bfa/bfa_fcxp.c create mode 100644 drivers/scsi/bfa/bfa_fcxp_priv.h create mode 100644 drivers/scsi/bfa/bfa_fwimg_priv.h create mode 100644 drivers/scsi/bfa/bfa_hw_cb.c create mode 100644 drivers/scsi/bfa/bfa_hw_ct.c create mode 100644 drivers/scsi/bfa/bfa_intr.c create mode 100644 drivers/scsi/bfa/bfa_intr_priv.h create mode 100644 drivers/scsi/bfa/bfa_ioc.c create mode 100644 drivers/scsi/bfa/bfa_ioc.h create mode 100644 drivers/scsi/bfa/bfa_iocfc.c create mode 100644 drivers/scsi/bfa/bfa_iocfc.h create mode 100644 drivers/scsi/bfa/bfa_iocfc_q.c create mode 100644 drivers/scsi/bfa/bfa_ioim.c create mode 100644 drivers/scsi/bfa/bfa_itnim.c create mode 100644 drivers/scsi/bfa/bfa_log.c create mode 100644 drivers/scsi/bfa/bfa_log_module.c create mode 100644 drivers/scsi/bfa/bfa_lps.c create mode 100644 drivers/scsi/bfa/bfa_lps_priv.h create mode 100644 drivers/scsi/bfa/bfa_module.c create mode 100644 drivers/scsi/bfa/bfa_modules_priv.h create mode 100644 drivers/scsi/bfa/bfa_os_inc.h create mode 100644 drivers/scsi/bfa/bfa_port.c create mode 100644 drivers/scsi/bfa/bfa_port_priv.h create mode 100644 drivers/scsi/bfa/bfa_priv.h create mode 100644 drivers/scsi/bfa/bfa_rport.c create mode 100644 drivers/scsi/bfa/bfa_rport_priv.h create mode 100644 drivers/scsi/bfa/bfa_sgpg.c create mode 100644 drivers/scsi/bfa/bfa_sgpg_priv.h create mode 100644 drivers/scsi/bfa/bfa_sm.c create mode 100644 drivers/scsi/bfa/bfa_timer.c create mode 100644 drivers/scsi/bfa/bfa_trcmod_priv.h create mode 100644 drivers/scsi/bfa/bfa_tskim.c create mode 100644 drivers/scsi/bfa/bfa_uf.c create mode 100644 drivers/scsi/bfa/bfa_uf_priv.h create mode 100644 drivers/scsi/bfa/bfad.c create mode 100644 drivers/scsi/bfa/bfad_attr.c create mode 100644 drivers/scsi/bfa/bfad_attr.h create mode 100644 drivers/scsi/bfa/bfad_drv.h create mode 100644 drivers/scsi/bfa/bfad_fwimg.c create mode 100644 drivers/scsi/bfa/bfad_im.c create mode 100644 drivers/scsi/bfa/bfad_im.h create mode 100644 drivers/scsi/bfa/bfad_im_compat.h create mode 100644 drivers/scsi/bfa/bfad_intr.c create mode 100644 drivers/scsi/bfa/bfad_ipfc.h create mode 100644 drivers/scsi/bfa/bfad_os.c create mode 100644 drivers/scsi/bfa/bfad_tm.h create mode 100644 drivers/scsi/bfa/bfad_trcmod.h create mode 100644 drivers/scsi/bfa/fab.c create mode 100644 drivers/scsi/bfa/fabric.c create mode 100644 drivers/scsi/bfa/fcbuild.c create mode 100644 drivers/scsi/bfa/fcbuild.h create mode 100644 drivers/scsi/bfa/fcpim.c create mode 100644 drivers/scsi/bfa/fcptm.c create mode 100644 drivers/scsi/bfa/fcs.h create mode 100644 drivers/scsi/bfa/fcs_auth.h create mode 100644 drivers/scsi/bfa/fcs_fabric.h create mode 100644 drivers/scsi/bfa/fcs_fcpim.h create mode 100644 drivers/scsi/bfa/fcs_fcptm.h create mode 100644 drivers/scsi/bfa/fcs_fcxp.h create mode 100644 drivers/scsi/bfa/fcs_lport.h create mode 100644 drivers/scsi/bfa/fcs_ms.h create mode 100644 drivers/scsi/bfa/fcs_port.h create mode 100644 drivers/scsi/bfa/fcs_rport.h create mode 100644 drivers/scsi/bfa/fcs_trcmod.h create mode 100644 drivers/scsi/bfa/fcs_uf.h create mode 100644 drivers/scsi/bfa/fcs_vport.h create mode 100644 drivers/scsi/bfa/fdmi.c create mode 100644 drivers/scsi/bfa/include/aen/bfa_aen.h create mode 100644 drivers/scsi/bfa/include/aen/bfa_aen_adapter.h create mode 100644 drivers/scsi/bfa/include/aen/bfa_aen_audit.h create mode 100644 drivers/scsi/bfa/include/aen/bfa_aen_ethport.h create mode 100644 drivers/scsi/bfa/include/aen/bfa_aen_ioc.h create mode 100644 drivers/scsi/bfa/include/aen/bfa_aen_itnim.h create mode 100644 drivers/scsi/bfa/include/aen/bfa_aen_lport.h create mode 100644 drivers/scsi/bfa/include/aen/bfa_aen_port.h create mode 100644 drivers/scsi/bfa/include/aen/bfa_aen_rport.h create mode 100644 drivers/scsi/bfa/include/bfa.h create mode 100644 drivers/scsi/bfa/include/bfa_fcpim.h create mode 100644 drivers/scsi/bfa/include/bfa_fcptm.h create mode 100644 drivers/scsi/bfa/include/bfa_svc.h create mode 100644 drivers/scsi/bfa/include/bfa_timer.h create mode 100644 drivers/scsi/bfa/include/bfi/bfi.h create mode 100644 drivers/scsi/bfa/include/bfi/bfi_boot.h create mode 100644 drivers/scsi/bfa/include/bfi/bfi_cbreg.h create mode 100644 drivers/scsi/bfa/include/bfi/bfi_cee.h create mode 100644 drivers/scsi/bfa/include/bfi/bfi_ctreg.h create mode 100644 drivers/scsi/bfa/include/bfi/bfi_fabric.h create mode 100644 drivers/scsi/bfa/include/bfi/bfi_fcpim.h create mode 100644 drivers/scsi/bfa/include/bfi/bfi_fcxp.h create mode 100644 drivers/scsi/bfa/include/bfi/bfi_ioc.h create mode 100644 drivers/scsi/bfa/include/bfi/bfi_iocfc.h create mode 100644 drivers/scsi/bfa/include/bfi/bfi_lport.h create mode 100644 drivers/scsi/bfa/include/bfi/bfi_lps.h create mode 100644 drivers/scsi/bfa/include/bfi/bfi_port.h create mode 100644 drivers/scsi/bfa/include/bfi/bfi_pport.h create mode 100644 drivers/scsi/bfa/include/bfi/bfi_rport.h create mode 100644 drivers/scsi/bfa/include/bfi/bfi_uf.h create mode 100644 drivers/scsi/bfa/include/cna/bfa_cna_trcmod.h create mode 100644 drivers/scsi/bfa/include/cna/cee/bfa_cee.h create mode 100644 drivers/scsi/bfa/include/cna/port/bfa_port.h create mode 100644 drivers/scsi/bfa/include/cna/pstats/ethport_defs.h create mode 100644 drivers/scsi/bfa/include/cna/pstats/phyport_defs.h create mode 100644 drivers/scsi/bfa/include/cs/bfa_checksum.h create mode 100644 drivers/scsi/bfa/include/cs/bfa_debug.h create mode 100644 drivers/scsi/bfa/include/cs/bfa_log.h create mode 100644 drivers/scsi/bfa/include/cs/bfa_perf.h create mode 100644 drivers/scsi/bfa/include/cs/bfa_plog.h create mode 100644 drivers/scsi/bfa/include/cs/bfa_q.h create mode 100644 drivers/scsi/bfa/include/cs/bfa_sm.h create mode 100644 drivers/scsi/bfa/include/cs/bfa_trc.h create mode 100644 drivers/scsi/bfa/include/cs/bfa_wc.h create mode 100644 drivers/scsi/bfa/include/defs/bfa_defs_adapter.h create mode 100644 drivers/scsi/bfa/include/defs/bfa_defs_aen.h create mode 100644 drivers/scsi/bfa/include/defs/bfa_defs_audit.h create mode 100644 drivers/scsi/bfa/include/defs/bfa_defs_auth.h create mode 100644 drivers/scsi/bfa/include/defs/bfa_defs_boot.h create mode 100644 drivers/scsi/bfa/include/defs/bfa_defs_cee.h create mode 100644 drivers/scsi/bfa/include/defs/bfa_defs_driver.h create mode 100644 drivers/scsi/bfa/include/defs/bfa_defs_ethport.h create mode 100644 drivers/scsi/bfa/include/defs/bfa_defs_fcpim.h create mode 100644 drivers/scsi/bfa/include/defs/bfa_defs_im_common.h create mode 100644 drivers/scsi/bfa/include/defs/bfa_defs_im_team.h create mode 100644 drivers/scsi/bfa/include/defs/bfa_defs_ioc.h create mode 100644 drivers/scsi/bfa/include/defs/bfa_defs_iocfc.h create mode 100644 drivers/scsi/bfa/include/defs/bfa_defs_ipfc.h create mode 100644 drivers/scsi/bfa/include/defs/bfa_defs_itnim.h create mode 100644 drivers/scsi/bfa/include/defs/bfa_defs_led.h create mode 100644 drivers/scsi/bfa/include/defs/bfa_defs_lport.h create mode 100644 drivers/scsi/bfa/include/defs/bfa_defs_mfg.h create mode 100644 drivers/scsi/bfa/include/defs/bfa_defs_pci.h create mode 100644 drivers/scsi/bfa/include/defs/bfa_defs_pm.h create mode 100644 drivers/scsi/bfa/include/defs/bfa_defs_pom.h create mode 100644 drivers/scsi/bfa/include/defs/bfa_defs_port.h create mode 100644 drivers/scsi/bfa/include/defs/bfa_defs_pport.h create mode 100644 drivers/scsi/bfa/include/defs/bfa_defs_qos.h create mode 100644 drivers/scsi/bfa/include/defs/bfa_defs_rport.h create mode 100644 drivers/scsi/bfa/include/defs/bfa_defs_status.h create mode 100644 drivers/scsi/bfa/include/defs/bfa_defs_tin.h create mode 100644 drivers/scsi/bfa/include/defs/bfa_defs_tsensor.h create mode 100644 drivers/scsi/bfa/include/defs/bfa_defs_types.h create mode 100644 drivers/scsi/bfa/include/defs/bfa_defs_version.h create mode 100644 drivers/scsi/bfa/include/defs/bfa_defs_vf.h create mode 100644 drivers/scsi/bfa/include/defs/bfa_defs_vport.h create mode 100644 drivers/scsi/bfa/include/fcb/bfa_fcb.h create mode 100644 drivers/scsi/bfa/include/fcb/bfa_fcb_fcpim.h create mode 100644 drivers/scsi/bfa/include/fcb/bfa_fcb_port.h create mode 100644 drivers/scsi/bfa/include/fcb/bfa_fcb_rport.h create mode 100644 drivers/scsi/bfa/include/fcb/bfa_fcb_vf.h create mode 100644 drivers/scsi/bfa/include/fcb/bfa_fcb_vport.h create mode 100644 drivers/scsi/bfa/include/fcs/bfa_fcs.h create mode 100644 drivers/scsi/bfa/include/fcs/bfa_fcs_auth.h create mode 100644 drivers/scsi/bfa/include/fcs/bfa_fcs_fabric.h create mode 100644 drivers/scsi/bfa/include/fcs/bfa_fcs_fcpim.h create mode 100644 drivers/scsi/bfa/include/fcs/bfa_fcs_fdmi.h create mode 100644 drivers/scsi/bfa/include/fcs/bfa_fcs_lport.h create mode 100644 drivers/scsi/bfa/include/fcs/bfa_fcs_rport.h create mode 100644 drivers/scsi/bfa/include/fcs/bfa_fcs_vport.h create mode 100644 drivers/scsi/bfa/include/log/bfa_log_fcs.h create mode 100644 drivers/scsi/bfa/include/log/bfa_log_hal.h create mode 100644 drivers/scsi/bfa/include/log/bfa_log_linux.h create mode 100644 drivers/scsi/bfa/include/log/bfa_log_wdrv.h create mode 100644 drivers/scsi/bfa/include/protocol/ct.h create mode 100644 drivers/scsi/bfa/include/protocol/fc.h create mode 100644 drivers/scsi/bfa/include/protocol/fc_sp.h create mode 100644 drivers/scsi/bfa/include/protocol/fcp.h create mode 100644 drivers/scsi/bfa/include/protocol/fdmi.h create mode 100644 drivers/scsi/bfa/include/protocol/pcifw.h create mode 100644 drivers/scsi/bfa/include/protocol/scsi.h create mode 100644 drivers/scsi/bfa/include/protocol/types.h create mode 100644 drivers/scsi/bfa/loop.c create mode 100644 drivers/scsi/bfa/lport_api.c create mode 100644 drivers/scsi/bfa/lport_priv.h create mode 100644 drivers/scsi/bfa/ms.c create mode 100644 drivers/scsi/bfa/n2n.c create mode 100644 drivers/scsi/bfa/ns.c create mode 100644 drivers/scsi/bfa/plog.c create mode 100644 drivers/scsi/bfa/rport.c create mode 100644 drivers/scsi/bfa/rport_api.c create mode 100644 drivers/scsi/bfa/rport_ftrs.c create mode 100644 drivers/scsi/bfa/scn.c create mode 100644 drivers/scsi/bfa/vfapi.c create mode 100644 drivers/scsi/bfa/vport.c create mode 100644 drivers/scsi/mpt2sas/mpi/mpi2_history.txt delete mode 100644 drivers/staging/agnx/Kconfig delete mode 100644 drivers/staging/agnx/Makefile delete mode 100644 drivers/staging/agnx/TODO delete mode 100644 drivers/staging/agnx/agnx.h delete mode 100644 drivers/staging/agnx/debug.h delete mode 100644 drivers/staging/agnx/pci.c delete mode 100644 drivers/staging/agnx/phy.c delete mode 100644 drivers/staging/agnx/phy.h delete mode 100644 drivers/staging/agnx/rf.c delete mode 100644 drivers/staging/agnx/sta.c delete mode 100644 drivers/staging/agnx/sta.h delete mode 100644 drivers/staging/agnx/table.c delete mode 100644 drivers/staging/agnx/table.h delete mode 100644 drivers/staging/agnx/xmit.c delete mode 100644 drivers/staging/agnx/xmit.h delete mode 100644 drivers/staging/cowloop/Kconfig delete mode 100644 drivers/staging/cowloop/Makefile delete mode 100644 drivers/staging/cowloop/TODO delete mode 100644 drivers/staging/cowloop/cowloop.c delete mode 100644 drivers/staging/cowloop/cowloop.h delete mode 100644 drivers/staging/stlc45xx/Kconfig delete mode 100644 drivers/staging/stlc45xx/Makefile delete mode 100644 drivers/staging/stlc45xx/stlc45xx.c delete mode 100644 drivers/staging/stlc45xx/stlc45xx.h delete mode 100644 drivers/staging/stlc45xx/stlc45xx_lmac.h create mode 100644 firmware/cis/COMpad2.cis.ihex create mode 100644 firmware/cis/COMpad4.cis.ihex create mode 100644 firmware/cis/DP83903.cis.ihex create mode 100644 firmware/cis/NE2K.cis.ihex create mode 100644 firmware/cis/PE-200.cis.ihex create mode 100644 firmware/cis/SW_555_SER.cis.ihex create mode 100644 firmware/cis/SW_7xx_SER.cis.ihex create mode 100644 firmware/cis/SW_8xx_SER.cis.ihex create mode 100644 firmware/cis/tamarack.cis.ihex

2 5

[alsa-devel] [PATCH] ASoC - Add support for upto 16 channels on OMAP MCBSP
by Liam Girdwood 06 Nov '09

06 Nov '09

From: Graeme Gregory <gg(a)slimlogic.co.uk> This patch increases the number of supported audio channels from 4 to 16 and was sponsored by Shotspotter inc. Signed-off-by: Graeme Gregory <gg(a)slimlogic.co.uk> Signed-off-by: Liam Girdwood <lrg(a)slimlogic.co.uk> --- sound/soc/omap/omap-mcbsp.c | 71 +++++++++++++++++++++++++++++------------- 1 files changed, 49 insertions(+), 22 deletions(-) diff --git a/sound/soc/omap/omap-mcbsp.c b/sound/soc/omap/omap-mcbsp.c index 3341f49..290ef2f 100644 --- a/sound/soc/omap/omap-mcbsp.c +++ b/sound/soc/omap/omap-mcbsp.c @@ -49,6 +49,8 @@ struct omap_mcbsp_data { */ int active; int configured; + unsigned int in_freq; + int clk_div; }; #define to_mcbsp(priv) container_of((priv), struct omap_mcbsp_data, bus_id) @@ -257,7 +259,7 @@ static int omap_mcbsp_dai_hw_params(struct snd_pcm_substream *substream, int dma, bus_id = mcbsp_data->bus_id, id = cpu_dai->id; int wlen, channels, wpf, sync_mode = OMAP_DMA_SYNC_ELEMENT; unsigned long port; - unsigned int format; + unsigned int format, frame_size, div; if (cpu_class_is_omap1()) { dma = omap1_dma_reqs[bus_id][substream->stream]; @@ -294,27 +296,23 @@ static int omap_mcbsp_dai_hw_params(struct snd_pcm_substream *substream, format = mcbsp_data->fmt & SND_SOC_DAIFMT_FORMAT_MASK; wpf = channels = params_channels(params); - switch (channels) { - case 2: - if (format == SND_SOC_DAIFMT_I2S) { - /* Use dual-phase frames */ - regs->rcr2 |= RPHASE; - regs->xcr2 |= XPHASE; - /* Set 1 word per (McBSP) frame for phase1 and phase2 */ - wpf--; - regs->rcr2 |= RFRLEN2(wpf - 1); - regs->xcr2 |= XFRLEN2(wpf - 1); - } - case 1: - case 4: + if (channels == 2 && format == SND_SOC_DAIFMT_I2S) { + /* Use dual-phase frames */ + regs->rcr2 |= RPHASE; + regs->xcr2 |= XPHASE; + /* Set 1 word per (McBSP) frame for phase1 and phase2 */ + wpf--; + regs->rcr2 |= RFRLEN2(wpf - 1); + regs->xcr2 |= XFRLEN2(wpf - 1); /* Set word per (McBSP) frame for phase1 */ regs->rcr1 |= RFRLEN1(wpf - 1); regs->xcr1 |= XFRLEN1(wpf - 1); - break; - default: + } else if (channels > 0 && channels < 17) { + regs->rcr1 |= RFRLEN1(wpf - 1); + regs->xcr1 |= XFRLEN1(wpf - 1); + } else /* Unsupported number of channels */ return -EINVAL; - } switch (params_format(params)) { case SNDRV_PCM_FORMAT_S16_LE: @@ -330,6 +328,34 @@ static int omap_mcbsp_dai_hw_params(struct snd_pcm_substream *substream, return -EINVAL; } + /* Default div to 1 if it wasn't set by machine driver, otherwise + * use set div as the maximum clock value + */ + div = mcbsp_data->clk_div ? mcbsp_data->clk_div : 1; + + /* calc best frame size for rate and clock divider */ + do { + frame_size = (mcbsp_data->in_freq / div) / params_rate(params); + pr_debug("freq %d, rate %d, frame size %d, div %d\n", + mcbsp_data->in_freq, params_rate(params), frame_size, div); + + if (frame_size > 256) + div++; + } while (frame_size > 256); + + /* Check we can fit the requested number of channels into our + * calculated frame size + */ + if ((channels * wlen) > frame_size) { + printk(KERN_ERR + "OMAP-MCBSP: cannot fit channels in frame size\n"); + return -EINVAL; + } + + /* Set the actual clkdiv to use for this samplerate */ + regs->srgr1 &= ~CLKGDV(0xFF); + regs->srgr1 |= CLKGDV(div - 1); + /* Set FS period and length in terms of bit clock periods */ switch (format) { case SND_SOC_DAIFMT_I2S: @@ -338,7 +364,7 @@ static int omap_mcbsp_dai_hw_params(struct snd_pcm_substream *substream, break; case SND_SOC_DAIFMT_DSP_A: case SND_SOC_DAIFMT_DSP_B: - regs->srgr2 |= FPER(wlen * channels - 1); + regs->srgr2 |= FPER(frame_size - 1); regs->srgr1 |= FWID(0); break; } @@ -449,12 +475,11 @@ static int omap_mcbsp_dai_set_clkdiv(struct snd_soc_dai *cpu_dai, int div_id, int div) { struct omap_mcbsp_data *mcbsp_data = to_mcbsp(cpu_dai->private_data); - struct omap_mcbsp_reg_cfg *regs = &mcbsp_data->regs; if (div_id != OMAP_MCBSP_CLKGDV) return -ENODEV; - regs->srgr1 |= CLKGDV(div - 1); + mcbsp_data->clk_div = div; return 0; } @@ -554,6 +579,8 @@ static int omap_mcbsp_dai_set_dai_sysclk(struct snd_soc_dai *cpu_dai, struct omap_mcbsp_reg_cfg *regs = &mcbsp_data->regs; int err = 0; + mcbsp_data->in_freq = freq; + switch (clk_id) { case OMAP_MCBSP_SYSCLK_CLK: regs->srgr2 |= CLKSM; @@ -598,13 +625,13 @@ static struct snd_soc_dai_ops omap_mcbsp_dai_ops = { .id = (link_id), \ .playback = { \ .channels_min = 1, \ - .channels_max = 4, \ + .channels_max = 16, \ .rates = OMAP_MCBSP_RATES, \ .formats = SNDRV_PCM_FMTBIT_S16_LE, \ }, \ .capture = { \ .channels_min = 1, \ - .channels_max = 4, \ + .channels_max = 16, \ .rates = OMAP_MCBSP_RATES, \ .formats = SNDRV_PCM_FMTBIT_S16_LE, \ }, \ -- 1.6.3.3

5 13

[alsa-devel] [SoC] DMA not generate interrupt !
by hung nguyen 06 Nov '09

06 Nov '09

Hi I am writing my audio driver for my board: TMPA910 CPU and WM8960 codec. when I run pcm_min.c, there is an error: "Input/Output error". I find that error because no DMA interrupt appear, printk() in DMA interrupt program no appear I have already set bit IE and ITC in DMA Configuaration register but no change. Here is my source code. Any idea, what could be the reason ?

2 1

[alsa-devel] OMAP-McBSP driver not allowing suspend/resume
by Aggarwal, Anuj 06 Nov '09

06 Nov '09

Hi, I am trying to put OMAP3 in suspend state, while audio is playing, by issuing: echo mem > /sys/power/state root@omap3evm:~# echo mem > /sys/power/state PM: Syncing filesystems ... done. Freezing user space processes ... (elapsed 0.00 seconds) done. Freezing remaining freezable tasks ... (elapsed 0.00 seconds) done. Suspending console(s) (use no_console_suspend to debug) Powerdomain (core_pwrdm) didn't enter target state 1 Powerdomain (per_pwrdm) didn't enter target state 1 Could not enter target state in pm_suspend Restarting tasks ... Suspended. Trying resume. done. Done. root@omap3evm:~# As can be seen from the log, both the CORE and PER power domains are not going to the suspend state. On further debug, I found that McBSP 2 instance belongs to the PER domain whereas SDMA belongs to CORE domain. And at least McBSP driver (on l-o tip) doesn't allow disabling of the clocks unless McBSP instance itself is freed. Because of this, when McBSP is stopped after receiving the suspend request, the clocks are still ON and the PER domain is not allowed to enter to the desired low-power state. The McBSP driver needs to be modified so that it can accommodate suspend/resume requests and turns off the clocks when not required. Has anyone modified the driver for this, on some other branch? I tried finding it but could not do so. (Just wanted to make sure before doing the changes) Regards, Anuj Aggarwal

3 3

[alsa-devel] Artifacts present in AIC23 capture for 48 KHz sampling rate
by Aggarwal, Anuj 06 Nov '09

06 Nov '09

Hi, I am observing artifacts (sharp spikes at fixed intervals) while capturing audio on AM3517 EVM and AIC23 codec. They are present only in one of the channels when I am capturing at 48 KHz. All other sampling rates are working fine with the above said combination. I have also attached the screenshot taken with the help of Audacity utility. Here, I tried recording silence but artifacts were observed on one channel. Has anyone also observed the similar behavior with AIC23 codec? Any hints on what could be the root cause? Regards, Anuj Aggarwal

1 0

[alsa-devel] Artifacts present in AIC23 capture for 48 KHz sampling rate
by Aggarwal, Anuj 06 Nov '09

06 Nov '09

Hi, I am observing artifacts (sharp spikes at fixed intervals) while capturing audio on AM3517 EVM and AIC23 codec. They are present only in one of the channels when I am capturing at 48 KHz. All other sampling rates are working fine with the above said combination. I have also attached the screenshot taken with the help of Audacity utility. Here, I tried recording silence but artifacts were observed on one channel. Has anyone also observed the similar behavior with AIC23 codec? Any hints what could be the root cause? Regards, Anuj Aggarwal

1 0

[alsa-devel] [PATCH] ASoC: OMAP: Don't try to set unsupported OMAP_DMA_DATA_BURST_16 on OMAP1
by Janusz Krzysztofik 06 Nov '09

06 Nov '09

Wednesday 21 October 2009 20:09:54 Mark Brown napisał(a): > This is fine by me but I'd like a proper changelog Yes, sir. ---------------------- After DMA burst mode has been introduced in sound/soc/omap/omap-pcm.c, omap_pcm_prepare() unconditionally calls: omap_set_dma_src_burst_mode(prtd->dma_ch, OMAP_DMA_DATA_BURST_16); omap_set_dma_dest_burst_mode(prtd->dma_ch, OMAP_DMA_DATA_BURST_16); Current implementation of those two functions found in arch/arm/plat-ompa/dma.c doesn't support OMAP_DMA_DATA_BURST_16 on OMAP1 at all, so they both end with BUG() on that machine. That results in ASoC being completely unusable, at least on my OMAP5910 based Amstrad Delta. The patch corrects the problem by not calling those two functions when run on OMAP1 class based machines. Created against linux-2.6.32-rc5. Tested on Amstrad Delta. Signed-off-by: Janusz Krzysztofik <jkrzyszt(a)tis.icnet.pl> --- --- linux-2.6.32-rc5/sound/soc/omap/omap-pcm.c.orig 2009-10-16 02:41:50.000000000 +0200 +++ linux-2.6.32-rc5/sound/soc/omap/omap-pcm.c 2009-10-21 12:33:45.000000000 +0200 @@ -195,6 +195,9 @@ static int omap_pcm_prepare(struct snd_p else omap_enable_dma_irq(prtd->dma_ch, OMAP_DMA_FRAME_IRQ); + if (cpu_class_is_omap1()) + return 0; + omap_set_dma_src_burst_mode(prtd->dma_ch, OMAP_DMA_DATA_BURST_16); omap_set_dma_dest_burst_mode(prtd->dma_ch, OMAP_DMA_DATA_BURST_16);

3 6

Re: [alsa-devel] snd-hdsp driver error?
by Raymond Yau 06 Nov '09

06 Nov '09

Please provide the full pulseaudio log and output of alsa-info.sh http://www.pulseaudio.org/wiki/Troubleshooting pulseaudio -k; pulseaudio -vvv and aplay -v -Dfront:0 32bit.wav aplay -v -M -Dfront:0 32bit.wav aplay -v -Dplughw:0 any.wav aplay -v -M -Dplughw:0 any.wav 2009/11/4 Lars Zobbe <fedesensfar(a)gmail.com> > Hi Raymond. > > I so sorry Raymond. But I'm not sure what to do with this info. Is there > something more I have to tell you? Is there anything I can do to make > pulseaudio able to detect via udev? Can I copy-paste that bit of code you > sent me somewhere? > Please tell me if there's more you need to know. > Greetings. > Lars. > > > > > On Tue, Nov 3, 2009 at 7:48 AM, Raymond Yau <superquad.vortex2(a)gmail.com>wrote: > >> I guess route plugin used by RME96*.conf does not support mmap when there >> is >> channel conversion since minimum channels supported by hdsp is 14 >> >> >> static struct snd_pcm_hardware snd_hdsp_playback_subinfo = >> { >> .info = (SNDRV_PCM_INFO_MMAP | >> SNDRV_PCM_INFO_MMAP_VALID | >> SNDRV_PCM_INFO_NONINTERLEAVED | >> SNDRV_PCM_INFO_SYNC_START | >> SNDRV_PCM_INFO_DOUBLE), >> #ifdef SNDRV_BIG_ENDIAN >> .formats = SNDRV_PCM_FMTBIT_S32_BE, >> #else >> .formats = SNDRV_PCM_FMTBIT_S32_LE, >> #endif >> .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), >> .rate_min = 32000, >> .rate_max = 96000, >> .channels_min = 14, >> .channels_max = HDSP_MAX_CHANNELS, >> .buffer_bytes_max = HDSP_CHANNEL_BUFFER_BYTES * HDSP_MAX_CHANNELS, >> .period_bytes_min = (64 * 4) * 10, >> .period_bytes_max = (8192 * 4) * HDSP_MAX_CHANNELS, >> .periods_min = 2, >> .periods_max = 2, >> .fifo_size = 0 >> }; >> >> 2009/11/2 Lars Zobbe <fedesensfar(a)gmail.com> >> >> > Hi. >> > >> > Talking to one of the pulseaudio developers (*Colin Guthrie*) about a >> > problem with pulseaudio loading modules and my sound card (RME HDSP >> 9632), >> > I >> > was adviced to inform you about the problem. >> > >> > I'm on ubuntu 9.10, 64bit, kernel 2.6.31 with an amd64 x2 3800+ >> processor. >> > >> > >> > Symptoms are: >> > Can only make pulseaudio load modules with the deprecated load-module >> > module-detect command, module-udev-detect doesn't detect anything (no >> sound >> > - only null sink output in padevchooser). >> > I get terrible stuttering. >> > I can remove pulseaudio and make things work, more or less. However, >> that >> > leaves me without software mixing and apps fighting for the rights to >> make >> > sound. And more inconveniences (fx. no volume-control). >> > I can play sound from audacity without stuttering by choosing the >> cardname >> > directly in output HDSP, not ALSA, not pulseaudio. >> > >> > >> > When trying to run alsa-info.sh I get a lot of "not found" errors. So >> > you'll >> > get some manual info (they might have moved som files around in ubuntu >> > 9.10). >> > >> > This is part of my syslog during a boot. (I did the formatting to bold). >> > >> > Nov 2 10:57:32 lars-desktop pulseaudio[1524]: module.c: module-detect >> is >> > deprecated: Please use module-udev-detect instead of module-detect! >> > Nov 2 10:57:37 lars-desktop pulseaudio[1524]: ratelimit.c: 27 events >> > suppressed >> > Nov 2 10:57:39 lars-desktop pulseaudio[1612]: module.c: module-detect >> is >> > deprecated: Please use module-udev-detect instead of module-detect! >> > Nov 2 10:57:44 lars-desktop pulseaudio[1612]: ratelimit.c: 23 events >> > suppressed >> > Nov 2 10:57:44 lars-desktop pulseaudio[1612]: alsa-sink.c: ALSA woke us >> up >> > to write new data to the device, but there was actually nothing to >> write! >> > Nov 2 10:57:44 lars-desktop pulseaudio[1612]: alsa-sink.c: *Most likely >> > this is a bug in the ALSA driver 'snd_hdsp'. Please report this issue to >> > the >> > ALSA developers.* >> > Nov 2 10:57:44 lars-desktop pulseaudio[1612]: alsa-sink.c: We were >> woken >> > up >> > with POLLOUT set -- however a subsequent snd_pcm_avail() returned 0 or >> > another value < min_avail. >> > Nov 2 10:57:49 lars-desktop pulseaudio[1612]: ratelimit.c: 99 events >> > suppressed >> > >> > Later if I try to play audio I get terrible skipping or stuttering and >> my >> > syslog (in less than a minute) writes: >> > Nov 2 11:55:16 lars-desktop pulseaudio[1612]: ratelimit.c: 16 events >> > suppressed >> > Nov 2 11:55:21 lars-desktop pulseaudio[1612]: ratelimit.c: 34 events >> > suppressed >> > Nov 2 11:55:26 lars-desktop pulseaudio[1612]: ratelimit.c: 70 events >> > suppressed >> > Nov 2 11:55:31 lars-desktop pulseaudio[1612]: ratelimit.c: 29 events >> > suppressed >> > Nov 2 11:55:36 lars-desktop pulseaudio[1612]: ratelimit.c: 43 events >> > suppressed >> > Nov 2 11:55:41 lars-desktop pulseaudio[1612]: ratelimit.c: 161 events >> > suppressed >> > Nov 2 11:55:46 lars-desktop pulseaudio[1612]: ratelimit.c: 28 events >> > suppressed >> > Nov 2 11:55:51 lars-desktop pulseaudio[1612]: ratelimit.c: 18 events >> > suppressed >> > Nov 2 11:55:56 lars-desktop pulseaudio[1612]: ratelimit.c: 16 events >> > suppressed >> > >> > Here's the relevant part (concerning my sound card) of lspci -vvv >> > >> > 02:09.0 Multimedia audio controller: Xilinx Corporation RME Hammerfall >> DSP >> > (rev 9a) >> > Control: I/O- Mem+ BusMaster+ SpecCycle- MemWINV- VGASnoop- ParErr- >> > Stepping- SERR- FastB2B- DisINTx- >> > Status: Cap- 66MHz- UDF- FastB2B- ParErr- DEVSEL=medium >TAbort- >> > <TAbort- <MAbort- >SERR- <PERR- INTx- >> > Latency: 255 >> > Interrupt: pin A routed to IRQ 19 >> > Region 0: Memory at fdff0000 (32-bit, non-prefetchable) [size=64K] >> > Kernel driver in use: RME Hammerfall DSP >> > Kernel modules: snd-hdsp >> > >> > And: >> > lars@lars-desktop:~$ aplay -l >> > **** List of PLAYBACK Hardware Devices **** >> > card 0: DSP [Hammerfall DSP], device 0: RME Hammerfall HDSP 9632 [RME >> > Hammerfall HDSP 9632] >> > Subdevices: 1/1 >> > Subdevice #0: subdevice #0 >> > >> > >> > lars@lars-desktop:~$ cat /proc/asound/version >> > Advanced Linux Sound Architecture Driver Version 1.0.21. >> > Compiled on Oct 15 2009 for kernel 2.6.31-14-generic (SMP). >> > >> > lars@lars-desktop:~$ cat /proc/asound/cards >> > 0 [DSP ]: H-DSP - Hammerfall DSP >> > RME Hammerfall HDSP 9632 at 0xfdff0000, irq 19 >> > >> > >> > lars@lars-desktop:~$ cat /proc/asound/modules >> > 0 snd_hdsp >> > >> > I don't have .asound.conf files. >> > >> > lars@lars-desktop:~$ hdsploader >> > hdsploader - firmware loader for RME Hammerfall DSP cards >> > Looking for HDSP + Multiface or Digiface cards : >> > Card 0 : RME Hammerfall HDSP 9632 at 0xfdff0000, irq 19 >> > >> > And of course. My computer makes no sound if I don't load the hdspmixer >> at >> > startup. I guess that's just normal for this card though. >> > >> > Please let me know, if you need more info. I really hope you can help >> out >> > here. And that this might help you to. >> > >> > Thanks for the great work you do. Greetings. >> > Lars Zobbe. >> > _______________________________________________ >> > Alsa-devel mailing list >> > Alsa-devel(a)alsa-project.org >> > http://mailman.alsa-project.org/mailman/listinfo/alsa-devel >> > >> _______________________________________________ >> Alsa-devel mailing list >> Alsa-devel(a)alsa-project.org >> http://mailman.alsa-project.org/mailman/listinfo/alsa-devel >> > >

2 3

[alsa-devel] ALSA full-duplex questions
by pl bossart 06 Nov '09

06 Nov '09

Hi, I have a very low-latency full-duplex application where I would like up- and downlink to be synchronous, i.e. period events happen at the same time for capture and playback. This would minimize the number of wake-ups and enable the platform to go to low power. I thought snd_pcm_link() would enable this coupling between capture and playback, but it looks like it only buids a list of linked devices and uses this information for state transitions. Said transitions don't look quite atomic by looking at the code. The alsa-lib/test/latency.c code even tries to measure the difference between the number of samples read/written. In short the question is whether I can force a synchronous behavior from my application, or if I need to roll up my sleeves and fix the drivers to see this behavior? Another solution I thought of would be to disable the period events on one of the devices, and handle both devices at once when one period event fires. But I am not sure you can disable all events for an audio device (was on the wish list of Lennart, not sure if it became reality?) Thanks for your feedback. - Pierre

1 0

[alsa-devel] [PATCH] cs4236: detect chip in one pass
by Krzysztof Helt 05 Nov '09

05 Nov '09

From: Krzysztof Helt <krzysztof.h1(a)wp.pl> The cs4236 was two step detection with call to the snd_wss_free() between two steps. The snd_wss_free() did not free a sound device created in the snd_wss_create(). This caused an OOPS during module removal as the same sound device was released twice. The same OOPS happened if the cs4236 module loading failed. Fix this by adapting the snd_cs4236_create() to correctly work with chips less capable then cs4236. The snd_cs4236_create() behaves the same as the snd_wss_create() if the chip is less capable than the cs4236. Signed-off-by: Krzysztof Helt <krzysztof.h1(a)wp.pl> --- This is the third version of the patch with less code indented (smaller change). include/sound/wss.h | 1 - sound/isa/cs423x/cs4236.c | 13 ++-------- sound/isa/cs423x/cs4236_lib.c | 50 +++++++++++++++++++++++++--------------- sound/isa/wss/wss_lib.c | 3 +- 4 files changed, 35 insertions(+), 32 deletions(-) diff --git a/include/sound/wss.h b/include/sound/wss.h index 6d65f32..fd01f22 100644 --- a/include/sound/wss.h +++ b/include/sound/wss.h @@ -154,7 +154,6 @@ int snd_wss_create(struct snd_card *card, unsigned short hardware, unsigned short hwshare, struct snd_wss **rchip); -int snd_wss_free(struct snd_wss *chip); int snd_wss_pcm(struct snd_wss *chip, int device, struct snd_pcm **rpcm); int snd_wss_timer(struct snd_wss *chip, int device, struct snd_timer **rtimer); int snd_wss_mixer(struct snd_wss *chip); diff --git a/sound/isa/cs423x/cs4236.c b/sound/isa/cs423x/cs4236.c index a076a6c..93fa672 100644 --- a/sound/isa/cs423x/cs4236.c +++ b/sound/isa/cs423x/cs4236.c @@ -394,21 +394,15 @@ static int __devinit snd_cs423x_probe(struct snd_card *card, int dev) return -EBUSY; } - err = snd_wss_create(card, port[dev], cport[dev], + err = snd_cs4236_create(card, port[dev], cport[dev], irq[dev], dma1[dev], dma2[dev], WSS_HW_DETECT3, 0, &chip); if (err < 0) return err; + + acard->chip = chip; if (chip->hardware & WSS_HW_CS4236B_MASK) { - snd_wss_free(chip); - err = snd_cs4236_create(card, - port[dev], cport[dev], - irq[dev], dma1[dev], dma2[dev], - WSS_HW_DETECT, 0, &chip); - if (err < 0) - return err; - acard->chip = chip; err = snd_cs4236_pcm(chip, 0, &pcm); if (err < 0) @@ -418,7 +412,6 @@ static int __devinit snd_cs423x_probe(struct snd_card *card, int dev) if (err < 0) return err; } else { - acard->chip = chip; err = snd_wss_pcm(chip, 0, &pcm); if (err < 0) return err; diff --git a/sound/isa/cs423x/cs4236_lib.c b/sound/isa/cs423x/cs4236_lib.c index 38835f3..1b1ad1c 100644 --- a/sound/isa/cs423x/cs4236_lib.c +++ b/sound/isa/cs423x/cs4236_lib.c @@ -87,6 +87,7 @@ #include <sound/core.h> #include <sound/wss.h> #include <sound/asoundef.h> +#include <sound/initval.h> /* * @@ -264,7 +265,10 @@ static void snd_cs4236_resume(struct snd_wss *chip) } #endif /* CONFIG_PM */ - +/* + * This function does no fail if the chip is not CS4236B or compatible. + * It just an equivalent to the snd_wss_create() then. + */ int snd_cs4236_create(struct snd_card *card, unsigned long port, unsigned long cport, @@ -281,21 +285,17 @@ int snd_cs4236_create(struct snd_card *card, *rchip = NULL; if (hardware == WSS_HW_DETECT) hardware = WSS_HW_DETECT3; - if (cport < 0x100) { - snd_printk(KERN_ERR "please, specify control port " - "for CS4236+ chips\n"); - return -ENODEV; - } + err = snd_wss_create(card, port, cport, irq, dma1, dma2, hardware, hwshare, &chip); if (err < 0) return err; - if (!(chip->hardware & WSS_HW_CS4236B_MASK)) { - snd_printk(KERN_ERR "CS4236+: MODE3 and extended registers " - "not available, hardware=0x%x\n", chip->hardware); - snd_device_free(card, chip); - return -ENODEV; + if ((chip->hardware & WSS_HW_CS4236B_MASK) == 0) { + snd_printd("chip is not CS4236+, hardware=0x%x\n", + chip->hardware); + *rchip = chip; + return 0; } #if 0 { @@ -308,9 +308,16 @@ int snd_cs4236_create(struct snd_card *card, idx, snd_cs4236_ctrl_in(chip, idx)); } #endif + if (cport < 0x100 || cport == SNDRV_AUTO_PORT) { + snd_printk(KERN_ERR "please, specify control port " + "for CS4236+ chips\n"); + snd_device_free(card, chip); + return -ENODEV; + } ver1 = snd_cs4236_ctrl_in(chip, 1); ver2 = snd_cs4236_ext_in(chip, CS4236_VERSION); - snd_printdd("CS4236: [0x%lx] C1 (version) = 0x%x, ext = 0x%x\n", cport, ver1, ver2); + snd_printdd("CS4236: [0x%lx] C1 (version) = 0x%x, ext = 0x%x\n", + cport, ver1, ver2); if (ver1 != ver2) { snd_printk(KERN_ERR "CS4236+ chip detected, but " "control port 0x%lx is not valid\n", cport); @@ -321,13 +328,17 @@ int snd_cs4236_create(struct snd_card *card, snd_cs4236_ctrl_out(chip, 2, 0xff); snd_cs4236_ctrl_out(chip, 3, 0x00); snd_cs4236_ctrl_out(chip, 4, 0x80); - snd_cs4236_ctrl_out(chip, 5, ((IEC958_AES1_CON_PCM_CODER & 3) << 6) | IEC958_AES0_CON_EMPHASIS_NONE); + reg = ((IEC958_AES1_CON_PCM_CODER & 3) << 6) | + IEC958_AES0_CON_EMPHASIS_NONE; + snd_cs4236_ctrl_out(chip, 5, reg); snd_cs4236_ctrl_out(chip, 6, IEC958_AES1_CON_PCM_CODER >> 2); snd_cs4236_ctrl_out(chip, 7, 0x00); - /* 0x8c for C8 is valid for Turtle Beach Malibu - the IEC-958 output */ - /* is working with this setup, other hardware should have */ - /* different signal paths and this value should be selectable */ - /* in the future */ + /* + * 0x8c for C8 is valid for Turtle Beach Malibu - the IEC-958 + * output is working with this setup, other hardware should + * have different signal paths and this value should be + * selectable in the future + */ snd_cs4236_ctrl_out(chip, 8, 0x8c); chip->rate_constraint = snd_cs4236_xrate; chip->set_playback_format = snd_cs4236_playback_format; @@ -339,9 +350,10 @@ int snd_cs4236_create(struct snd_card *card, /* initialize extended registers */ for (reg = 0; reg < sizeof(snd_cs4236_ext_map); reg++) - snd_cs4236_ext_out(chip, CS4236_I23VAL(reg), snd_cs4236_ext_map[reg]); + snd_cs4236_ext_out(chip, CS4236_I23VAL(reg), + snd_cs4236_ext_map[reg]); - /* initialize compatible but more featured registers */ + /* initialize compatible but more featured registers */ snd_wss_out(chip, CS4231_LEFT_INPUT, 0x40); snd_wss_out(chip, CS4231_RIGHT_INPUT, 0x40); snd_wss_out(chip, CS4231_AUX1_LEFT_INPUT, 0xff); diff --git a/sound/isa/wss/wss_lib.c b/sound/isa/wss/wss_lib.c index 5d2ba1b..aab44e7 100644 --- a/sound/isa/wss/wss_lib.c +++ b/sound/isa/wss/wss_lib.c @@ -1682,7 +1682,7 @@ static void snd_wss_resume(struct snd_wss *chip) } #endif /* CONFIG_PM */ -int snd_wss_free(struct snd_wss *chip) +static int snd_wss_free(struct snd_wss *chip) { release_and_free_resource(chip->res_port); release_and_free_resource(chip->res_cport); @@ -1705,7 +1705,6 @@ int snd_wss_free(struct snd_wss *chip) kfree(chip); return 0; } -EXPORT_SYMBOL(snd_wss_free); static int snd_wss_dev_free(struct snd_device *device) { -- 1.6.4 ------------------------------------------------------------------------------ Mapa fotoradarow! Pobierz >> http://link.interia.pl/f2413

2 1

[alsa-devel] ALSA/ASoC crash in pm_qos_remove_requirement()?
by Daniel Mack 05 Nov '09

05 Nov '09

Has anyone seen a similar crash to the one below recently? It happened to us on PXA300 embedded platforms. Any pointers appreciated. Thanks, Daniel [ 882.823660] Unable to handle kernel paging request at virtual address 62696c2f [ 882.830853] pgd = c6000000 [ 882.833536] [62696c2f] *pgd=00000000 [ 882.837081] Internal error: Oops: 3 [#3] [ 882.840971] last sysfs file: /sys/devices/platform/spi_gpio.0/spi0.2/value [ 882.847793] Modules linked in: eeti_ts libertas_sdio pxamci ds2760_battery w1_ds2760 wire [ 882.855926] CPU: 0 Tainted: G D (2.6.32-rc6 #1) [ 882.861483] PC is at pm_qos_remove_requirement+0x78/0xb8 [ 882.866773] LR is at snd_pcm_hw_params+0x258/0x2e4 [ 882.871535] pc : [<c006da64>] lr : [<c02685ec>] psr: 60000093 [ 882.871546] sp : c7fa1da0 ip : 00000001 fp : bea08668 [ 882.882938] r10: c793b534 r9 : 00000001 r8 : c04dbd10 [ 882.888125] r7 : 60000013 r6 : c7f57000 r5 : 00000000 r4 : 62696c2f [ 882.894604] r3 : c03548f0 r2 : 005893bc r1 : c793b534 r0 : 00000001 [ 882.901085] Flags: nZCv IRQs off FIQs on Mode SVC_32 ISA ARM Segment user [ 882.908260] Control: 0000397f Table: a6000018 DAC: 00000015 [ 882.913962] Process p0-renderer (pid: 1235, stack limit = 0xc7fa0278) [ 882.920355] Stack: (0xc7fa1da0 to 0xc7fa2000) [ 882.924691] 1da0: c7f56000 00000000 c7f57000 00000001 c793b534 c7fa0000 c7f9f480 c02685ec [ 882.932822] 1dc0: c7f57000 c25c4111 bea08668 c793b500 bea08668 c0268a0c 00000000 00000000 [ 882.940954] 1de0: 00000000 c7f66160 c7fa1e04 00000000 c7f66160 c0090d1c 00000000 c004a0d0 [ 882.949078] 1e00: c7fbd880 c7f661dc 00000080 00000000 00000000 c76920ac 00000046 00000046 [ 882.957203] 1e20: 00000000 c0605660 00000000 a65b330f c0605660 00000000 00000000 c0093974 [ 882.965326] 1e40: 00000000 00000000 00000200 c7f78934 00000000 00000046 4044d000 c0605660 [ 882.973452] 1e60: 00000000 00000000 c6001010 c7f66160 00000000 4044d000 c7f78934 c7f80634 [ 882.981584] 1e80: c7f80600 c00941e8 00000046 00000000 00000000 40007000 3048c51d 0000004d [ 882.989708] 1ea0: c6000000 00000202 00000134 00000359 c05266a0 c0070834 3048c51d 00000000 [ 882.997834] 1ec0: c7fa1eec c7f66160 c7fea000 c7f9f480 c25c4111 bea08668 c793b500 bea08668 [ 883.005966] 1ee0: c7fa0000 4062a608 bea08668 c0269eb0 c04d6624 bea08268 00000005 c7fa1fb0 [ 883.014100] 1f00: 4044da44 c7f9f480 c25c4111 bea08668 c7f9f480 c00b207c 00000012 c7f9f480 [ 883.022232] 1f20: 00000012 c00b2780 c04d9d60 c006d164 c7fa1f5c c7f9401c c7fea000 00000015 [ 883.030366] 1f40: 00000000 c7fea000 c7f80780 c7f80600 c7fa1fac c7fa1f60 c0351fec c0052f54 [ 883.038498] 1f60: 00000000 c005b5c8 00000012 bea08668 c25c4111 c7f9f480 c00440c4 c7fa0000 [ 883.046631] 1f80: 4062a608 c00b2820 40005030 00000001 03368914 bea08668 404b1674 00063a20 [ 883.054764] 1fa0: 00000036 c0043f40 bea08668 404b1674 00000012 c25c4111 bea08668 00020001 [ 883.062896] 1fc0: bea08668 404b1674 00063a20 00000036 00063778 00000000 4062a608 bea08668 [ 883.071021] 1fe0: 404b19c0 bea08198 404593fc 40759234 20000010 00000012 00000000 00000000 [ 883.079172] [<c006da64>] (pm_qos_remove_requirement+0x78/0xb8) from [<c02685ec>] (snd_pcm_hw_params+0x258/0x2e4) [ 883.089292] [<c02685ec>] (snd_pcm_hw_params+0x258/0x2e4) from [<c0268a0c>] (snd_pcm_common_ioctl1+0x22c/0xf00) [ 883.099241] [<c0268a0c>] (snd_pcm_common_ioctl1+0x22c/0xf00) from [<c0269eb0>] (snd_pcm_playback_ioctl1+0x3d0/0x3f4) [ 883.109713] [<c0269eb0>] (snd_pcm_playback_ioctl1+0x3d0/0x3f4) from [<c00b207c>] (vfs_ioctl+0x2c/0x70) [ 883.118971] [<c00b207c>] (vfs_ioctl+0x2c/0x70) from [<c00b2780>] (do_vfs_ioctl+0x4f4/0x55c) [ 883.127275] [<c00b2780>] (do_vfs_ioctl+0x4f4/0x55c) from [<c00b2820>] (sys_ioctl+0x38/0x5c) [ 883.135592] [<c00b2820>] (sys_ioctl+0x38/0x5c) from [<c0043f40>] (ret_fast_syscall+0x0/0x28) [ 883.143978] Code: eb00d3da e3a03001 ea000006 e1a04006 (e5946000) [ 883.150212] ---[ end trace 9912192a230e6312 ]---

2 2

[alsa-devel] Trying to get unsupported CODEC to work
by Alex Austin 05 Nov '09

05 Nov '09

HelloI have an MSI Media Live DIVA motherboard. It has an AMD SB600 HD Audio controller, and two CODECs on the HDA bus. First is an ALC888 Second is an Intersil DAE-3. Two alsa-info outputs in different circumstances http://www.alsa-project.org/db/?f=20c86e755fdbbdbc8761c8c2f4de76bce2ea0c11 http://www.alsa-project.org/db/?f=15c5e5eab0104622a84b2dd0df03f26c17c7242d Output of codecgraph with "modprobe hda-intel probe_mask=2" http://pastebin.com/f54b6a9b8 What's the next step to get this supported? -- - Alex Austin (651) 238-9273 "...and then I visited Wikipedia ...and the next 8 hours are a blur."

3 13

Re: [alsa-devel] Conexant CX20561 - Microphone problems
by Takashi Iwai 05 Nov '09

05 Nov '09

At Thu, 5 Nov 2009 06:34:36 -0500, Shawn Starr wrote: > > > > The interference is coming from: ALSA Capture on default (seems to be the > > > digital device), yet HDA Intel [CONEXANT Analog] has no such > > > interference. > > > > I don't understand what you mean here at all.... > > > I'm not understanding what 'default' is in this case. How many capture > (microphone) inputs does this device have? It really seems strange to me > that one capture input has so much interference. I just don't know what it is > using. > > **** List of CAPTURE Hardware Devices **** > card 0: Intel [HDA Intel], device 0: CONEXANT Analog [CONEXANT Analog] > Subdevices: 0/1 > Subdevice #0: subdevice #0 So, you have only this PCM stream for capture. > **** List of PLAYBACK Hardware Devices **** > card 0: Intel [HDA Intel], device 0: CONEXANT Analog [CONEXANT Analog] > Subdevices: 0/1 > Subdevice #0: subdevice #0 > card 0: Intel [HDA Intel], device 1: Conexant Digital [Conexant Digital] > Subdevices: 1/1 > Subdevice #0: subdevice #0 These are for playback, not capture. Takashi

1 0

[alsa-devel] Seg. fault when using Salsa 0.0.25
by Mogens Lindholdt Lauridsen 05 Nov '09

05 Nov '09

Hi, I got an application which uses Salsa 0.0.25. When I quit this application, it ends with a seg. fault. I don't know if this is caused by my application using Salsa wrongly, or a problem in Salsa. However, I got a fix for it. When my application closes, "hctl_elem_event_handler" is called. And since "helem->private_data" is null, this causes a seg. fault: snd_mixer_elem_t *elem = helem->private_data; snd_mixer_t *mixer = elem->mixer; It seems like: if (!elem) return 0; should have been before: snd_mixer_t *mixer = elem->mixer; An easy way to fix/avoid this is to remove "snd_mixer_t *mixer = elem->mixer;" and replace "mixer" with "elem->mixer" in the function. Like this: static int hctl_elem_event_handler(snd_hctl_elem_t *helem, unsigned int mask) { snd_mixer_elem_t *elem = helem->private_data; //MLN fix: snd_mixer_t *mixer = elem->mixer; int err; if (!elem) return 0; if (mask == SND_CTL_EVENT_MASK_REMOVE) { err = _snd_mixer_elem_throw_event(elem, mask); if (err < 0) return err; remove_simple_element(helem, 1); return 0; } if (mask & SND_CTL_EVENT_MASK_INFO) { remove_simple_element(helem, 0); add_simple_element(helem, elem->mixer); // MLN fix: "mixer" substituted by "elem->mixer" err = snd_mixer_elem_info(elem); if (err < 0) return err; snd_mixer_sort(elem->mixer); // MLN fix: "mixer" substituted by "elem->mixer" } if (mask & SND_CTL_EVENT_MASK_VALUE) { err = update_simple_element(helem, elem); if (err < 0) return err; if (err) { err = snd_mixer_elem_value(elem); if (err < 0) return err; } } return 0; } Kind regards, Mogens

2 1

Re: [alsa-devel] [Intel-gfx] Problems with HDMI audio on Intel DG45FC motherboard
by Wu Fengguang 05 Nov '09

05 Nov '09

On Thu, Nov 05, 2009 at 05:06:22PM +0800, David Härdeman wrote: > On Thu, November 5, 2009 08:47, Wu Fengguang wrote: > > On Thu, Nov 05, 2009 at 08:46:55AM +0800, David wrote: > >> Currently doing some testing with sticky stream id and format. > >> > >> Could you test the attached patch (applies to alsa git repo, without > >> your patchset) and see if you get the initial 0.5s silence with your > >> receiver? > > > > Yes it worked! > > Worked as in you get no 0.5s of initial silence? Or worked as in you at > least got some audio and the computer didn't crash? :) no 0.5s :) > > However something is broken when > > > > CONFIG_SND_HDA_POWER_SAVE=y > > CONFIG_SND_HDA_POWER_SAVE_DEFAULT=1 In the above config, you need to restart playback within 1s to avoid losing the first 0.5s samples. (Otherwise power save will kick in.) > I was kind of expecting my patch to break both power save and > suspend/resume given that it expects the stream format and id to survive > from pcm_close to pcm_prepare (which they probably won't if power saving Don't worry, I fixed that in my implementation :) > and/or resume/suspend kicks in). Power save also seems to mess up some > other parts of the driver even without my patch (haven't really looked > into that yet...power save might be tricky with HDMI from what I've seen > so far). Yes, HDMI power save is inherently not possible given that the sink devices have the more than 1s delays.. > The patch was just a test case to see if it was enough to fix the 0.5s > silence on receivers which are less picky than mine (it still doesn't fix > the 0.5s silence on my receiver but it fixes the > silence-for-the-duration-of-a-track problem). > > Next up, more testing with VCFG when I have more time. I have actually > tried setting that bit but it didn't change anything. Comments in > setup_dig_out_stream from hda_codec.c seems to suggest that it's a bit > more complex than just setting the right bit. No worry, I guess that's realtek specific problem (spdif_status_reset is only set by it). > > Attached is my updated patchset, which includes the sticky > > stream/infoframe features. > > Thanks, I'll take a look at it as soon as possible. Thanks, Fengguang

1 0

[alsa-devel] Intel HDA - AD1883 Codec - Jack Sense / Detect
by Alan Bennett 05 Nov '09

05 Nov '09

Hello; We have a custom motherboard Intel HDA / AD1883. For output, we connect the headphone jack and the mono / front speaker. We are unable to get audio in Linux (Windows is fine) that activates the front/mono speaker. The headphones work without a problem. However, none of the 4 "model=" strings improve the situation. The headphones always work, but no configuration will activate the onboard front/mono speaker. Is there a way to query the live status of the AD1883 / jack-detect/sense? -Alan

2 1

[alsa-devel] [PATCH] ALSA: intel8x0: Mute External Amplifier by default for another Sony model
by Dan Chen 05 Nov '09

05 Nov '09

Hi, Attached is a patch against current sound-2.6 HEAD adding the SSID of another Sony model that requires the inv_eapd quirk. Thanks, Dan

2 1

[alsa-devel] VIA VT1828S hda_intel errors
by Robert Hancock 05 Nov '09

05 Nov '09

I've been using the VT1828S codec support from ALSA git for the last few weeks. It seems to work fine, but there are some problems showing up in dmesg: Oct 25 20:46:14 newcastle kernel: ALSA sound/pci/hda/hda_intel.c:683: No response from codec, disabling MSI: last cmd=0x02af0900 Oct 25 20:46:15 newcastle kernel: ALSA sound/pci/hda/hda_intel.c:698: azx_get_response timeout, switching to polling mode: last cmd=0x02af0900 It seems like the cmd isn't always the same, previously it was 0x024f0c00. Is there something bad about this command that could be causing the response timeout? Also, disabling MSI for one occurrence of this seems a bit paranoid.. Also saw one of these: Oct 26 21:13:20 newcastle kernel: hda-intel: IRQ timing workaround is activated for card #0. Suggest a bigger bdl_pos_adj. and PulseAudio also complained: Oct 26 00:27:50 newcastle pulseaudio[16530]: alsa-sink.c: ALSA woke us up to write new data to the device, but there was actually nothing to write! Oct 26 00:27:50 newcastle pulseaudio[16530]: alsa-sink.c: Most likely this is a bug in the ALSA driver 'snd_hda_intel'. Please report this issue to the ALSA developers. Oct 26 00:27:50 newcastle pulseaudio[16530]: alsa-sink.c: We were woken up with POLLOUT set -- however a subsequent snd_pcm_avail() returned 0 or another value < min_avail.

2 6

[alsa-devel] [PATCH 3/7] S3C64XX PCM: Define PCM Controller base registers
by Jassi Brar 05 Nov '09

05 Nov '09

Signed-off-by: Jassi Brar <jassi.brar(a)samsung.com> --- arch/arm/mach-s3c6400/include/mach/map.h | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/arch/arm/mach-s3c6400/include/mach/map.h b/arch/arm/mach-s3c6400/include/mach/map.h index fc8b223..866be31 100644 --- a/arch/arm/mach-s3c6400/include/mach/map.h +++ b/arch/arm/mach-s3c6400/include/mach/map.h @@ -48,6 +48,8 @@ #define S3C64XX_PA_IIS1 (0x7F003000) #define S3C64XX_PA_TIMER (0x7F006000) #define S3C64XX_PA_IIC0 (0x7F004000) +#define S3C64XX_PA_PCM0 (0x7F009000) +#define S3C64XX_PA_PCM1 (0x7F00A000) #define S3C64XX_PA_IISV4 (0x7F00D000) #define S3C64XX_PA_IIC1 (0x7F00F000) -- 1.6.2.5

1 0

[alsa-devel] [PATCH 2/7] S3C AUDIO: Rename 's3c24xx-pcm' driver to 's3c_audio'
by Jassi Brar 05 Nov '09

05 Nov '09

Making room for namespace for the PCM Controller driver the platform driver(s3c24xx-pcm) has been renamed to SoC agnostic name 's3c-audio'. Signed-off-by: Jassi Brar <jassi.brar(a)samsung.com> --- sound/soc/s3c24xx/Makefile | 2 +- sound/soc/s3c24xx/jive_wm8750.c | 2 +- sound/soc/s3c24xx/ln2440sbc_alc650.c | 2 +- sound/soc/s3c24xx/neo1973_gta02_wm8753.c | 2 +- sound/soc/s3c24xx/neo1973_wm8753.c | 2 +- sound/soc/s3c24xx/s3c-audio.c | 467 ++++++++++++++++++++++++ sound/soc/s3c24xx/s3c-audio.h | 31 ++ sound/soc/s3c24xx/s3c-i2s-v2.c | 2 +- sound/soc/s3c24xx/s3c2412-i2s.c | 2 +- sound/soc/s3c24xx/s3c2443-ac97.c | 2 +- sound/soc/s3c24xx/s3c24xx-i2s.c | 2 +- sound/soc/s3c24xx/s3c24xx-pcm.c | 467 ------------------------ sound/soc/s3c24xx/s3c24xx-pcm.h | 31 -- sound/soc/s3c24xx/s3c24xx_simtec.c | 2 +- sound/soc/s3c24xx/s3c24xx_simtec_hermes.c | 2 +- sound/soc/s3c24xx/s3c24xx_simtec_tlv320aic23.c | 2 +- sound/soc/s3c24xx/s3c24xx_uda134x.c | 2 +- sound/soc/s3c24xx/s3c64xx-i2s.c | 2 +- sound/soc/s3c24xx/smdk2443_wm9710.c | 2 +- sound/soc/s3c24xx/smdk64xx_wm8580.c | 2 +- 20 files changed, 514 insertions(+), 514 deletions(-) create mode 100644 sound/soc/s3c24xx/s3c-audio.c create mode 100644 sound/soc/s3c24xx/s3c-audio.h delete mode 100644 sound/soc/s3c24xx/s3c24xx-pcm.c delete mode 100644 sound/soc/s3c24xx/s3c24xx-pcm.h diff --git a/sound/soc/s3c24xx/Makefile b/sound/soc/s3c24xx/Makefile index 7790406..3bdb74d 100644 --- a/sound/soc/s3c24xx/Makefile +++ b/sound/soc/s3c24xx/Makefile @@ -1,5 +1,5 @@ # S3c24XX Platform Support -snd-soc-s3c24xx-objs := s3c24xx-pcm.o +snd-soc-s3c24xx-objs := s3c-audio.o snd-soc-s3c24xx-i2s-objs := s3c24xx-i2s.o snd-soc-s3c2412-i2s-objs := s3c2412-i2s.o snd-soc-s3c64xx-i2s-objs := s3c64xx-i2s.o diff --git a/sound/soc/s3c24xx/jive_wm8750.c b/sound/soc/s3c24xx/jive_wm8750.c index 93e6c87..ac3a709 100644 --- a/sound/soc/s3c24xx/jive_wm8750.c +++ b/sound/soc/s3c24xx/jive_wm8750.c @@ -25,7 +25,7 @@ #include <asm/mach-types.h> -#include "s3c24xx-pcm.h" +#include "s3c-audio.h" #include "s3c2412-i2s.h" #include "../codecs/wm8750.h" diff --git a/sound/soc/s3c24xx/ln2440sbc_alc650.c b/sound/soc/s3c24xx/ln2440sbc_alc650.c index 12c7148..3896e52 100644 --- a/sound/soc/s3c24xx/ln2440sbc_alc650.c +++ b/sound/soc/s3c24xx/ln2440sbc_alc650.c @@ -24,7 +24,7 @@ #include <sound/soc-dapm.h> #include "../codecs/ac97.h" -#include "s3c24xx-pcm.h" +#include "s3c-audio.h" #include "s3c24xx-ac97.h" static struct snd_soc_card ln2440sbc; diff --git a/sound/soc/s3c24xx/neo1973_gta02_wm8753.c b/sound/soc/s3c24xx/neo1973_gta02_wm8753.c index 26409a9..1d05137 100644 --- a/sound/soc/s3c24xx/neo1973_gta02_wm8753.c +++ b/sound/soc/s3c24xx/neo1973_gta02_wm8753.c @@ -32,7 +32,7 @@ #include <asm/io.h> #include <mach/gta02.h> #include "../codecs/wm8753.h" -#include "s3c24xx-pcm.h" +#include "s3c-audio.h" #include "s3c24xx-i2s.h" static struct snd_soc_card neo1973_gta02; diff --git a/sound/soc/s3c24xx/neo1973_wm8753.c b/sound/soc/s3c24xx/neo1973_wm8753.c index 77de6c5..9183166 100644 --- a/sound/soc/s3c24xx/neo1973_wm8753.c +++ b/sound/soc/s3c24xx/neo1973_wm8753.c @@ -36,7 +36,7 @@ #include "../codecs/wm8753.h" #include "lm4857.h" -#include "s3c24xx-pcm.h" +#include "s3c-audio.h" #include "s3c24xx-i2s.h" /* define the scenarios */ diff --git a/sound/soc/s3c24xx/s3c-audio.c b/sound/soc/s3c24xx/s3c-audio.c new file mode 100644 index 0000000..a0be71f --- /dev/null +++ b/sound/soc/s3c24xx/s3c-audio.c @@ -0,0 +1,467 @@ +/* + * s3c-audio.c -- ALSA Soc Audio Layer + * + * (c) 2006 Wolfson Microelectronics PLC. + * Graeme Gregory graeme.gregory(a)wolfsonmicro.com or linux(a)wolfsonmicro.com + * + * Copyright 2004-2005 Simtec Electronics + * http://armlinux.simtec.co.uk/ + * Ben Dooks <ben(a)simtec.co.uk> + * + * This program is free software; you can redistribute it and/or modify it + * under the terms of the GNU General Public License as published by the + * Free Software Foundation; either version 2 of the License, or (at your + * option) any later version. + */ + +#include <linux/module.h> +#include <linux/init.h> +#include <linux/io.h> +#include <linux/platform_device.h> +#include <linux/slab.h> +#include <linux/dma-mapping.h> + +#include <sound/core.h> +#include <sound/pcm.h> +#include <sound/pcm_params.h> +#include <sound/soc.h> + +#include <asm/dma.h> +#include <mach/hardware.h> +#include <mach/dma.h> + +#include "s3c-audio.h" + +static const struct snd_pcm_hardware s3c_dma_hardware = { + .info = SNDRV_PCM_INFO_INTERLEAVED | + SNDRV_PCM_INFO_BLOCK_TRANSFER | + SNDRV_PCM_INFO_MMAP | + SNDRV_PCM_INFO_MMAP_VALID | + SNDRV_PCM_INFO_PAUSE | + SNDRV_PCM_INFO_RESUME, + .formats = SNDRV_PCM_FMTBIT_S16_LE | + SNDRV_PCM_FMTBIT_U16_LE | + SNDRV_PCM_FMTBIT_U8 | + SNDRV_PCM_FMTBIT_S8, + .channels_min = 2, + .channels_max = 2, + .buffer_bytes_max = 128*1024, + .period_bytes_min = PAGE_SIZE, + .period_bytes_max = PAGE_SIZE*2, + .periods_min = 2, + .periods_max = 128, + .fifo_size = 32, +}; + +struct s3c24xx_runtime_data { + spinlock_t lock; + int state; + unsigned int dma_loaded; + unsigned int dma_limit; + unsigned int dma_period; + dma_addr_t dma_start; + dma_addr_t dma_pos; + dma_addr_t dma_end; + struct s3c_audio_dma_params *params; +}; + +/* s3c_dma_enqueue + * + * place a dma buffer onto the queue for the dma system + * to handle. +*/ +static void s3c_dma_enqueue(struct snd_pcm_substream *substream) +{ + struct s3c24xx_runtime_data *prtd = substream->runtime->private_data; + dma_addr_t pos = prtd->dma_pos; + int ret; + + pr_debug("Entered %s\n", __func__); + + while (prtd->dma_loaded < prtd->dma_limit) { + unsigned long len = prtd->dma_period; + + pr_debug("dma_loaded: %d\n", prtd->dma_loaded); + + if ((pos + len) > prtd->dma_end) { + len = prtd->dma_end - pos; + pr_debug(KERN_DEBUG "%s: corrected dma len %ld\n", + __func__, len); + } + + ret = s3c2410_dma_enqueue(prtd->params->channel, + substream, pos, len); + + if (ret == 0) { + prtd->dma_loaded++; + pos += prtd->dma_period; + if (pos >= prtd->dma_end) + pos = prtd->dma_start; + } else + break; + } + + prtd->dma_pos = pos; +} + +static void s3c24xx_audio_buffdone(struct s3c2410_dma_chan *channel, + void *dev_id, int size, + enum s3c2410_dma_buffresult result) +{ + struct snd_pcm_substream *substream = dev_id; + struct s3c24xx_runtime_data *prtd; + + pr_debug("Entered %s\n", __func__); + + if (result == S3C2410_RES_ABORT || result == S3C2410_RES_ERR) + return; + + prtd = substream->runtime->private_data; + + if (substream) + snd_pcm_period_elapsed(substream); + + spin_lock(&prtd->lock); + if (prtd->state & ST_RUNNING) { + prtd->dma_loaded--; + s3c_dma_enqueue(substream); + } + + spin_unlock(&prtd->lock); +} + +static int s3c_dma_hw_params(struct snd_pcm_substream *substream, + struct snd_pcm_hw_params *params) +{ + struct snd_pcm_runtime *runtime = substream->runtime; + struct s3c24xx_runtime_data *prtd = runtime->private_data; + struct snd_soc_pcm_runtime *rtd = substream->private_data; + struct s3c_audio_dma_params *dma = rtd->dai->cpu_dai->dma_data; + unsigned long totbytes = params_buffer_bytes(params); + int ret = 0; + + pr_debug("Entered %s\n", __func__); + + /* return if this is a bufferless transfer e.g. + * codec <--> BT codec or GSM modem -- lg FIXME */ + if (!dma) + return 0; + + /* this may get called several times by oss emulation + * with different params -HW */ + if (prtd->params == NULL) { + /* prepare DMA */ + prtd->params = dma; + + pr_debug("params %p, client %p, channel %d\n", prtd->params, + prtd->params->client, prtd->params->channel); + + ret = s3c2410_dma_request(prtd->params->channel, + prtd->params->client, NULL); + + if (ret < 0) { + printk(KERN_ERR "failed to get dma channel\n"); + return ret; + } + } + + s3c2410_dma_set_buffdone_fn(prtd->params->channel, + s3c24xx_audio_buffdone); + + snd_pcm_set_runtime_buffer(substream, &substream->dma_buffer); + + runtime->dma_bytes = totbytes; + + spin_lock_irq(&prtd->lock); + prtd->dma_loaded = 0; + prtd->dma_limit = runtime->hw.periods_min; + prtd->dma_period = params_period_bytes(params); + prtd->dma_start = runtime->dma_addr; + prtd->dma_pos = prtd->dma_start; + prtd->dma_end = prtd->dma_start + totbytes; + spin_unlock_irq(&prtd->lock); + + return 0; +} + +static int s3c_dma_hw_free(struct snd_pcm_substream *substream) +{ + struct s3c24xx_runtime_data *prtd = substream->runtime->private_data; + + pr_debug("Entered %s\n", __func__); + + /* TODO - do we need to ensure DMA flushed */ + snd_pcm_set_runtime_buffer(substream, NULL); + + if (prtd->params) { + s3c2410_dma_free(prtd->params->channel, prtd->params->client); + prtd->params = NULL; + } + + return 0; +} + +static int s3c_dma_prepare(struct snd_pcm_substream *substream) +{ + struct s3c24xx_runtime_data *prtd = substream->runtime->private_data; + int ret = 0; + + pr_debug("Entered %s\n", __func__); + + /* return if this is a bufferless transfer e.g. + * codec <--> BT codec or GSM modem -- lg FIXME */ + if (!prtd->params) + return 0; + + /* channel needs configuring for mem=>device, increment memory addr, + * sync to pclk, half-word transfers to the IIS-FIFO. */ + if (substream->stream == SNDRV_PCM_STREAM_PLAYBACK) { + s3c2410_dma_devconfig(prtd->params->channel, + S3C2410_DMASRC_MEM, + prtd->params->dma_addr); + } else { + s3c2410_dma_devconfig(prtd->params->channel, + S3C2410_DMASRC_HW, + prtd->params->dma_addr); + } + + s3c2410_dma_config(prtd->params->channel, + prtd->params->dma_size); + + /* flush the DMA channel */ + s3c2410_dma_ctrl(prtd->params->channel, S3C2410_DMAOP_FLUSH); + prtd->dma_loaded = 0; + prtd->dma_pos = prtd->dma_start; + + /* enqueue dma buffers */ + s3c_dma_enqueue(substream); + + return ret; +} + +static int s3c_dma_trigger(struct snd_pcm_substream *substream, int cmd) +{ + struct s3c24xx_runtime_data *prtd = substream->runtime->private_data; + int ret = 0; + + pr_debug("Entered %s\n", __func__); + + spin_lock(&prtd->lock); + + switch (cmd) { + case SNDRV_PCM_TRIGGER_START: + case SNDRV_PCM_TRIGGER_RESUME: + case SNDRV_PCM_TRIGGER_PAUSE_RELEASE: + prtd->state |= ST_RUNNING; + s3c2410_dma_ctrl(prtd->params->channel, S3C2410_DMAOP_START); + break; + + case SNDRV_PCM_TRIGGER_STOP: + case SNDRV_PCM_TRIGGER_SUSPEND: + case SNDRV_PCM_TRIGGER_PAUSE_PUSH: + prtd->state &= ~ST_RUNNING; + s3c2410_dma_ctrl(prtd->params->channel, S3C2410_DMAOP_STOP); + break; + + default: + ret = -EINVAL; + break; + } + + spin_unlock(&prtd->lock); + + return ret; +} + +static snd_pcm_uframes_t +s3c_dma_pointer(struct snd_pcm_substream *substream) +{ + struct snd_pcm_runtime *runtime = substream->runtime; + struct s3c24xx_runtime_data *prtd = runtime->private_data; + unsigned long res; + dma_addr_t src, dst; + + pr_debug("Entered %s\n", __func__); + + spin_lock(&prtd->lock); + s3c2410_dma_getposition(prtd->params->channel, &src, &dst); + + if (substream->stream == SNDRV_PCM_STREAM_CAPTURE) + res = dst - prtd->dma_start; + else + res = src - prtd->dma_start; + + spin_unlock(&prtd->lock); + + pr_debug("Pointer %x %x\n", src, dst); + + /* we seem to be getting the odd error from the pcm library due + * to out-of-bounds pointers. this is maybe due to the dma engine + * not having loaded the new values for the channel before being + * callled... (todo - fix ) + */ + + if (res >= snd_pcm_lib_buffer_bytes(substream)) { + if (res == snd_pcm_lib_buffer_bytes(substream)) + res = 0; + } + + return bytes_to_frames(substream->runtime, res); +} + +static int s3c_dma_open(struct snd_pcm_substream *substream) +{ + struct snd_pcm_runtime *runtime = substream->runtime; + struct s3c24xx_runtime_data *prtd; + + pr_debug("Entered %s\n", __func__); + + snd_pcm_hw_constraint_integer(runtime, SNDRV_PCM_HW_PARAM_PERIODS); + snd_soc_set_runtime_hwparams(substream, &s3c_dma_hardware); + + prtd = kzalloc(sizeof(struct s3c24xx_runtime_data), GFP_KERNEL); + if (prtd == NULL) + return -ENOMEM; + + spin_lock_init(&prtd->lock); + + runtime->private_data = prtd; + return 0; +} + +static int s3c_dma_close(struct snd_pcm_substream *substream) +{ + struct snd_pcm_runtime *runtime = substream->runtime; + struct s3c24xx_runtime_data *prtd = runtime->private_data; + + pr_debug("Entered %s\n", __func__); + + if (!prtd) + pr_debug("s3c_dma_close called with prtd == NULL\n"); + + kfree(prtd); + + return 0; +} + +static int s3c_dma_mmap(struct snd_pcm_substream *substream, + struct vm_area_struct *vma) +{ + struct snd_pcm_runtime *runtime = substream->runtime; + + pr_debug("Entered %s\n", __func__); + + return dma_mmap_writecombine(substream->pcm->card->dev, vma, + runtime->dma_area, + runtime->dma_addr, + runtime->dma_bytes); +} + +static struct snd_pcm_ops s3c_dma_ops = { + .open = s3c_dma_open, + .close = s3c_dma_close, + .ioctl = snd_pcm_lib_ioctl, + .hw_params = s3c_dma_hw_params, + .hw_free = s3c_dma_hw_free, + .prepare = s3c_dma_prepare, + .trigger = s3c_dma_trigger, + .pointer = s3c_dma_pointer, + .mmap = s3c_dma_mmap, +}; + +static int s3c_preallocate_dma_buffer(struct snd_pcm *pcm, int stream) +{ + struct snd_pcm_substream *substream = pcm->streams[stream].substream; + struct snd_dma_buffer *buf = &substream->dma_buffer; + size_t size = s3c_dma_hardware.buffer_bytes_max; + + pr_debug("Entered %s\n", __func__); + + buf->dev.type = SNDRV_DMA_TYPE_DEV; + buf->dev.dev = pcm->card->dev; + buf->private_data = NULL; + buf->area = dma_alloc_writecombine(pcm->card->dev, size, + &buf->addr, GFP_KERNEL); + if (!buf->area) + return -ENOMEM; + buf->bytes = size; + return 0; +} + +static void s3c_dma_free_dma_buffers(struct snd_pcm *pcm) +{ + struct snd_pcm_substream *substream; + struct snd_dma_buffer *buf; + int stream; + + pr_debug("Entered %s\n", __func__); + + for (stream = 0; stream < 2; stream++) { + substream = pcm->streams[stream].substream; + if (!substream) + continue; + + buf = &substream->dma_buffer; + if (!buf->area) + continue; + + dma_free_writecombine(pcm->card->dev, buf->bytes, + buf->area, buf->addr); + buf->area = NULL; + } +} + +static u64 s3c_dmamask = DMA_BIT_MASK(32); + +static int s3c_dma_new(struct snd_card *card, + struct snd_soc_dai *dai, struct snd_pcm *pcm) +{ + int ret = 0; + + pr_debug("Entered %s\n", __func__); + + if (!card->dev->dma_mask) + card->dev->dma_mask = &s3c_dmamask; + if (!card->dev->coherent_dma_mask) + card->dev->coherent_dma_mask = 0xffffffff; + + if (dai->playback.channels_min) { + ret = s3c_preallocate_dma_buffer(pcm, + SNDRV_PCM_STREAM_PLAYBACK); + if (ret) + goto out; + } + + if (dai->capture.channels_min) { + ret = s3c_preallocate_dma_buffer(pcm, + SNDRV_PCM_STREAM_CAPTURE); + if (ret) + goto out; + } + out: + return ret; +} + +struct snd_soc_platform s3c24xx_soc_platform = { + .name = "s3c24xx-audio", + .pcm_ops = &s3c_dma_ops, + .pcm_new = s3c_dma_new, + .pcm_free = s3c_dma_free_dma_buffers, +}; +EXPORT_SYMBOL_GPL(s3c24xx_soc_platform); + +static int __init s3c24xx_soc_platform_init(void) +{ + return snd_soc_register_platform(&s3c24xx_soc_platform); +} +module_init(s3c24xx_soc_platform_init); + +static void __exit s3c24xx_soc_platform_exit(void) +{ + snd_soc_unregister_platform(&s3c24xx_soc_platform); +} +module_exit(s3c24xx_soc_platform_exit); + +MODULE_AUTHOR("Ben Dooks, <ben(a)simtec.co.uk>"); +MODULE_DESCRIPTION("Samsung S3C Audio DMA module"); +MODULE_LICENSE("GPL"); diff --git a/sound/soc/s3c24xx/s3c-audio.h b/sound/soc/s3c24xx/s3c-audio.h new file mode 100644 index 0000000..d04ddf8 --- /dev/null +++ b/sound/soc/s3c24xx/s3c-audio.h @@ -0,0 +1,31 @@ +/* + * s3c-audio.h -- + * + * This program is free software; you can redistribute it and/or modify it + * under the terms of the GNU General Public License as published by the + * Free Software Foundation; either version 2 of the License, or (at your + * option) any later version. + * + * ALSA PCM interface for the Samsung S3C24xx CPU + */ + +#ifndef _S3C_AUDIO_H +#define _S3C_AUDIO_H + +#define ST_RUNNING (1<<0) +#define ST_OPENED (1<<1) + +struct s3c_audio_dma_params { + struct s3c2410_dma_client *client; /* stream identifier */ + int channel; /* Channel ID */ + dma_addr_t dma_addr; + int dma_size; /* Size of the DMA transfer */ +}; + +#define S3C24XX_DAI_I2S 0 + +/* platform data */ +extern struct snd_soc_platform s3c24xx_soc_platform; +extern struct snd_ac97_bus_ops s3c24xx_ac97_ops; + +#endif diff --git a/sound/soc/s3c24xx/s3c-i2s-v2.c b/sound/soc/s3c24xx/s3c-i2s-v2.c index 9788e65..4e322a0 100644 --- a/sound/soc/s3c24xx/s3c-i2s-v2.c +++ b/sound/soc/s3c24xx/s3c-i2s-v2.c @@ -35,7 +35,7 @@ #include <mach/dma.h> #include "s3c-i2s-v2.h" -#include "s3c24xx-pcm.h" +#include "s3c-audio.h" #undef S3C_IIS_V2_SUPPORTED diff --git a/sound/soc/s3c24xx/s3c2412-i2s.c b/sound/soc/s3c24xx/s3c2412-i2s.c index 6bc13d5..593a081 100644 --- a/sound/soc/s3c24xx/s3c2412-i2s.c +++ b/sound/soc/s3c24xx/s3c2412-i2s.c @@ -37,7 +37,7 @@ #include <mach/regs-gpio.h> #include <mach/dma.h> -#include "s3c24xx-pcm.h" +#include "s3c-audio.h" #include "s3c2412-i2s.h" #define S3C2412_I2S_DEBUG 0 diff --git a/sound/soc/s3c24xx/s3c2443-ac97.c b/sound/soc/s3c24xx/s3c2443-ac97.c index d3bd29a..2b71218 100644 --- a/sound/soc/s3c24xx/s3c2443-ac97.c +++ b/sound/soc/s3c24xx/s3c2443-ac97.c @@ -35,7 +35,7 @@ #include <asm/dma.h> #include <mach/dma.h> -#include "s3c24xx-pcm.h" +#include "s3c-audio.h" #include "s3c24xx-ac97.h" struct s3c24xx_ac97_info { diff --git a/sound/soc/s3c24xx/s3c24xx-i2s.c b/sound/soc/s3c24xx/s3c24xx-i2s.c index 998e752..2361aa6 100644 --- a/sound/soc/s3c24xx/s3c24xx-i2s.c +++ b/sound/soc/s3c24xx/s3c24xx-i2s.c @@ -38,7 +38,7 @@ #include <plat/regs-iis.h> -#include "s3c24xx-pcm.h" +#include "s3c-audio.h" #include "s3c24xx-i2s.h" static struct s3c2410_dma_client s3c24xx_dma_client_out = { diff --git a/sound/soc/s3c24xx/s3c24xx-pcm.c b/sound/soc/s3c24xx/s3c24xx-pcm.c deleted file mode 100644 index a0be71f..0000000 --- a/sound/soc/s3c24xx/s3c24xx-pcm.c +++ /dev/null @@ -1,467 +0,0 @@ -/* - * s3c24xx-pcm.c -- ALSA Soc Audio Layer - * - * (c) 2006 Wolfson Microelectronics PLC. - * Graeme Gregory graeme.gregory(a)wolfsonmicro.com or linux(a)wolfsonmicro.com - * - * Copyright 2004-2005 Simtec Electronics - * http://armlinux.simtec.co.uk/ - * Ben Dooks <ben(a)simtec.co.uk> - * - * This program is free software; you can redistribute it and/or modify it - * under the terms of the GNU General Public License as published by the - * Free Software Foundation; either version 2 of the License, or (at your - * option) any later version. - */ - -#include <linux/module.h> -#include <linux/init.h> -#include <linux/io.h> -#include <linux/platform_device.h> -#include <linux/slab.h> -#include <linux/dma-mapping.h> - -#include <sound/core.h> -#include <sound/pcm.h> -#include <sound/pcm_params.h> -#include <sound/soc.h> - -#include <asm/dma.h> -#include <mach/hardware.h> -#include <mach/dma.h> - -#include "s3c24xx-pcm.h" - -static const struct snd_pcm_hardware s3c_dma_hardware = { - .info = SNDRV_PCM_INFO_INTERLEAVED | - SNDRV_PCM_INFO_BLOCK_TRANSFER | - SNDRV_PCM_INFO_MMAP | - SNDRV_PCM_INFO_MMAP_VALID | - SNDRV_PCM_INFO_PAUSE | - SNDRV_PCM_INFO_RESUME, - .formats = SNDRV_PCM_FMTBIT_S16_LE | - SNDRV_PCM_FMTBIT_U16_LE | - SNDRV_PCM_FMTBIT_U8 | - SNDRV_PCM_FMTBIT_S8, - .channels_min = 2, - .channels_max = 2, - .buffer_bytes_max = 128*1024, - .period_bytes_min = PAGE_SIZE, - .period_bytes_max = PAGE_SIZE*2, - .periods_min = 2, - .periods_max = 128, - .fifo_size = 32, -}; - -struct s3c24xx_runtime_data { - spinlock_t lock; - int state; - unsigned int dma_loaded; - unsigned int dma_limit; - unsigned int dma_period; - dma_addr_t dma_start; - dma_addr_t dma_pos; - dma_addr_t dma_end; - struct s3c_audio_dma_params *params; -}; - -/* s3c_dma_enqueue - * - * place a dma buffer onto the queue for the dma system - * to handle. -*/ -static void s3c_dma_enqueue(struct snd_pcm_substream *substream) -{ - struct s3c24xx_runtime_data *prtd = substream->runtime->private_data; - dma_addr_t pos = prtd->dma_pos; - int ret; - - pr_debug("Entered %s\n", __func__); - - while (prtd->dma_loaded < prtd->dma_limit) { - unsigned long len = prtd->dma_period; - - pr_debug("dma_loaded: %d\n", prtd->dma_loaded); - - if ((pos + len) > prtd->dma_end) { - len = prtd->dma_end - pos; - pr_debug(KERN_DEBUG "%s: corrected dma len %ld\n", - __func__, len); - } - - ret = s3c2410_dma_enqueue(prtd->params->channel, - substream, pos, len); - - if (ret == 0) { - prtd->dma_loaded++; - pos += prtd->dma_period; - if (pos >= prtd->dma_end) - pos = prtd->dma_start; - } else - break; - } - - prtd->dma_pos = pos; -} - -static void s3c24xx_audio_buffdone(struct s3c2410_dma_chan *channel, - void *dev_id, int size, - enum s3c2410_dma_buffresult result) -{ - struct snd_pcm_substream *substream = dev_id; - struct s3c24xx_runtime_data *prtd; - - pr_debug("Entered %s\n", __func__); - - if (result == S3C2410_RES_ABORT || result == S3C2410_RES_ERR) - return; - - prtd = substream->runtime->private_data; - - if (substream) - snd_pcm_period_elapsed(substream); - - spin_lock(&prtd->lock); - if (prtd->state & ST_RUNNING) { - prtd->dma_loaded--; - s3c_dma_enqueue(substream); - } - - spin_unlock(&prtd->lock); -} - -static int s3c_dma_hw_params(struct snd_pcm_substream *substream, - struct snd_pcm_hw_params *params) -{ - struct snd_pcm_runtime *runtime = substream->runtime; - struct s3c24xx_runtime_data *prtd = runtime->private_data; - struct snd_soc_pcm_runtime *rtd = substream->private_data; - struct s3c_audio_dma_params *dma = rtd->dai->cpu_dai->dma_data; - unsigned long totbytes = params_buffer_bytes(params); - int ret = 0; - - pr_debug("Entered %s\n", __func__); - - /* return if this is a bufferless transfer e.g. - * codec <--> BT codec or GSM modem -- lg FIXME */ - if (!dma) - return 0; - - /* this may get called several times by oss emulation - * with different params -HW */ - if (prtd->params == NULL) { - /* prepare DMA */ - prtd->params = dma; - - pr_debug("params %p, client %p, channel %d\n", prtd->params, - prtd->params->client, prtd->params->channel); - - ret = s3c2410_dma_request(prtd->params->channel, - prtd->params->client, NULL); - - if (ret < 0) { - printk(KERN_ERR "failed to get dma channel\n"); - return ret; - } - } - - s3c2410_dma_set_buffdone_fn(prtd->params->channel, - s3c24xx_audio_buffdone); - - snd_pcm_set_runtime_buffer(substream, &substream->dma_buffer); - - runtime->dma_bytes = totbytes; - - spin_lock_irq(&prtd->lock); - prtd->dma_loaded = 0; - prtd->dma_limit = runtime->hw.periods_min; - prtd->dma_period = params_period_bytes(params); - prtd->dma_start = runtime->dma_addr; - prtd->dma_pos = prtd->dma_start; - prtd->dma_end = prtd->dma_start + totbytes; - spin_unlock_irq(&prtd->lock); - - return 0; -} - -static int s3c_dma_hw_free(struct snd_pcm_substream *substream) -{ - struct s3c24xx_runtime_data *prtd = substream->runtime->private_data; - - pr_debug("Entered %s\n", __func__); - - /* TODO - do we need to ensure DMA flushed */ - snd_pcm_set_runtime_buffer(substream, NULL); - - if (prtd->params) { - s3c2410_dma_free(prtd->params->channel, prtd->params->client); - prtd->params = NULL; - } - - return 0; -} - -static int s3c_dma_prepare(struct snd_pcm_substream *substream) -{ - struct s3c24xx_runtime_data *prtd = substream->runtime->private_data; - int ret = 0; - - pr_debug("Entered %s\n", __func__); - - /* return if this is a bufferless transfer e.g. - * codec <--> BT codec or GSM modem -- lg FIXME */ - if (!prtd->params) - return 0; - - /* channel needs configuring for mem=>device, increment memory addr, - * sync to pclk, half-word transfers to the IIS-FIFO. */ - if (substream->stream == SNDRV_PCM_STREAM_PLAYBACK) { - s3c2410_dma_devconfig(prtd->params->channel, - S3C2410_DMASRC_MEM, - prtd->params->dma_addr); - } else { - s3c2410_dma_devconfig(prtd->params->channel, - S3C2410_DMASRC_HW, - prtd->params->dma_addr); - } - - s3c2410_dma_config(prtd->params->channel, - prtd->params->dma_size); - - /* flush the DMA channel */ - s3c2410_dma_ctrl(prtd->params->channel, S3C2410_DMAOP_FLUSH); - prtd->dma_loaded = 0; - prtd->dma_pos = prtd->dma_start; - - /* enqueue dma buffers */ - s3c_dma_enqueue(substream); - - return ret; -} - -static int s3c_dma_trigger(struct snd_pcm_substream *substream, int cmd) -{ - struct s3c24xx_runtime_data *prtd = substream->runtime->private_data; - int ret = 0; - - pr_debug("Entered %s\n", __func__); - - spin_lock(&prtd->lock); - - switch (cmd) { - case SNDRV_PCM_TRIGGER_START: - case SNDRV_PCM_TRIGGER_RESUME: - case SNDRV_PCM_TRIGGER_PAUSE_RELEASE: - prtd->state |= ST_RUNNING; - s3c2410_dma_ctrl(prtd->params->channel, S3C2410_DMAOP_START); - break; - - case SNDRV_PCM_TRIGGER_STOP: - case SNDRV_PCM_TRIGGER_SUSPEND: - case SNDRV_PCM_TRIGGER_PAUSE_PUSH: - prtd->state &= ~ST_RUNNING; - s3c2410_dma_ctrl(prtd->params->channel, S3C2410_DMAOP_STOP); - break; - - default: - ret = -EINVAL; - break; - } - - spin_unlock(&prtd->lock); - - return ret; -} - -static snd_pcm_uframes_t -s3c_dma_pointer(struct snd_pcm_substream *substream) -{ - struct snd_pcm_runtime *runtime = substream->runtime; - struct s3c24xx_runtime_data *prtd = runtime->private_data; - unsigned long res; - dma_addr_t src, dst; - - pr_debug("Entered %s\n", __func__); - - spin_lock(&prtd->lock); - s3c2410_dma_getposition(prtd->params->channel, &src, &dst); - - if (substream->stream == SNDRV_PCM_STREAM_CAPTURE) - res = dst - prtd->dma_start; - else - res = src - prtd->dma_start; - - spin_unlock(&prtd->lock); - - pr_debug("Pointer %x %x\n", src, dst); - - /* we seem to be getting the odd error from the pcm library due - * to out-of-bounds pointers. this is maybe due to the dma engine - * not having loaded the new values for the channel before being - * callled... (todo - fix ) - */ - - if (res >= snd_pcm_lib_buffer_bytes(substream)) { - if (res == snd_pcm_lib_buffer_bytes(substream)) - res = 0; - } - - return bytes_to_frames(substream->runtime, res); -} - -static int s3c_dma_open(struct snd_pcm_substream *substream) -{ - struct snd_pcm_runtime *runtime = substream->runtime; - struct s3c24xx_runtime_data *prtd; - - pr_debug("Entered %s\n", __func__); - - snd_pcm_hw_constraint_integer(runtime, SNDRV_PCM_HW_PARAM_PERIODS); - snd_soc_set_runtime_hwparams(substream, &s3c_dma_hardware); - - prtd = kzalloc(sizeof(struct s3c24xx_runtime_data), GFP_KERNEL); - if (prtd == NULL) - return -ENOMEM; - - spin_lock_init(&prtd->lock); - - runtime->private_data = prtd; - return 0; -} - -static int s3c_dma_close(struct snd_pcm_substream *substream) -{ - struct snd_pcm_runtime *runtime = substream->runtime; - struct s3c24xx_runtime_data *prtd = runtime->private_data; - - pr_debug("Entered %s\n", __func__); - - if (!prtd) - pr_debug("s3c_dma_close called with prtd == NULL\n"); - - kfree(prtd); - - return 0; -} - -static int s3c_dma_mmap(struct snd_pcm_substream *substream, - struct vm_area_struct *vma) -{ - struct snd_pcm_runtime *runtime = substream->runtime; - - pr_debug("Entered %s\n", __func__); - - return dma_mmap_writecombine(substream->pcm->card->dev, vma, - runtime->dma_area, - runtime->dma_addr, - runtime->dma_bytes); -} - -static struct snd_pcm_ops s3c_dma_ops = { - .open = s3c_dma_open, - .close = s3c_dma_close, - .ioctl = snd_pcm_lib_ioctl, - .hw_params = s3c_dma_hw_params, - .hw_free = s3c_dma_hw_free, - .prepare = s3c_dma_prepare, - .trigger = s3c_dma_trigger, - .pointer = s3c_dma_pointer, - .mmap = s3c_dma_mmap, -}; - -static int s3c_preallocate_dma_buffer(struct snd_pcm *pcm, int stream) -{ - struct snd_pcm_substream *substream = pcm->streams[stream].substream; - struct snd_dma_buffer *buf = &substream->dma_buffer; - size_t size = s3c_dma_hardware.buffer_bytes_max; - - pr_debug("Entered %s\n", __func__); - - buf->dev.type = SNDRV_DMA_TYPE_DEV; - buf->dev.dev = pcm->card->dev; - buf->private_data = NULL; - buf->area = dma_alloc_writecombine(pcm->card->dev, size, - &buf->addr, GFP_KERNEL); - if (!buf->area) - return -ENOMEM; - buf->bytes = size; - return 0; -} - -static void s3c_dma_free_dma_buffers(struct snd_pcm *pcm) -{ - struct snd_pcm_substream *substream; - struct snd_dma_buffer *buf; - int stream; - - pr_debug("Entered %s\n", __func__); - - for (stream = 0; stream < 2; stream++) { - substream = pcm->streams[stream].substream; - if (!substream) - continue; - - buf = &substream->dma_buffer; - if (!buf->area) - continue; - - dma_free_writecombine(pcm->card->dev, buf->bytes, - buf->area, buf->addr); - buf->area = NULL; - } -} - -static u64 s3c_dmamask = DMA_BIT_MASK(32); - -static int s3c_dma_new(struct snd_card *card, - struct snd_soc_dai *dai, struct snd_pcm *pcm) -{ - int ret = 0; - - pr_debug("Entered %s\n", __func__); - - if (!card->dev->dma_mask) - card->dev->dma_mask = &s3c_dmamask; - if (!card->dev->coherent_dma_mask) - card->dev->coherent_dma_mask = 0xffffffff; - - if (dai->playback.channels_min) { - ret = s3c_preallocate_dma_buffer(pcm, - SNDRV_PCM_STREAM_PLAYBACK); - if (ret) - goto out; - } - - if (dai->capture.channels_min) { - ret = s3c_preallocate_dma_buffer(pcm, - SNDRV_PCM_STREAM_CAPTURE); - if (ret) - goto out; - } - out: - return ret; -} - -struct snd_soc_platform s3c24xx_soc_platform = { - .name = "s3c24xx-audio", - .pcm_ops = &s3c_dma_ops, - .pcm_new = s3c_dma_new, - .pcm_free = s3c_dma_free_dma_buffers, -}; -EXPORT_SYMBOL_GPL(s3c24xx_soc_platform); - -static int __init s3c24xx_soc_platform_init(void) -{ - return snd_soc_register_platform(&s3c24xx_soc_platform); -} -module_init(s3c24xx_soc_platform_init); - -static void __exit s3c24xx_soc_platform_exit(void) -{ - snd_soc_unregister_platform(&s3c24xx_soc_platform); -} -module_exit(s3c24xx_soc_platform_exit); - -MODULE_AUTHOR("Ben Dooks, <ben(a)simtec.co.uk>"); -MODULE_DESCRIPTION("Samsung S3C Audio DMA module"); -MODULE_LICENSE("GPL"); diff --git a/sound/soc/s3c24xx/s3c24xx-pcm.h b/sound/soc/s3c24xx/s3c24xx-pcm.h deleted file mode 100644 index d04ddf8..0000000 --- a/sound/soc/s3c24xx/s3c24xx-pcm.h +++ /dev/null @@ -1,31 +0,0 @@ -/* - * s3c24xx-pcm.h -- - * - * This program is free software; you can redistribute it and/or modify it - * under the terms of the GNU General Public License as published by the - * Free Software Foundation; either version 2 of the License, or (at your - * option) any later version. - * - * ALSA PCM interface for the Samsung S3C24xx CPU - */ - -#ifndef _S3C_AUDIO_H -#define _S3C_AUDIO_H - -#define ST_RUNNING (1<<0) -#define ST_OPENED (1<<1) - -struct s3c_audio_dma_params { - struct s3c2410_dma_client *client; /* stream identifier */ - int channel; /* Channel ID */ - dma_addr_t dma_addr; - int dma_size; /* Size of the DMA transfer */ -}; - -#define S3C24XX_DAI_I2S 0 - -/* platform data */ -extern struct snd_soc_platform s3c24xx_soc_platform; -extern struct snd_ac97_bus_ops s3c24xx_ac97_ops; - -#endif diff --git a/sound/soc/s3c24xx/s3c24xx_simtec.c b/sound/soc/s3c24xx/s3c24xx_simtec.c index 1966e0d..ef75416 100644 --- a/sound/soc/s3c24xx/s3c24xx_simtec.c +++ b/sound/soc/s3c24xx/s3c24xx_simtec.c @@ -21,7 +21,7 @@ #include <plat/audio-simtec.h> -#include "s3c24xx-pcm.h" +#include "s3c-audio.h" #include "s3c24xx-i2s.h" #include "s3c24xx_simtec.h" diff --git a/sound/soc/s3c24xx/s3c24xx_simtec_hermes.c b/sound/soc/s3c24xx/s3c24xx_simtec_hermes.c index 8346bd9..61166a5 100644 --- a/sound/soc/s3c24xx/s3c24xx_simtec_hermes.c +++ b/sound/soc/s3c24xx/s3c24xx_simtec_hermes.c @@ -18,7 +18,7 @@ #include <plat/audio-simtec.h> -#include "s3c24xx-pcm.h" +#include "s3c-audio.h" #include "s3c24xx-i2s.h" #include "s3c24xx_simtec.h" diff --git a/sound/soc/s3c24xx/s3c24xx_simtec_tlv320aic23.c b/sound/soc/s3c24xx/s3c24xx_simtec_tlv320aic23.c index 25797e0..af0bf57 100644 --- a/sound/soc/s3c24xx/s3c24xx_simtec_tlv320aic23.c +++ b/sound/soc/s3c24xx/s3c24xx_simtec_tlv320aic23.c @@ -18,7 +18,7 @@ #include <plat/audio-simtec.h> -#include "s3c24xx-pcm.h" +#include "s3c-audio.h" #include "s3c24xx-i2s.h" #include "s3c24xx_simtec.h" diff --git a/sound/soc/s3c24xx/s3c24xx_uda134x.c b/sound/soc/s3c24xx/s3c24xx_uda134x.c index c215d32..e8d6cc2 100644 --- a/sound/soc/s3c24xx/s3c24xx_uda134x.c +++ b/sound/soc/s3c24xx/s3c24xx_uda134x.c @@ -24,7 +24,7 @@ #include <plat/regs-iis.h> -#include "s3c24xx-pcm.h" +#include "s3c-audio.h" #include "s3c24xx-i2s.h" #include "../codecs/uda134x.h" diff --git a/sound/soc/s3c24xx/s3c64xx-i2s.c b/sound/soc/s3c24xx/s3c64xx-i2s.c index 03f5a6b..98fa4bd 100644 --- a/sound/soc/s3c24xx/s3c64xx-i2s.c +++ b/sound/soc/s3c24xx/s3c64xx-i2s.c @@ -35,7 +35,7 @@ #include <mach/map.h> #include <mach/dma.h> -#include "s3c24xx-pcm.h" +#include "s3c-audio.h" #include "s3c64xx-i2s.h" static struct s3c2410_dma_client s3c64xx_dma_client_out = { diff --git a/sound/soc/s3c24xx/smdk2443_wm9710.c b/sound/soc/s3c24xx/smdk2443_wm9710.c index a2a4f53..106c72d 100644 --- a/sound/soc/s3c24xx/smdk2443_wm9710.c +++ b/sound/soc/s3c24xx/smdk2443_wm9710.c @@ -20,7 +20,7 @@ #include <sound/soc-dapm.h> #include "../codecs/ac97.h" -#include "s3c24xx-pcm.h" +#include "s3c-audio.h" #include "s3c24xx-ac97.h" static struct snd_soc_card smdk2443; diff --git a/sound/soc/s3c24xx/smdk64xx_wm8580.c b/sound/soc/s3c24xx/smdk64xx_wm8580.c index cb8a916..7956a9c 100644 --- a/sound/soc/s3c24xx/smdk64xx_wm8580.c +++ b/sound/soc/s3c24xx/smdk64xx_wm8580.c @@ -19,7 +19,7 @@ #include <sound/soc-dapm.h> #include "../codecs/wm8580.h" -#include "s3c24xx-pcm.h" +#include "s3c-audio.h" #include "s3c64xx-i2s.h" #define S3C64XX_I2S_V4 2 -- 1.6.2.5

1 0

[alsa-devel] Patches for Samsung SoC PCM Controller driver
by Jassi Brar 05 Nov '09

05 Nov '09

Hello, Samsung SoCs S3C2450, S3C64XX and later versions have got PCM controllers which drive what the ALSA stack terms DSP_A/DSP_B formats. Since the S3C ALSA platform driver was named s3c24xx-pcm, which cause direct namespace clash with the new PCM controller drivers, it has been renamed along with some of its local symbols. First two of the following series of patches does that and later ones make ground for and add the PCM controller driver. regards.

1 0

[alsa-devel] [RESEND] [PATCH 0/3] Close alsa-lib file descriptors on exec
by Rémi Denis-Courmont 04 Nov '09

04 Nov '09

Hello, The device nodes opened by alsa-lib are private, and are not meant to be used after exec(). Setting the close-on-exec flags avoid leaking devices file descriptors into unintended processes. Further more, the Linux kernel O_CLOEXEC flag is used if available for fully thread-safe operations. configure.in | 2 ++ include/local.h | 23 +++++++++++++++++------ src/control/control_hw.c | 11 ----------- src/hwdep/hwdep_hw.c | 11 ----------- src/pcm/pcm_hw.c | 12 ------------ src/rawmidi/rawmidi_hw.c | 11 ----------- src/seq/seq_hw.c | 11 ----------- src/timer/timer_hw.c | 11 ----------- 8 files changed, 19 insertions(+), 73 deletions(-) -- Rémi Denis-Courmont http://www.remlab.net/

3 4

[alsa-devel] [PATCH] ASoC ADS117x ADC driver
by Liam Girdwood 04 Nov '09

04 Nov '09

From: Graeme Gregory <gg(a)slimlogic.co.uk> This patch adds support for the TI ADS117x family of multichannel ADCs and was sponsored by Shotspotter Inc. Signed-off-by: Graeme Gregory <gg(a)slimlogic.co.uk> Signed-off-by: Liam Girdwood <lrg(a)slimlogic.co.uk> --- sound/soc/codecs/Kconfig | 5 ++ sound/soc/codecs/Makefile | 2 + sound/soc/codecs/ads117x.c | 129 ++++++++++++++++++++++++++++++++++++++++++++ sound/soc/codecs/ads117x.h | 13 +++++ 4 files changed, 149 insertions(+), 0 deletions(-) create mode 100644 sound/soc/codecs/ads117x.c create mode 100644 sound/soc/codecs/ads117x.h diff --git a/sound/soc/codecs/Kconfig b/sound/soc/codecs/Kconfig index b54dfd0..9763062 100644 --- a/sound/soc/codecs/Kconfig +++ b/sound/soc/codecs/Kconfig @@ -15,6 +15,7 @@ config SND_SOC_ALL_CODECS select SND_SOC_AD1836 if SPI_MASTER select SND_SOC_AD1938 if SPI_MASTER select SND_SOC_AD1980 if SND_SOC_AC97_BUS + select SND_SOC_ADS117X select SND_SOC_AD73311 if I2C select SND_SOC_AK4104 if SPI_MASTER select SND_SOC_AK4535 if I2C @@ -97,6 +98,9 @@ config SND_SOC_AD1980 config SND_SOC_AD73311 tristate + +config SND_SOC_ADS117X + tristate config SND_SOC_AK4104 tristate @@ -261,3 +265,4 @@ config SND_SOC_WM9713 # Amp config SND_SOC_MAX9877 tristate + diff --git a/sound/soc/codecs/Makefile b/sound/soc/codecs/Makefile index 15350ec..ad12458 100644 --- a/sound/soc/codecs/Makefile +++ b/sound/soc/codecs/Makefile @@ -5,6 +5,7 @@ snd-soc-ad1939-objs := ad1939.o snd-soc-ad1980-objs := ad1980.o snd-soc-ak4535-objs := ak4535.o snd-soc-ad73311-objs := ad73311.o +snd-soc-ads117x-objs := ads117x.o snd-soc-ak4104-objs := ak4104.o snd-soc-ak4535-objs := ak4535.o snd-soc-ak4642-objs := ak4642.o @@ -67,6 +68,7 @@ obj-$(CONFIG_SND_SOC_AD1938) += snd-soc-ad1938.o obj-$(CONFIG_SND_SOC_AD1939) += snd-soc-ad1939.o obj-$(CONFIG_SND_SOC_AD1980) += snd-soc-ad1980.o obj-$(CONFIG_SND_SOC_AD73311) += snd-soc-ad73311.o +obj-$(CONFIG_SND_SOC_ADS117X) += snd-soc-ads117x.o obj-$(CONFIG_SND_SOC_AK4104) += snd-soc-ak4104.o obj-$(CONFIG_SND_SOC_AK4535) += snd-soc-ak4535.o obj-$(CONFIG_SND_SOC_CS4251X) += snd-soc-cs4251x.o diff --git a/sound/soc/codecs/ads117x.c b/sound/soc/codecs/ads117x.c new file mode 100644 index 0000000..72be32c --- /dev/null +++ b/sound/soc/codecs/ads117x.c @@ -0,0 +1,129 @@ +/* + * ads117x.c -- Driver for ads1174/8 ADC chips + * + * Copyright 2009 ShotSpotter Inc. + * Author: Graeme Gregory <gg(a)slimlogic.co.uk> + * + * This program is free software; you can redistribute it and/or modify it + * under the terms of the GNU General Public License as published by the + * Free Software Foundation; either version 2 of the License, or (at your + * option) any later version. + */ + +#include <linux/kernel.h> +#include <linux/init.h> +#include <linux/device.h> +#include <sound/core.h> +#include <sound/pcm.h> +#include <sound/initval.h> +#include <sound/soc.h> + +#include "ads117x.h" + +#define ADS117X_RATES (SNDRV_PCM_RATE_8000 | SNDRV_PCM_RATE_11025 |\ + SNDRV_PCM_RATE_16000 | SNDRV_PCM_RATE_22050 |\ + SNDRV_PCM_RATE_44100 | SNDRV_PCM_RATE_48000 ) + +#define ADS117X_FORMATS (SNDRV_PCM_FMTBIT_S16_LE) + +struct snd_soc_dai ads117x_dai = { +/* ADC */ + .name = "ADS117X ADC", + .id = 1, + .capture = { + .stream_name = "Capture", + .channels_min = 1, + .channels_max = 32, + .rates = ADS117X_RATES, + .formats = ADS117X_FORMATS,}, +}; +EXPORT_SYMBOL_GPL(ads117x_dai); + +/* + * initialise the ads117x driver + */ +static int ads117x_init(struct snd_soc_device *socdev) +{ + struct snd_soc_codec *codec = socdev->card->codec; + int ret = 0; + + codec->name = "ADS117X"; + codec->owner = THIS_MODULE; + codec->dai = &ads117x_dai; + codec->num_dai = 1; + + /* register pcms */ + ret = snd_soc_new_pcms(socdev, SNDRV_DEFAULT_IDX1, SNDRV_DEFAULT_STR1); + if (ret < 0) { + printk(KERN_ERR "ads117x: failed to create pcms\n"); + return ret; + } + + ret = snd_soc_init_card(socdev); + if (ret < 0) { + printk(KERN_ERR "ads117x: failed to register card\n"); + goto card_err; + } + return ret; + +card_err: + snd_soc_free_pcms(socdev); + return ret; +} + +static int ads117x_probe(struct platform_device *pdev) +{ + struct snd_soc_device *socdev = platform_get_drvdata(pdev); + struct snd_soc_codec *codec; + int ret; + + pr_info("ads117x ADC\n"); + + codec = kzalloc(sizeof(struct snd_soc_codec), GFP_KERNEL); + if (codec == NULL) + return -ENOMEM; + + socdev->card->codec = codec; + mutex_init(&codec->mutex); + INIT_LIST_HEAD(&codec->dapm_widgets); + INIT_LIST_HEAD(&codec->dapm_paths); + + ret = ads117x_init(socdev); + if (ret != 0) + kfree(codec); + + return ret; +} + +static int ads117x_remove(struct platform_device *pdev) +{ + struct snd_soc_device *socdev = platform_get_drvdata(pdev); + struct snd_soc_codec *codec = socdev->card->codec; + + snd_soc_free_pcms(socdev); + kfree(codec); + + return 0; +} + +struct snd_soc_codec_device soc_codec_dev_ads117x = { + .probe = ads117x_probe, + .remove = ads117x_remove, +}; +EXPORT_SYMBOL_GPL(soc_codec_dev_ads117x); + +static int __init ads117x_modinit(void) +{ + return snd_soc_register_dai(&ads117x_dai); +} +module_init(ads117x_modinit); + +static void __exit ads117x_exit(void) +{ + snd_soc_unregister_dai(&ads117x_dai); +} +module_exit(ads117x_exit); + +MODULE_DESCRIPTION("ASoC ads117x driver"); +MODULE_AUTHOR("Graeme Gregory"); +MODULE_LICENSE("GPL"); diff --git a/sound/soc/codecs/ads117x.h b/sound/soc/codecs/ads117x.h new file mode 100644 index 0000000..dbcf50e --- /dev/null +++ b/sound/soc/codecs/ads117x.h @@ -0,0 +1,13 @@ +/* + * ads117x.h -- Driver for ads1174/8 ADC chips + * + * Copyright 2009 ShotSpotter Inc. + * Author: Graeme Gregory <gg(a)slimlogic.co.uk> + * + * This program is free software; you can redistribute it and/or modify it + * under the terms of the GNU General Public License as published by the + * Free Software Foundation; either version 2 of the License, or (at your + * option) any later version. + */ +extern struct snd_soc_dai ads117x_dai; +extern struct snd_soc_codec_device soc_codec_dev_ads117x; -- 1.6.3.3

2 1

[alsa-devel] [PATCH] ALSA: hda - Add OLPC XO-1.5 PCI ID
by Daniel Drake 04 Nov '09

04 Nov '09

The XO-1.5 laptop now has a unique subvendor/subproduct ID, which can be used to automatically select the correct CXT5066 configuration. Signed-off-by: Daniel Drake <dsd(a)laptop.org> --- sound/pci/hda/patch_conexant.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/sound/pci/hda/patch_conexant.c b/sound/pci/hda/patch_conexant.c index 3fbbc8c..6479e65 100644 --- a/sound/pci/hda/patch_conexant.c +++ b/sound/pci/hda/patch_conexant.c @@ -2325,6 +2325,7 @@ static struct snd_pci_quirk cxt5066_cfg_tbl[] = { CXT5066_LAPTOP), SND_PCI_QUIRK(0x1028, 0x02f5, "Dell", CXT5066_DELL_LAPTOP), + SND_PCI_QUIRK(0x152d, 0x0833, "OLPC XO-1.5", CXT5066_OLPC_XO_1_5), {} }; -- 1.6.2.5

2 1

[alsa-devel] [PATCH] alsa: echoaudio - pci id cleanup
by Tim Blechmann 04 Nov '09

04 Nov '09

using the PCI_VENDOR_ID_MOTOROLA definition instead of the value 0x1057 makes code a bit cleaner. Signed-off-by: Tim Blechmann <tim(a)klingt.org> --- sound/pci/echoaudio/darla20.c | 3 ++- sound/pci/echoaudio/darla24.c | 6 ++++-- sound/pci/echoaudio/echo3g.c | 3 ++- sound/pci/echoaudio/gina20.c | 3 ++- sound/pci/echoaudio/gina24.c | 12 ++++++++---- sound/pci/echoaudio/indigo.c | 3 ++- sound/pci/echoaudio/indigodj.c | 3 ++- sound/pci/echoaudio/indigodjx.c | 3 ++- sound/pci/echoaudio/indigoio.c | 3 ++- sound/pci/echoaudio/indigoiox.c | 3 ++- sound/pci/echoaudio/layla20.c | 6 ++++-- sound/pci/echoaudio/layla24.c | 3 ++- sound/pci/echoaudio/mia.c | 6 ++++-- sound/pci/echoaudio/mona.c | 18 ++++++++++++------ 14 files changed, 50 insertions(+), 25 deletions(-)

2 2

[alsa-devel] [PATCH] sh: add SuperH DAC audio driver for ALSA V4
by Rafael Ignacio Zurita 04 Nov '09

04 Nov '09

This is a port of the sound/oss/sh_dac_audio.c driver. The driver uses an on-chip 8-bit D/A converter, which has a speaker connected to one of its channels, found in several ancient HP machines. For interrupts it uses a high-resolution timer (hrtimer). Tested on SH7709 based hp6xx (HP Jornada 680/690 and HP Palmtop 620lx/660lx). Also, since OSS Emulation works, the old OSS sound/oss/sh_dac_audio.c driver would be obsolete soon, and it could be removed. Changes since V3: - renamed sound/sh/snd_sh_dac_audio.c to sound/sh/sh_dac_audio.c Changes since V2: - renamed include/sound/dac_audio.h to include/sound/sh_dac_audio.h Changes since V1: - moved the platform device code into board code. - dropped dac_audio_sync(), since that code is not needed (it was inherited of the old oss driver). - rewrote the code with style problems. Signed-off-by: Rafael Ignacio Zurita <rizurita(a)yahoo.com> --- arch/sh/boards/mach-hp6xx/setup.c | 55 ++++ arch/sh/include/mach-common/mach/hp6xx.h | 4 + include/sound/sh_dac_audio.h | 21 ++ sound/sh/Kconfig | 8 + sound/sh/Makefile | 2 + sound/sh/sh_dac_audio.c | 453 ++++++++++++++++++++++++++++++ 6 files changed, 543 insertions(+), 0 deletions(-) diff --git a/arch/sh/boards/mach-hp6xx/setup.c b/arch/sh/boards/mach-hp6xx/setup.c index 8f305b3..e6dd5e9 100644 --- a/arch/sh/boards/mach-hp6xx/setup.c +++ b/arch/sh/boards/mach-hp6xx/setup.c @@ -13,6 +13,7 @@ #include <linux/init.h> #include <linux/platform_device.h> #include <linux/irq.h> +#include <sound/sh_dac_audio.h> #include <asm/hd64461.h> #include <asm/io.h> #include <mach/hp6xx.h> @@ -51,9 +52,63 @@ static struct platform_device jornadakbd_device = { .id = -1, }; +static void dac_audio_start(struct dac_audio_pdata *pdata) +{ + u16 v; + u8 v8; + + /* HP Jornada 680/690 speaker on */ + v = inw(HD64461_GPADR); + v &= ~HD64461_GPADR_SPEAKER; + outw(v, HD64461_GPADR); + + /* HP Palmtop 620lx/660lx speaker on */ + v8 = inb(PKDR); + v8 &= ~PKDR_SPEAKER; + outb(v8, PKDR); + + sh_dac_enable(pdata->channel); +} + +static void dac_audio_stop(struct dac_audio_pdata *pdata) +{ + u16 v; + u8 v8; + + /* HP Jornada 680/690 speaker off */ + v = inw(HD64461_GPADR); + v |= HD64461_GPADR_SPEAKER; + outw(v, HD64461_GPADR); + + /* HP Palmtop 620lx/660lx speaker off */ + v8 = inb(PKDR); + v8 |= PKDR_SPEAKER; + outb(v8, PKDR); + + sh_dac_output(0, pdata->channel); + sh_dac_disable(pdata->channel); +} + +static struct dac_audio_pdata dac_audio_platform_data = { + .buffer_size = 64000, + .channel = 1, + .start = dac_audio_start, + .stop = dac_audio_stop, +}; + +static struct platform_device dac_audio_device = { + .name = "dac_audio", + .id = -1, + .dev = { + .platform_data = &dac_audio_platform_data, + } + +}; + static struct platform_device *hp6xx_devices[] __initdata = { &cf_ide_device, &jornadakbd_device, + &dac_audio_device, }; static void __init hp6xx_init_irq(void) diff --git a/arch/sh/include/mach-common/mach/hp6xx.h b/arch/sh/include/mach-common/mach/hp6xx.h index 0d4165a..bcc301a 100644 --- a/arch/sh/include/mach-common/mach/hp6xx.h +++ b/arch/sh/include/mach-common/mach/hp6xx.h @@ -29,6 +29,9 @@ #define PKDR_LED_GREEN 0x10 +/* HP Palmtop 620lx/660lx speaker on/off */ +#define PKDR_SPEAKER 0x20 + #define SCPDR_TS_SCAN_ENABLE 0x20 #define SCPDR_TS_SCAN_Y 0x02 #define SCPDR_TS_SCAN_X 0x01 @@ -42,6 +45,7 @@ #define ADC_CHANNEL_BACKUP 4 #define ADC_CHANNEL_CHARGE 5 +/* HP Jornada 680/690 speaker on/off */ #define HD64461_GPADR_SPEAKER 0x01 #define HD64461_GPADR_PCMCIA0 (0x02|0x08) diff --git a/include/sound/sh_dac_audio.h b/include/sound/sh_dac_audio.h new file mode 100644 index 0000000..f5deaf1 --- /dev/null +++ b/include/sound/sh_dac_audio.h @@ -0,0 +1,21 @@ +/* + * SH_DAC specific configuration, for the dac_audio platform_device + * + * Copyright (C) 2009 Rafael Ignacio Zurita <rizurita(a)yahoo.com> + * + * This program is free software; you can redistribute it and/or modify it + * under the terms of the GNU General Public License version 2 as published + * by the Free Software Foundation. + */ + +#ifndef __INCLUDE_SH_DAC_AUDIO_H +#define __INCLUDE_SH_DAC_AUDIO_H + +struct dac_audio_pdata { + int buffer_size; + int channel; + void (*start)(struct dac_audio_pdata *pd); + void (*stop)(struct dac_audio_pdata *pd); +}; + +#endif /* __INCLUDE_SH_DAC_AUDIO_H */ diff --git a/sound/sh/Kconfig b/sound/sh/Kconfig index aed0f90..61139f3 100644 --- a/sound/sh/Kconfig +++ b/sound/sh/Kconfig @@ -19,5 +19,13 @@ config SND_AICA help ALSA Sound driver for the SEGA Dreamcast console. +config SND_SH_DAC_AUDIO + tristate "SuperH DAC audio support" + depends on SND + depends on CPU_SH3 && HIGH_RES_TIMERS + select SND_PCM + help + Say Y here to include support for the on-chip DAC. + endif # SND_SUPERH diff --git a/sound/sh/Makefile b/sound/sh/Makefile index 8fdcb6e..7d09b51 100644 --- a/sound/sh/Makefile +++ b/sound/sh/Makefile @@ -3,6 +3,8 @@ # snd-aica-objs := aica.o +snd-sh_dac_audio-objs := sh_dac_audio.o # Toplevel Module Dependency obj-$(CONFIG_SND_AICA) += snd-aica.o +obj-$(CONFIG_SND_SH_DAC_AUDIO) += snd-sh_dac_audio.o diff --git a/sound/sh/sh_dac_audio.c b/sound/sh/sh_dac_audio.c new file mode 100644 index 0000000..76d9ad2 --- /dev/null +++ b/sound/sh/sh_dac_audio.c @@ -0,0 +1,453 @@ +/* + * sh_dac_audio.c - SuperH DAC audio driver for ALSA + * + * Copyright (c) 2009 by Rafael Ignacio Zurita <rizurita(a)yahoo.com> + * + * + * Based on sh_dac_audio.c (Copyright (C) 2004, 2005 by Andriy Skulysh) + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * + */ + +#include <linux/hrtimer.h> +#include <linux/interrupt.h> +#include <linux/io.h> +#include <linux/platform_device.h> +#include <sound/core.h> +#include <sound/initval.h> +#include <sound/pcm.h> +#include <sound/sh_dac_audio.h> +#include <asm/clock.h> +#include <asm/hd64461.h> +#include <mach/hp6xx.h> +#include <cpu/dac.h> + +MODULE_AUTHOR("Rafael Ignacio Zurita <rizurita(a)yahoo.com>"); +MODULE_DESCRIPTION("SuperH DAC audio driver"); +MODULE_LICENSE("GPL"); +MODULE_SUPPORTED_DEVICE("{{SuperH DAC audio support}}"); + +/* Module Parameters */ +static int index = SNDRV_DEFAULT_IDX1; +static char *id = SNDRV_DEFAULT_STR1; +module_param(index, int, 0444); +MODULE_PARM_DESC(index, "Index value for SuperH DAC audio."); +module_param(id, charp, 0444); +MODULE_PARM_DESC(id, "ID string for SuperH DAC audio."); + +/* main struct */ +struct snd_sh_dac { + struct snd_card *card; + struct snd_pcm_substream *substream; + struct hrtimer hrtimer; + ktime_t wakeups_per_second; + + int rate; + int empty; + char *data_buffer, *buffer_begin, *buffer_end; + int processed; /* bytes proccesed, to compare with period_size */ + int buffer_size; + struct dac_audio_pdata *pdata; +}; + + +static void dac_audio_start_timer(struct snd_sh_dac *chip) +{ + hrtimer_start(&chip->hrtimer, chip->wakeups_per_second, + HRTIMER_MODE_REL); +} + +static void dac_audio_stop_timer(struct snd_sh_dac *chip) +{ + hrtimer_cancel(&chip->hrtimer); +} + +static void dac_audio_reset(struct snd_sh_dac *chip) +{ + dac_audio_stop_timer(chip); + chip->buffer_begin = chip->buffer_end = chip->data_buffer; + chip->processed = 0; + chip->empty = 1; +} + +static void dac_audio_set_rate(struct snd_sh_dac *chip) +{ + chip->wakeups_per_second = ktime_set(0, 1000000000 / chip->rate); +} + + +/* PCM INTERFACE */ + +static struct snd_pcm_hardware snd_sh_dac_pcm_hw = { + .info = (SNDRV_PCM_INFO_MMAP | + SNDRV_PCM_INFO_MMAP_VALID | + SNDRV_PCM_INFO_INTERLEAVED | + SNDRV_PCM_INFO_HALF_DUPLEX), + .formats = SNDRV_PCM_FMTBIT_U8, + .rates = SNDRV_PCM_RATE_8000, + .rate_min = 8000, + .rate_max = 8000, + .channels_min = 1, + .channels_max = 1, + .buffer_bytes_max = (48*1024), + .period_bytes_min = 1, + .period_bytes_max = (48*1024), + .periods_min = 1, + .periods_max = 1024, +}; + +static int snd_sh_dac_pcm_open(struct snd_pcm_substream *substream) +{ + struct snd_sh_dac *chip = snd_pcm_substream_chip(substream); + struct snd_pcm_runtime *runtime = substream->runtime; + + runtime->hw = snd_sh_dac_pcm_hw; + + chip->substream = substream; + chip->buffer_begin = chip->buffer_end = chip->data_buffer; + chip->processed = 0; + chip->empty = 1; + + chip->pdata->start(chip->pdata); + + return 0; +} + +static int snd_sh_dac_pcm_close(struct snd_pcm_substream *substream) +{ + struct snd_sh_dac *chip = snd_pcm_substream_chip(substream); + + chip->substream = NULL; + + dac_audio_stop_timer(chip); + chip->pdata->stop(chip->pdata); + + return 0; +} + +static int snd_sh_dac_pcm_hw_params(struct snd_pcm_substream *substream, + struct snd_pcm_hw_params *hw_params) +{ + return snd_pcm_lib_malloc_pages(substream, + params_buffer_bytes(hw_params)); +} + +static int snd_sh_dac_pcm_hw_free(struct snd_pcm_substream *substream) +{ + return snd_pcm_lib_free_pages(substream); +} + +static int snd_sh_dac_pcm_prepare(struct snd_pcm_substream *substream) +{ + struct snd_sh_dac *chip = snd_pcm_substream_chip(substream); + struct snd_pcm_runtime *runtime = chip->substream->runtime; + + chip->buffer_size = runtime->buffer_size; + memset(chip->data_buffer, 0, chip->pdata->buffer_size); + + return 0; +} + +static int snd_sh_dac_pcm_trigger(struct snd_pcm_substream *substream, int cmd) +{ + struct snd_sh_dac *chip = snd_pcm_substream_chip(substream); + + switch (cmd) { + case SNDRV_PCM_TRIGGER_START: + dac_audio_start_timer(chip); + break; + case SNDRV_PCM_TRIGGER_STOP: + chip->buffer_begin = chip->buffer_end = chip->data_buffer; + chip->processed = 0; + chip->empty = 1; + dac_audio_stop_timer(chip); + break; + default: + return -EINVAL; + } + + return 0; +} + +static int snd_sh_dac_pcm_copy(struct snd_pcm_substream *substream, int channel, + snd_pcm_uframes_t pos, void __user *src, snd_pcm_uframes_t count) +{ + /* channel is not used (interleaved data) */ + struct snd_sh_dac *chip = snd_pcm_substream_chip(substream); + struct snd_pcm_runtime *runtime = substream->runtime; + ssize_t b_count = frames_to_bytes(runtime , count); + ssize_t b_pos = frames_to_bytes(runtime , pos); + + if (count < 0) + return -EINVAL; + + if (!count) + return 0; + + memcpy_toio(chip->data_buffer + b_pos, src, b_count); + chip->buffer_end = chip->data_buffer + b_pos + b_count; + + if (chip->empty) { + chip->empty = 0; + dac_audio_start_timer(chip); + } + + return 0; +} + +static int snd_sh_dac_pcm_silence(struct snd_pcm_substream *substream, + int channel, snd_pcm_uframes_t pos, + snd_pcm_uframes_t count) +{ + /* channel is not used (interleaved data) */ + struct snd_sh_dac *chip = snd_pcm_substream_chip(substream); + struct snd_pcm_runtime *runtime = substream->runtime; + ssize_t b_count = frames_to_bytes(runtime , count); + ssize_t b_pos = frames_to_bytes(runtime , pos); + + if (count < 0) + return -EINVAL; + + if (!count) + return 0; + + memset_io(chip->data_buffer + b_pos, 0, b_count); + chip->buffer_end = chip->data_buffer + b_pos + b_count; + + if (chip->empty) { + chip->empty = 0; + dac_audio_start_timer(chip); + } + + return 0; +} + +static +snd_pcm_uframes_t snd_sh_dac_pcm_pointer(struct snd_pcm_substream *substream) +{ + struct snd_sh_dac *chip = snd_pcm_substream_chip(substream); + int pointer = chip->buffer_begin - chip->data_buffer; + + return pointer; +} + +/* pcm ops */ +static struct snd_pcm_ops snd_sh_dac_pcm_ops = { + .open = snd_sh_dac_pcm_open, + .close = snd_sh_dac_pcm_close, + .ioctl = snd_pcm_lib_ioctl, + .hw_params = snd_sh_dac_pcm_hw_params, + .hw_free = snd_sh_dac_pcm_hw_free, + .prepare = snd_sh_dac_pcm_prepare, + .trigger = snd_sh_dac_pcm_trigger, + .pointer = snd_sh_dac_pcm_pointer, + .copy = snd_sh_dac_pcm_copy, + .silence = snd_sh_dac_pcm_silence, + .mmap = snd_pcm_lib_mmap_iomem, +}; + +static int __devinit snd_sh_dac_pcm(struct snd_sh_dac *chip, int device) +{ + int err; + struct snd_pcm *pcm; + + /* device should be always 0 for us */ + err = snd_pcm_new(chip->card, "SH_DAC PCM", device, 1, 0, &pcm); + if (err < 0) + return err; + + pcm->private_data = chip; + strcpy(pcm->name, "SH_DAC PCM"); + snd_pcm_set_ops(pcm, SNDRV_PCM_STREAM_PLAYBACK, &snd_sh_dac_pcm_ops); + + /* buffer size=48K */ + snd_pcm_lib_preallocate_pages_for_all(pcm, SNDRV_DMA_TYPE_CONTINUOUS, + snd_dma_continuous_data(GFP_KERNEL), + 48 * 1024, + 48 * 1024); + + return 0; +} +/* END OF PCM INTERFACE */ + + +/* driver .remove -- destructor */ +static int snd_sh_dac_remove(struct platform_device *devptr) +{ + snd_card_free(platform_get_drvdata(devptr)); + platform_set_drvdata(devptr, NULL); + + return 0; +} + +/* free -- it has been defined by create */ +static int snd_sh_dac_free(struct snd_sh_dac *chip) +{ + /* release the data */ + kfree(chip->data_buffer); + kfree(chip); + + return 0; +} + +static int snd_sh_dac_dev_free(struct snd_device *device) +{ + struct snd_sh_dac *chip = device->device_data; + + return snd_sh_dac_free(chip); +} + +static enum hrtimer_restart sh_dac_audio_timer(struct hrtimer *handle) +{ + struct snd_sh_dac *chip = container_of(handle, struct snd_sh_dac, + hrtimer); + struct snd_pcm_runtime *runtime = chip->substream->runtime; + ssize_t b_ps = frames_to_bytes(runtime, runtime->period_size); + + if (!chip->empty) { + sh_dac_output(*chip->buffer_begin, chip->pdata->channel); + chip->buffer_begin++; + + chip->processed++; + if (chip->processed >= b_ps) { + chip->processed -= b_ps; + snd_pcm_period_elapsed(chip->substream); + } + + if (chip->buffer_begin == (chip->data_buffer + + chip->buffer_size - 1)) + chip->buffer_begin = chip->data_buffer; + + if (chip->buffer_begin == chip->buffer_end) + chip->empty = 1; + + } + + if (!chip->empty) + hrtimer_start(&chip->hrtimer, chip->wakeups_per_second, + HRTIMER_MODE_REL); + + return HRTIMER_NORESTART; +} + +/* create -- chip-specific constructor for the cards components */ +static int __devinit snd_sh_dac_create(struct snd_card *card, + struct platform_device *devptr, + struct snd_sh_dac **rchip) +{ + struct snd_sh_dac *chip; + int err; + + static struct snd_device_ops ops = { + .dev_free = snd_sh_dac_dev_free, + }; + + *rchip = NULL; + + chip = kzalloc(sizeof(*chip), GFP_KERNEL); + if (chip == NULL) + return -ENOMEM; + + chip->card = card; + + hrtimer_init(&chip->hrtimer, CLOCK_MONOTONIC, HRTIMER_MODE_REL); + chip->hrtimer.function = sh_dac_audio_timer; + + dac_audio_reset(chip); + chip->rate = 8000; + dac_audio_set_rate(chip); + + chip->pdata = devptr->dev.platform_data; + + chip->data_buffer = kmalloc(chip->pdata->buffer_size, GFP_KERNEL); + if (chip->data_buffer == NULL) { + kfree(chip); + return -ENOMEM; + } + + err = snd_device_new(card, SNDRV_DEV_LOWLEVEL, chip, &ops); + if (err < 0) { + snd_sh_dac_free(chip); + return err; + } + + *rchip = chip; + + return 0; +} + +/* driver .probe -- constructor */ +static int __devinit snd_sh_dac_probe(struct platform_device *devptr) +{ + struct snd_sh_dac *chip; + struct snd_card *card; + int err; + + err = snd_card_create(index, id, THIS_MODULE, 0, &card); + if (err < 0) { + snd_printk(KERN_ERR "cannot allocate the card\n"); + return err; + } + + err = snd_sh_dac_create(card, devptr, &chip); + if (err < 0) + goto probe_error; + + err = snd_sh_dac_pcm(chip, 0); + if (err < 0) + goto probe_error; + + strcpy(card->driver, "snd_sh_dac"); + strcpy(card->shortname, "SuperH DAC audio driver"); + printk(KERN_INFO "%s %s", card->longname, card->shortname); + + err = snd_card_register(card); + if (err < 0) + goto probe_error; + + snd_printk("ALSA driver for SuperH DAC audio"); + + platform_set_drvdata(devptr, card); + return 0; + +probe_error: + snd_card_free(card); + return err; +} + +/* + * "driver" definition + */ +static struct platform_driver driver = { + .probe = snd_sh_dac_probe, + .remove = snd_sh_dac_remove, + .driver = { + .name = "dac_audio", + }, +}; + +static int __init sh_dac_init(void) +{ + return platform_driver_register(&driver); +} + +static void __exit sh_dac_exit(void) +{ + platform_driver_unregister(&driver); +} + +module_init(sh_dac_init); +module_exit(sh_dac_exit);

3 2

[alsa-devel] question re: creating a dummy midi device to be readable/writable by alsa/jack
by John Murphy 04 Nov '09

04 Nov '09

hi! I'm currently working on a project to develop a driver for a midi controller that is currently unsupported by Linux. As this is going to be my first project with alsa/midi, I am trying to start by creating a dummy midi device that can be loaded (where? kernel? userspace?), be seen by jack as if it was a normal midi device and then work on my reverse-engineering, debugging, etc. from there. However, looking through the documentation, I'm not exactly sure on how to start building this dummy device. Can anyone help point me in the right direction? Thanks, and sorry for the newbie question! -- john http://ghfdrvtsyup.net/proxxxy

1 0

[alsa-devel] [PATCH] cs4236: detect chip in one pass
by Krzysztof Helt 03 Nov '09

03 Nov '09

From: Krzysztof Helt <krzysztof.h1(a)wp.pl> The cs4236 was two step detection with call to the snd_wss_free() between two steps. The snd_wss_free() did not free a sound device created in the snd_wss_create(). This caused an OOPS during module removal as the same sound device was released twice. The same OOPS happened if the cs4236 module loading failed. Fix this by adapting the snd_cs4236_create() to correctly work with chips less capable then cs4236. The snd_cs4236_create() behaves the same as the snd_wss_create() if the chip is less capable than the cs4236. Signed-off-by: Krzysztof Helt <krzysztof.h1(a)wp.pl> --- This is the second version of the patch with added snd_device_free() call in error path. include/sound/wss.h | 1 - sound/isa/cs423x/cs4236.c | 13 +--- sound/isa/cs423x/cs4236_lib.c | 144 ++++++++++++++++++++++------------------- sound/isa/wss/wss_lib.c | 3 +- 4 files changed, 81 insertions(+), 80 deletions(-) diff --git a/include/sound/wss.h b/include/sound/wss.h index 6d65f32..fd01f22 100644 --- a/include/sound/wss.h +++ b/include/sound/wss.h @@ -154,7 +154,6 @@ int snd_wss_create(struct snd_card *card, unsigned short hardware, unsigned short hwshare, struct snd_wss **rchip); -int snd_wss_free(struct snd_wss *chip); int snd_wss_pcm(struct snd_wss *chip, int device, struct snd_pcm **rpcm); int snd_wss_timer(struct snd_wss *chip, int device, struct snd_timer **rtimer); int snd_wss_mixer(struct snd_wss *chip); diff --git a/sound/isa/cs423x/cs4236.c b/sound/isa/cs423x/cs4236.c index a076a6c..93fa672 100644 --- a/sound/isa/cs423x/cs4236.c +++ b/sound/isa/cs423x/cs4236.c @@ -394,21 +394,15 @@ static int __devinit snd_cs423x_probe(struct snd_card *card, int dev) return -EBUSY; } - err = snd_wss_create(card, port[dev], cport[dev], + err = snd_cs4236_create(card, port[dev], cport[dev], irq[dev], dma1[dev], dma2[dev], WSS_HW_DETECT3, 0, &chip); if (err < 0) return err; + + acard->chip = chip; if (chip->hardware & WSS_HW_CS4236B_MASK) { - snd_wss_free(chip); - err = snd_cs4236_create(card, - port[dev], cport[dev], - irq[dev], dma1[dev], dma2[dev], - WSS_HW_DETECT, 0, &chip); - if (err < 0) - return err; - acard->chip = chip; err = snd_cs4236_pcm(chip, 0, &pcm); if (err < 0) @@ -418,7 +412,6 @@ static int __devinit snd_cs423x_probe(struct snd_card *card, int dev) if (err < 0) return err; } else { - acard->chip = chip; err = snd_wss_pcm(chip, 0, &pcm); if (err < 0) return err; diff --git a/sound/isa/cs423x/cs4236_lib.c b/sound/isa/cs423x/cs4236_lib.c index 38835f3..0e29056 100644 --- a/sound/isa/cs423x/cs4236_lib.c +++ b/sound/isa/cs423x/cs4236_lib.c @@ -87,6 +87,7 @@ #include <sound/core.h> #include <sound/wss.h> #include <sound/asoundef.h> +#include <sound/initval.h> /* * @@ -264,7 +265,10 @@ static void snd_cs4236_resume(struct snd_wss *chip) } #endif /* CONFIG_PM */ - +/* + * This function does no fail if the chip is not CS4236B or compatible. + * It just an equivalent to the snd_wss_create() then. + */ int snd_cs4236_create(struct snd_card *card, unsigned long port, unsigned long cport, @@ -281,83 +285,89 @@ int snd_cs4236_create(struct snd_card *card, *rchip = NULL; if (hardware == WSS_HW_DETECT) hardware = WSS_HW_DETECT3; - if (cport < 0x100) { - snd_printk(KERN_ERR "please, specify control port " - "for CS4236+ chips\n"); - return -ENODEV; - } + err = snd_wss_create(card, port, cport, irq, dma1, dma2, hardware, hwshare, &chip); if (err < 0) return err; - if (!(chip->hardware & WSS_HW_CS4236B_MASK)) { - snd_printk(KERN_ERR "CS4236+: MODE3 and extended registers " - "not available, hardware=0x%x\n", chip->hardware); - snd_device_free(card, chip); - return -ENODEV; - } + if (chip->hardware & WSS_HW_CS4236B_MASK) { #if 0 - { - int idx; - for (idx = 0; idx < 8; idx++) - snd_printk(KERN_DEBUG "CD%i = 0x%x\n", - idx, inb(chip->cport + idx)); - for (idx = 0; idx < 9; idx++) - snd_printk(KERN_DEBUG "C%i = 0x%x\n", - idx, snd_cs4236_ctrl_in(chip, idx)); - } + { + int idx; + for (idx = 0; idx < 8; idx++) + snd_printk(KERN_DEBUG "CD%i = 0x%x\n", + idx, inb(chip->cport + idx)); + for (idx = 0; idx < 9; idx++) + snd_printk(KERN_DEBUG "C%i = 0x%x\n", + idx, snd_cs4236_ctrl_in(chip, idx)); + } #endif - ver1 = snd_cs4236_ctrl_in(chip, 1); - ver2 = snd_cs4236_ext_in(chip, CS4236_VERSION); - snd_printdd("CS4236: [0x%lx] C1 (version) = 0x%x, ext = 0x%x\n", cport, ver1, ver2); - if (ver1 != ver2) { - snd_printk(KERN_ERR "CS4236+ chip detected, but " - "control port 0x%lx is not valid\n", cport); - snd_device_free(card, chip); - return -ENODEV; - } - snd_cs4236_ctrl_out(chip, 0, 0x00); - snd_cs4236_ctrl_out(chip, 2, 0xff); - snd_cs4236_ctrl_out(chip, 3, 0x00); - snd_cs4236_ctrl_out(chip, 4, 0x80); - snd_cs4236_ctrl_out(chip, 5, ((IEC958_AES1_CON_PCM_CODER & 3) << 6) | IEC958_AES0_CON_EMPHASIS_NONE); - snd_cs4236_ctrl_out(chip, 6, IEC958_AES1_CON_PCM_CODER >> 2); - snd_cs4236_ctrl_out(chip, 7, 0x00); - /* 0x8c for C8 is valid for Turtle Beach Malibu - the IEC-958 output */ - /* is working with this setup, other hardware should have */ - /* different signal paths and this value should be selectable */ - /* in the future */ - snd_cs4236_ctrl_out(chip, 8, 0x8c); - chip->rate_constraint = snd_cs4236_xrate; - chip->set_playback_format = snd_cs4236_playback_format; - chip->set_capture_format = snd_cs4236_capture_format; + if (cport < 0x100 || cport == SNDRV_AUTO_PORT) { + snd_printk(KERN_ERR "please, specify control port " + "for CS4236+ chips\n"); + snd_device_free(card, chip); + return -ENODEV; + } + ver1 = snd_cs4236_ctrl_in(chip, 1); + ver2 = snd_cs4236_ext_in(chip, CS4236_VERSION); + snd_printdd("CS4236: [0x%lx] C1 (version) = 0x%x, ext = 0x%x\n", + cport, ver1, ver2); + if (ver1 != ver2) { + snd_printk(KERN_ERR "CS4236+ chip detected, but " + "control port 0x%lx is not valid\n", cport); + snd_device_free(card, chip); + return -ENODEV; + } + snd_cs4236_ctrl_out(chip, 0, 0x00); + snd_cs4236_ctrl_out(chip, 2, 0xff); + snd_cs4236_ctrl_out(chip, 3, 0x00); + snd_cs4236_ctrl_out(chip, 4, 0x80); + reg = ((IEC958_AES1_CON_PCM_CODER & 3) << 6) | + IEC958_AES0_CON_EMPHASIS_NONE; + snd_cs4236_ctrl_out(chip, 5, reg); + snd_cs4236_ctrl_out(chip, 6, IEC958_AES1_CON_PCM_CODER >> 2); + snd_cs4236_ctrl_out(chip, 7, 0x00); + /* + * 0x8c for C8 is valid for Turtle Beach Malibu - the IEC-958 + * output is working with this setup, other hardware should + * have different signal paths and this value should be + * selectable in the future + * */ + snd_cs4236_ctrl_out(chip, 8, 0x8c); + chip->rate_constraint = snd_cs4236_xrate; + chip->set_playback_format = snd_cs4236_playback_format; + chip->set_capture_format = snd_cs4236_capture_format; #ifdef CONFIG_PM - chip->suspend = snd_cs4236_suspend; - chip->resume = snd_cs4236_resume; + chip->suspend = snd_cs4236_suspend; + chip->resume = snd_cs4236_resume; #endif - /* initialize extended registers */ - for (reg = 0; reg < sizeof(snd_cs4236_ext_map); reg++) - snd_cs4236_ext_out(chip, CS4236_I23VAL(reg), snd_cs4236_ext_map[reg]); - - /* initialize compatible but more featured registers */ - snd_wss_out(chip, CS4231_LEFT_INPUT, 0x40); - snd_wss_out(chip, CS4231_RIGHT_INPUT, 0x40); - snd_wss_out(chip, CS4231_AUX1_LEFT_INPUT, 0xff); - snd_wss_out(chip, CS4231_AUX1_RIGHT_INPUT, 0xff); - snd_wss_out(chip, CS4231_AUX2_LEFT_INPUT, 0xdf); - snd_wss_out(chip, CS4231_AUX2_RIGHT_INPUT, 0xdf); - snd_wss_out(chip, CS4231_RIGHT_LINE_IN, 0xff); - snd_wss_out(chip, CS4231_LEFT_LINE_IN, 0xff); - snd_wss_out(chip, CS4231_RIGHT_LINE_IN, 0xff); - switch (chip->hardware) { - case WSS_HW_CS4235: - case WSS_HW_CS4239: - snd_wss_out(chip, CS4235_LEFT_MASTER, 0xff); - snd_wss_out(chip, CS4235_RIGHT_MASTER, 0xff); - break; - } + /* initialize extended registers */ + for (reg = 0; reg < sizeof(snd_cs4236_ext_map); reg++) + snd_cs4236_ext_out(chip, CS4236_I23VAL(reg), + snd_cs4236_ext_map[reg]); + + /* initialize compatible but more featured registers */ + snd_wss_out(chip, CS4231_LEFT_INPUT, 0x40); + snd_wss_out(chip, CS4231_RIGHT_INPUT, 0x40); + snd_wss_out(chip, CS4231_AUX1_LEFT_INPUT, 0xff); + snd_wss_out(chip, CS4231_AUX1_RIGHT_INPUT, 0xff); + snd_wss_out(chip, CS4231_AUX2_LEFT_INPUT, 0xdf); + snd_wss_out(chip, CS4231_AUX2_RIGHT_INPUT, 0xdf); + snd_wss_out(chip, CS4231_RIGHT_LINE_IN, 0xff); + snd_wss_out(chip, CS4231_LEFT_LINE_IN, 0xff); + snd_wss_out(chip, CS4231_RIGHT_LINE_IN, 0xff); + switch (chip->hardware) { + case WSS_HW_CS4235: + case WSS_HW_CS4239: + snd_wss_out(chip, CS4235_LEFT_MASTER, 0xff); + snd_wss_out(chip, CS4235_RIGHT_MASTER, 0xff); + break; + } + } else + snd_printd("chip is not CS4236+, hardware=0x%x\n", + chip->hardware); *rchip = chip; return 0; diff --git a/sound/isa/wss/wss_lib.c b/sound/isa/wss/wss_lib.c index 5d2ba1b..aab44e7 100644 --- a/sound/isa/wss/wss_lib.c +++ b/sound/isa/wss/wss_lib.c @@ -1682,7 +1682,7 @@ static void snd_wss_resume(struct snd_wss *chip) } #endif /* CONFIG_PM */ -int snd_wss_free(struct snd_wss *chip) +static int snd_wss_free(struct snd_wss *chip) { release_and_free_resource(chip->res_port); release_and_free_resource(chip->res_cport); @@ -1705,7 +1705,6 @@ int snd_wss_free(struct snd_wss *chip) kfree(chip); return 0; } -EXPORT_SYMBOL(snd_wss_free); static int snd_wss_dev_free(struct snd_device *device) { -- 1.6.4 ---------------------------------------------------------------------- Konkurs: Wygrywaj nagrody z Pudzianem! Sprawd� >> http://link.interia.pl/f240e

2 4

[alsa-devel] [PATCH] alsa-lib: snd_device_name_hint misbehaving
by John Lindgren 03 Nov '09

03 Nov '09

* Remove erroneous snd_config_delete calls that cause later calls to snd_pcm_open to fail. * Don't list card-independent PCM devices ("null" or PulseAudio, for example) more than once even if multiple sound cards are installed. * Add "ctl" to the list of device types that snd_device_name_hint can search for. * Cache the path to libasound.so within snd_dlopen rather than looking it up with dladdr every call. For a longer explanation: http://mailman.alsa-project.org/pipermail/alsa-devel/2009-October/022505.ht… Signed-off-by: John Lindgren <john.lindgren(a)tds.net> ------ src/conf.c | 2 -- src/control/namehint.c | 34 +++++++++++++++++++++++++++------- src/dlmisc.c | 10 +++++++--- 3 files changed, 34 insertions(+), 12 deletions(-) ------ diff --git a/src/conf.c b/src/conf.c index 570c90f..52a477c 100644 --- a/src/conf.c +++ b/src/conf.c @@ -1132,7 +1132,6 @@ static int parse_def(snd_config_t *parent, input_t *input, int skip, int overrid free(id); continue; } - snd_config_delete(n); } if (mode == MERGE) { SNDERR("%s does not exists", id); @@ -1156,7 +1155,6 @@ static int parse_def(snd_config_t *parent, input_t *input, int skip, int overrid skip = 1; n = NULL; } else if (mode == OVERRIDE) { - snd_config_delete(n); n = NULL; } } else { diff --git a/src/control/namehint.c b/src/control/namehint.c index e878f83..ec9d04f 100644 --- a/src/control/namehint.c +++ b/src/control/namehint.c @@ -328,7 +328,6 @@ static int try_config(struct hint_list *list, if (snd_config_search(cfg1, "slave", &cfg) >= 0 && snd_config_search(cfg, base, &cfg1) >= 0) goto __hint; - snd_config_delete(res); res = NULL; if (strchr(buf, ':') != NULL) goto __ok; @@ -379,8 +378,6 @@ static int try_config(struct hint_list *list, err = hint_list_add(list, buf, buf1); } __skip_add: - if (res) - snd_config_delete(res); if (buf1) free(buf1); free(buf); @@ -450,13 +447,10 @@ static int add_card(struct hint_list *list, int card) if (err == -EXDEV) continue; if (err < 0) { + list->card = card; list->device = -1; err = try_config(list, list->siface, str); } - if (err < 0) { - list->card = -1; - err = try_config(list, list->siface, str); - } if (err == -ENOMEM) goto __error; } @@ -466,6 +460,29 @@ static int add_card(struct hint_list *list, int card) return err; } +static int add_software_devices(struct hint_list *list) +{ + int err; + snd_config_t *conf, *n; + snd_config_iterator_t i, next; + const char *str; + + err = snd_config_search(snd_config, list->siface, &conf); + if (err < 0) + return err; + snd_config_for_each(i, next, conf) { + n = snd_config_iterator_entry(i); + if (snd_config_get_id(n, &str) < 0) + continue; + list->card = -1; + list->device = -1; + err = try_config(list, list->siface, str); + if (err == -ENOMEM) + return -ENOMEM; + } + return 0; +} + static int get_card_name(struct hint_list *list, int card) { char scard[16], *s; @@ -532,6 +549,8 @@ int snd_device_name_hint(int card, const char *iface, void ***hints) list.iface = SND_CTL_ELEM_IFACE_SEQUENCER; else if (strcmp(iface, "hwdep") == 0) list.iface = SND_CTL_ELEM_IFACE_HWDEP; + else if (strcmp(iface, "ctl") == 0) + list.iface = SND_CTL_ELEM_IFACE_MIXER; else return -EINVAL; list.show_all = 0; @@ -543,6 +562,7 @@ int snd_device_name_hint(int card, const char *iface, void ***hints) if (err >= 0) err = add_card(&list, card); } else { + add_software_devices(&list); err = snd_card_next(&card); if (err < 0) goto __error; diff --git a/src/dlmisc.c b/src/dlmisc.c index c882cdc..3cca0f0 100644 --- a/src/dlmisc.c +++ b/src/dlmisc.c @@ -54,9 +54,13 @@ void *snd_dlopen(const char *name, int mode) #else #ifdef HAVE_LIBDL if (name == NULL) { - Dl_info dlinfo; - if (dladdr(snd_dlopen, &dlinfo) > 0) - name = dlinfo.dli_fname; + static const char * self = NULL; + if (self == NULL) { + Dl_info dlinfo; + if (dladdr(snd_dlopen, &dlinfo) > 0) + self = dlinfo.dli_fname; + } + name = self; } #endif #endif

4 12

[alsa-devel] [RFC PATCH 2/3] MIPS: Alchemy: DB1200 AC97+I2S audio support.
by Manuel Lauss 03 Nov '09

03 Nov '09

Machine driver for DB1200 AC97 and I2S audio systems, intended as a proper reference asoc machine for Alchemy-based systems. AC97/I2S can be selected at boot time by setting switch S6.7 Cc: alsa-devel(a)alsa-project.org Cc: Mark Brown <broonie(a)opensource.wolfsonmicro.com> Signed-off-by: Manuel Lauss <manuel.lauss(a)gmail.com> --- Depends on patch "ASoC: au1x: convert to platform drivers" in Mark Brown's asoc tree to actually work. arch/mips/alchemy/devboards/db1200/platform.c | 51 +++++++++ sound/soc/au1x/Kconfig | 10 +- sound/soc/au1x/Makefile | 4 +- sound/soc/au1x/db1200.c | 141 ++++++++++++++++++++++++ sound/soc/au1x/sample-ac97.c | 144 ------------------------- 5 files changed, 200 insertions(+), 150 deletions(-) create mode 100644 sound/soc/au1x/db1200.c delete mode 100644 sound/soc/au1x/sample-ac97.c diff --git a/arch/mips/alchemy/devboards/db1200/platform.c b/arch/mips/alchemy/devboards/db1200/platform.c index 5a6ef8d..d6b3e64 100644 --- a/arch/mips/alchemy/devboards/db1200/platform.c +++ b/arch/mips/alchemy/devboards/db1200/platform.c @@ -399,12 +399,43 @@ static struct platform_device db1200_spi_dev = { .resource = au1200_psc0_res, }; +static struct resource au1200_psc1_res[] = { + [0] = { + .start = PSC1_PHYS_ADDR, + .end = PSC1_PHYS_ADDR + 0x000fffff, + .flags = IORESOURCE_MEM, + }, + [1] = { + .start = AU1200_PSC1_INT, + .end = AU1200_PSC1_INT, + .flags = IORESOURCE_IRQ, + }, + [2] = { + .start = DSCR_CMD0_PSC1_TX, + .end = DSCR_CMD0_PSC1_TX, + .flags = IORESOURCE_DMA, + }, + [3] = { + .start = DSCR_CMD0_PSC1_RX, + .end = DSCR_CMD0_PSC1_RX, + .flags = IORESOURCE_DMA, + }, +}; + +static struct platform_device db1200_audio_dev = { + /* name assigned later based on switch setting */ + .id = 1, /* PSC ID */ + .num_resources = ARRAY_SIZE(au1200_psc1_res), + .resource = au1200_psc1_res, +}; + static struct platform_device *db1200_devs[] __initdata = { NULL, /* PSC0, selected by S6.8 */ &db1200_ide_dev, &db1200_eth_dev, &db1200_rtc_dev, &db1200_nand_dev, + &db1200_audio_dev, }; static int __init db1200_dev_init(void) @@ -419,6 +450,7 @@ static int __init db1200_dev_init(void) ARRAY_SIZE(db1200_i2c_devs)); /* SWITCHES: S6.8 I2C/SPI selector (OFF=I2C ON=SPI) + * S6.7 AC97/I2S selector (OFF=AC97 ON=I2S) */ /* NOTE: GPIO215 controls OTG VBUS supply. In SPI mode however @@ -456,6 +488,25 @@ static int __init db1200_dev_init(void) __raw_writel(pfc, (void __iomem *)SYS_PINFUNC); wmb(); + /* Audio: DIP7 selects I2S(0)/AC97(1), but need I2C for I2S! + * so: DIP7=1 || DIP8=0 => AC97, DIP7=0 && DIP8=1 => I2S + */ + sw &= BCSR_SWITCHES_DIP_8 | BCSR_SWITCHES_DIP_7; + if (sw == BCSR_SWITCHES_DIP_8) { + bcsr_mod(BCSR_RESETS, 0, BCSR_RESETS_PSC1MUX); + db1200_audio_dev.name = "au1xpsc_i2s"; + printk(KERN_INFO " S6.7 ON : PSC1 mode I2S\n"); + } else { + bcsr_mod(BCSR_RESETS, BCSR_RESETS_PSC1MUX, 0); + db1200_audio_dev.name = "au1xpsc_ac97"; + printk(KERN_INFO " S6.7 OFF: PSC1 mode AC97\n"); + } + + /* Audio PSC clock is supplied externally. (FIXME: platdata!!) */ + __raw_writel(PSC_SEL_CLK_SERCLK, + (void __iomem *)KSEG1ADDR(PSC1_PHYS_ADDR) + PSC_SEL_OFFSET); + wmb(); + db1x_register_pcmcia_socket(PCMCIA_ATTR_PSEUDO_PHYS, PCMCIA_ATTR_PSEUDO_PHYS + 0x00040000 - 1, PCMCIA_MEM_PSEUDO_PHYS, diff --git a/sound/soc/au1x/Kconfig b/sound/soc/au1x/Kconfig index 410a893..4b67140 100644 --- a/sound/soc/au1x/Kconfig +++ b/sound/soc/au1x/Kconfig @@ -22,11 +22,13 @@ config SND_SOC_AU1XPSC_AC97 ## ## Boards ## -config SND_SOC_SAMPLE_PSC_AC97 - tristate "Sample Au12x0/Au1550 PSC AC97 sound machine" +config SND_SOC_DB1200 + tristate "DB1200 AC97+I2S audio support" depends on SND_SOC_AU1XPSC select SND_SOC_AU1XPSC_AC97 select SND_SOC_AC97_CODEC + select SND_SOC_AU1XPSC_I2S + select SND_SOC_WM8731 help - This is a sample AC97 sound machine for use in Au12x0/Au1550 - based systems which have audio on PSC1 (e.g. Db1200 demoboard). + Select this option to enable audio (AC97 or I2S) on the + Alchemy/AMD/RMI DB1200 demoboard. diff --git a/sound/soc/au1x/Makefile b/sound/soc/au1x/Makefile index 6c6950b..1687307 100644 --- a/sound/soc/au1x/Makefile +++ b/sound/soc/au1x/Makefile @@ -8,6 +8,6 @@ obj-$(CONFIG_SND_SOC_AU1XPSC_I2S) += snd-soc-au1xpsc-i2s.o obj-$(CONFIG_SND_SOC_AU1XPSC_AC97) += snd-soc-au1xpsc-ac97.o # Boards -snd-soc-sample-ac97-objs := sample-ac97.o +snd-soc-db1200-objs := db1200.o -obj-$(CONFIG_SND_SOC_SAMPLE_PSC_AC97) += snd-soc-sample-ac97.o +obj-$(CONFIG_SND_SOC_DB1200) += snd-soc-db1200.o diff --git a/sound/soc/au1x/db1200.c b/sound/soc/au1x/db1200.c new file mode 100644 index 0000000..cdf7be1 --- /dev/null +++ b/sound/soc/au1x/db1200.c @@ -0,0 +1,141 @@ +/* + * DB1200 ASoC audio fabric support code. + * + * (c) 2008-9 Manuel Lauss <manuel.lauss(a)gmail.com> + * + */ + +#include <linux/module.h> +#include <linux/moduleparam.h> +#include <linux/timer.h> +#include <linux/interrupt.h> +#include <linux/platform_device.h> +#include <sound/core.h> +#include <sound/pcm.h> +#include <sound/soc.h> +#include <sound/soc-dapm.h> +#include <asm/mach-au1x00/au1000.h> +#include <asm/mach-au1x00/au1xxx_psc.h> +#include <asm/mach-au1x00/au1xxx_dbdma.h> +#include <asm/mach-db1x00/bcsr.h> + +#include "../codecs/ac97.h" +#include "../codecs/wm8731.h" +#include "psc.h" + +/*------------------------- AC97 PART ---------------------------*/ + +static struct snd_soc_dai_link db1200_ac97_dai = { + .name = "AC97", + .stream_name = "AC97 HiFi", + .cpu_dai = &au1xpsc_ac97_dai, + .codec_dai = &ac97_dai, +}; + +static struct snd_soc_card db1200_ac97_machine = { + .name = "DB1200_AC97", + .dai_link = &db1200_ac97_dai, + .num_links = 1, + .platform = &au1xpsc_soc_platform, +}; + +static struct snd_soc_device db1200_ac97_devdata = { + .card = &db1200_ac97_machine, + .codec_dev = &soc_codec_dev_ac97, +}; + +/*------------------------- I2S PART ---------------------------*/ + +static int db1200_i2s_startup(struct snd_pcm_substream *substream) +{ + struct snd_soc_pcm_runtime *rtd = substream->private_data; + struct snd_soc_dai *codec_dai = rtd->dai->codec_dai; + struct snd_soc_dai *cpu_dai = rtd->dai->cpu_dai; + int ret; + + /* WM8731 has its own 12MHz crystal */ + snd_soc_dai_set_sysclk(codec_dai, WM8731_SYSCLK, + 12000000, SND_SOC_CLOCK_IN); + + /* codec is bitclock and lrclk master */ + ret = snd_soc_dai_set_fmt(codec_dai, SND_SOC_DAIFMT_LEFT_J | + SND_SOC_DAIFMT_NB_NF | SND_SOC_DAIFMT_CBM_CFM); + if (ret < 0) + goto out; + + ret = snd_soc_dai_set_fmt(cpu_dai, SND_SOC_DAIFMT_LEFT_J | + SND_SOC_DAIFMT_NB_NF | SND_SOC_DAIFMT_CBM_CFM); + if (ret < 0) + goto out; + + ret = 0; +out: + return ret; +} + +static struct snd_soc_ops db1200_i2s_wm8731_ops = { + .startup = db1200_i2s_startup, +}; + +static struct snd_soc_dai_link db1200_i2s_dai = { + .name = "WM8731", + .stream_name = "WM8731 PCM", + .cpu_dai = &au1xpsc_i2s_dai, + .codec_dai = &wm8731_dai, + .ops = &db1200_i2s_wm8731_ops, +}; + +static struct snd_soc_card db1200_i2s_machine = { + .name = "DB1200_I2S", + .dai_link = &db1200_i2s_dai, + .num_links = 1, + .platform = &au1xpsc_soc_platform, +}; + +static struct snd_soc_device db1200_i2s_devdata = { + .card = &db1200_i2s_machine, + .codec_dev = &soc_codec_dev_wm8731, +}; + +/*------------------------- COMMON PART ---------------------------*/ + +static struct platform_device *db1200_asoc_dev; + +static int __init db1200_audio_load(void) +{ + int ret; + + ret = -ENOMEM; + db1200_asoc_dev = platform_device_alloc("soc-audio", -1); + if (!db1200_asoc_dev) + goto out; + + /* DB1200 board setup set PSC1MUX to preferred audio device */ + if (bcsr_read(BCSR_RESETS) & BCSR_RESETS_PSC1MUX) + platform_set_drvdata(db1200_asoc_dev, &db1200_i2s_devdata); + else + platform_set_drvdata(db1200_asoc_dev, &db1200_ac97_devdata); + + db1200_ac97_devdata.dev = &db1200_asoc_dev->dev; + db1200_i2s_devdata.dev = &db1200_asoc_dev->dev; + ret = platform_device_add(db1200_asoc_dev); + + if (ret) { + platform_device_put(db1200_asoc_dev); + db1200_asoc_dev = NULL; + } +out: + return ret; +} + +static void __exit db1200_audio_unload(void) +{ + platform_device_unregister(db1200_asoc_dev); +} + +module_init(db1200_audio_load); +module_exit(db1200_audio_unload); + +MODULE_LICENSE("GPL"); +MODULE_DESCRIPTION("DB1200 ASoC audio support"); +MODULE_AUTHOR("Manuel Lauss"); diff --git a/sound/soc/au1x/sample-ac97.c b/sound/soc/au1x/sample-ac97.c deleted file mode 100644 index 27683eb..0000000 --- a/sound/soc/au1x/sample-ac97.c +++ /dev/null @@ -1,144 +0,0 @@ -/* - * Sample Au12x0/Au1550 PSC AC97 sound machine. - * - * Copyright (c) 2007-2008 Manuel Lauss <mano(a)roarinelk.homelinux.net> - * - * This program is free software; you can redistribute it and/or modify - * it under the terms outlined in the file COPYING at the root of this - * source archive. - * - * This is a very generic AC97 sound machine driver for boards which - * have (AC97) audio at PSC1 (e.g. DB1200 demoboards). - */ - -#include <linux/module.h> -#include <linux/moduleparam.h> -#include <linux/timer.h> -#include <linux/interrupt.h> -#include <linux/platform_device.h> -#include <sound/core.h> -#include <sound/pcm.h> -#include <sound/soc.h> -#include <sound/soc-dapm.h> -#include <asm/mach-au1x00/au1000.h> -#include <asm/mach-au1x00/au1xxx_psc.h> -#include <asm/mach-au1x00/au1xxx_dbdma.h> - -#include "../codecs/ac97.h" -#include "psc.h" - -static int au1xpsc_sample_ac97_init(struct snd_soc_codec *codec) -{ - snd_soc_dapm_sync(codec); - return 0; -} - -static struct snd_soc_dai_link au1xpsc_sample_ac97_dai = { - .name = "AC97", - .stream_name = "AC97 HiFi", - .cpu_dai = &au1xpsc_ac97_dai, /* see psc-ac97.c */ - .codec_dai = &ac97_dai, /* see codecs/ac97.c */ - .init = au1xpsc_sample_ac97_init, - .ops = NULL, -}; - -static struct snd_soc_card au1xpsc_sample_ac97_machine = { - .name = "Au1xxx PSC AC97 Audio", - .dai_link = &au1xpsc_sample_ac97_dai, - .num_links = 1, -}; - -static struct snd_soc_device au1xpsc_sample_ac97_devdata = { - .card = &au1xpsc_sample_ac97_machine, - .platform = &au1xpsc_soc_platform, /* see dbdma2.c */ - .codec_dev = &soc_codec_dev_ac97, -}; - -static struct resource au1xpsc_psc1_res[] = { - [0] = { - .start = CPHYSADDR(PSC1_BASE_ADDR), - .end = CPHYSADDR(PSC1_BASE_ADDR) + 0x000fffff, - .flags = IORESOURCE_MEM, - }, - [1] = { -#ifdef CONFIG_SOC_AU1200 - .start = AU1200_PSC1_INT, - .end = AU1200_PSC1_INT, -#elif defined(CONFIG_SOC_AU1550) - .start = AU1550_PSC1_INT, - .end = AU1550_PSC1_INT, -#endif - .flags = IORESOURCE_IRQ, - }, - [2] = { - .start = DSCR_CMD0_PSC1_TX, - .end = DSCR_CMD0_PSC1_TX, - .flags = IORESOURCE_DMA, - }, - [3] = { - .start = DSCR_CMD0_PSC1_RX, - .end = DSCR_CMD0_PSC1_RX, - .flags = IORESOURCE_DMA, - }, -}; - -static struct platform_device *au1xpsc_sample_ac97_dev; - -static int __init au1xpsc_sample_ac97_load(void) -{ - int ret; - -#ifdef CONFIG_SOC_AU1200 - unsigned long io; - - /* modify sys_pinfunc for AC97 on PSC1 */ - io = au_readl(SYS_PINFUNC); - io |= SYS_PINFUNC_P1C; - io &= ~(SYS_PINFUNC_P1A | SYS_PINFUNC_P1B); - au_writel(io, SYS_PINFUNC); - au_sync(); -#endif - - ret = -ENOMEM; - - /* setup PSC clock source for AC97 part: external clock provided - * by codec. The psc-ac97.c driver depends on this setting! - */ - au_writel(PSC_SEL_CLK_SERCLK, PSC1_BASE_ADDR + PSC_SEL_OFFSET); - au_sync(); - - au1xpsc_sample_ac97_dev = platform_device_alloc("soc-audio", -1); - if (!au1xpsc_sample_ac97_dev) - goto out; - - au1xpsc_sample_ac97_dev->resource = - kmemdup(au1xpsc_psc1_res, sizeof(struct resource) * - ARRAY_SIZE(au1xpsc_psc1_res), GFP_KERNEL); - au1xpsc_sample_ac97_dev->num_resources = ARRAY_SIZE(au1xpsc_psc1_res); - au1xpsc_sample_ac97_dev->id = 1; - - platform_set_drvdata(au1xpsc_sample_ac97_dev, - &au1xpsc_sample_ac97_devdata); - au1xpsc_sample_ac97_devdata.dev = &au1xpsc_sample_ac97_dev->dev; - ret = platform_device_add(au1xpsc_sample_ac97_dev); - - if (ret) { - platform_device_put(au1xpsc_sample_ac97_dev); - au1xpsc_sample_ac97_dev = NULL; - } - -out: - return ret; -} - -static void __exit au1xpsc_sample_ac97_exit(void) -{ - platform_device_unregister(au1xpsc_sample_ac97_dev); -} - -module_init(au1xpsc_sample_ac97_load); -module_exit(au1xpsc_sample_ac97_exit); - -MODULE_LICENSE("GPL"); -MODULE_DESCRIPTION("Au1xxx PSC sample AC97 machine"); -MODULE_AUTHOR("Manuel Lauss <mano(a)roarinelk.homelinux.net>"); -- 1.6.5.1

3 7

[alsa-devel] [PATCH 0/5] ASoC/MFD/OMAP: TWL4030: APLL_CTL handling change
by Peter Ujfalusi 03 Nov '09

03 Nov '09

Hello, The following series changes the way how the APLL_CTL register is handled by the twl4030 codec related drivers. Moving the configuration of APLL_CTL register from child drivers (specifically from soc codec driver) to the twl4030-codec MFD driver. Because the audio_mclk is static, board specific and can not be changed in runtime, the codec MFD is the right place to configure it early enough, so child can use the hardware correctly. Before this patch for example the APLL_INFREQ was configured first, when the user played or recorded audio via the twl4030. The digital bypass needs correct APLL_INFREQ to be configured in order to work properly. If the digital bypass enabled before any audio activity, in some cases the bypassed audio was not correct. The series also addresses the issue, that after boot-up, neither of the loopbacks was working, because the codec was actually off. Setting the codec->bias_level to _OFF, before setting the codec bias level to STANDBY fixes this issue. This series is on top of Takashi's sound-2.6 topic/asoc branch, which has the twl403-codec MFD and related patches for 2.6.33. It would be really nice, if this series would make it also to the same branch, since this fixes some real anomalies brought in by the cleanup of the twl4030 codec related drivers. These problems were hidden before because of the inconsistent handling of bits and states in the codec driver in the past. Thank you, --- Peter Ujfalusi (5): MFD: TWL4030: Add audio_mclk to the codec platform data OMAP: Configure audio_mclk for twl4030-codec MFD MFD: twl4030-codec: APLL_INFREQ handling in the MFD driver ASoC: TWL4030: Make sure, that the codec is powered on startup ASoC: TWL4030: Do not modify the APLL_CTL register arch/arm/mach-omap2/board-3430sdp.c | 1 + arch/arm/mach-omap2/board-omap3beagle.c | 1 + arch/arm/mach-omap2/board-omap3evm.c | 1 + arch/arm/mach-omap2/board-omap3pandora.c | 1 + arch/arm/mach-omap2/board-overo.c | 1 + arch/arm/mach-omap2/board-zoom2.c | 1 + drivers/mfd/twl4030-codec.c | 40 +++++++++++++++++ include/linux/i2c/twl4030.h | 1 + include/linux/mfd/twl4030-codec.h | 1 + sound/soc/codecs/twl4030.c | 70 +++++++++++------------------ 10 files changed, 75 insertions(+), 43 deletions(-)

2 12

[alsa-devel] snd-hdsp driver error?
by Lars Zobbe 03 Nov '09

03 Nov '09

Hi. Talking to one of the pulseaudio developers (*Colin Guthrie*) about a problem with pulseaudio loading modules and my sound card (RME HDSP 9632), I was adviced to inform you about the problem. I'm on ubuntu 9.10, 64bit, kernel 2.6.31 with an amd64 x2 3800+ processor. Symptoms are: Can only make pulseaudio load modules with the deprecated load-module module-detect command, module-udev-detect doesn't detect anything (no sound - only null sink output in padevchooser). I get terrible stuttering. I can remove pulseaudio and make things work, more or less. However, that leaves me without software mixing and apps fighting for the rights to make sound. And more inconveniences (fx. no volume-control). I can play sound from audacity without stuttering by choosing the cardname directly in output HDSP, not ALSA, not pulseaudio. When trying to run alsa-info.sh I get a lot of "not found" errors. So you'll get some manual info (they might have moved som files around in ubuntu 9.10). This is part of my syslog during a boot. (I did the formatting to bold). Nov 2 10:57:32 lars-desktop pulseaudio[1524]: module.c: module-detect is deprecated: Please use module-udev-detect instead of module-detect! Nov 2 10:57:37 lars-desktop pulseaudio[1524]: ratelimit.c: 27 events suppressed Nov 2 10:57:39 lars-desktop pulseaudio[1612]: module.c: module-detect is deprecated: Please use module-udev-detect instead of module-detect! Nov 2 10:57:44 lars-desktop pulseaudio[1612]: ratelimit.c: 23 events suppressed Nov 2 10:57:44 lars-desktop pulseaudio[1612]: alsa-sink.c: ALSA woke us up to write new data to the device, but there was actually nothing to write! Nov 2 10:57:44 lars-desktop pulseaudio[1612]: alsa-sink.c: *Most likely this is a bug in the ALSA driver 'snd_hdsp'. Please report this issue to the ALSA developers.* Nov 2 10:57:44 lars-desktop pulseaudio[1612]: alsa-sink.c: We were woken up with POLLOUT set -- however a subsequent snd_pcm_avail() returned 0 or another value < min_avail. Nov 2 10:57:49 lars-desktop pulseaudio[1612]: ratelimit.c: 99 events suppressed Later if I try to play audio I get terrible skipping or stuttering and my syslog (in less than a minute) writes: Nov 2 11:55:16 lars-desktop pulseaudio[1612]: ratelimit.c: 16 events suppressed Nov 2 11:55:21 lars-desktop pulseaudio[1612]: ratelimit.c: 34 events suppressed Nov 2 11:55:26 lars-desktop pulseaudio[1612]: ratelimit.c: 70 events suppressed Nov 2 11:55:31 lars-desktop pulseaudio[1612]: ratelimit.c: 29 events suppressed Nov 2 11:55:36 lars-desktop pulseaudio[1612]: ratelimit.c: 43 events suppressed Nov 2 11:55:41 lars-desktop pulseaudio[1612]: ratelimit.c: 161 events suppressed Nov 2 11:55:46 lars-desktop pulseaudio[1612]: ratelimit.c: 28 events suppressed Nov 2 11:55:51 lars-desktop pulseaudio[1612]: ratelimit.c: 18 events suppressed Nov 2 11:55:56 lars-desktop pulseaudio[1612]: ratelimit.c: 16 events suppressed Here's the relevant part (concerning my sound card) of lspci -vvv 02:09.0 Multimedia audio controller: Xilinx Corporation RME Hammerfall DSP (rev 9a) Control: I/O- Mem+ BusMaster+ SpecCycle- MemWINV- VGASnoop- ParErr- Stepping- SERR- FastB2B- DisINTx- Status: Cap- 66MHz- UDF- FastB2B- ParErr- DEVSEL=medium >TAbort- <TAbort- <MAbort- >SERR- <PERR- INTx- Latency: 255 Interrupt: pin A routed to IRQ 19 Region 0: Memory at fdff0000 (32-bit, non-prefetchable) [size=64K] Kernel driver in use: RME Hammerfall DSP Kernel modules: snd-hdsp And: lars@lars-desktop:~$ aplay -l **** List of PLAYBACK Hardware Devices **** card 0: DSP [Hammerfall DSP], device 0: RME Hammerfall HDSP 9632 [RME Hammerfall HDSP 9632] Subdevices: 1/1 Subdevice #0: subdevice #0 lars@lars-desktop:~$ cat /proc/asound/version Advanced Linux Sound Architecture Driver Version 1.0.21. Compiled on Oct 15 2009 for kernel 2.6.31-14-generic (SMP). lars@lars-desktop:~$ cat /proc/asound/cards 0 [DSP ]: H-DSP - Hammerfall DSP RME Hammerfall HDSP 9632 at 0xfdff0000, irq 19 lars@lars-desktop:~$ cat /proc/asound/modules 0 snd_hdsp I don't have .asound.conf files. lars@lars-desktop:~$ hdsploader hdsploader - firmware loader for RME Hammerfall DSP cards Looking for HDSP + Multiface or Digiface cards : Card 0 : RME Hammerfall HDSP 9632 at 0xfdff0000, irq 19 And of course. My computer makes no sound if I don't load the hdspmixer at startup. I guess that's just normal for this card though. Please let me know, if you need more info. I really hope you can help out here. And that this might help you to. Thanks for the great work you do. Greetings. Lars Zobbe.

2 1

[alsa-devel] Query regarding broken pipe on capturre device
by Ketan Deshpande 03 Nov '09

03 Nov '09

Hello All, I am facing a certain problem in the application development using ALSA.Below is the small description of my problem I am trying to read from the capture device using "snd_pcm_readi"; but sometimes i get a error saying "error reading from capture device : broken pipe -32". Which results in the audio break. I have tried to use the port in blocking as well as non blocking mode but that does not seem to help. I have tried to make sure the buffer sizes match, using the below mentioned formula. ALSA Buffer size in my Apllication = 1024 * 8 = Periodsize * number of periods = HW Buffer size Can you please suggest me, as to what could be the reason for the broken pipe error and how can I get rid of that? regards, -Ketan =====-----=====-----===== Notice: The information contained in this e-mail message and/or attachments to it may contain confidential or privileged information. If you are not the intended recipient, any dissemination, use, review, distribution, printing or copying of the information contained in this e-mail message and/or attachments to it are strictly prohibited. If you have received this communication in error, please notify us by reply e-mail or telephone and immediately and permanently delete the message and any attachments. Thank you

1 0

[alsa-devel] [PATCH] sh: add SuperH DAC audio driver for ALSA V3
by Rafael Ignacio Zurita 03 Nov '09

03 Nov '09

This is a port of the sound/oss/sh_dac_audio.c driver. The driver uses an on-chip 8-bit D/A converter, which has a speaker connected to one of its channels, found in several ancient HP machines. For interrupts it uses a high-resolution timer (hrtimer). Tested on SH7709 based hp6xx (HP Jornada 680/690 and HP Palmtop 620lx/660lx). Also, since OSS Emulation works, the old OSS sound/oss/sh_dac_audio.c driver would be obsolete soon, and it could be removed. Changes since V2: - renamed include/sound/dac_audio.h to include/sound/sh_dac_audio.h Changes since V1: - moved the platform device code into board code. - dropped dac_audio_sync(), since that code is not needed (it was inherited of the old oss driver). - rewrote the code with style problems. Signed-off-by: Rafael Ignacio Zurita <rizurita(a)yahoo.com> --- arch/sh/boards/mach-hp6xx/setup.c | 55 ++++ arch/sh/include/mach-common/mach/hp6xx.h | 4 + include/sound/sh_dac_audio.h | 21 ++ sound/sh/Kconfig | 8 + sound/sh/Makefile | 1 + sound/sh/snd_sh_dac_audio.c | 453 ++++++++++++++++++++++++++++++ 6 files changed, 542 insertions(+), 0 deletions(-) diff --git a/arch/sh/boards/mach-hp6xx/setup.c b/arch/sh/boards/mach-hp6xx/setup.c index 8f305b3..e6dd5e9 100644 --- a/arch/sh/boards/mach-hp6xx/setup.c +++ b/arch/sh/boards/mach-hp6xx/setup.c @@ -13,6 +13,7 @@ #include <linux/init.h> #include <linux/platform_device.h> #include <linux/irq.h> +#include <sound/sh_dac_audio.h> #include <asm/hd64461.h> #include <asm/io.h> #include <mach/hp6xx.h> @@ -51,9 +52,63 @@ static struct platform_device jornadakbd_device = { .id = -1, }; +static void dac_audio_start(struct dac_audio_pdata *pdata) +{ + u16 v; + u8 v8; + + /* HP Jornada 680/690 speaker on */ + v = inw(HD64461_GPADR); + v &= ~HD64461_GPADR_SPEAKER; + outw(v, HD64461_GPADR); + + /* HP Palmtop 620lx/660lx speaker on */ + v8 = inb(PKDR); + v8 &= ~PKDR_SPEAKER; + outb(v8, PKDR); + + sh_dac_enable(pdata->channel); +} + +static void dac_audio_stop(struct dac_audio_pdata *pdata) +{ + u16 v; + u8 v8; + + /* HP Jornada 680/690 speaker off */ + v = inw(HD64461_GPADR); + v |= HD64461_GPADR_SPEAKER; + outw(v, HD64461_GPADR); + + /* HP Palmtop 620lx/660lx speaker off */ + v8 = inb(PKDR); + v8 |= PKDR_SPEAKER; + outb(v8, PKDR); + + sh_dac_output(0, pdata->channel); + sh_dac_disable(pdata->channel); +} + +static struct dac_audio_pdata dac_audio_platform_data = { + .buffer_size = 64000, + .channel = 1, + .start = dac_audio_start, + .stop = dac_audio_stop, +}; + +static struct platform_device dac_audio_device = { + .name = "dac_audio", + .id = -1, + .dev = { + .platform_data = &dac_audio_platform_data, + } + +}; + static struct platform_device *hp6xx_devices[] __initdata = { &cf_ide_device, &jornadakbd_device, + &dac_audio_device, }; static void __init hp6xx_init_irq(void) diff --git a/arch/sh/include/mach-common/mach/hp6xx.h b/arch/sh/include/mach-common/mach/hp6xx.h index 0d4165a..bcc301a 100644 --- a/arch/sh/include/mach-common/mach/hp6xx.h +++ b/arch/sh/include/mach-common/mach/hp6xx.h @@ -29,6 +29,9 @@ #define PKDR_LED_GREEN 0x10 +/* HP Palmtop 620lx/660lx speaker on/off */ +#define PKDR_SPEAKER 0x20 + #define SCPDR_TS_SCAN_ENABLE 0x20 #define SCPDR_TS_SCAN_Y 0x02 #define SCPDR_TS_SCAN_X 0x01 @@ -42,6 +45,7 @@ #define ADC_CHANNEL_BACKUP 4 #define ADC_CHANNEL_CHARGE 5 +/* HP Jornada 680/690 speaker on/off */ #define HD64461_GPADR_SPEAKER 0x01 #define HD64461_GPADR_PCMCIA0 (0x02|0x08) diff --git a/include/sound/sh_dac_audio.h b/include/sound/sh_dac_audio.h new file mode 100644 index 0000000..f5deaf1 --- /dev/null +++ b/include/sound/sh_dac_audio.h @@ -0,0 +1,21 @@ +/* + * SH_DAC specific configuration, for the dac_audio platform_device + * + * Copyright (C) 2009 Rafael Ignacio Zurita <rizurita(a)yahoo.com> + * + * This program is free software; you can redistribute it and/or modify it + * under the terms of the GNU General Public License version 2 as published + * by the Free Software Foundation. + */ + +#ifndef __INCLUDE_SH_DAC_AUDIO_H +#define __INCLUDE_SH_DAC_AUDIO_H + +struct dac_audio_pdata { + int buffer_size; + int channel; + void (*start)(struct dac_audio_pdata *pd); + void (*stop)(struct dac_audio_pdata *pd); +}; + +#endif /* __INCLUDE_SH_DAC_AUDIO_H */ diff --git a/sound/sh/Kconfig b/sound/sh/Kconfig index aed0f90..61139f3 100644 --- a/sound/sh/Kconfig +++ b/sound/sh/Kconfig @@ -19,5 +19,13 @@ config SND_AICA help ALSA Sound driver for the SEGA Dreamcast console. +config SND_SH_DAC_AUDIO + tristate "SuperH DAC audio support" + depends on SND + depends on CPU_SH3 && HIGH_RES_TIMERS + select SND_PCM + help + Say Y here to include support for the on-chip DAC. + endif # SND_SUPERH diff --git a/sound/sh/Makefile b/sound/sh/Makefile index 8fdcb6e..c4b81c4 100644 --- a/sound/sh/Makefile +++ b/sound/sh/Makefile @@ -6,3 +6,4 @@ snd-aica-objs := aica.o # Toplevel Module Dependency obj-$(CONFIG_SND_AICA) += snd-aica.o +obj-$(CONFIG_SND_SH_DAC_AUDIO) += snd_sh_dac_audio.o diff --git a/sound/sh/snd_sh_dac_audio.c b/sound/sh/snd_sh_dac_audio.c new file mode 100644 index 0000000..ec3ca66 --- /dev/null +++ b/sound/sh/snd_sh_dac_audio.c @@ -0,0 +1,453 @@ +/* + * snd_sh_dac_audio.c - SuperH DAC audio driver for ALSA + * + * Copyright (c) 2009 by Rafael Ignacio Zurita <rizurita(a)yahoo.com> + * + * + * Based on sh_dac_audio.c (Copyright (C) 2004, 2005 by Andriy Skulysh) + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * + */ + +#include <linux/hrtimer.h> +#include <linux/interrupt.h> +#include <linux/io.h> +#include <linux/platform_device.h> +#include <sound/core.h> +#include <sound/initval.h> +#include <sound/pcm.h> +#include <sound/sh_dac_audio.h> +#include <asm/clock.h> +#include <asm/hd64461.h> +#include <mach/hp6xx.h> +#include <cpu/dac.h> + +MODULE_AUTHOR("Rafael Ignacio Zurita <rizurita(a)yahoo.com>"); +MODULE_DESCRIPTION("SuperH DAC audio driver"); +MODULE_LICENSE("GPL"); +MODULE_SUPPORTED_DEVICE("{{SuperH DAC audio support}}"); + +/* Module Parameters */ +static int index = SNDRV_DEFAULT_IDX1; +static char *id = SNDRV_DEFAULT_STR1; +module_param(index, int, 0444); +MODULE_PARM_DESC(index, "Index value for SuperH DAC audio."); +module_param(id, charp, 0444); +MODULE_PARM_DESC(id, "ID string for SuperH DAC audio."); + +/* main struct */ +struct snd_sh_dac { + struct snd_card *card; + struct snd_pcm_substream *substream; + struct hrtimer hrtimer; + ktime_t wakeups_per_second; + + int rate; + int empty; + char *data_buffer, *buffer_begin, *buffer_end; + int processed; /* bytes proccesed, to compare with period_size */ + int buffer_size; + struct dac_audio_pdata *pdata; +}; + + +static void dac_audio_start_timer(struct snd_sh_dac *chip) +{ + hrtimer_start(&chip->hrtimer, chip->wakeups_per_second, + HRTIMER_MODE_REL); +} + +static void dac_audio_stop_timer(struct snd_sh_dac *chip) +{ + hrtimer_cancel(&chip->hrtimer); +} + +static void dac_audio_reset(struct snd_sh_dac *chip) +{ + dac_audio_stop_timer(chip); + chip->buffer_begin = chip->buffer_end = chip->data_buffer; + chip->processed = 0; + chip->empty = 1; +} + +static void dac_audio_set_rate(struct snd_sh_dac *chip) +{ + chip->wakeups_per_second = ktime_set(0, 1000000000 / chip->rate); +} + + +/* PCM INTERFACE */ + +static struct snd_pcm_hardware snd_sh_dac_pcm_hw = { + .info = (SNDRV_PCM_INFO_MMAP | + SNDRV_PCM_INFO_MMAP_VALID | + SNDRV_PCM_INFO_INTERLEAVED | + SNDRV_PCM_INFO_HALF_DUPLEX), + .formats = SNDRV_PCM_FMTBIT_U8, + .rates = SNDRV_PCM_RATE_8000, + .rate_min = 8000, + .rate_max = 8000, + .channels_min = 1, + .channels_max = 1, + .buffer_bytes_max = (48*1024), + .period_bytes_min = 1, + .period_bytes_max = (48*1024), + .periods_min = 1, + .periods_max = 1024, +}; + +static int snd_sh_dac_pcm_open(struct snd_pcm_substream *substream) +{ + struct snd_sh_dac *chip = snd_pcm_substream_chip(substream); + struct snd_pcm_runtime *runtime = substream->runtime; + + runtime->hw = snd_sh_dac_pcm_hw; + + chip->substream = substream; + chip->buffer_begin = chip->buffer_end = chip->data_buffer; + chip->processed = 0; + chip->empty = 1; + + chip->pdata->start(chip->pdata); + + return 0; +} + +static int snd_sh_dac_pcm_close(struct snd_pcm_substream *substream) +{ + struct snd_sh_dac *chip = snd_pcm_substream_chip(substream); + + chip->substream = NULL; + + dac_audio_stop_timer(chip); + chip->pdata->stop(chip->pdata); + + return 0; +} + +static int snd_sh_dac_pcm_hw_params(struct snd_pcm_substream *substream, + struct snd_pcm_hw_params *hw_params) +{ + return snd_pcm_lib_malloc_pages(substream, + params_buffer_bytes(hw_params)); +} + +static int snd_sh_dac_pcm_hw_free(struct snd_pcm_substream *substream) +{ + return snd_pcm_lib_free_pages(substream); +} + +static int snd_sh_dac_pcm_prepare(struct snd_pcm_substream *substream) +{ + struct snd_sh_dac *chip = snd_pcm_substream_chip(substream); + struct snd_pcm_runtime *runtime = chip->substream->runtime; + + chip->buffer_size = runtime->buffer_size; + memset(chip->data_buffer, 0, chip->pdata->buffer_size); + + return 0; +} + +static int snd_sh_dac_pcm_trigger(struct snd_pcm_substream *substream, int cmd) +{ + struct snd_sh_dac *chip = snd_pcm_substream_chip(substream); + + switch (cmd) { + case SNDRV_PCM_TRIGGER_START: + dac_audio_start_timer(chip); + break; + case SNDRV_PCM_TRIGGER_STOP: + chip->buffer_begin = chip->buffer_end = chip->data_buffer; + chip->processed = 0; + chip->empty = 1; + dac_audio_stop_timer(chip); + break; + default: + return -EINVAL; + } + + return 0; +} + +static int snd_sh_dac_pcm_copy(struct snd_pcm_substream *substream, int channel, + snd_pcm_uframes_t pos, void __user *src, snd_pcm_uframes_t count) +{ + /* channel is not used (interleaved data) */ + struct snd_sh_dac *chip = snd_pcm_substream_chip(substream); + struct snd_pcm_runtime *runtime = substream->runtime; + ssize_t b_count = frames_to_bytes(runtime , count); + ssize_t b_pos = frames_to_bytes(runtime , pos); + + if (count < 0) + return -EINVAL; + + if (!count) + return 0; + + memcpy_toio(chip->data_buffer + b_pos, src, b_count); + chip->buffer_end = chip->data_buffer + b_pos + b_count; + + if (chip->empty) { + chip->empty = 0; + dac_audio_start_timer(chip); + } + + return 0; +} + +static int snd_sh_dac_pcm_silence(struct snd_pcm_substream *substream, + int channel, snd_pcm_uframes_t pos, + snd_pcm_uframes_t count) +{ + /* channel is not used (interleaved data) */ + struct snd_sh_dac *chip = snd_pcm_substream_chip(substream); + struct snd_pcm_runtime *runtime = substream->runtime; + ssize_t b_count = frames_to_bytes(runtime , count); + ssize_t b_pos = frames_to_bytes(runtime , pos); + + if (count < 0) + return -EINVAL; + + if (!count) + return 0; + + memset_io(chip->data_buffer + b_pos, 0, b_count); + chip->buffer_end = chip->data_buffer + b_pos + b_count; + + if (chip->empty) { + chip->empty = 0; + dac_audio_start_timer(chip); + } + + return 0; +} + +static +snd_pcm_uframes_t snd_sh_dac_pcm_pointer(struct snd_pcm_substream *substream) +{ + struct snd_sh_dac *chip = snd_pcm_substream_chip(substream); + int pointer = chip->buffer_begin - chip->data_buffer; + + return pointer; +} + +/* pcm ops */ +static struct snd_pcm_ops snd_sh_dac_pcm_ops = { + .open = snd_sh_dac_pcm_open, + .close = snd_sh_dac_pcm_close, + .ioctl = snd_pcm_lib_ioctl, + .hw_params = snd_sh_dac_pcm_hw_params, + .hw_free = snd_sh_dac_pcm_hw_free, + .prepare = snd_sh_dac_pcm_prepare, + .trigger = snd_sh_dac_pcm_trigger, + .pointer = snd_sh_dac_pcm_pointer, + .copy = snd_sh_dac_pcm_copy, + .silence = snd_sh_dac_pcm_silence, + .mmap = snd_pcm_lib_mmap_iomem, +}; + +static int __devinit snd_sh_dac_pcm(struct snd_sh_dac *chip, int device) +{ + int err; + struct snd_pcm *pcm; + + /* device should be always 0 for us */ + err = snd_pcm_new(chip->card, "SH_DAC PCM", device, 1, 0, &pcm); + if (err < 0) + return err; + + pcm->private_data = chip; + strcpy(pcm->name, "SH_DAC PCM"); + snd_pcm_set_ops(pcm, SNDRV_PCM_STREAM_PLAYBACK, &snd_sh_dac_pcm_ops); + + /* buffer size=48K */ + snd_pcm_lib_preallocate_pages_for_all(pcm, SNDRV_DMA_TYPE_CONTINUOUS, + snd_dma_continuous_data(GFP_KERNEL), + 48 * 1024, + 48 * 1024); + + return 0; +} +/* END OF PCM INTERFACE */ + + +/* driver .remove -- destructor */ +static int snd_sh_dac_remove(struct platform_device *devptr) +{ + snd_card_free(platform_get_drvdata(devptr)); + platform_set_drvdata(devptr, NULL); + + return 0; +} + +/* free -- it has been defined by create */ +static int snd_sh_dac_free(struct snd_sh_dac *chip) +{ + /* release the data */ + kfree(chip->data_buffer); + kfree(chip); + + return 0; +} + +static int snd_sh_dac_dev_free(struct snd_device *device) +{ + struct snd_sh_dac *chip = device->device_data; + + return snd_sh_dac_free(chip); +} + +static enum hrtimer_restart sh_dac_audio_timer(struct hrtimer *handle) +{ + struct snd_sh_dac *chip = container_of(handle, struct snd_sh_dac, + hrtimer); + struct snd_pcm_runtime *runtime = chip->substream->runtime; + ssize_t b_ps = frames_to_bytes(runtime, runtime->period_size); + + if (!chip->empty) { + sh_dac_output(*chip->buffer_begin, chip->pdata->channel); + chip->buffer_begin++; + + chip->processed++; + if (chip->processed >= b_ps) { + chip->processed -= b_ps; + snd_pcm_period_elapsed(chip->substream); + } + + if (chip->buffer_begin == (chip->data_buffer + + chip->buffer_size - 1)) + chip->buffer_begin = chip->data_buffer; + + if (chip->buffer_begin == chip->buffer_end) + chip->empty = 1; + + } + + if (!chip->empty) + hrtimer_start(&chip->hrtimer, chip->wakeups_per_second, + HRTIMER_MODE_REL); + + return HRTIMER_NORESTART; +} + +/* create -- chip-specific constructor for the cards components */ +static int __devinit snd_sh_dac_create(struct snd_card *card, + struct platform_device *devptr, + struct snd_sh_dac **rchip) +{ + struct snd_sh_dac *chip; + int err; + + static struct snd_device_ops ops = { + .dev_free = snd_sh_dac_dev_free, + }; + + *rchip = NULL; + + chip = kzalloc(sizeof(*chip), GFP_KERNEL); + if (chip == NULL) + return -ENOMEM; + + chip->card = card; + + hrtimer_init(&chip->hrtimer, CLOCK_MONOTONIC, HRTIMER_MODE_REL); + chip->hrtimer.function = sh_dac_audio_timer; + + dac_audio_reset(chip); + chip->rate = 8000; + dac_audio_set_rate(chip); + + chip->pdata = devptr->dev.platform_data; + + chip->data_buffer = kmalloc(chip->pdata->buffer_size, GFP_KERNEL); + if (chip->data_buffer == NULL) { + kfree(chip); + return -ENOMEM; + } + + err = snd_device_new(card, SNDRV_DEV_LOWLEVEL, chip, &ops); + if (err < 0) { + snd_sh_dac_free(chip); + return err; + } + + *rchip = chip; + + return 0; +} + +/* driver .probe -- constructor */ +static int __devinit snd_sh_dac_probe(struct platform_device *devptr) +{ + struct snd_sh_dac *chip; + struct snd_card *card; + int err; + + err = snd_card_create(index, id, THIS_MODULE, 0, &card); + if (err < 0) { + snd_printk(KERN_ERR "cannot allocate the card\n"); + return err; + } + + err = snd_sh_dac_create(card, devptr, &chip); + if (err < 0) + goto probe_error; + + err = snd_sh_dac_pcm(chip, 0); + if (err < 0) + goto probe_error; + + strcpy(card->driver, "snd_sh_dac"); + strcpy(card->shortname, "SuperH DAC audio driver"); + printk(KERN_INFO "%s %s", card->longname, card->shortname); + + err = snd_card_register(card); + if (err < 0) + goto probe_error; + + snd_printk("ALSA driver for SuperH DAC audio"); + + platform_set_drvdata(devptr, card); + return 0; + +probe_error: + snd_card_free(card); + return err; +} + +/* + * "driver" definition + */ +static struct platform_driver driver = { + .probe = snd_sh_dac_probe, + .remove = snd_sh_dac_remove, + .driver = { + .name = "dac_audio", + }, +}; + +static int __init sh_dac_init(void) +{ + return platform_driver_register(&driver); +} + +static void __exit sh_dac_exit(void) +{ + platform_driver_unregister(&driver); +} + +module_init(sh_dac_init); +module_exit(sh_dac_exit);

3 5

Re: [alsa-devel] [PATCH] alsa-lib: snd_device_name_hint misbehaving
by John Lindgren 02 Nov '09

02 Nov '09

Raymond Yau wrote: > Is there any test program for this change since currently only "hw" and > "pulse" can be listed by name hint ? > > * Add "ctl" to the list of device types that snd_device_name_hint can > search for. The development snapshot of Audacious is the only program that uses snd_device_name_hint to list mixer devices, to my knowledge. Attached are screenshots of the selector menu before and after the patch. John Lindgren

1 0

[alsa-devel] question on snd_jack_report
by Kp, Jeeja 02 Nov '09

02 Nov '09

>What is event.c? If this is some part of the X.Org server then you'd be >better asking the X folks about how to configure and use the X server, >it rewraps the data it's getting from the kernel. Sorry,it's evtest.c( this program polls /dev/input/eventX and prints the events). Basically when a Headphone is inserted into the jack, driver send snd_jack_report() with the status of present to ALSA. When the respective /dev/input/event5 is read from userspace, it must print the events. I don't see any events when snd_jack_report() is called.

2 1

[alsa-devel] [PATCH - report available sample formats in aplay/arecord when currently selected one doesn't work]
by alsa2＠bzzt.net 02 Nov '09

02 Nov '09

From: Arnout Engelen <alsa2(a)bzzt.net> Signed-off-by: Arnout Engelen <alsa2(a)bzzt.net> --- aplay/aplay.c | 15 +++++++++++++++ 1 files changed, 15 insertions(+), 0 deletions(-) diff --git a/aplay/aplay.c b/aplay/aplay.c index c7c82a1..60f17de 100644 --- a/aplay/aplay.c +++ b/aplay/aplay.c @@ -941,6 +941,20 @@ static int test_au(int fd, void *buffer) return 0; } +static void show_available_sample_formats(snd_pcm_hw_params_t* params) +{ + snd_pcm_format_t format; + + fprintf(stderr, "Available formats:\n"); + for (format = 0; format < SND_PCM_FORMAT_LAST; format++) + { + if (snd_pcm_hw_params_test_format(handle, params, format) == 0) + { + fprintf(stderr, "- %s\n", snd_pcm_format_name(format)); + } + } +} + static void set_params(void) { snd_pcm_hw_params_t *params; @@ -977,6 +991,7 @@ static void set_params(void) err = snd_pcm_hw_params_set_format(handle, params, hwparams.format); if (err < 0) { error(_("Sample format non available")); + show_available_sample_formats(params); exit(EXIT_FAILURE); } err = snd_pcm_hw_params_set_channels(handle, params, hwparams.channels); -- 1.6.3.3

2 1

[alsa-devel] Resubmit: [PATCH] sound/soc/codecs: Add support for the wm8727 DAC.
by Neil Jones 02 Nov '09

02 Nov '09

Add support for the Wolfson Micro wm8727 DAC, this is a simple non-configurable DAC. Signed-off-by: Neil Jones <neil.jones(a)imgtec.com> ---

2 1

[alsa-devel] [PATCH] sound/soc/codecs: Add support for the wm8727 DAC.
by Neil Jones 02 Nov '09

02 Nov '09

Add support for the Wolfson Micro wm8727 DAC, this is a simple non-configurable DAC. Signed-off-by: Neil Jones <neil.jones(a)imgtec.com> --- sound/soc/codecs/Kconfig | 6 ++- sound/soc/codecs/Makefile | 5 +- sound/soc/codecs/wm8727.c | 120 +++++++++++++++++++++++++++++++++++++++++++++ sound/soc/codecs/wm8727.h | 21 ++++++++ 4 files changed, 149 insertions(+), 3 deletions(-) create mode 100644 sound/soc/codecs/wm8727.c create mode 100644 sound/soc/codecs/wm8727.h diff --git a/sound/soc/codecs/Kconfig b/sound/soc/codecs/Kconfig index 0edca93..816cc86 100644 --- a/sound/soc/codecs/Kconfig +++ b/sound/soc/codecs/Kconfig @@ -36,6 +36,7 @@ config SND_SOC_ALL_CODECS select SND_SOC_WM8510 if SND_SOC_I2C_AND_SPI select SND_SOC_WM8523 if I2C select SND_SOC_WM8580 if I2C + select SND_SOC_WM8727 select SND_SOC_WM8728 if SND_SOC_I2C_AND_SPI select SND_SOC_WM8731 if SND_SOC_I2C_AND_SPI select SND_SOC_WM8750 if SND_SOC_I2C_AND_SPI @@ -160,6 +161,9 @@ config SND_SOC_WM8523 config SND_SOC_WM8580 tristate +config SND_SOC_WM8727 + tristate + config SND_SOC_WM8728 tristate @@ -217,6 +221,6 @@ config SND_SOC_WM9712 config SND_SOC_WM9713 tristate -# Amp config SND_SOC_MAX9877 tristate + diff --git a/sound/soc/codecs/Makefile b/sound/soc/codecs/Makefile index fb4af28..fa536a9 100644 --- a/sound/soc/codecs/Makefile +++ b/sound/soc/codecs/Makefile @@ -24,6 +24,7 @@ snd-soc-wm8400-objs := wm8400.o snd-soc-wm8510-objs := wm8510.o snd-soc-wm8523-objs := wm8523.o snd-soc-wm8580-objs := wm8580.o +snd-soc-wm8727-objs := wm8727.o snd-soc-wm8728-objs := wm8728.o snd-soc-wm8731-objs := wm8731.o snd-soc-wm8750-objs := wm8750.o @@ -44,7 +45,6 @@ snd-soc-wm9705-objs := wm9705.o snd-soc-wm9712-objs := wm9712.o snd-soc-wm9713-objs := wm9713.o snd-soc-wm-hubs-objs := wm_hubs.o - # Amp snd-soc-max9877-objs := max9877.o @@ -74,6 +74,7 @@ obj-$(CONFIG_SND_SOC_WM8400) += snd-soc-wm8400.o obj-$(CONFIG_SND_SOC_WM8510) += snd-soc-wm8510.o obj-$(CONFIG_SND_SOC_WM8523) += snd-soc-wm8523.o obj-$(CONFIG_SND_SOC_WM8580) += snd-soc-wm8580.o +obj-$(CONFIG_SND_SOC_WM8727) += snd-soc-wm8727.o obj-$(CONFIG_SND_SOC_WM8728) += snd-soc-wm8728.o obj-$(CONFIG_SND_SOC_WM8731) += snd-soc-wm8731.o obj-$(CONFIG_SND_SOC_WM8750) += snd-soc-wm8750.o @@ -94,6 +95,6 @@ obj-$(CONFIG_SND_SOC_WM9705) += snd-soc-wm9705.o obj-$(CONFIG_SND_SOC_WM9712) += snd-soc-wm9712.o obj-$(CONFIG_SND_SOC_WM9713) += snd-soc-wm9713.o obj-$(CONFIG_SND_SOC_WM_HUBS) += snd-soc-wm-hubs.o - # Amp obj-$(CONFIG_SND_SOC_MAX9877) += snd-soc-max9877.o + diff --git a/sound/soc/codecs/wm8727.c b/sound/soc/codecs/wm8727.c new file mode 100644 index 0000000..83aa5fa --- /dev/null +++ b/sound/soc/codecs/wm8727.c @@ -0,0 +1,120 @@ +/* + * wm8727.c + * + * Created on: 15-Oct-2009 + * Author: neil.jones(a)imgtec.com + * + * Copyright (C) 2009 Imagination Technologies Ltd. + * + * This program is free software; you can redistribute it and/or modify it + * under the terms of the GNU General Public License as published by the + * Free Software Foundation; either version 2 of the License, or (at your + * option) any later version. + */ + +#include <linux/init.h> +#include <linux/module.h> +#include <linux/kernel.h> +#include <linux/device.h> +#include <sound/core.h> +#include <sound/pcm.h> +#include <sound/ac97_codec.h> +#include <sound/initval.h> +#include <sound/soc.h> + +#include "wm8727.h" +/* + * Note this is a simple chip with no configuration interface, sample rate is + * determined automatically by examining the Master clock and Bit clock ratios + */ +#define WM8727_RATES (SNDRV_PCM_RATE_32000 | SNDRV_PCM_RATE_44100 |\ + SNDRV_PCM_RATE_48000 | SNDRV_PCM_RATE_96000 |\ + SNDRV_PCM_RATE_192000) + + +struct snd_soc_dai wm8727_dai = { + .name = "WM8727", + .playback = { + .stream_name = "Playback", + .channels_min = 2, + .channels_max = 2, + .rates = WM8727_RATES, + .formats = SNDRV_PCM_FMTBIT_S16_LE | SNDRV_PCM_FMTBIT_S24_LE, + }, +}; +EXPORT_SYMBOL_GPL(wm8727_dai); + +static int wm8727_soc_probe(struct platform_device *pdev) +{ + struct snd_soc_device *socdev = platform_get_drvdata(pdev); + struct snd_soc_codec *codec; + int ret = 0; + + codec = kzalloc(sizeof(struct snd_soc_codec), GFP_KERNEL); + if (codec == NULL) + return -ENOMEM; + mutex_init(&codec->mutex); + codec->name = "WM8727"; + codec->owner = THIS_MODULE; + codec->dai = &wm8727_dai; + codec->num_dai = 1; + socdev->card->codec = codec; + INIT_LIST_HEAD(&codec->dapm_widgets); + INIT_LIST_HEAD(&codec->dapm_paths); + + /* register pcms */ + ret = snd_soc_new_pcms(socdev, SNDRV_DEFAULT_IDX1, SNDRV_DEFAULT_STR1); + if (ret < 0) { + printk(KERN_ERR "wm8727: failed to create pcms\n"); + goto pcm_err; + } + /* register card */ + ret = snd_soc_init_card(socdev); + if (ret < 0) { + printk(KERN_ERR "wm8727: failed to register card\n"); + goto register_err; + } + + return ret; + +register_err: + snd_soc_free_pcms(socdev); +pcm_err: + kfree(socdev->card->codec); + socdev->card->codec = NULL; + return ret; +} + +static int wm8727_soc_remove(struct platform_device *pdev) +{ + struct snd_soc_device *socdev = platform_get_drvdata(pdev); + struct snd_soc_codec *codec = socdev->card->codec; + + if (codec == NULL) + return 0; + snd_soc_free_pcms(socdev); + kfree(codec); + return 0; +} + +struct snd_soc_codec_device soc_codec_dev_wm8727 = { + .probe = wm8727_soc_probe, + .remove = wm8727_soc_remove, +}; +EXPORT_SYMBOL_GPL(soc_codec_dev_wm8727); + +static int __init wm8727_init(void) +{ + return snd_soc_register_dai(&wm8727_dai); +} +module_init(wm8727_init); + +static void __exit wm8727_exit(void) +{ + snd_soc_unregister_dai(&wm8727_dai); +} +module_exit(wm8727_exit); + +MODULE_DESCRIPTION("ASoC wm8727 driver"); +MODULE_AUTHOR("Neil Jones"); +MODULE_LICENSE("GPL"); diff --git a/sound/soc/codecs/wm8727.h b/sound/soc/codecs/wm8727.h new file mode 100644 index 0000000..ee19aa7 --- /dev/null +++ b/sound/soc/codecs/wm8727.h @@ -0,0 +1,21 @@ +/* + * wm8727.h + * + * Created on: 15-Oct-2009 + * Author: neil.jones(a)imgtec.com + * + * Copyright (C) 2009 Imagination Technologies Ltd. + * + * This program is free software; you can redistribute it and/or modify it + * under the terms of the GNU General Public License as published by the + * Free Software Foundation; either version 2 of the License, or (at your + * option) any later version. + */ + +#ifndef WM8727_H_ +#define WM8727_H_ + +extern struct snd_soc_dai wm8727_dai; +extern struct snd_soc_codec_device soc_codec_dev_wm8727; + +#endif /* WM8727_H_ */ -- 1.5.5.2

2 3

[alsa-devel] update documentation to match MAX_PCM_SUBSYSTEMS
by Adrian Bridgett 02 Nov '09

02 Nov '09

In this patch, MAX_PCM_SUBSTREAMS was increased: http://gitorious.org/linux-omap/mainline/commit/b888d1ce82ebd2bafecf64c7657… However the MODULE_PARAM_DESC was not updated to match. Patch attached. Adrian -- bitcube.co.uk - Linux infrastructure consultancy Puppet, Debian, Red Hat, Ubuntu, CentOS, ...

2 1

[alsa-devel] Old issue with new details(HP tx2100er headphone jack problem)[RESOLVED]
by Alex Pyattaev 02 Nov '09

02 Nov '09

Hello! I have my laptop for a year now, and ever since i've been trying to fix the sound. Playback works out-of-the box, but recording was always messy. Anyway, recent updates in alsa-driver (shipped with kernel 2.6.31) have completely fixed all sound issues! I have no idea what change actually did the trick, but internal mic was not working before. So, to be exact Hardware: HP tx2100er laptop, AMD64, nforce2 chipset. Audio: Realtek ALC861-VD attached to an nForce2 southbridge, subvendor 0x103c device 0x30e5 see alsa-info output in attachement. Soft: gentoo and all common alsa libs (latest versions). So, thank you for great job and if you need to find out why it works don't hesitate to ask for more info - just mail me. Best regards, Alex Pyattaev

2 1

[alsa-devel] [Fwd: Scratch Live amplifier switch]
by LCID Fire 02 Nov '09

02 Nov '09

Hi. Following the patch to add the amplifier switch (changing input levels phono/line) for the Serato Scratch Live device. Please apply or complain ;)

2 3

[alsa-devel] [PATCH] ASoC: au1x: convert to platform drivers.
by Manuel Lauss 02 Nov '09

02 Nov '09

Convert psc-ac97,i2s to platform drivers similar to the davinci ones. Signed-off-by: Manuel Lauss <manuel.lauss(a)gmail.com> --- As suggested by Mark Brown a few months back. Against linus-git. Tested on DB1200. sound/soc/au1x/dbdma2.c | 117 +++++++++++++++++++++++----- sound/soc/au1x/psc-ac97.c | 194 ++++++++++++++++++++++++++++----------------- sound/soc/au1x/psc-i2s.c | 189 ++++++++++++++++++++++++++++---------------- sound/soc/au1x/psc.h | 7 ++- 4 files changed, 344 insertions(+), 163 deletions(-) diff --git a/sound/soc/au1x/dbdma2.c b/sound/soc/au1x/dbdma2.c index 72617d7..b8965d9 100644 --- a/sound/soc/au1x/dbdma2.c +++ b/sound/soc/au1x/dbdma2.c @@ -2,7 +2,7 @@ * Au12x0/Au1550 PSC ALSA ASoC audio support. * * (c) 2007-2008 MSC Vertriebsges.m.b.H., - * Manuel Lauss <mano(a)roarinelk.homelinux.net> + * Manuel Lauss <manuel.lauss(a)gmail.com> * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License version 2 as @@ -331,6 +331,30 @@ static int au1xpsc_pcm_new(struct snd_card *card, static int au1xpsc_pcm_probe(struct platform_device *pdev) { + if (!au1xpsc_audio_pcmdma[PCM_TX] || !au1xpsc_audio_pcmdma[PCM_RX]) + return -ENODEV; + + return 0; +} + +static int au1xpsc_pcm_remove(struct platform_device *pdev) +{ + return 0; +} + +/* au1xpsc audio platform */ +struct snd_soc_platform au1xpsc_soc_platform = { + .name = "au1xpsc-pcm-dbdma", + .probe = au1xpsc_pcm_probe, + .remove = au1xpsc_pcm_remove, + .pcm_ops = &au1xpsc_pcm_ops, + .pcm_new = au1xpsc_pcm_new, + .pcm_free = au1xpsc_pcm_free_dma_buffers, +}; +EXPORT_SYMBOL_GPL(au1xpsc_soc_platform); + +static int __devinit au1xpsc_pcm_drvprobe(struct platform_device *pdev) +{ struct resource *r; int ret; @@ -363,7 +387,9 @@ static int au1xpsc_pcm_probe(struct platform_device *pdev) } (au1xpsc_audio_pcmdma[PCM_RX])->ddma_id = r->start; - return 0; + ret = snd_soc_register_platform(&au1xpsc_soc_platform); + if (!ret) + return ret; out2: kfree(au1xpsc_audio_pcmdma[PCM_RX]); @@ -374,10 +400,12 @@ out1: return ret; } -static int au1xpsc_pcm_remove(struct platform_device *pdev) +static int __devexit au1xpsc_pcm_drvremove(struct platform_device *pdev) { int i; + snd_soc_unregister_platform(&au1xpsc_soc_platform); + for (i = 0; i < 2; i++) { if (au1xpsc_audio_pcmdma[i]) { au1x_pcm_dbdma_free(au1xpsc_audio_pcmdma[i]); @@ -389,32 +417,83 @@ static int au1xpsc_pcm_remove(struct platform_device *pdev) return 0; } -/* au1xpsc audio platform */ -struct snd_soc_platform au1xpsc_soc_platform = { - .name = "au1xpsc-pcm-dbdma", - .probe = au1xpsc_pcm_probe, - .remove = au1xpsc_pcm_remove, - .pcm_ops = &au1xpsc_pcm_ops, - .pcm_new = au1xpsc_pcm_new, - .pcm_free = au1xpsc_pcm_free_dma_buffers, +static struct platform_driver au1xpsc_pcm_driver = { + .driver = { + .name = "au1xpsc-pcm", + .owner = THIS_MODULE, + }, + .probe = au1xpsc_pcm_drvprobe, + .remove = __devexit_p(au1xpsc_pcm_drvremove), }; -EXPORT_SYMBOL_GPL(au1xpsc_soc_platform); -static int __init au1xpsc_audio_dbdma_init(void) +static int __init au1xpsc_audio_dbdma_load(void) { au1xpsc_audio_pcmdma[PCM_TX] = NULL; au1xpsc_audio_pcmdma[PCM_RX] = NULL; - return snd_soc_register_platform(&au1xpsc_soc_platform); + return platform_driver_register(&au1xpsc_pcm_driver); } -static void __exit au1xpsc_audio_dbdma_exit(void) +static void __exit au1xpsc_audio_dbdma_unload(void) { - snd_soc_unregister_platform(&au1xpsc_soc_platform); + platform_driver_unregister(&au1xpsc_pcm_driver); +} + +module_init(au1xpsc_audio_dbdma_load); +module_exit(au1xpsc_audio_dbdma_unload); + + +struct platform_device *au1xpsc_pcm_add(struct platform_device *pdev) +{ + struct resource *res, *r; + struct platform_device *pd; + int id[2]; + int ret; + + r = platform_get_resource(pdev, IORESOURCE_DMA, 0); + if (!r) + return NULL; + id[0] = r->start; + + r = platform_get_resource(pdev, IORESOURCE_DMA, 1); + if (!r) + return NULL; + id[1] = r->start; + + res = kzalloc(sizeof(struct resource) * 2, GFP_KERNEL); + if (!res) + return NULL; + + res[0].start = res[0].end = id[0]; + res[1].start = res[1].end = id[1]; + res[0].flags = res[1].flags = IORESOURCE_DMA; + + pd = platform_device_alloc("au1xpsc-pcm", -1); + if (!pd) + goto out; + + pd->resource = res; + pd->num_resources = 2; + + ret = platform_device_add(pd); + if (!ret) + return pd; + +out: + kfree(res); + return NULL; } +EXPORT_SYMBOL_GPL(au1xpsc_pcm_add); -module_init(au1xpsc_audio_dbdma_init); -module_exit(au1xpsc_audio_dbdma_exit); +void au1xpsc_pcm_destroy(struct platform_device *dmapd) +{ + if (dmapd) { + kfree(dmapd->resource); + dmapd->resource = NULL; + platform_device_unregister(dmapd); + } +} +EXPORT_SYMBOL_GPL(au1xpsc_pcm_destroy); MODULE_LICENSE("GPL"); MODULE_DESCRIPTION("Au12x0/Au1550 PSC Audio DMA driver"); -MODULE_AUTHOR("Manuel Lauss <mano(a)roarinelk.homelinux.net>"); +MODULE_AUTHOR("Manuel Lauss"); diff --git a/sound/soc/au1x/psc-ac97.c b/sound/soc/au1x/psc-ac97.c index 2a06a9c..340311d 100644 --- a/sound/soc/au1x/psc-ac97.c +++ b/sound/soc/au1x/psc-ac97.c @@ -317,19 +317,55 @@ static int au1xpsc_ac97_trigger(struct snd_pcm_substream *substream, static int au1xpsc_ac97_probe(struct platform_device *pdev, struct snd_soc_dai *dai) { + return au1xpsc_ac97_workdata ? 0 : -ENODEV; +} + +static void au1xpsc_ac97_remove(struct platform_device *pdev, + struct snd_soc_dai *dai) +{ +} + +static struct snd_soc_dai_ops au1xpsc_ac97_dai_ops = { + .trigger = au1xpsc_ac97_trigger, + .hw_params = au1xpsc_ac97_hw_params, +}; + +struct snd_soc_dai au1xpsc_ac97_dai = { + .name = "au1xpsc_ac97", + .ac97_control = 1, + .probe = au1xpsc_ac97_probe, + .remove = au1xpsc_ac97_remove, + .playback = { + .rates = AC97_RATES, + .formats = AC97_FMTS, + .channels_min = 2, + .channels_max = 2, + }, + .capture = { + .rates = AC97_RATES, + .formats = AC97_FMTS, + .channels_min = 2, + .channels_max = 2, + }, + .ops = &au1xpsc_ac97_dai_ops, +}; +EXPORT_SYMBOL_GPL(au1xpsc_ac97_dai); + +static int __devinit au1xpsc_ac97_drvprobe(struct platform_device *pdev) +{ int ret; struct resource *r; unsigned long sel; + struct au1xpsc_audio_data *wd; if (au1xpsc_ac97_workdata) return -EBUSY; - au1xpsc_ac97_workdata = - kzalloc(sizeof(struct au1xpsc_audio_data), GFP_KERNEL); - if (!au1xpsc_ac97_workdata) + wd = kzalloc(sizeof(struct au1xpsc_audio_data), GFP_KERNEL); + if (!wd) return -ENOMEM; - mutex_init(&au1xpsc_ac97_workdata->lock); + mutex_init(&wd->lock); r = platform_get_resource(pdev, IORESOURCE_MEM, 0); if (!r) { @@ -338,81 +374,95 @@ static int au1xpsc_ac97_probe(struct platform_device *pdev, } ret = -EBUSY; - au1xpsc_ac97_workdata->ioarea = - request_mem_region(r->start, r->end - r->start + 1, + wd->ioarea = request_mem_region(r->start, r->end - r->start + 1, "au1xpsc_ac97"); - if (!au1xpsc_ac97_workdata->ioarea) + if (!wd->ioarea) goto out0; - au1xpsc_ac97_workdata->mmio = ioremap(r->start, 0xffff); - if (!au1xpsc_ac97_workdata->mmio) + wd->mmio = ioremap(r->start, 0xffff); + if (!wd->mmio) goto out1; /* configuration: max dma trigger threshold, enable ac97 */ - au1xpsc_ac97_workdata->cfg = PSC_AC97CFG_RT_FIFO8 | - PSC_AC97CFG_TT_FIFO8 | - PSC_AC97CFG_DE_ENABLE; + wd->cfg = PSC_AC97CFG_RT_FIFO8 | PSC_AC97CFG_TT_FIFO8 | + PSC_AC97CFG_DE_ENABLE; - /* preserve PSC clock source set up by platform (dev.platform_data - * is already occupied by soc layer) - */ - sel = au_readl(PSC_SEL(au1xpsc_ac97_workdata)) & PSC_SEL_CLK_MASK; - au_writel(PSC_CTRL_DISABLE, PSC_CTRL(au1xpsc_ac97_workdata)); + /* preserve PSC clock source set up by platform */ + sel = au_readl(PSC_SEL(wd)) & PSC_SEL_CLK_MASK; + au_writel(PSC_CTRL_DISABLE, PSC_CTRL(wd)); au_sync(); - au_writel(0, PSC_SEL(au1xpsc_ac97_workdata)); + au_writel(0, PSC_SEL(wd)); au_sync(); - au_writel(PSC_SEL_PS_AC97MODE | sel, PSC_SEL(au1xpsc_ac97_workdata)); + au_writel(PSC_SEL_PS_AC97MODE | sel, PSC_SEL(wd)); au_sync(); - /* next up: cold reset. Dont check for PSC-ready now since - * there may not be any codec clock yet. - */ - return 0; + ret = snd_soc_register_dai(&au1xpsc_ac97_dai); + if (ret) + goto out1; + + wd->dmapd = au1xpsc_pcm_add(pdev); + if (wd->dmapd) { + platform_set_drvdata(pdev, wd); + au1xpsc_ac97_workdata = wd; /* MDEV */ + return 0; + } + snd_soc_unregister_dai(&au1xpsc_ac97_dai); out1: - release_resource(au1xpsc_ac97_workdata->ioarea); - kfree(au1xpsc_ac97_workdata->ioarea); + release_resource(wd->ioarea); + kfree(wd->ioarea); out0: - kfree(au1xpsc_ac97_workdata); - au1xpsc_ac97_workdata = NULL; + kfree(wd); return ret; } -static void au1xpsc_ac97_remove(struct platform_device *pdev, - struct snd_soc_dai *dai) +static int __devexit au1xpsc_ac97_drvremove(struct platform_device *pdev) { + struct au1xpsc_audio_data *wd = platform_get_drvdata(pdev); + + if (wd->dmapd) + au1xpsc_pcm_destroy(wd->dmapd); + + snd_soc_unregister_dai(&au1xpsc_ac97_dai); + /* disable PSC completely */ - au_writel(0, AC97_CFG(au1xpsc_ac97_workdata)); + au_writel(0, AC97_CFG(wd)); au_sync(); - au_writel(PSC_CTRL_DISABLE, PSC_CTRL(au1xpsc_ac97_workdata)); + au_writel(PSC_CTRL_DISABLE, PSC_CTRL(wd)); au_sync(); - iounmap(au1xpsc_ac97_workdata->mmio); - release_resource(au1xpsc_ac97_workdata->ioarea); - kfree(au1xpsc_ac97_workdata->ioarea); - kfree(au1xpsc_ac97_workdata); - au1xpsc_ac97_workdata = NULL; + iounmap(wd->mmio); + release_resource(wd->ioarea); + kfree(wd->ioarea); + kfree(wd); + + au1xpsc_ac97_workdata = NULL; /* MDEV */ + + return 0; } -static int au1xpsc_ac97_suspend(struct snd_soc_dai *dai) +#ifdef CONFIG_PM +static int au1xpsc_ac97_drvsuspend(struct device *dev) { + struct au1xpsc_audio_data *wd = dev_get_drvdata(dev); + /* save interesting registers and disable PSC */ - au1xpsc_ac97_workdata->pm[0] = - au_readl(PSC_SEL(au1xpsc_ac97_workdata)); + wd->pm[0] = au_readl(PSC_SEL(wd)); - au_writel(0, AC97_CFG(au1xpsc_ac97_workdata)); + au_writel(0, AC97_CFG(wd)); au_sync(); - au_writel(PSC_CTRL_DISABLE, PSC_CTRL(au1xpsc_ac97_workdata)); + au_writel(PSC_CTRL_DISABLE, PSC_CTRL(wd)); au_sync(); return 0; } -static int au1xpsc_ac97_resume(struct snd_soc_dai *dai) +static int au1xpsc_ac97_drvresume(struct device *dev) { + struct au1xpsc_audio_data *wd = dev_get_drvdata(dev); + /* restore PSC clock config */ - au_writel(au1xpsc_ac97_workdata->pm[0] | PSC_SEL_PS_AC97MODE, - PSC_SEL(au1xpsc_ac97_workdata)); + au_writel(wd->pm[0] | PSC_SEL_PS_AC97MODE, PSC_SEL(wd)); au_sync(); /* after this point the ac97 core will cold-reset the codec. @@ -422,48 +472,44 @@ static int au1xpsc_ac97_resume(struct snd_soc_dai *dai) return 0; } -static struct snd_soc_dai_ops au1xpsc_ac97_dai_ops = { - .trigger = au1xpsc_ac97_trigger, - .hw_params = au1xpsc_ac97_hw_params, +static struct dev_pm_ops au1xpscac97_pmops = { + .suspend = au1xpsc_ac97_drvsuspend, + .resume = au1xpsc_ac97_drvresume, }; -struct snd_soc_dai au1xpsc_ac97_dai = { - .name = "au1xpsc_ac97", - .ac97_control = 1, - .probe = au1xpsc_ac97_probe, - .remove = au1xpsc_ac97_remove, - .suspend = au1xpsc_ac97_suspend, - .resume = au1xpsc_ac97_resume, - .playback = { - .rates = AC97_RATES, - .formats = AC97_FMTS, - .channels_min = 2, - .channels_max = 2, - }, - .capture = { - .rates = AC97_RATES, - .formats = AC97_FMTS, - .channels_min = 2, - .channels_max = 2, +#define AU1XPSCAC97_PMOPS &au1xpscac97_pmops + +#else + +#define AU1XPSCAC97_PMOPS NULL + +#endif + +static struct platform_driver au1xpsc_ac97_driver = { + .driver = { + .name = "au1xpsc_ac97", + .owner = THIS_MODULE, + .pm = AU1XPSCAC97_PMOPS, }, - .ops = &au1xpsc_ac97_dai_ops, + .probe = au1xpsc_ac97_drvprobe, + .remove = __devexit_p(au1xpsc_ac97_drvremove), }; -EXPORT_SYMBOL_GPL(au1xpsc_ac97_dai); -static int __init au1xpsc_ac97_init(void) +static int __init au1xpsc_ac97_load(void) { au1xpsc_ac97_workdata = NULL; - return snd_soc_register_dai(&au1xpsc_ac97_dai); + return platform_driver_register(&au1xpsc_ac97_driver); } -static void __exit au1xpsc_ac97_exit(void) +static void __exit au1xpsc_ac97_unload(void) { - snd_soc_unregister_dai(&au1xpsc_ac97_dai); + platform_driver_unregister(&au1xpsc_ac97_driver); } -module_init(au1xpsc_ac97_init); -module_exit(au1xpsc_ac97_exit); +module_init(au1xpsc_ac97_load); +module_exit(au1xpsc_ac97_unload); MODULE_LICENSE("GPL"); MODULE_DESCRIPTION("Au12x0/Au1550 PSC AC97 ALSA ASoC audio driver"); -MODULE_AUTHOR("Manuel Lauss <manuel.lauss(a)gmail.com>"); +MODULE_AUTHOR("Manuel Lauss"); + diff --git a/sound/soc/au1x/psc-i2s.c b/sound/soc/au1x/psc-i2s.c index bb58932..0cf2ca6 100644 --- a/sound/soc/au1x/psc-i2s.c +++ b/sound/soc/au1x/psc-i2s.c @@ -2,7 +2,7 @@ * Au12x0/Au1550 PSC ALSA ASoC audio support. * * (c) 2007-2008 MSC Vertriebsges.m.b.H., - * Manuel Lauss <mano(a)roarinelk.homelinux.net> + * Manuel Lauss <manuel.lauss(a)gmail.com> * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License version 2 as @@ -265,16 +265,52 @@ static int au1xpsc_i2s_trigger(struct snd_pcm_substream *substream, int cmd, static int au1xpsc_i2s_probe(struct platform_device *pdev, struct snd_soc_dai *dai) { + return au1xpsc_i2s_workdata ? 0 : -ENODEV; +} + +static void au1xpsc_i2s_remove(struct platform_device *pdev, + struct snd_soc_dai *dai) +{ +} + +static struct snd_soc_dai_ops au1xpsc_i2s_dai_ops = { + .trigger = au1xpsc_i2s_trigger, + .hw_params = au1xpsc_i2s_hw_params, + .set_fmt = au1xpsc_i2s_set_fmt, +}; + +struct snd_soc_dai au1xpsc_i2s_dai = { + .name = "au1xpsc_i2s", + .probe = au1xpsc_i2s_probe, + .remove = au1xpsc_i2s_remove, + .playback = { + .rates = AU1XPSC_I2S_RATES, + .formats = AU1XPSC_I2S_FMTS, + .channels_min = 2, + .channels_max = 8, /* 2 without external help */ + }, + .capture = { + .rates = AU1XPSC_I2S_RATES, + .formats = AU1XPSC_I2S_FMTS, + .channels_min = 2, + .channels_max = 8, /* 2 without external help */ + }, + .ops = &au1xpsc_i2s_dai_ops, +}; +EXPORT_SYMBOL(au1xpsc_i2s_dai); + +static int __init au1xpsc_i2s_drvprobe(struct platform_device *pdev) +{ struct resource *r; unsigned long sel; int ret; + struct au1xpsc_audio_data *wd; if (au1xpsc_i2s_workdata) return -EBUSY; - au1xpsc_i2s_workdata = - kzalloc(sizeof(struct au1xpsc_audio_data), GFP_KERNEL); - if (!au1xpsc_i2s_workdata) + wd = kzalloc(sizeof(struct au1xpsc_audio_data), GFP_KERNEL); + if (!wd) return -ENOMEM; r = platform_get_resource(pdev, IORESOURCE_MEM, 0); @@ -284,131 +320,146 @@ static int au1xpsc_i2s_probe(struct platform_device *pdev, } ret = -EBUSY; - au1xpsc_i2s_workdata->ioarea = - request_mem_region(r->start, r->end - r->start + 1, + wd->ioarea = request_mem_region(r->start, r->end - r->start + 1, "au1xpsc_i2s"); - if (!au1xpsc_i2s_workdata->ioarea) + if (!wd->ioarea) goto out0; - au1xpsc_i2s_workdata->mmio = ioremap(r->start, 0xffff); - if (!au1xpsc_i2s_workdata->mmio) + wd->mmio = ioremap(r->start, 0xffff); + if (!wd->mmio) goto out1; /* preserve PSC clock source set up by platform (dev.platform_data * is already occupied by soc layer) */ - sel = au_readl(PSC_SEL(au1xpsc_i2s_workdata)) & PSC_SEL_CLK_MASK; - au_writel(PSC_CTRL_DISABLE, PSC_CTRL(au1xpsc_i2s_workdata)); + sel = au_readl(PSC_SEL(wd)) & PSC_SEL_CLK_MASK; + au_writel(PSC_CTRL_DISABLE, PSC_CTRL(wd)); au_sync(); - au_writel(PSC_SEL_PS_I2SMODE | sel, PSC_SEL(au1xpsc_i2s_workdata)); - au_writel(0, I2S_CFG(au1xpsc_i2s_workdata)); + au_writel(PSC_SEL_PS_I2SMODE | sel, PSC_SEL(wd)); + au_writel(0, I2S_CFG(wd)); au_sync(); /* preconfigure: set max rx/tx fifo depths */ - au1xpsc_i2s_workdata->cfg |= - PSC_I2SCFG_RT_FIFO8 | PSC_I2SCFG_TT_FIFO8; + wd->cfg |= PSC_I2SCFG_RT_FIFO8 | PSC_I2SCFG_TT_FIFO8; /* don't wait for I2S core to become ready now; clocks may not * be running yet; depending on clock input for PSC a wait might * time out. */ - return 0; + ret = snd_soc_register_dai(&au1xpsc_i2s_dai); + if (ret) + goto out1; + /* finally add the DMA device for this PSC */ + wd->dmapd = au1xpsc_pcm_add(pdev); + if (wd->dmapd) { + platform_set_drvdata(pdev, wd); + au1xpsc_i2s_workdata = wd; + return 0; + } + + snd_soc_unregister_dai(&au1xpsc_i2s_dai); out1: - release_resource(au1xpsc_i2s_workdata->ioarea); - kfree(au1xpsc_i2s_workdata->ioarea); + release_resource(wd->ioarea); + kfree(wd->ioarea); out0: - kfree(au1xpsc_i2s_workdata); - au1xpsc_i2s_workdata = NULL; + kfree(wd); return ret; } -static void au1xpsc_i2s_remove(struct platform_device *pdev, - struct snd_soc_dai *dai) +static int __devexit au1xpsc_i2s_drvremove(struct platform_device *pdev) { - au_writel(0, I2S_CFG(au1xpsc_i2s_workdata)); + struct au1xpsc_audio_data *wd = platform_get_drvdata(pdev); + + if (wd->dmapd) + au1xpsc_pcm_destroy(wd->dmapd); + + snd_soc_unregister_dai(&au1xpsc_i2s_dai); + + au_writel(0, I2S_CFG(wd)); au_sync(); - au_writel(PSC_CTRL_DISABLE, PSC_CTRL(au1xpsc_i2s_workdata)); + au_writel(PSC_CTRL_DISABLE, PSC_CTRL(wd)); au_sync(); - iounmap(au1xpsc_i2s_workdata->mmio); - release_resource(au1xpsc_i2s_workdata->ioarea); - kfree(au1xpsc_i2s_workdata->ioarea); - kfree(au1xpsc_i2s_workdata); - au1xpsc_i2s_workdata = NULL; + iounmap(wd->mmio); + release_resource(wd->ioarea); + kfree(wd->ioarea); + kfree(wd); + + au1xpsc_i2s_workdata = NULL; /* MDEV */ + + return 0; } -static int au1xpsc_i2s_suspend(struct snd_soc_dai *cpu_dai) +#ifdef CONFIG_PM +static int au1xpsc_i2s_drvsuspend(struct device *dev) { + struct au1xpsc_audio_data *wd = dev_get_drvdata(dev); + /* save interesting register and disable PSC */ - au1xpsc_i2s_workdata->pm[0] = - au_readl(PSC_SEL(au1xpsc_i2s_workdata)); + wd->pm[0] = au_readl(PSC_SEL(wd)); - au_writel(0, I2S_CFG(au1xpsc_i2s_workdata)); + au_writel(0, I2S_CFG(wd)); au_sync(); - au_writel(PSC_CTRL_DISABLE, PSC_CTRL(au1xpsc_i2s_workdata)); + au_writel(PSC_CTRL_DISABLE, PSC_CTRL(wd)); au_sync(); return 0; } -static int au1xpsc_i2s_resume(struct snd_soc_dai *cpu_dai) +static int au1xpsc_i2s_drvresume(struct device *dev) { + struct au1xpsc_audio_data *wd = dev_get_drvdata(dev); + /* select I2S mode and PSC clock */ - au_writel(PSC_CTRL_DISABLE, PSC_CTRL(au1xpsc_i2s_workdata)); + au_writel(PSC_CTRL_DISABLE, PSC_CTRL(wd)); au_sync(); - au_writel(0, PSC_SEL(au1xpsc_i2s_workdata)); + au_writel(0, PSC_SEL(wd)); au_sync(); - au_writel(au1xpsc_i2s_workdata->pm[0], - PSC_SEL(au1xpsc_i2s_workdata)); + au_writel(wd->pm[0], PSC_SEL(wd)); au_sync(); return 0; } -static struct snd_soc_dai_ops au1xpsc_i2s_dai_ops = { - .trigger = au1xpsc_i2s_trigger, - .hw_params = au1xpsc_i2s_hw_params, - .set_fmt = au1xpsc_i2s_set_fmt, +static struct dev_pm_ops au1xpsci2s_pmops = { + .suspend = au1xpsc_i2s_drvsuspend, + .resume = au1xpsc_i2s_drvresume, }; -struct snd_soc_dai au1xpsc_i2s_dai = { - .name = "au1xpsc_i2s", - .probe = au1xpsc_i2s_probe, - .remove = au1xpsc_i2s_remove, - .suspend = au1xpsc_i2s_suspend, - .resume = au1xpsc_i2s_resume, - .playback = { - .rates = AU1XPSC_I2S_RATES, - .formats = AU1XPSC_I2S_FMTS, - .channels_min = 2, - .channels_max = 8, /* 2 without external help */ - }, - .capture = { - .rates = AU1XPSC_I2S_RATES, - .formats = AU1XPSC_I2S_FMTS, - .channels_min = 2, - .channels_max = 8, /* 2 without external help */ +#define AU1XPSCI2S_PMOPS &au1xpsci2s_pmops + +#else + +#define AU1XPSCI2S_PMOPS NULL + +#endif + +static struct platform_driver au1xpsc_i2s_driver = { + .driver = { + .name = "au1xpsc_i2s", + .owner = THIS_MODULE, + .pm = AU1XPSCI2S_PMOPS, }, - .ops = &au1xpsc_i2s_dai_ops, + .probe = au1xpsc_i2s_drvprobe, + .remove = __devexit_p(au1xpsc_i2s_drvremove), }; -EXPORT_SYMBOL(au1xpsc_i2s_dai); -static int __init au1xpsc_i2s_init(void) +static int __init au1xpsc_i2s_load(void) { au1xpsc_i2s_workdata = NULL; - return snd_soc_register_dai(&au1xpsc_i2s_dai); + return platform_driver_register(&au1xpsc_i2s_driver); } -static void __exit au1xpsc_i2s_exit(void) +static void __exit au1xpsc_i2s_unload(void) { - snd_soc_unregister_dai(&au1xpsc_i2s_dai); + platform_driver_unregister(&au1xpsc_i2s_driver); } -module_init(au1xpsc_i2s_init); -module_exit(au1xpsc_i2s_exit); +module_init(au1xpsc_i2s_load); +module_exit(au1xpsc_i2s_unload); MODULE_LICENSE("GPL"); MODULE_DESCRIPTION("Au12x0/Au1550 PSC I2S ALSA ASoC audio driver"); -MODULE_AUTHOR("Manuel Lauss <mano(a)roarinelk.homelinux.net>"); +MODULE_AUTHOR("Manuel Lauss"); diff --git a/sound/soc/au1x/psc.h b/sound/soc/au1x/psc.h index 3f474e8..32d3807 100644 --- a/sound/soc/au1x/psc.h +++ b/sound/soc/au1x/psc.h @@ -2,7 +2,7 @@ * Au12x0/Au1550 PSC ALSA ASoC audio support. * * (c) 2007-2008 MSC Vertriebsges.m.b.H., - * Manuel Lauss <mano(a)roarinelk.homelinux.net> + * Manuel Lauss <manuel.lauss(a)gmail.com> * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License version 2 as @@ -21,6 +21,10 @@ extern struct snd_soc_dai au1xpsc_i2s_dai; extern struct snd_soc_platform au1xpsc_soc_platform; extern struct snd_ac97_bus_ops soc_ac97_ops; +/* DBDMA helpers */ +extern struct platform_device *au1xpsc_pcm_add(struct platform_device *pdev); +extern void au1xpsc_pcm_destroy(struct platform_device *dmapd); + struct au1xpsc_audio_data { void __iomem *mmio; @@ -30,6 +34,7 @@ struct au1xpsc_audio_data { unsigned long pm[2]; struct resource *ioarea; struct mutex lock; + struct platform_device *dmapd; }; #define PCM_TX 0 -- 1.6.5.1

2 4

[alsa-devel] FW: question on snd_jack_report
by Kp, Jeeja 02 Nov '09

02 Nov '09

When I call snd_jack_report with the status of the jack, am monitoring the /dev/input/eventX (using event.c) for Userspace events when Headset is inserted and I don't see any events even when snd_jack_report() is called. Is there any specific configuration that is required (xorg.config)? -----Original Message----- From: Mark Brown [mailto:broonie@opensource.wolfsonmicro.com] Sent: Wednesday, October 21, 2009 6:49 PM To: Harsha, Priya Cc: alsa-devel(a)alsa-project.org Subject: Re: [alsa-devel] question on snd_jack_report On Wed, Oct 21, 2009 at 06:22:47PM +0530, Harsha, Priya wrote: Please fix your MUA to wrap at 80 columns, I have once more reflowed your text to fit. > When I call snd_jack_report with the status of the jack, from the user > user space which parameter should I check in the > sys/class/input/input2 to know if the jack is present or not? Assuming you're looking to check the presence of a device in the jack (rather than the presence of the jack itself) then there's nothing in sysfs, you read this information from the device node. See evtest.c (google should show up lots of copies) for sample code doing this.

2 1

[alsa-devel] [PATCH 13/16] pcmcia: use dynamic debug infrastructure, deprecate CS_CHECK (sound)
by Dominik Brodowski 02 Nov '09

02 Nov '09

Convert PCMCIA drivers to use the dynamic debug infrastructure, instead of requiring manual settings of PCMCIA_DEBUG. Also, remove all usages of the CS_CHECK macro and replace them with proper Linux style calling and return value checking. The extra error reporting may be dropped, as the PCMCIA core already complains about any (non-driver-author) errors. CC: Jaroslav Kysela <perex(a)perex.cz> CC: alsa-devel(a)alsa-project.org Signed-off-by: Dominik Brodowski <linux(a)dominikbrodowski.net> --- sound/pcmcia/pdaudiocf/pdaudiocf.c | 21 ++++++++++++--------- sound/pcmcia/vx/vxpocket.c | 21 ++++++++++++--------- 2 files changed, 24 insertions(+), 18 deletions(-) diff --git a/sound/pcmcia/pdaudiocf/pdaudiocf.c b/sound/pcmcia/pdaudiocf/pdaudiocf.c index 7dea74b..64b8599 100644 --- a/sound/pcmcia/pdaudiocf/pdaudiocf.c +++ b/sound/pcmcia/pdaudiocf/pdaudiocf.c @@ -217,20 +217,25 @@ static void snd_pdacf_detach(struct pcmcia_device *link) * configuration callback */ -#define CS_CHECK(fn, ret) \ -do { last_fn = (fn); if ((last_ret = (ret)) != 0) goto cs_failed; } while (0) - static int pdacf_config(struct pcmcia_device *link) { struct snd_pdacf *pdacf = link->priv; - int last_fn, last_ret; + int ret; snd_printdd(KERN_DEBUG "pdacf_config called\n"); link->conf.ConfigIndex = 0x5; - CS_CHECK(RequestIO, pcmcia_request_io(link, &link->io)); - CS_CHECK(RequestIRQ, pcmcia_request_irq(link, &link->irq)); - CS_CHECK(RequestConfiguration, pcmcia_request_configuration(link, &link->conf)); + ret = pcmcia_request_io(link, &link->io); + if (ret) + goto failed; + + ret = pcmcia_request_irq(link, &link->irq); + if (ret) + goto failed; + + ret = pcmcia_request_configuration(link, &link->conf); + if (ret) + goto failed; if (snd_pdacf_assign_resources(pdacf, link->io.BasePort1, link->irq.AssignedIRQ) < 0) goto failed; @@ -238,8 +243,6 @@ static int pdacf_config(struct pcmcia_device *link) link->dev_node = &pdacf->node; return 0; -cs_failed: - cs_error(link, last_fn, last_ret); failed: pcmcia_disable_device(link); return -ENODEV; diff --git a/sound/pcmcia/vx/vxpocket.c b/sound/pcmcia/vx/vxpocket.c index 7445cc8..1492744 100644 --- a/sound/pcmcia/vx/vxpocket.c +++ b/sound/pcmcia/vx/vxpocket.c @@ -213,14 +213,11 @@ static int snd_vxpocket_assign_resources(struct vx_core *chip, int port, int irq * configuration callback */ -#define CS_CHECK(fn, ret) \ -do { last_fn = (fn); if ((last_ret = (ret)) != 0) goto cs_failed; } while (0) - static int vxpocket_config(struct pcmcia_device *link) { struct vx_core *chip = link->priv; struct snd_vxpocket *vxp = (struct snd_vxpocket *)chip; - int last_fn, last_ret; + int ret; snd_printdd(KERN_DEBUG "vxpocket_config called\n"); @@ -235,9 +232,17 @@ static int vxpocket_config(struct pcmcia_device *link) strcpy(chip->card->driver, vxp440_hw.name); } - CS_CHECK(RequestIO, pcmcia_request_io(link, &link->io)); - CS_CHECK(RequestIRQ, pcmcia_request_irq(link, &link->irq)); - CS_CHECK(RequestConfiguration, pcmcia_request_configuration(link, &link->conf)); + ret = pcmcia_request_io(link, &link->io); + if (ret) + goto failed; + + ret = pcmcia_request_irq(link, &link->irq); + if (ret) + goto failed; + + ret = pcmcia_request_configuration(link, &link->conf); + if (ret) + goto failed; chip->dev = &handle_to_dev(link); snd_card_set_dev(chip->card, chip->dev); @@ -248,8 +253,6 @@ static int vxpocket_config(struct pcmcia_device *link) link->dev_node = &vxp->node; return 0; -cs_failed: - cs_error(link, last_fn, last_ret); failed: pcmcia_disable_device(link); return -ENODEV; -- 1.6.0.4

2 1

[alsa-devel] [PATCH] hda: Use quirk mask for Dell Inspiron Mini9/Vostro A90
by Dan Chen 02 Nov '09

02 Nov '09

Hi, Attached please find a patch against current sound-2.6 HEAD that uses a quirk mask for Dell Inspiron Mini9/Vostro A90. Thanks, Dan

2 1

Re: [alsa-devel] [Intel-gfx] Problems with HDMI audio on Intel DG45FC motherboard
by Wu Fengguang 02 Nov '09

02 Nov '09

On Fri, Oct 30, 2009 at 06:29:32AM +0800, David Härdeman wrote: > On Thu, Oct 29, 2009 at 05:46:02PM +0800, Wu Fengguang wrote: > > I'm not sure why your device can silence even nothing changed with the > > infoframe. Would you retry the attached patch and post the dmesg? This > > is just to make things more clear. I'm not against your patch in general. > > dmesg attached...the first and third speaker-test invocation produced > audible sound while the second and fourth didn't (the changed infoframe > seems to cause the receiver to reset some internal state which kicks it > into working). OK, your device seems to work if there is a switch of infoframe, ie. coupled with the "HDMI: updating infoframe" message. Note that the message only happens if the audio infoframe don't match up with previous one, _or_ the previous one has been wiped out by some reset operation: Data Island Packet Data ----------------------- The contents of this buffer are cleared during function reset or HD audio link reset. Could you try dumping the audio infoframe data at the beginning of hdmi_switch_infoframe() or hdmi_stop_infoframe_trans(), to check if the previous content have been reset to 0? Thanks, Fengguang --- Content-Description: intel-hdmi-oct-29.log > Script started on Thu 29 Oct 2009 11:18:26 PM CET > scott:~/new8# dmesg -c > /dev/null > scott:~/new8# speaker-test -c2 -D hdmi -twav -l1 > > speaker-test 1.0.20 > > Playback device is hdmi > Stream parameters are 48000Hz, S16_LE, 2 channels > WAV file(s) > Rate set to 48000Hz (requested 48000Hz) > Buffer size range from 64 to 16384 > Period size range from 32 to 8192 > Using max buffer size 16384 > Periods = 4 > was set period_size = 4096 > was set buffer_size = 16384 > 0 - Front Left > 1 - Front Right > Time per period = 2.730676 > scott:~/new8# dmesg -c > [ 470.461885] ALSA sound/pci/hda/hda_intel.c:1621: azx_pcm_prepare: bufsize=0x10000, format=0x11 > [ 470.461959] HDMI: hdmi_setup_audio_infoframe > [ 470.461961] HDMI: trying to update infoframe > [ 470.462067] infoframe 132 =? 132 > [ 470.462110] infoframe 1 =? 1 > [ 470.462153] infoframe 10 =? 10 > [ 470.462187] infoframe 87 =? 112 > [ 470.462188] HDMI: updating infoframe > [ 470.462283] HDMI: ELD buf size is 64 > [ 470.462336] HDMI: DIP GP[0] buf size is 13 > [ 470.462379] HDMI: DIP GP[1] buf size is 10 > [ 470.462422] HDMI: DIP GP[2] buf size is 30 > [ 470.462464] HDMI: DIP GP[3] buf size is 30 > [ 470.462498] HDMI: DIP GP[4] buf size is 0 > [ 470.462551] HDMI: DIP GP[5] buf size is 0 > [ 470.462584] HDMI: DIP GP[6] buf size is 0 > [ 470.462627] HDMI: DIP GP[7] buf size is 0 > [ 470.462644] ALSA sound/pci/hda/hda_codec.c:1083: hda_codec_setup_stream: NID=0x2, stream=0x5, channel=0, format=0x11 > [ 473.199329] ALSA sound/pci/hda/hda_codec.c:1096: hda_codec_cleanup_stream: NID=0x2 > [ 473.199389] ALSA sound/pci/hda/hda_codec.c:1096: hda_codec_cleanup_stream: NID=0x2 > scott:~/new8# speaker-test -c2 -D hdmi -twav -l1 > > speaker-test 1.0.20 > > Playback device is hdmi > Stream parameters are 48000Hz, S16_LE, 2 channels > WAV file(s) > Rate set to 48000Hz (requested 48000Hz) > Buffer size range from 64 to 16384 > Period size range from 32 to 8192 > Using max buffer size 16384 > Periods = 4 > was set period_size = 4096 > was set buffer_size = 16384 > 0 - Front Left > 1 - Front Right > Time per period = 2.730384 > scott:~/new8# dmesg -c > [ 489.945260] ALSA sound/pci/hda/hda_intel.c:1621: azx_pcm_prepare: bufsize=0x10000, format=0x11 > [ 489.945341] HDMI: hdmi_setup_audio_infoframe > [ 489.945342] HDMI: trying to update infoframe > [ 489.945447] infoframe 132 =? 132 > [ 489.945489] infoframe 1 =? 1 > [ 489.945531] infoframe 10 =? 10 > [ 489.945573] infoframe 112 =? 112 > [ 489.945614] infoframe 1 =? 1 > [ 489.945656] infoframe 0 =? 0 > [ 489.945697] infoframe 0 =? 0 > [ 489.945739] infoframe 0 =? 0 > [ 489.945781] infoframe 0 =? 0 > [ 489.945823] infoframe 0 =? 0 > [ 489.945864] infoframe 0 =? 0 > [ 489.945906] infoframe 0 =? 0 > [ 489.945948] infoframe 0 =? 0 > [ 489.945989] infoframe 0 =? 0 > [ 489.945991] ALSA sound/pci/hda/hda_codec.c:1083: hda_codec_setup_stream: NID=0x2, stream=0x5, channel=0, format=0x11 > [ 492.682520] ALSA sound/pci/hda/hda_codec.c:1096: hda_codec_cleanup_stream: NID=0x2 > [ 492.682584] ALSA sound/pci/hda/hda_codec.c:1096: hda_codec_cleanup_stream: NID=0x2 > scott:~/new8# speaker-test -c8 -D hdmi -twav -l1 > > speaker-test 1.0.20 > > Playback device is hdmi > Stream parameters are 48000Hz, S16_LE, 8 channels > WAV file(s) > Rate set to 48000Hz (requested 48000Hz) > Buffer size range from 16 to 4096 > Period size range from 8 to 2048 > Using max buffer size 4096 > Periods = 4 > was set period_size = 1024 > was set buffer_size = 4096 > 0 - Front Left > 4 - Center > 1 - Front Right > 7 - Side Right > 3 - Rear Right > 2 - Rear Left > 6 - Side Left > 5 - LFE > Time per period = 11.307268 > scott:~/new8# dmesg -c > [ 540.685870] ALSA sound/pci/hda/hda_intel.c:1621: azx_pcm_prepare: bufsize=0x10000, format=0x17 > [ 540.685954] HDMI: hdmi_setup_audio_infoframe > [ 540.685959] ALSA sound/pci/hda/patch_intelhdmi.c:605: HDMI: select CA 0x13 for 8-channel allocation: FL/FR LFE FC RL/RR RC FLC/FRC RLC/RRC FLW/FRW FLH/FRH TC FCH > [ 540.686168] HDMI: ASP channel 0 => slot 0 > [ 540.686201] HDMI: ASP channel 0 => slot 0 > [ 540.686254] HDMI: ASP channel 0 => slot 0 > [ 540.686306] HDMI: ASP channel 0 => slot 0 > [ 540.686349] HDMI: ASP channel 0 => slot 0 > [ 540.686393] HDMI: ASP channel 0 => slot 0 > [ 540.686436] HDMI: ASP channel 0 => slot 0 > [ 540.686470] HDMI: ASP channel 0 => slot 0 > [ 540.686472] HDMI: trying to update infoframe > [ 540.686586] infoframe 132 =? 132 > [ 540.686639] infoframe 1 =? 1 > [ 540.686682] infoframe 10 =? 10 > [ 540.686726] infoframe 112 =? 87 > [ 540.686727] HDMI: updating infoframe > [ 540.686812] HDMI: ELD buf size is 64 > [ 540.686844] HDMI: DIP GP[0] buf size is 13 > [ 540.686897] HDMI: DIP GP[1] buf size is 10 > [ 540.686930] HDMI: DIP GP[2] buf size is 30 > [ 540.686973] HDMI: DIP GP[3] buf size is 30 > [ 540.687016] HDMI: DIP GP[4] buf size is 0 > [ 540.687059] HDMI: DIP GP[5] buf size is 0 > [ 540.687093] HDMI: DIP GP[6] buf size is 0 > [ 540.687146] HDMI: DIP GP[7] buf size is 0 > [ 540.687160] ALSA sound/pci/hda/hda_codec.c:1083: hda_codec_setup_stream: NID=0x2, stream=0x5, channel=0, format=0x17 > [ 551.999466] ALSA sound/pci/hda/hda_codec.c:1096: hda_codec_cleanup_stream: NID=0x2 > [ 551.999526] ALSA sound/pci/hda/hda_codec.c:1096: hda_codec_cleanup_stream: NID=0x2 > scott:~/new8# speaker-test -c8 -D hdmi -twav -l1 > > speaker-test 1.0.20 > > Playback device is hdmi > Stream parameters are 48000Hz, S16_LE, 8 channels > WAV file(s) > Rate set to 48000Hz (requested 48000Hz) > Buffer size range from 16 to 4096 > Period size range from 8 to 2048 > Using max buffer size 4096 > Periods = 4 > was set period_size = 1024 > was set buffer_size = 4096 > 0 - Front Left > 4 - Center > 1 - Front Right > 7 - Side Right > 3 - Rear Right > 2 - Rear Left > 6 - Side Left > 5 - LFE > Time per period = 11.307234 > scott:~/new8# dmesg -c > [ 569.801850] ALSA sound/pci/hda/hda_intel.c:1621: azx_pcm_prepare: bufsize=0x10000, format=0x17 > [ 569.801933] HDMI: hdmi_setup_audio_infoframe > [ 569.801939] ALSA sound/pci/hda/patch_intelhdmi.c:605: HDMI: select CA 0x13 for 8-channel allocation: FL/FR LFE FC RL/RR RC FLC/FRC RLC/RRC FLW/FRW FLH/FRH TC FCH > [ 569.802149] HDMI: ASP channel 0 => slot 0 > [ 569.802202] HDMI: ASP channel 0 => slot 0 > [ 569.802235] HDMI: ASP channel 0 => slot 0 > [ 569.802278] HDMI: ASP channel 0 => slot 0 > [ 569.802321] HDMI: ASP channel 0 => slot 0 > [ 569.802364] HDMI: ASP channel 0 => slot 0 > [ 569.802398] HDMI: ASP channel 0 => slot 0 > [ 569.802451] HDMI: ASP channel 0 => slot 0 > [ 569.802453] HDMI: trying to update infoframe > [ 569.802567] infoframe 132 =? 132 > [ 569.802620] infoframe 1 =? 1 > [ 569.802673] infoframe 10 =? 10 > [ 569.802715] infoframe 87 =? 87 > [ 569.802758] infoframe 7 =? 7 > [ 569.802801] infoframe 0 =? 0 > [ 569.802834] infoframe 0 =? 0 > [ 569.802887] infoframe 19 =? 19 > [ 569.802920] infoframe 0 =? 0 > [ 569.802972] infoframe 0 =? 0 > [ 569.803025] infoframe 0 =? 0 > [ 569.803068] infoframe 0 =? 0 > [ 569.803111] infoframe 0 =? 0 > [ 569.803154] infoframe 0 =? 0 > [ 569.803156] ALSA sound/pci/hda/hda_codec.c:1083: hda_codec_setup_stream: NID=0x2, stream=0x5, channel=0, format=0x17 > [ 581.115970] ALSA sound/pci/hda/hda_codec.c:1096: hda_codec_cleanup_stream: NID=0x2 > [ 581.116033] ALSA sound/pci/hda/hda_codec.c:1096: hda_codec_cleanup_stream: NID=0x2 > scott:~/new8# exit > exit > > Script done on Thu 29 Oct 2009 11:21:01 PM CET

1 0

Re: [alsa-devel] question on snd_jack_report
by Kp, Jeeja 01 Nov '09

01 Nov '09

When I call snd_jack_report with the status of the jack, am monitoring the /dev/input/eventX (using event.c) for Userspace events when Headset is inserted and I don't see any events even when snd_jack_report() is called. Is there any specific configuration that is required (xorg.config)? -----Original Message----- From: Mark Brown [mailto:broonie@opensource.wolfsonmicro.com] Sent: Wednesday, October 21, 2009 6:49 PM To: Harsha, Priya Cc: alsa-devel(a)alsa-project.org Subject: Re: [alsa-devel] question on snd_jack_report On Wed, Oct 21, 2009 at 06:22:47PM +0530, Harsha, Priya wrote: Please fix your MUA to wrap at 80 columns, I have once more reflowed your text to fit. > When I call snd_jack_report with the status of the jack, from the user > user space which parameter should I check in the > sys/class/input/input2 to know if the jack is present or not? Assuming you're looking to check the presence of a device in the jack (rather than the presence of the jack itself) then there's nothing in sysfs, you read this information from the device node. See evtest.c (google should show up lots of copies) for sample code doing this.

1 0

[alsa-devel] [PATCH] cs4236: detect cs4236+ chip in one pass
by Krzysztof Helt 01 Nov '09

01 Nov '09

From: Krzysztof Helt <krzysztof.h1(a)wp.pl> The cs4236 was two step detection with call to the snd_wss_free() between two steps. The snd_wss_free() did not free a sound device created in the snd_wss_create(). This caused an OOPS during module removal as the same sound device was released twice. The same OOPS happened if the cs4236 module loading failed. Fix this by adapting the snd_cs4236_create() to correctly work with chips less capable then cs4236. The snd_cs4236_create() behaves the same as the snd_wss_create() if the chip is less capable than the cs4236. Signed-off-by: Krzysztof Helt <krzysztof.h1(a)wp.pl> --- It is related to the kernel bug #13379. If the snd-cs4236 is forced to be loaded with isapnp=0 and wrong control port is given, the driver OOPS and it is not possible to reload the driver until reboot. The OOPS from Wim Osternholt is below: ALSA sound/isa/cs423x/cs4236_lib.c:313: CS4236: [0x210] C1 (version) = 0xff, ext = 0xe8 ALSA sound/isa/cs423x/cs4236_lib.c:316: CS4236+ chip detected, but control port 0x210 is not valid BUG: unable to handle kernel NULL pointer dereference at 00000018 IP: [<c02285c6>] release_resource+0x16/0x48 *pde = 00000000 Oops: 0000 [#1] SMP last sysfs file: /sys/devices/pci0000:00/0000:00:01.1/ide1/1.0/block/hdc/size Modules linked in: snd_cs4236(+) snd_wss_lib snd_opl3_lib snd_hwdep snd_mpu401_uart snd_rawmidi snd_pcm snd_timer snd_page_alloc snd_mixer_oss sd_mod svgalib_helper uhci_hcd neofb cfbcopyarea vgastate cfbimgblt cfbfillrect usbcore xircom_cb Oct 29 12:43:16 barbapapa Pid: 5317, comm: modprobe Not tainted (2.6.30-gentoo-r8 #3) 2645310 EIP: 0060:[<c02285c6>] EFLAGS: 00010206 CPU: 0 EIP is at release_resource+0x16/0x48 EAX: c066a91c EBX: c8f40d80 ECX: 00000018 EDX: cad81fb0 ESI: c83c0000 EDI: 00002fff EBP: c8379df8 ESP: c8379df4 DS: 007b ES: 007b FS: 00d8 GS: 0033 SS: 0068 Process modprobe (pid: 5317, ti=c8378000 task=c8322be0 task.ti=c8378000) Stack: c8f40d80 c8379e04 c04186f3 c82ca000 c8379e10 cad81f38 c8f40240 c8379e18 cad81fbb c8379e28 c041883e c83c0000 00002000 c8379e3c c04188f2 c83c0000 c83c0000 c8f42d80 c8379e48 c04147e7 00000000 c8379e74 c04152a3 c83c01b4 Call Trace: [<c04186f3>] ? release_and_free_resource+0xf/0x1c [<cad81f38>] ? snd_wss_free+0xe/0x86 [snd_wss_lib] [<cad81fbb>] ? snd_wss_dev_free+0xb/0xd [snd_wss_lib] [<c041883e>] ? snd_device_free+0x8d/0xea [<c04188f2>] ? snd_device_free_all+0x57/0x79 [<c04147e7>] ? snd_card_do_free+0x6e/0xd2 [<c04152a3>] ? snd_card_free+0x7f/0x89 [<cad9973d>] ? snd_cs423x_isa_probe+0x3e/0x4d [snd_cs4236] [<cad996ff>] ? snd_cs423x_isa_probe+0x0/0x4d [snd_cs4236] [<c03b9802>] ? isa_bus_probe+0x1c/0x1f [<c03b60b7>] ? driver_probe_device+0x8e/0x102 [<c03b62ee>] ? __device_attach+0x0/0x32 [<c03b6316>] ? __device_attach+0x28/0x32 [<c03b5590>] ? bus_for_each_drv+0x39/0x63 [<c03b61ee>] ? device_attach+0x45/0x59 [<c03b62ee>] ? __device_attach+0x0/0x32 [<c03b552d>] ? bus_attach_device+0x1e/0x48 [<c03b44cd>] ? device_add+0x331/0x471 [<c034d63e>] ? kobject_init+0x35/0x5a [<c03b461f>] ? device_register+0x12/0x15 [<c03b9994>] ? isa_register_driver+0xde/0x146 [<cada1000>] ? alsa_card_cs423x_init+0x0/0x74 [snd_cs4236] [<cada1012>] ? alsa_card_cs423x_init+0x12/0x74 [snd_cs4236] [<c0201141>] ? do_one_initcall+0x4c/0x131 [<c024445f>] ? sys_init_module+0x87/0x190 [<c02029f5>] ? syscall_call+0x7/0xb Code: 3b 4e 04 8b 55 ec 7c e5 7f 04 3b 16 72 df 59 5b 5b 5e 5f 5d c3 55 89 e5 53 89 c3 b8 1c a9 66 c0 e8 7b de 2d 00 8b 4b 10 83 c1 18 <8b> 11 85 d2 74 19 39 da 75 10 8b 42 14 89 01 31 c0 c7 42 10 00 [<c02285c6>] release_resource+0x16/0x48 SS:ESP 0068:c8379df4 CR2: 0000000000000018 include/sound/wss.h | 1 - sound/isa/cs423x/cs4236.c | 13 +--- sound/isa/cs423x/cs4236_lib.c | 143 ++++++++++++++++++++++------------------- sound/isa/wss/wss_lib.c | 3 +- 4 files changed, 80 insertions(+), 80 deletions(-) diff --git a/include/sound/wss.h b/include/sound/wss.h index 6d65f32..fd01f22 100644 --- a/include/sound/wss.h +++ b/include/sound/wss.h @@ -154,7 +154,6 @@ int snd_wss_create(struct snd_card *card, unsigned short hardware, unsigned short hwshare, struct snd_wss **rchip); -int snd_wss_free(struct snd_wss *chip); int snd_wss_pcm(struct snd_wss *chip, int device, struct snd_pcm **rpcm); int snd_wss_timer(struct snd_wss *chip, int device, struct snd_timer **rtimer); int snd_wss_mixer(struct snd_wss *chip); diff --git a/sound/isa/cs423x/cs4236.c b/sound/isa/cs423x/cs4236.c index a076a6c..93fa672 100644 --- a/sound/isa/cs423x/cs4236.c +++ b/sound/isa/cs423x/cs4236.c @@ -394,21 +394,15 @@ static int __devinit snd_cs423x_probe(struct snd_card *card, int dev) return -EBUSY; } - err = snd_wss_create(card, port[dev], cport[dev], + err = snd_cs4236_create(card, port[dev], cport[dev], irq[dev], dma1[dev], dma2[dev], WSS_HW_DETECT3, 0, &chip); if (err < 0) return err; + + acard->chip = chip; if (chip->hardware & WSS_HW_CS4236B_MASK) { - snd_wss_free(chip); - err = snd_cs4236_create(card, - port[dev], cport[dev], - irq[dev], dma1[dev], dma2[dev], - WSS_HW_DETECT, 0, &chip); - if (err < 0) - return err; - acard->chip = chip; err = snd_cs4236_pcm(chip, 0, &pcm); if (err < 0) @@ -418,7 +412,6 @@ static int __devinit snd_cs423x_probe(struct snd_card *card, int dev) if (err < 0) return err; } else { - acard->chip = chip; err = snd_wss_pcm(chip, 0, &pcm); if (err < 0) return err; diff --git a/sound/isa/cs423x/cs4236_lib.c b/sound/isa/cs423x/cs4236_lib.c index 38835f3..2f9f430 100644 --- a/sound/isa/cs423x/cs4236_lib.c +++ b/sound/isa/cs423x/cs4236_lib.c @@ -87,6 +87,7 @@ #include <sound/core.h> #include <sound/wss.h> #include <sound/asoundef.h> +#include <sound/initval.h> /* * @@ -264,7 +265,10 @@ static void snd_cs4236_resume(struct snd_wss *chip) } #endif /* CONFIG_PM */ - +/* + * This function does no fail if the chip is not CS4236B or compatible. + * It just an equivalent to the snd_wss_create() then. + */ int snd_cs4236_create(struct snd_card *card, unsigned long port, unsigned long cport, @@ -281,83 +285,88 @@ int snd_cs4236_create(struct snd_card *card, *rchip = NULL; if (hardware == WSS_HW_DETECT) hardware = WSS_HW_DETECT3; - if (cport < 0x100) { - snd_printk(KERN_ERR "please, specify control port " - "for CS4236+ chips\n"); - return -ENODEV; - } + err = snd_wss_create(card, port, cport, irq, dma1, dma2, hardware, hwshare, &chip); if (err < 0) return err; - if (!(chip->hardware & WSS_HW_CS4236B_MASK)) { - snd_printk(KERN_ERR "CS4236+: MODE3 and extended registers " - "not available, hardware=0x%x\n", chip->hardware); - snd_device_free(card, chip); - return -ENODEV; - } + if (chip->hardware & WSS_HW_CS4236B_MASK) { #if 0 - { - int idx; - for (idx = 0; idx < 8; idx++) - snd_printk(KERN_DEBUG "CD%i = 0x%x\n", - idx, inb(chip->cport + idx)); - for (idx = 0; idx < 9; idx++) - snd_printk(KERN_DEBUG "C%i = 0x%x\n", - idx, snd_cs4236_ctrl_in(chip, idx)); - } + { + int idx; + for (idx = 0; idx < 8; idx++) + snd_printk(KERN_DEBUG "CD%i = 0x%x\n", + idx, inb(chip->cport + idx)); + for (idx = 0; idx < 9; idx++) + snd_printk(KERN_DEBUG "C%i = 0x%x\n", + idx, snd_cs4236_ctrl_in(chip, idx)); + } #endif - ver1 = snd_cs4236_ctrl_in(chip, 1); - ver2 = snd_cs4236_ext_in(chip, CS4236_VERSION); - snd_printdd("CS4236: [0x%lx] C1 (version) = 0x%x, ext = 0x%x\n", cport, ver1, ver2); - if (ver1 != ver2) { - snd_printk(KERN_ERR "CS4236+ chip detected, but " - "control port 0x%lx is not valid\n", cport); - snd_device_free(card, chip); - return -ENODEV; - } - snd_cs4236_ctrl_out(chip, 0, 0x00); - snd_cs4236_ctrl_out(chip, 2, 0xff); - snd_cs4236_ctrl_out(chip, 3, 0x00); - snd_cs4236_ctrl_out(chip, 4, 0x80); - snd_cs4236_ctrl_out(chip, 5, ((IEC958_AES1_CON_PCM_CODER & 3) << 6) | IEC958_AES0_CON_EMPHASIS_NONE); - snd_cs4236_ctrl_out(chip, 6, IEC958_AES1_CON_PCM_CODER >> 2); - snd_cs4236_ctrl_out(chip, 7, 0x00); - /* 0x8c for C8 is valid for Turtle Beach Malibu - the IEC-958 output */ - /* is working with this setup, other hardware should have */ - /* different signal paths and this value should be selectable */ - /* in the future */ - snd_cs4236_ctrl_out(chip, 8, 0x8c); - chip->rate_constraint = snd_cs4236_xrate; - chip->set_playback_format = snd_cs4236_playback_format; - chip->set_capture_format = snd_cs4236_capture_format; + if (cport < 0x100 || cport == SNDRV_AUTO_PORT) { + snd_printk(KERN_ERR "please, specify control port " + "for CS4236+ chips\n"); + return -ENODEV; + } + ver1 = snd_cs4236_ctrl_in(chip, 1); + ver2 = snd_cs4236_ext_in(chip, CS4236_VERSION); + snd_printdd("CS4236: [0x%lx] C1 (version) = 0x%x, ext = 0x%x\n", + cport, ver1, ver2); + if (ver1 != ver2) { + snd_printk(KERN_ERR "CS4236+ chip detected, but " + "control port 0x%lx is not valid\n", cport); + snd_device_free(card, chip); + return -ENODEV; + } + snd_cs4236_ctrl_out(chip, 0, 0x00); + snd_cs4236_ctrl_out(chip, 2, 0xff); + snd_cs4236_ctrl_out(chip, 3, 0x00); + snd_cs4236_ctrl_out(chip, 4, 0x80); + reg = ((IEC958_AES1_CON_PCM_CODER & 3) << 6) | + IEC958_AES0_CON_EMPHASIS_NONE; + snd_cs4236_ctrl_out(chip, 5, reg); + snd_cs4236_ctrl_out(chip, 6, IEC958_AES1_CON_PCM_CODER >> 2); + snd_cs4236_ctrl_out(chip, 7, 0x00); + /* + * 0x8c for C8 is valid for Turtle Beach Malibu - the IEC-958 + * output is working with this setup, other hardware should + * have different signal paths and this value should be + * selectable in the future + * */ + snd_cs4236_ctrl_out(chip, 8, 0x8c); + chip->rate_constraint = snd_cs4236_xrate; + chip->set_playback_format = snd_cs4236_playback_format; + chip->set_capture_format = snd_cs4236_capture_format; #ifdef CONFIG_PM - chip->suspend = snd_cs4236_suspend; - chip->resume = snd_cs4236_resume; + chip->suspend = snd_cs4236_suspend; + chip->resume = snd_cs4236_resume; #endif - /* initialize extended registers */ - for (reg = 0; reg < sizeof(snd_cs4236_ext_map); reg++) - snd_cs4236_ext_out(chip, CS4236_I23VAL(reg), snd_cs4236_ext_map[reg]); - - /* initialize compatible but more featured registers */ - snd_wss_out(chip, CS4231_LEFT_INPUT, 0x40); - snd_wss_out(chip, CS4231_RIGHT_INPUT, 0x40); - snd_wss_out(chip, CS4231_AUX1_LEFT_INPUT, 0xff); - snd_wss_out(chip, CS4231_AUX1_RIGHT_INPUT, 0xff); - snd_wss_out(chip, CS4231_AUX2_LEFT_INPUT, 0xdf); - snd_wss_out(chip, CS4231_AUX2_RIGHT_INPUT, 0xdf); - snd_wss_out(chip, CS4231_RIGHT_LINE_IN, 0xff); - snd_wss_out(chip, CS4231_LEFT_LINE_IN, 0xff); - snd_wss_out(chip, CS4231_RIGHT_LINE_IN, 0xff); - switch (chip->hardware) { - case WSS_HW_CS4235: - case WSS_HW_CS4239: - snd_wss_out(chip, CS4235_LEFT_MASTER, 0xff); - snd_wss_out(chip, CS4235_RIGHT_MASTER, 0xff); - break; - } + /* initialize extended registers */ + for (reg = 0; reg < sizeof(snd_cs4236_ext_map); reg++) + snd_cs4236_ext_out(chip, CS4236_I23VAL(reg), + snd_cs4236_ext_map[reg]); + + /* initialize compatible but more featured registers */ + snd_wss_out(chip, CS4231_LEFT_INPUT, 0x40); + snd_wss_out(chip, CS4231_RIGHT_INPUT, 0x40); + snd_wss_out(chip, CS4231_AUX1_LEFT_INPUT, 0xff); + snd_wss_out(chip, CS4231_AUX1_RIGHT_INPUT, 0xff); + snd_wss_out(chip, CS4231_AUX2_LEFT_INPUT, 0xdf); + snd_wss_out(chip, CS4231_AUX2_RIGHT_INPUT, 0xdf); + snd_wss_out(chip, CS4231_RIGHT_LINE_IN, 0xff); + snd_wss_out(chip, CS4231_LEFT_LINE_IN, 0xff); + snd_wss_out(chip, CS4231_RIGHT_LINE_IN, 0xff); + switch (chip->hardware) { + case WSS_HW_CS4235: + case WSS_HW_CS4239: + snd_wss_out(chip, CS4235_LEFT_MASTER, 0xff); + snd_wss_out(chip, CS4235_RIGHT_MASTER, 0xff); + break; + } + } else + snd_printd("chip is not CS4236+, hardware=0x%x\n", + chip->hardware); *rchip = chip; return 0; diff --git a/sound/isa/wss/wss_lib.c b/sound/isa/wss/wss_lib.c index 5d2ba1b..aab44e7 100644 --- a/sound/isa/wss/wss_lib.c +++ b/sound/isa/wss/wss_lib.c @@ -1682,7 +1682,7 @@ static void snd_wss_resume(struct snd_wss *chip) } #endif /* CONFIG_PM */ -int snd_wss_free(struct snd_wss *chip) +static int snd_wss_free(struct snd_wss *chip) { release_and_free_resource(chip->res_port); release_and_free_resource(chip->res_cport); @@ -1705,7 +1705,6 @@ int snd_wss_free(struct snd_wss *chip) kfree(chip); return 0; } -EXPORT_SYMBOL(snd_wss_free); static int snd_wss_dev_free(struct snd_device *device) { -- 1.6.4 ------------------------------------------------------------------------------ Strrraszny konkurs z Scooby-Doo! Wez udzial >> http://link.interia.pl/f2412

2 2

[alsa-devel] [patch] snd-pcsp: add nopcm mode
by Stas Sergeev 01 Nov '09

01 Nov '09

Hello. Currently, if the high-res timers are unavailable, snd-pcsp does not initialize. People who choose it over pcspkr, loose their console beeps in that case and get annoyed. With this patch, the console beeps remain regardless of the high-res timers. Additionally, the "nopcm" modparam is added to forcibly disable the PCM capabilities of the driver. Signed-off-by: Stas Sergeev <stsp(a)aknet.ru>

2 1

[alsa-devel] [USB] alsa-lib 1.2.21[a] broke USB audio buffering - regression
by Shawn Starr 31 Oct '09

31 Oct '09

Hello ALSA developers, I seem have noticed a problem with USB audio buffering. Prior to using *buntu, which uses ALSA 1.2.20 I had no problems with using my USB webcam for audio. When I switched to Debian, which uses ALSA 1.2.21a I noticed USB audio became choppy. The device in question is a QuickCam Pro 9000 webcam. I can confirm this to be the case since taking the 1.2.20 source and rebuilding it on Debian causes the audio choppiness problem to stop. Thanks, Shawn.

1 1

[alsa-devel] [PATCH] Add CLKOUT support to wm8731 codec driver
by Bill Gatliff 30 Oct '09

30 Oct '09

The WM8731 Codec driver lacks support for utilizing the CLKOUT signal as the I2S master clock. The following patch adds that support, along with a few minor whitespace cleanups. Bill Gatliff (1): Add support for CLKOUT to wm8731 codec driver sound/soc/codecs/wm8731.c | 155 +++++++++++++++++++++++++++------------------ sound/soc/codecs/wm8731.h | 20 ++++++- 2 files changed, 113 insertions(+), 62 deletions(-)

2 9

[alsa-devel] [RFC 0/2] ASoC: remove io_mutex
by ext-eero.nurkkala＠nokia.com 30 Oct '09

30 Oct '09

From: Eero Nurkkala <ext-eero.nurkkala(a)nokia.com> This RFC set addresses the existence of io_mutex. A safer method is introduced - but it changes the semantics quite a bit, as now all drivers calling snd_soc_update_bits() will need to make sure the codec mutex is taken. snd_soc_test_bits() - function does not need to take the io_mutex at all - all calls to it have the codec mutex already taken. Warning: Not even compile tested! Possible drawback: dapm_power_widgets() may hold the codec mutex for a few ms, which may be too long; meanwhile, calls to snd_soc_update_bits() are stalled. Of course we wish optimal performance and maybe the codec mutex should only be taken for such registers that contain both volume and dapm bits... Ideas, comments, all welcome.

2 3

[alsa-devel] [patch] snd-pcsp fixes
by Stas Sergeev 30 Oct '09

30 Oct '09

Hi. The attached patch fixes the problems introduced in this commit: http://git.kernel.org/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commitdi… - Fix nForce workaround by honouring the pointer_update var - Revert "ns" to u64, as per the hrtimer API - Revert to the zero-delay timer startup, since I can't reproduce any problem with it (please, give me the hint!) Signed-off-by: Stas Sergeev <stsp(a)aknet.ru> Takashi, could you please apply or tell me where the problem is/was? Or, alternatively, we can revert the commit entirely, and then re-do the cleanups.

2 5

[alsa-devel] [PATCH 3/14] sound/parisc: Move dereference after NULL test
by Julia Lawall 30 Oct '09

30 Oct '09

From: Julia Lawall <julia(a)diku.dk> If the NULL test on h is needed in snd_harmony_mixer_init, then the dereference should be after the NULL test. Actually, there is a sequence of calls: snd_harmony_create, then snd_harmony_pcm_init, and then snd_harmony_mixer_init. snd_harmony_create initializes h, but may indeed leave it as NULL. There was no NULL test at the beginning of snd_harmony_pcm_init, so I have added one. The NULL test in snd_harmony_mixer_init is then not necessary, but in case the ordering of the calls changes, I have left it, and moved the dereference after it. A simplified version of the semantic match that detects this problem is as follows (http://coccinelle.lip6.fr/): // <smpl> @match exists@ expression x, E; identifier fld; @@ * x->fld ... when != $x = E\|&x$ * x == NULL // </smpl> Signed-off-by: Julia Lawall <julia(a)diku.dk> --- sound/parisc/harmony.c | 6 +++++- 1 files changed, 5 insertions(+), 1 deletions(-) diff --git a/sound/parisc/harmony.c b/sound/parisc/harmony.c index e924492..f47f9e2 100644 --- a/sound/parisc/harmony.c +++ b/sound/parisc/harmony.c @@ -624,6 +624,9 @@ snd_harmony_pcm_init(struct snd_harmony *h) struct snd_pcm *pcm; int err; + if (snd_BUG_ON(!h)) + return -EINVAL; + harmony_disable_interrupts(h); err = snd_pcm_new(h->card, "harmony", 0, 1, 1, &pcm); @@ -865,11 +868,12 @@ snd_harmony_mixer_reset(struct snd_harmony *h) static int __devinit snd_harmony_mixer_init(struct snd_harmony *h) { - struct snd_card *card = h->card; + struct snd_card *card; int idx, err; if (snd_BUG_ON(!h)) return -EINVAL; + card = h->card; strcpy(card->mixername, "Harmony Gain control interface"); for (idx = 0; idx < HARMONY_CONTROLS; idx++) {

3 2

[alsa-devel] [PATCH 1/2] es18xx: remove snd_card pointer from snd_es18xx structure
by Krzysztof Helt 30 Oct '09

30 Oct '09

From: Krzysztof Helt <krzysztof.h1(a)wp.pl> The snd_card pointer is redundant and code can be easily changed to work without it. Signed-off-by: Krzysztof Helt <krzysztof.h1(a)wp.pl> --- Both patches are just small code improvement for the driver. sound/isa/es18xx.c | 75 ++++++++++++++++++++++++++++++--------------------- 1 files changed, 44 insertions(+), 31 deletions(-) diff --git a/sound/isa/es18xx.c b/sound/isa/es18xx.c index 8cfbff7..160752b 100644 --- a/sound/isa/es18xx.c +++ b/sound/isa/es18xx.c @@ -121,7 +121,6 @@ struct snd_es18xx { unsigned int dma1_shift; unsigned int dma2_shift; - struct snd_card *card; struct snd_pcm *pcm; struct snd_pcm_substream *playback_a_substream; struct snd_pcm_substream *capture_a_substream; @@ -755,7 +754,9 @@ static int snd_es18xx_playback_trigger(struct snd_pcm_substream *substream, static irqreturn_t snd_es18xx_interrupt(int irq, void *dev_id) { - struct snd_es18xx *chip = dev_id; + struct snd_card *card = dev_id; + struct snd_audiodrive *acard = card->private_data; + struct snd_es18xx *chip = acard->chip; unsigned char status; if (chip->caps & ES18XX_CONTROL) { @@ -805,12 +806,16 @@ static irqreturn_t snd_es18xx_interrupt(int irq, void *dev_id) int split = 0; if (chip->caps & ES18XX_HWV) { split = snd_es18xx_mixer_read(chip, 0x64) & 0x80; - snd_ctl_notify(chip->card, SNDRV_CTL_EVENT_MASK_VALUE, &chip->hw_switch->id); - snd_ctl_notify(chip->card, SNDRV_CTL_EVENT_MASK_VALUE, &chip->hw_volume->id); + snd_ctl_notify(card, SNDRV_CTL_EVENT_MASK_VALUE, + &chip->hw_switch->id); + snd_ctl_notify(card, SNDRV_CTL_EVENT_MASK_VALUE, + &chip->hw_volume->id); } if (!split) { - snd_ctl_notify(chip->card, SNDRV_CTL_EVENT_MASK_VALUE, &chip->master_switch->id); - snd_ctl_notify(chip->card, SNDRV_CTL_EVENT_MASK_VALUE, &chip->master_volume->id); + snd_ctl_notify(card, SNDRV_CTL_EVENT_MASK_VALUE, + &chip->master_switch->id); + snd_ctl_notify(card, SNDRV_CTL_EVENT_MASK_VALUE, + &chip->master_volume->id); } /* ack interrupt */ snd_es18xx_mixer_write(chip, 0x66, 0x00); @@ -1691,8 +1696,11 @@ static struct snd_pcm_ops snd_es18xx_capture_ops = { .pointer = snd_es18xx_capture_pointer, }; -static int __devinit snd_es18xx_pcm(struct snd_es18xx *chip, int device, struct snd_pcm ** rpcm) +static int __devinit snd_es18xx_pcm(struct snd_card *card, int device, + struct snd_pcm **rpcm) { + struct snd_audiodrive *acard = card->private_data; + struct snd_es18xx *chip = acard->chip; struct snd_pcm *pcm; char str[16]; int err; @@ -1701,9 +1709,9 @@ static int __devinit snd_es18xx_pcm(struct snd_es18xx *chip, int device, struct *rpcm = NULL; sprintf(str, "ES%x", chip->version); if (chip->caps & ES18XX_PCM2) - err = snd_pcm_new(chip->card, str, device, 2, 1, &pcm); + err = snd_pcm_new(card, str, device, 2, 1, &pcm); else - err = snd_pcm_new(chip->card, str, device, 1, 1, &pcm); + err = snd_pcm_new(card, str, device, 1, 1, &pcm); if (err < 0) return err; @@ -1737,7 +1745,7 @@ static int snd_es18xx_suspend(struct snd_card *card, pm_message_t state) struct snd_audiodrive *acard = card->private_data; struct snd_es18xx *chip = acard->chip; - snd_power_change_state(chip->card, SNDRV_CTL_POWER_D3hot); + snd_power_change_state(card, SNDRV_CTL_POWER_D3hot); snd_pcm_suspend_all(chip->pcm); @@ -1758,18 +1766,21 @@ static int snd_es18xx_resume(struct snd_card *card) /* restore PM register, we won't wake till (not 0x07) i/o activity though */ snd_es18xx_write(chip, ES18XX_PM, chip->pm_reg ^= ES18XX_PM_FM); - snd_power_change_state(chip->card, SNDRV_CTL_POWER_D0); + snd_power_change_state(card, SNDRV_CTL_POWER_D0); return 0; } #endif /* CONFIG_PM */ -static int snd_es18xx_free(struct snd_es18xx *chip) +static int snd_es18xx_free(struct snd_card *card) { + struct snd_audiodrive *acard = card->private_data; + struct snd_es18xx *chip = acard->chip; + release_and_free_resource(chip->res_port); release_and_free_resource(chip->res_ctrl_port); release_and_free_resource(chip->res_mpu_port); if (chip->irq >= 0) - free_irq(chip->irq, (void *) chip); + free_irq(chip->irq, (void *) card); if (chip->dma1 >= 0) { disable_dma(chip->dma1); free_dma(chip->dma1); @@ -1784,8 +1795,7 @@ static int snd_es18xx_free(struct snd_es18xx *chip) static int snd_es18xx_dev_free(struct snd_device *device) { - struct snd_es18xx *chip = device->device_data; - return snd_es18xx_free(chip); + return snd_es18xx_free(device->card); } static int __devinit snd_es18xx_new_device(struct snd_card *card, @@ -1808,7 +1818,6 @@ static int __devinit snd_es18xx_new_device(struct snd_card *card, spin_lock_init(&chip->reg_lock); spin_lock_init(&chip->mixer_lock); spin_lock_init(&chip->ctrl_lock); - chip->card = card; chip->port = port; chip->mpu_port = mpu_port; chip->fm_port = fm_port; @@ -1818,53 +1827,55 @@ static int __devinit snd_es18xx_new_device(struct snd_card *card, chip->audio2_vol = 0x00; chip->active = 0; - if ((chip->res_port = request_region(port, 16, "ES18xx")) == NULL) { - snd_es18xx_free(chip); + chip->res_port = request_region(port, 16, "ES18xx"); + if (chip->res_port == NULL) { + snd_es18xx_free(card); snd_printk(KERN_ERR PFX "unable to grap ports 0x%lx-0x%lx\n", port, port + 16 - 1); return -EBUSY; } - if (request_irq(irq, snd_es18xx_interrupt, IRQF_DISABLED, "ES18xx", (void *) chip)) { - snd_es18xx_free(chip); + if (request_irq(irq, snd_es18xx_interrupt, IRQF_DISABLED, "ES18xx", + (void *) card)) { + snd_es18xx_free(card); snd_printk(KERN_ERR PFX "unable to grap IRQ %d\n", irq); return -EBUSY; } chip->irq = irq; if (request_dma(dma1, "ES18xx DMA 1")) { - snd_es18xx_free(chip); + snd_es18xx_free(card); snd_printk(KERN_ERR PFX "unable to grap DMA1 %d\n", dma1); return -EBUSY; } chip->dma1 = dma1; if (dma2 != dma1 && request_dma(dma2, "ES18xx DMA 2")) { - snd_es18xx_free(chip); + snd_es18xx_free(card); snd_printk(KERN_ERR PFX "unable to grap DMA2 %d\n", dma2); return -EBUSY; } chip->dma2 = dma2; if (snd_es18xx_probe(chip) < 0) { - snd_es18xx_free(chip); + snd_es18xx_free(card); return -ENODEV; } - if ((err = snd_device_new(card, SNDRV_DEV_LOWLEVEL, chip, &ops)) < 0) { - snd_es18xx_free(chip); + err = snd_device_new(card, SNDRV_DEV_LOWLEVEL, NULL, &ops); + if (err < 0) { + snd_es18xx_free(card); return err; } *rchip = chip; return 0; } -static int __devinit snd_es18xx_mixer(struct snd_es18xx *chip) +static int __devinit snd_es18xx_mixer(struct snd_card *card) { - struct snd_card *card; + struct snd_audiodrive *acard = card->private_data; + struct snd_es18xx *chip = acard->chip; int err; unsigned int idx; - card = chip->card; - strcpy(card->mixername, chip->pcm->name); for (idx = 0; idx < ARRAY_SIZE(snd_es18xx_base_controls); idx++) { @@ -2161,10 +2172,12 @@ static int __devinit snd_audiodrive_probe(struct snd_card *card, int dev) chip->port, irq[dev], dma1[dev]); - if ((err = snd_es18xx_pcm(chip, 0, NULL)) < 0) + err = snd_es18xx_pcm(card, 0, NULL); + if (err < 0) return err; - if ((err = snd_es18xx_mixer(chip)) < 0) + err = snd_es18xx_mixer(card); + if (err < 0) return err; if (fm_port[dev] > 0 && fm_port[dev] != SNDRV_AUTO_PORT) { -- 1.6.0.3 ---------------------------------------------------------------------- Sprawdz jak dziala nowy Windows Sprawdz na >>> http://link.interia.pl/f23ea <<<

2 1

[alsa-devel] [PATCH] remove OSS Ensoniq SoundScape driver
by Krzysztof Helt 30 Oct '09

30 Oct '09

From: Krzysztof Helt <krzysztof.h1(a)wp.pl> The OSS driver for Ensoniq SoundScape cards is broken after conversion to mutexes and a new ALSA snd-sscape driver handles all devices handled by the OSS one. The ALSA driver was tested with these cards: Spea V7 MediaFX Ensoniq Soundscape Elite Ensoniq Soundscape VIVO (this card is not handled by the OSS driver) Signed-off-by: Krzysztof Helt <krzysztof.h1(a)wp.pl> --- Theodore Allen confirmed that that the new driver works for his Ensoniq Soundscape Elite card (both MIDI and PCM): "I decided to upgrade to 2.6.28.10 from 2.6.28. I also put the firmware in the /lib/firmware directory. Now the MIDI seems to work on most files. There are a few that sound odd, but perhaps it's the midi map. I have no idea why the driver allowed the sscape_ctl program to load the firmware earlier, but it doesn't now. Was there an ALSA change between 2.6.28 and 2.6.28.10? Less happily, the sound seems now to have a very faint "zzzt" kind of "click" just before playing, which I think it didn't with 2.6.28. I'll verify that after I reboot into the old kernel." I will investigate the PCM issue after he confirms that it is a regression. This allows closing the ALSA bug #2234. diff --git a/sound/oss/Kconfig b/sound/oss/Kconfig index bcf2a06..135a2b7 100644 --- a/sound/oss/Kconfig +++ b/sound/oss/Kconfig @@ -287,18 +287,6 @@ config SOUND_DMAP Say Y unless you have 16MB or more RAM or a PCI sound card. -config SOUND_SSCAPE - tristate "Ensoniq SoundScape support" - help - Answer Y if you have a sound card based on the Ensoniq SoundScape - chipset. Such cards are being manufactured at least by Ensoniq, Spea - and Reveal (Reveal makes also other cards). - - If you compile the driver into the kernel, you have to add - "sscape=<io>,<irq>,<dma>,<mpuio>,<mpuirq>" to the kernel command - line. - - config SOUND_VMIDI tristate "Loopback MIDI device support" help diff --git a/sound/oss/Makefile b/sound/oss/Makefile index e0ae4d4..567b8a7 100644 --- a/sound/oss/Makefile +++ b/sound/oss/Makefile @@ -13,7 +13,6 @@ obj-$(CONFIG_SOUND_SH_DAC_AUDIO) += sh_dac_audio.o obj-$(CONFIG_SOUND_AEDSP16) += aedsp16.o obj-$(CONFIG_SOUND_PSS) += pss.o ad1848.o mpu401.o obj-$(CONFIG_SOUND_TRIX) += trix.o ad1848.o sb_lib.o uart401.o -obj-$(CONFIG_SOUND_SSCAPE) += sscape.o ad1848.o mpu401.o obj-$(CONFIG_SOUND_MSS) += ad1848.o obj-$(CONFIG_SOUND_PAS) += pas2.o sb.o sb_lib.o uart401.o obj-$(CONFIG_SOUND_SB) += sb.o sb_lib.o uart401.o diff --git a/sound/oss/sscape.c b/sound/oss/sscape.c deleted file mode 100644 index 30c36d1..0000000 --- a/sound/oss/sscape.c +++ /dev/null @@ -1,1480 +0,0 @@ -/* - * sound/oss/sscape.c - * - * Low level driver for Ensoniq SoundScape - * - * - * Copyright (C) by Hannu Savolainen 1993-1997 - * - * OSS/Free for Linux is distributed under the GNU GENERAL PUBLIC LICENSE (GPL) - * Version 2 (June 1991). See the "COPYING" file distributed with this software - * for more info. - * - * - * Thomas Sailer : ioctl code reworked (vmalloc/vfree removed) - * Sergey Smitienko : ensoniq p'n'p support - * Christoph Hellwig : adapted to module_init/module_exit - * Bartlomiej Zolnierkiewicz : added __init to attach_sscape() - * Chris Rankin : Specify that this module owns the coprocessor - * Arnaldo C. de Melo : added missing restore_flags in sscape_pnp_upload_file - */ - -#include <linux/init.h> -#include <linux/module.h> - -#include "sound_config.h" -#include "sound_firmware.h" - -#include <linux/types.h> -#include <linux/errno.h> -#include <linux/signal.h> -#include <linux/fcntl.h> -#include <linux/ctype.h> -#include <linux/stddef.h> -#include <linux/kmod.h> -#include <asm/dma.h> -#include <asm/io.h> -#include <linux/wait.h> -#include <linux/slab.h> -#include <linux/ioport.h> -#include <linux/delay.h> -#include <linux/proc_fs.h> -#include <linux/mm.h> -#include <linux/spinlock.h> - -#include "coproc.h" - -#include "ad1848.h" -#include "mpu401.h" - -/* - * I/O ports - */ -#define MIDI_DATA 0 -#define MIDI_CTRL 1 -#define HOST_CTRL 2 -#define TX_READY 0x02 -#define RX_READY 0x01 -#define HOST_DATA 3 -#define ODIE_ADDR 4 -#define ODIE_DATA 5 - -/* - * Indirect registers - */ - -#define GA_INTSTAT_REG 0 -#define GA_INTENA_REG 1 -#define GA_DMAA_REG 2 -#define GA_DMAB_REG 3 -#define GA_INTCFG_REG 4 -#define GA_DMACFG_REG 5 -#define GA_CDCFG_REG 6 -#define GA_SMCFGA_REG 7 -#define GA_SMCFGB_REG 8 -#define GA_HMCTL_REG 9 - -/* - * DMA channel identifiers (A and B) - */ - -#define SSCAPE_DMA_A 0 -#define SSCAPE_DMA_B 1 - -#define PORT(name) (devc->base+name) - -/* - * Host commands recognized by the OBP microcode - */ - -#define CMD_GEN_HOST_ACK 0x80 -#define CMD_GEN_MPU_ACK 0x81 -#define CMD_GET_BOARD_TYPE 0x82 -#define CMD_SET_CONTROL 0x88 /* Old firmware only */ -#define CMD_GET_CONTROL 0x89 /* Old firmware only */ -#define CTL_MASTER_VOL 0 -#define CTL_MIC_MODE 2 -#define CTL_SYNTH_VOL 4 -#define CTL_WAVE_VOL 7 -#define CMD_SET_EXTMIDI 0x8a -#define CMD_GET_EXTMIDI 0x8b -#define CMD_SET_MT32 0x8c -#define CMD_GET_MT32 0x8d - -#define CMD_ACK 0x80 - -#define IC_ODIE 1 -#define IC_OPUS 2 - -typedef struct sscape_info -{ - int base, irq, dma; - - int codec, codec_irq; /* required to setup pnp cards*/ - int codec_type; - int ic_type; - char* raw_buf; - unsigned long raw_buf_phys; - int buffsize; /* -------------------------- */ - spinlock_t lock; - int ok; /* Properly detected */ - int failed; - int dma_allocated; - int codec_audiodev; - int opened; - int *osp; - int my_audiodev; -} sscape_info; - -static struct sscape_info adev_info = { - 0 -}; - -static struct sscape_info *devc = &adev_info; -static int sscape_mididev = -1; - -/* Some older cards have assigned interrupt bits differently than new ones */ -static char valid_interrupts_old[] = { - 9, 7, 5, 15 -}; - -static char valid_interrupts_new[] = { - 9, 5, 7, 10 -}; - -static char *valid_interrupts = valid_interrupts_new; - -/* - * See the bottom of the driver. This can be set by spea =0/1. - */ - -#ifdef REVEAL_SPEA -static char old_hardware = 1; -#else -static char old_hardware; -#endif - -static void sleep(unsigned howlong) -{ - current->state = TASK_INTERRUPTIBLE; - schedule_timeout(howlong); -} - -static unsigned char sscape_read(struct sscape_info *devc, int reg) -{ - unsigned long flags; - unsigned char val; - - spin_lock_irqsave(&devc->lock,flags); - outb(reg, PORT(ODIE_ADDR)); - val = inb(PORT(ODIE_DATA)); - spin_unlock_irqrestore(&devc->lock,flags); - return val; -} - -static void __sscape_write(int reg, int data) -{ - outb(reg, PORT(ODIE_ADDR)); - outb(data, PORT(ODIE_DATA)); -} - -static void sscape_write(struct sscape_info *devc, int reg, int data) -{ - unsigned long flags; - - spin_lock_irqsave(&devc->lock,flags); - __sscape_write(reg, data); - spin_unlock_irqrestore(&devc->lock,flags); -} - -static unsigned char sscape_pnp_read_codec(sscape_info* devc, unsigned char reg) -{ - unsigned char res; - unsigned long flags; - - spin_lock_irqsave(&devc->lock,flags); - outb( reg, devc -> codec); - res = inb (devc -> codec + 1); - spin_unlock_irqrestore(&devc->lock,flags); - return res; - -} - -static void sscape_pnp_write_codec(sscape_info* devc, unsigned char reg, unsigned char data) -{ - unsigned long flags; - - spin_lock_irqsave(&devc->lock,flags); - outb( reg, devc -> codec); - outb( data, devc -> codec + 1); - spin_unlock_irqrestore(&devc->lock,flags); -} - -static void host_open(struct sscape_info *devc) -{ - outb((0x00), PORT(HOST_CTRL)); /* Put the board to the host mode */ -} - -static void host_close(struct sscape_info *devc) -{ - outb((0x03), PORT(HOST_CTRL)); /* Put the board to the MIDI mode */ -} - -static int host_write(struct sscape_info *devc, unsigned char *data, int count) -{ - unsigned long flags; - int i, timeout_val; - - spin_lock_irqsave(&devc->lock,flags); - /* - * Send the command and data bytes - */ - - for (i = 0; i < count; i++) - { - for (timeout_val = 10000; timeout_val > 0; timeout_val--) - if (inb(PORT(HOST_CTRL)) & TX_READY) - break; - - if (timeout_val <= 0) - { - spin_unlock_irqrestore(&devc->lock,flags); - return 0; - } - outb(data[i], PORT(HOST_DATA)); - } - spin_unlock_irqrestore(&devc->lock,flags); - return 1; -} - -static int host_read(struct sscape_info *devc) -{ - unsigned long flags; - int timeout_val; - unsigned char data; - - spin_lock_irqsave(&devc->lock,flags); - /* - * Read a byte - */ - - for (timeout_val = 10000; timeout_val > 0; timeout_val--) - if (inb(PORT(HOST_CTRL)) & RX_READY) - break; - - if (timeout_val <= 0) - { - spin_unlock_irqrestore(&devc->lock,flags); - return -1; - } - data = inb(PORT(HOST_DATA)); - spin_unlock_irqrestore(&devc->lock,flags); - return data; -} - -#if 0 /* unused */ -static int host_command1(struct sscape_info *devc, int cmd) -{ - unsigned char buf[10]; - buf[0] = (unsigned char) (cmd & 0xff); - return host_write(devc, buf, 1); -} -#endif /* unused */ - - -static int host_command2(struct sscape_info *devc, int cmd, int parm1) -{ - unsigned char buf[10]; - - buf[0] = (unsigned char) (cmd & 0xff); - buf[1] = (unsigned char) (parm1 & 0xff); - - return host_write(devc, buf, 2); -} - -static int host_command3(struct sscape_info *devc, int cmd, int parm1, int parm2) -{ - unsigned char buf[10]; - - buf[0] = (unsigned char) (cmd & 0xff); - buf[1] = (unsigned char) (parm1 & 0xff); - buf[2] = (unsigned char) (parm2 & 0xff); - return host_write(devc, buf, 3); -} - -static void set_mt32(struct sscape_info *devc, int value) -{ - host_open(devc); - host_command2(devc, CMD_SET_MT32, value ? 1 : 0); - if (host_read(devc) != CMD_ACK) - { - /* printk( "SNDSCAPE: Setting MT32 mode failed\n"); */ - } - host_close(devc); -} - -static void set_control(struct sscape_info *devc, int ctrl, int value) -{ - host_open(devc); - host_command3(devc, CMD_SET_CONTROL, ctrl, value); - if (host_read(devc) != CMD_ACK) - { - /* printk( "SNDSCAPE: Setting control (%d) failed\n", ctrl); */ - } - host_close(devc); -} - -static void do_dma(struct sscape_info *devc, int dma_chan, unsigned long buf, int blk_size, int mode) -{ - unsigned char temp; - - if (dma_chan != SSCAPE_DMA_A) - { - printk(KERN_WARNING "soundscape: Tried to use DMA channel != A. Why?\n"); - return; - } - audio_devs[devc->codec_audiodev]->flags &= ~DMA_AUTOMODE; - DMAbuf_start_dma(devc->codec_audiodev, buf, blk_size, mode); - audio_devs[devc->codec_audiodev]->flags |= DMA_AUTOMODE; - - temp = devc->dma << 4; /* Setup DMA channel select bits */ - if (devc->dma <= 3) - temp |= 0x80; /* 8 bit DMA channel */ - - temp |= 1; /* Trigger DMA */ - sscape_write(devc, GA_DMAA_REG, temp); - temp &= 0xfe; /* Clear DMA trigger */ - sscape_write(devc, GA_DMAA_REG, temp); -} - -static int verify_mpu(struct sscape_info *devc) -{ - /* - * The SoundScape board could be in three modes (MPU, 8250 and host). - * If the card is not in the MPU mode, enabling the MPU driver will - * cause infinite loop (the driver believes that there is always some - * received data in the buffer. - * - * Detect this by looking if there are more than 10 received MIDI bytes - * (0x00) in the buffer. - */ - - int i; - - for (i = 0; i < 10; i++) - { - if (inb(devc->base + HOST_CTRL) & 0x80) - return 1; - - if (inb(devc->base) != 0x00) - return 1; - } - printk(KERN_WARNING "SoundScape: The device is not in the MPU-401 mode\n"); - return 0; -} - -static int sscape_coproc_open(void *dev_info, int sub_device) -{ - if (sub_device == COPR_MIDI) - { - set_mt32(devc, 0); - if (!verify_mpu(devc)) - return -EIO; - } - return 0; -} - -static void sscape_coproc_close(void *dev_info, int sub_device) -{ - struct sscape_info *devc = dev_info; - unsigned long flags; - - spin_lock_irqsave(&devc->lock,flags); - if (devc->dma_allocated) - { - __sscape_write(GA_DMAA_REG, 0x20); /* DMA channel disabled */ - devc->dma_allocated = 0; - } - spin_unlock_irqrestore(&devc->lock,flags); - return; -} - -static void sscape_coproc_reset(void *dev_info) -{ -} - -static int sscape_download_boot(struct sscape_info *devc, unsigned char *block, int size, int flag) -{ - unsigned long flags; - unsigned char temp; - volatile int done, timeout_val; - static unsigned char codec_dma_bits; - - if (flag & CPF_FIRST) - { - /* - * First block. Have to allocate DMA and to reset the board - * before continuing. - */ - - spin_lock_irqsave(&devc->lock,flags); - codec_dma_bits = sscape_read(devc, GA_CDCFG_REG); - - if (devc->dma_allocated == 0) - devc->dma_allocated = 1; - - spin_unlock_irqrestore(&devc->lock,flags); - - sscape_write(devc, GA_HMCTL_REG, - (temp = sscape_read(devc, GA_HMCTL_REG)) & 0x3f); /*Reset */ - - for (timeout_val = 10000; timeout_val > 0; timeout_val--) - sscape_read(devc, GA_HMCTL_REG); /* Delay */ - - /* Take board out of reset */ - sscape_write(devc, GA_HMCTL_REG, - (temp = sscape_read(devc, GA_HMCTL_REG)) | 0x80); - } - /* - * Transfer one code block using DMA - */ - if (audio_devs[devc->codec_audiodev]->dmap_out->raw_buf == NULL) - { - printk(KERN_WARNING "soundscape: DMA buffer not available\n"); - return 0; - } - memcpy(audio_devs[devc->codec_audiodev]->dmap_out->raw_buf, block, size); - - spin_lock_irqsave(&devc->lock,flags); - - /******** INTERRUPTS DISABLED NOW ********/ - - do_dma(devc, SSCAPE_DMA_A, - audio_devs[devc->codec_audiodev]->dmap_out->raw_buf_phys, - size, DMA_MODE_WRITE); - - /* - * Wait until transfer completes. - */ - - done = 0; - timeout_val = 30; - while (!done && timeout_val-- > 0) - { - int resid; - - if (HZ / 50) - sleep(HZ / 50); - clear_dma_ff(devc->dma); - if ((resid = get_dma_residue(devc->dma)) == 0) - done = 1; - } - - spin_unlock_irqrestore(&devc->lock,flags); - if (!done) - return 0; - - if (flag & CPF_LAST) - { - /* - * Take the board out of reset - */ - outb((0x00), PORT(HOST_CTRL)); - outb((0x00), PORT(MIDI_CTRL)); - - temp = sscape_read(devc, GA_HMCTL_REG); - temp |= 0x40; - sscape_write(devc, GA_HMCTL_REG, temp); /* Kickstart the board */ - - /* - * Wait until the ODB wakes up - */ - spin_lock_irqsave(&devc->lock,flags); - done = 0; - timeout_val = 5 * HZ; - while (!done && timeout_val-- > 0) - { - unsigned char x; - - sleep(1); - x = inb(PORT(HOST_DATA)); - if (x == 0xff || x == 0xfe) /* OBP startup acknowledge */ - { - DDB(printk("Soundscape: Acknowledge = %x\n", x)); - done = 1; - } - } - sscape_write(devc, GA_CDCFG_REG, codec_dma_bits); - - spin_unlock_irqrestore(&devc->lock,flags); - if (!done) - { - printk(KERN_ERR "soundscape: The OBP didn't respond after code download\n"); - return 0; - } - spin_lock_irqsave(&devc->lock,flags); - done = 0; - timeout_val = 5 * HZ; - while (!done && timeout_val-- > 0) - { - sleep(1); - if (inb(PORT(HOST_DATA)) == 0xfe) /* Host startup acknowledge */ - done = 1; - } - spin_unlock_irqrestore(&devc->lock,flags); - if (!done) - { - printk(KERN_ERR "soundscape: OBP Initialization failed.\n"); - return 0; - } - printk(KERN_INFO "SoundScape board initialized OK\n"); - set_control(devc, CTL_MASTER_VOL, 100); - set_control(devc, CTL_SYNTH_VOL, 100); - -#ifdef SSCAPE_DEBUG3 - /* - * Temporary debugging aid. Print contents of the registers after - * downloading the code. - */ - { - int i; - - for (i = 0; i < 13; i++) - printk("I%d = %02x (new value)\n", i, sscape_read(devc, i)); - } -#endif - - } - return 1; -} - -static int download_boot_block(void *dev_info, copr_buffer * buf) -{ - if (buf->len <= 0 || buf->len > sizeof(buf->data)) - return -EINVAL; - - if (!sscape_download_boot(devc, buf->data, buf->len, buf->flags)) - { - printk(KERN_ERR "soundscape: Unable to load microcode block to the OBP.\n"); - return -EIO; - } - return 0; -} - -static int sscape_coproc_ioctl(void *dev_info, unsigned int cmd, void __user *arg, int local) -{ - copr_buffer *buf; - int err; - - switch (cmd) - { - case SNDCTL_COPR_RESET: - sscape_coproc_reset(dev_info); - return 0; - - case SNDCTL_COPR_LOAD: - buf = (copr_buffer *) vmalloc(sizeof(copr_buffer)); - if (buf == NULL) - return -ENOSPC; - if (copy_from_user(buf, arg, sizeof(copr_buffer))) - { - vfree(buf); - return -EFAULT; - } - err = download_boot_block(dev_info, buf); - vfree(buf); - return err; - - default: - return -EINVAL; - } -} - -static coproc_operations sscape_coproc_operations = -{ - "SoundScape M68K", - THIS_MODULE, - sscape_coproc_open, - sscape_coproc_close, - sscape_coproc_ioctl, - sscape_coproc_reset, - &adev_info -}; - -static struct resource *sscape_ports; -static int sscape_is_pnp; - -static void __init attach_sscape(struct address_info *hw_config) -{ -#ifndef SSCAPE_REGS - /* - * Config register values for Spea/V7 Media FX and Ensoniq S-2000. - * These values are card - * dependent. If you have another SoundScape based card, you have to - * find the correct values. Do the following: - * - Compile this driver with SSCAPE_DEBUG1 defined. - * - Shut down and power off your machine. - * - Boot with DOS so that the SSINIT.EXE program is run. - * - Warm boot to {Linux|SYSV|BSD} and write down the lines displayed - * when detecting the SoundScape. - * - Modify the following list to use the values printed during boot. - * Undefine the SSCAPE_DEBUG1 - */ -#define SSCAPE_REGS { \ -/* I0 */ 0x00, \ -/* I1 */ 0xf0, /* Note! Ignored. Set always to 0xf0 */ \ -/* I2 */ 0x20, /* Note! Ignored. Set always to 0x20 */ \ -/* I3 */ 0x20, /* Note! Ignored. Set always to 0x20 */ \ -/* I4 */ 0xf5, /* Ignored */ \ -/* I5 */ 0x10, \ -/* I6 */ 0x00, \ -/* I7 */ 0x2e, /* I7 MEM config A. Likely to vary between models */ \ -/* I8 */ 0x00, /* I8 MEM config B. Likely to vary between models */ \ -/* I9 */ 0x40 /* Ignored */ \ - } -#endif - - unsigned long flags; - static unsigned char regs[10] = SSCAPE_REGS; - - int i, irq_bits = 0xff; - - if (old_hardware) - { - valid_interrupts = valid_interrupts_old; - conf_printf("Ensoniq SoundScape (old)", hw_config); - } - else - conf_printf("Ensoniq SoundScape", hw_config); - - for (i = 0; i < 4; i++) - { - if (hw_config->irq == valid_interrupts[i]) - { - irq_bits = i; - break; - } - } - if (hw_config->irq > 15 || (regs[4] = irq_bits == 0xff)) - { - printk(KERN_ERR "Invalid IRQ%d\n", hw_config->irq); - release_region(devc->base, 2); - release_region(devc->base + 2, 6); - if (sscape_is_pnp) - release_region(devc->codec, 2); - return; - } - - if (!sscape_is_pnp) { - - spin_lock_irqsave(&devc->lock,flags); - /* Host interrupt enable */ - sscape_write(devc, 1, 0xf0); /* All interrupts enabled */ - /* DMA A status/trigger register */ - sscape_write(devc, 2, 0x20); /* DMA channel disabled */ - /* DMA B status/trigger register */ - sscape_write(devc, 3, 0x20); /* DMA channel disabled */ - /* Host interrupt config reg */ - sscape_write(devc, 4, 0xf0 | (irq_bits << 2) | irq_bits); - /* Don't destroy CD-ROM DMA config bits (0xc0) */ - sscape_write(devc, 5, (regs[5] & 0x3f) | (sscape_read(devc, 5) & 0xc0)); - /* CD-ROM config (WSS codec actually) */ - sscape_write(devc, 6, regs[6]); - sscape_write(devc, 7, regs[7]); - sscape_write(devc, 8, regs[8]); - /* Master control reg. Don't modify CR-ROM bits. Disable SB emul */ - sscape_write(devc, 9, (sscape_read(devc, 9) & 0xf0) | 0x08); - spin_unlock_irqrestore(&devc->lock,flags); - } -#ifdef SSCAPE_DEBUG2 - /* - * Temporary debugging aid. Print contents of the registers after - * changing them. - */ - { - int i; - - for (i = 0; i < 13; i++) - printk("I%d = %02x (new value)\n", i, sscape_read(devc, i)); - } -#endif - - if (probe_mpu401(hw_config, sscape_ports)) - hw_config->always_detect = 1; - hw_config->name = "SoundScape"; - - hw_config->irq *= -1; /* Negative value signals IRQ sharing */ - attach_mpu401(hw_config, THIS_MODULE); - hw_config->irq *= -1; /* Restore it */ - - if (hw_config->slots[1] != -1) /* The MPU driver installed itself */ - { - sscape_mididev = hw_config->slots[1]; - midi_devs[hw_config->slots[1]]->coproc = &sscape_coproc_operations; - } - sscape_write(devc, GA_INTENA_REG, 0x80); /* Master IRQ enable */ - devc->ok = 1; - devc->failed = 0; -} - -static int detect_ga(sscape_info * devc) -{ - unsigned char save; - - DDB(printk("Entered Soundscape detect_ga(%x)\n", devc->base)); - - /* - * First check that the address register of "ODIE" is - * there and that it has exactly 4 writable bits. - * First 4 bits - */ - - if ((save = inb(PORT(ODIE_ADDR))) & 0xf0) - { - DDB(printk("soundscape: Detect error A\n")); - return 0; - } - outb((0x00), PORT(ODIE_ADDR)); - if (inb(PORT(ODIE_ADDR)) != 0x00) - { - DDB(printk("soundscape: Detect error B\n")); - return 0; - } - outb((0xff), PORT(ODIE_ADDR)); - if (inb(PORT(ODIE_ADDR)) != 0x0f) - { - DDB(printk("soundscape: Detect error C\n")); - return 0; - } - outb((save), PORT(ODIE_ADDR)); - - /* - * Now verify that some indirect registers return zero on some bits. - * This may break the driver with some future revisions of "ODIE" but... - */ - - if (sscape_read(devc, 0) & 0x0c) - { - DDB(printk("soundscape: Detect error D (%x)\n", sscape_read(devc, 0))); - return 0; - } - if (sscape_read(devc, 1) & 0x0f) - { - DDB(printk("soundscape: Detect error E\n")); - return 0; - } - if (sscape_read(devc, 5) & 0x0f) - { - DDB(printk("soundscape: Detect error F\n")); - return 0; - } - return 1; -} - -static int sscape_read_host_ctrl(sscape_info* devc) -{ - return host_read(devc); -} - -static void sscape_write_host_ctrl2(sscape_info *devc, int a, int b) -{ - host_command2(devc, a, b); -} - -static int sscape_alloc_dma(sscape_info *devc) -{ - char *start_addr, *end_addr; - int dma_pagesize; - int sz, size; - struct page *page; - - if (devc->raw_buf != NULL) return 0; /* Already done */ - dma_pagesize = (devc->dma < 4) ? (64 * 1024) : (128 * 1024); - devc->raw_buf = NULL; - devc->buffsize = 8192*4; - if (devc->buffsize > dma_pagesize) devc->buffsize = dma_pagesize; - start_addr = NULL; - /* - * Now loop until we get a free buffer. Try to get smaller buffer if - * it fails. Don't accept smaller than 8k buffer for performance - * reasons. - */ - while (start_addr == NULL && devc->buffsize > PAGE_SIZE) { - for (sz = 0, size = PAGE_SIZE; size < devc->buffsize; sz++, size <<= 1); - devc->buffsize = PAGE_SIZE * (1 << sz); - start_addr = (char *) __get_free_pages(GFP_ATOMIC|GFP_DMA, sz); - if (start_addr == NULL) devc->buffsize /= 2; - } - - if (start_addr == NULL) { - printk(KERN_ERR "sscape pnp init error: Couldn't allocate DMA buffer\n"); - return 0; - } else { - /* make some checks */ - end_addr = start_addr + devc->buffsize - 1; - /* now check if it fits into the same dma-pagesize */ - - if (((long) start_addr & ~(dma_pagesize - 1)) != ((long) end_addr & ~(dma_pagesize - 1)) - || end_addr >= (char *) (MAX_DMA_ADDRESS)) { - printk(KERN_ERR "sscape pnp: Got invalid address 0x%lx for %db DMA-buffer\n", (long) start_addr, devc->buffsize); - return 0; - } - } - devc->raw_buf = start_addr; - devc->raw_buf_phys = virt_to_bus(start_addr); - - for (page = virt_to_page(start_addr); page <= virt_to_page(end_addr); page++) - SetPageReserved(page); - return 1; -} - -static void sscape_free_dma(sscape_info *devc) -{ - int sz, size; - unsigned long start_addr, end_addr; - struct page *page; - - if (devc->raw_buf == NULL) return; - for (sz = 0, size = PAGE_SIZE; size < devc->buffsize; sz++, size <<= 1); - start_addr = (unsigned long) devc->raw_buf; - end_addr = start_addr + devc->buffsize; - - for (page = virt_to_page(start_addr); page <= virt_to_page(end_addr); page++) - ClearPageReserved(page); - - free_pages((unsigned long) devc->raw_buf, sz); - devc->raw_buf = NULL; -} - -/* Intel version !!!!!!!!! */ - -static int sscape_start_dma(int chan, unsigned long physaddr, int count, int dma_mode) -{ - unsigned long flags; - - flags = claim_dma_lock(); - disable_dma(chan); - clear_dma_ff(chan); - set_dma_mode(chan, dma_mode); - set_dma_addr(chan, physaddr); - set_dma_count(chan, count); - enable_dma(chan); - release_dma_lock(flags); - return 0; -} - -static void sscape_pnp_start_dma(sscape_info* devc, int arg ) -{ - int reg; - if (arg == 0) reg = 2; - else reg = 3; - - sscape_write(devc, reg, sscape_read( devc, reg) | 0x01); - sscape_write(devc, reg, sscape_read( devc, reg) & 0xFE); -} - -static int sscape_pnp_wait_dma (sscape_info* devc, int arg ) -{ - int reg; - unsigned long i; - unsigned char d; - - if (arg == 0) reg = 2; - else reg = 3; - - sleep ( 1 ); - i = 0; - do { - d = sscape_read(devc, reg) & 1; - if ( d == 1) break; - i++; - } while (i < 500000); - d = sscape_read(devc, reg) & 1; - return d; -} - -static int sscape_pnp_alloc_dma(sscape_info* devc) -{ - /* printk(KERN_INFO "sscape: requesting dma\n"); */ - if (request_dma(devc -> dma, "sscape")) return 0; - /* printk(KERN_INFO "sscape: dma channel allocated\n"); */ - if (!sscape_alloc_dma(devc)) { - free_dma(devc -> dma); - return 0; - }; - return 1; -} - -static void sscape_pnp_free_dma(sscape_info* devc) -{ - sscape_free_dma( devc); - free_dma(devc -> dma ); - /* printk(KERN_INFO "sscape: dma released\n"); */ -} - -static int sscape_pnp_upload_file(sscape_info* devc, char* fn) -{ - int done = 0; - int timeout_val; - char* data,*dt; - int len,l; - unsigned long flags; - - sscape_write( devc, 9, sscape_read(devc, 9 ) & 0x3F ); - sscape_write( devc, 2, (devc -> dma << 4) | 0x80 ); - sscape_write( devc, 3, 0x20 ); - sscape_write( devc, 9, sscape_read( devc, 9 ) | 0x80 ); - - len = mod_firmware_load(fn, &data); - if (len == 0) { - printk(KERN_ERR "sscape: file not found: %s\n", fn); - return 0; - } - dt = data; - spin_lock_irqsave(&devc->lock,flags); - while ( len > 0 ) { - if (len > devc -> buffsize) l = devc->buffsize; - else l = len; - len -= l; - memcpy(devc->raw_buf, dt, l); dt += l; - sscape_start_dma(devc->dma, devc->raw_buf_phys, l, 0x48); - sscape_pnp_start_dma ( devc, 0 ); - if (sscape_pnp_wait_dma ( devc, 0 ) == 0) { - spin_unlock_irqrestore(&devc->lock,flags); - return 0; - } - } - - spin_unlock_irqrestore(&devc->lock,flags); - vfree(data); - - outb(0, devc -> base + 2); - outb(0, devc -> base); - - sscape_write ( devc, 9, sscape_read( devc, 9 ) | 0x40); - - timeout_val = 5 * HZ; - while (!done && timeout_val-- > 0) - { - unsigned char x; - sleep(1); - x = inb( devc -> base + 3); - if (x == 0xff || x == 0xfe) /* OBP startup acknowledge */ - { - //printk(KERN_ERR "Soundscape: Acknowledge = %x\n", x); - done = 1; - } - } - timeout_val = 5 * HZ; - done = 0; - while (!done && timeout_val-- > 0) - { - unsigned char x; - sleep(1); - x = inb( devc -> base + 3); - if (x == 0xfe) /* OBP startup acknowledge */ - { - //printk(KERN_ERR "Soundscape: Acknowledge = %x\n", x); - done = 1; - } - } - - if ( !done ) printk(KERN_ERR "soundscape: OBP Initialization failed.\n"); - - sscape_write( devc, 2, devc->ic_type == IC_ODIE ? 0x70 : 0x40); - sscape_write( devc, 3, (devc -> dma << 4) + 0x80); - return 1; -} - -static void __init sscape_pnp_init_hw(sscape_info* devc) -{ - unsigned char midi_irq = 0, sb_irq = 0; - unsigned i; - static char code_file_name[23] = "/sndscape/sndscape.cox"; - - int sscape_joystic_enable = 0x7f; - int sscape_mic_enable = 0; - int sscape_ext_midi = 0; - - if ( !sscape_pnp_alloc_dma(devc) ) { - printk(KERN_ERR "sscape: faild to allocate dma\n"); - return; - } - - for (i = 0; i < 4; i++) { - if ( devc -> irq == valid_interrupts[i] ) - midi_irq = i; - if ( devc -> codec_irq == valid_interrupts[i] ) - sb_irq = i; - } - - sscape_write( devc, 5, 0x50); - sscape_write( devc, 7, 0x2e); - sscape_write( devc, 8, 0x00); - - sscape_write( devc, 2, devc->ic_type == IC_ODIE ? 0x70 : 0x40); - sscape_write( devc, 3, ( devc -> dma << 4) | 0x80); - - sscape_write (devc, 4, 0xF0 | (midi_irq<<2) | midi_irq); - - i = 0x10; //sscape_read(devc, 9) & (devc->ic_type == IC_ODIE ? 0xf0 : 0xc0); - if (sscape_joystic_enable) i |= 8; - - sscape_write (devc, 9, i); - sscape_write (devc, 6, 0x80); - sscape_write (devc, 1, 0x80); - - if (devc -> codec_type == 2) { - sscape_pnp_write_codec( devc, 0x0C, 0x50); - sscape_pnp_write_codec( devc, 0x10, sscape_pnp_read_codec( devc, 0x10) & 0x3F); - sscape_pnp_write_codec( devc, 0x11, sscape_pnp_read_codec( devc, 0x11) | 0xC0); - sscape_pnp_write_codec( devc, 29, 0x20); - } - - if (sscape_pnp_upload_file(devc, "/sndscape/scope.cod") == 0 ) { - printk(KERN_ERR "sscape: faild to upload file /sndscape/scope.cod\n"); - sscape_pnp_free_dma(devc); - return; - } - - i = sscape_read_host_ctrl( devc ); - - if ( (i & 0x0F) > 7 ) { - printk(KERN_ERR "sscape: scope.cod faild\n"); - sscape_pnp_free_dma(devc); - return; - } - if ( i & 0x10 ) sscape_write( devc, 7, 0x2F); - code_file_name[21] = (char) ( i & 0x0F) + 0x30; - if (sscape_pnp_upload_file( devc, code_file_name) == 0) { - printk(KERN_ERR "sscape: faild to upload file %s\n", code_file_name); - sscape_pnp_free_dma(devc); - return; - } - - if (devc->ic_type != IC_ODIE) { - sscape_pnp_write_codec( devc, 10, (sscape_pnp_read_codec(devc, 10) & 0x7f) | - ( sscape_mic_enable == 0 ? 0x00 : 0x80) ); - } - sscape_write_host_ctrl2( devc, 0x84, 0x64 ); /* MIDI volume */ - sscape_write_host_ctrl2( devc, 0x86, 0x64 ); /* MIDI volume?? */ - sscape_write_host_ctrl2( devc, 0x8A, sscape_ext_midi); - - sscape_pnp_write_codec ( devc, 6, 0x3f ); //WAV_VOL - sscape_pnp_write_codec ( devc, 7, 0x3f ); //WAV_VOL - sscape_pnp_write_codec ( devc, 2, 0x1F ); //WD_CDXVOLL - sscape_pnp_write_codec ( devc, 3, 0x1F ); //WD_CDXVOLR - - if (devc -> codec_type == 1) { - sscape_pnp_write_codec ( devc, 4, 0x1F ); - sscape_pnp_write_codec ( devc, 5, 0x1F ); - sscape_write_host_ctrl2( devc, 0x88, sscape_mic_enable); - } else { - int t; - sscape_pnp_write_codec ( devc, 0x10, 0x1F << 1); - sscape_pnp_write_codec ( devc, 0x11, 0xC0 | (0x1F << 1)); - - t = sscape_pnp_read_codec( devc, 0x00) & 0xDF; - if ( (sscape_mic_enable == 0)) t |= 0; - else t |= 0x20; - sscape_pnp_write_codec ( devc, 0x00, t); - t = sscape_pnp_read_codec( devc, 0x01) & 0xDF; - if ( (sscape_mic_enable == 0) ) t |= 0; - else t |= 0x20; - sscape_pnp_write_codec ( devc, 0x01, t); - sscape_pnp_write_codec ( devc, 0x40 | 29 , 0x20); - outb(0, devc -> codec); - } - if (devc -> ic_type == IC_OPUS ) { - int i = sscape_read( devc, 9 ); - sscape_write( devc, 9, i | 3 ); - sscape_write( devc, 3, 0x40); - - if (request_region(0x228, 1, "sscape setup junk")) { - outb(0, 0x228); - release_region(0x228,1); - } - sscape_write( devc, 3, (devc -> dma << 4) | 0x80); - sscape_write( devc, 9, i ); - } - - host_close ( devc ); - sscape_pnp_free_dma(devc); -} - -static int __init detect_sscape_pnp(sscape_info* devc) -{ - long i, irq_bits = 0xff; - unsigned int d; - - DDB(printk("Entered detect_sscape_pnp(%x)\n", devc->base)); - - if (!request_region(devc->codec, 2, "sscape codec")) { - printk(KERN_ERR "detect_sscape_pnp: port %x is not free\n", devc->codec); - return 0; - } - - if ((inb(devc->base + 2) & 0x78) != 0) - goto fail; - - d = inb ( devc -> base + 4) & 0xF0; - if (d & 0x80) - goto fail; - - if (d == 0) { - devc->codec_type = 1; - devc->ic_type = IC_ODIE; - } else if ( (d & 0x60) != 0) { - devc->codec_type = 2; - devc->ic_type = IC_OPUS; - } else if ( (d & 0x40) != 0) { /* WTF? */ - devc->codec_type = 2; - devc->ic_type = IC_ODIE; - } else - goto fail; - - sscape_is_pnp = 1; - - outb(0xFA, devc -> base+4); - if ((inb( devc -> base+4) & 0x9F) != 0x0A) - goto fail; - outb(0xFE, devc -> base+4); - if ( (inb(devc -> base+4) & 0x9F) != 0x0E) - goto fail; - if ( (inb(devc -> base+5) & 0x9F) != 0x0E) - goto fail; - - if (devc->codec_type == 2) { - if (devc->codec != devc->base + 8) { - printk("soundscape warning: incorrect codec port specified\n"); - goto fail; - } - d = 0x10 | (sscape_read(devc, 9) & 0xCF); - sscape_write(devc, 9, d); - sscape_write(devc, 6, 0x80); - } else { - //todo: check codec is not base + 8 - } - - d = (sscape_read(devc, 9) & 0x3F) | 0xC0; - sscape_write(devc, 9, d); - - for (i = 0; i < 550000; i++) - if ( !(inb(devc -> codec) & 0x80) ) break; - - d = inb(devc -> codec); - if (d & 0x80) - goto fail; - if ( inb(devc -> codec + 2) == 0xFF) - goto fail; - - sscape_write(devc, 9, sscape_read(devc, 9) & 0x3F ); - - d = inb(devc -> codec) & 0x80; - if ( d == 0) { - printk(KERN_INFO "soundscape: hardware detected\n"); - valid_interrupts = valid_interrupts_new; - } else { - printk(KERN_INFO "soundscape: board looks like media fx\n"); - valid_interrupts = valid_interrupts_old; - old_hardware = 1; - } - - sscape_write( devc, 9, 0xC0 | (sscape_read(devc, 9) & 0x3F) ); - - for (i = 0; i < 550000; i++) - if ( !(inb(devc -> codec) & 0x80)) - break; - - sscape_pnp_init_hw(devc); - - for (i = 0; i < 4; i++) - { - if (devc->codec_irq == valid_interrupts[i]) { - irq_bits = i; - break; - } - } - sscape_write(devc, GA_INTENA_REG, 0x00); - sscape_write(devc, GA_DMACFG_REG, 0x50); - sscape_write(devc, GA_DMAA_REG, 0x70); - sscape_write(devc, GA_DMAB_REG, 0x20); - sscape_write(devc, GA_INTCFG_REG, 0xf0); - sscape_write(devc, GA_CDCFG_REG, 0x89 | (devc->dma << 4) | (irq_bits << 1)); - - sscape_pnp_write_codec( devc, 0, sscape_pnp_read_codec( devc, 0) | 0x20); - sscape_pnp_write_codec( devc, 0, sscape_pnp_read_codec( devc, 1) | 0x20); - - return 1; -fail: - release_region(devc->codec, 2); - return 0; -} - -static int __init probe_sscape(struct address_info *hw_config) -{ - devc->base = hw_config->io_base; - devc->irq = hw_config->irq; - devc->dma = hw_config->dma; - devc->osp = hw_config->osp; - -#ifdef SSCAPE_DEBUG1 - /* - * Temporary debugging aid. Print contents of the registers before - * changing them. - */ - { - int i; - - for (i = 0; i < 13; i++) - printk("I%d = %02x (old value)\n", i, sscape_read(devc, i)); - } -#endif - devc->failed = 1; - - sscape_ports = request_region(devc->base, 2, "mpu401"); - if (!sscape_ports) - return 0; - - if (!request_region(devc->base + 2, 6, "SoundScape")) { - release_region(devc->base, 2); - return 0; - } - - if (!detect_ga(devc)) { - if (detect_sscape_pnp(devc)) - return 1; - release_region(devc->base, 2); - release_region(devc->base + 2, 6); - return 0; - } - - if (old_hardware) /* Check that it's really an old Spea/Reveal card. */ - { - unsigned char tmp; - int cc; - - if (!((tmp = sscape_read(devc, GA_HMCTL_REG)) & 0xc0)) - { - sscape_write(devc, GA_HMCTL_REG, tmp | 0x80); - for (cc = 0; cc < 200000; ++cc) - inb(devc->base + ODIE_ADDR); - } - } - return 1; -} - -static int __init init_ss_ms_sound(struct address_info *hw_config) -{ - int i, irq_bits = 0xff; - int ad_flags = 0; - struct resource *ports; - - if (devc->failed) - { - printk(KERN_ERR "soundscape: Card not detected\n"); - return 0; - } - if (devc->ok == 0) - { - printk(KERN_ERR "soundscape: Invalid initialization order.\n"); - return 0; - } - for (i = 0; i < 4; i++) - { - if (hw_config->irq == valid_interrupts[i]) - { - irq_bits = i; - break; - } - } - if (irq_bits == 0xff) { - printk(KERN_ERR "soundscape: Invalid MSS IRQ%d\n", hw_config->irq); - return 0; - } - - if (old_hardware) - ad_flags = 0x12345677; /* Tell that we may have a CS4248 chip (Spea-V7 Media FX) */ - else if (sscape_is_pnp) - ad_flags = 0x87654321; /* Tell that we have a soundscape pnp with 1845 chip */ - - ports = request_region(hw_config->io_base, 4, "ad1848"); - if (!ports) { - printk(KERN_ERR "soundscape: ports busy\n"); - return 0; - } - - if (!ad1848_detect(ports, &ad_flags, hw_config->osp)) { - release_region(hw_config->io_base, 4); - return 0; - } - - if (!sscape_is_pnp) /*pnp is already setup*/ - { - /* - * Setup the DMA polarity. - */ - sscape_write(devc, GA_DMACFG_REG, 0x50); - - /* - * Take the gate-array off of the DMA channel. - */ - sscape_write(devc, GA_DMAB_REG, 0x20); - - /* - * Init the AD1848 (CD-ROM) config reg. - */ - sscape_write(devc, GA_CDCFG_REG, 0x89 | (hw_config->dma << 4) | (irq_bits << 1)); - } - - if (hw_config->irq == devc->irq) - printk(KERN_WARNING "soundscape: Warning! The WSS mode can't share IRQ with MIDI\n"); - - hw_config->slots[0] = ad1848_init( - sscape_is_pnp ? "SoundScape" : "SoundScape PNP", - ports, - hw_config->irq, - hw_config->dma, - hw_config->dma, - 0, - devc->osp, - THIS_MODULE); - - - if (hw_config->slots[0] != -1) /* The AD1848 driver installed itself */ - { - audio_devs[hw_config->slots[0]]->coproc = &sscape_coproc_operations; - devc->codec_audiodev = hw_config->slots[0]; - devc->my_audiodev = hw_config->slots[0]; - - /* Set proper routings here (what are they) */ - AD1848_REROUTE(SOUND_MIXER_LINE1, SOUND_MIXER_LINE); - } - -#ifdef SSCAPE_DEBUG5 - /* - * Temporary debugging aid. Print contents of the registers - * after the AD1848 device has been initialized. - */ - { - int i; - - for (i = 0; i < 13; i++) - printk("I%d = %02x\n", i, sscape_read(devc, i)); - } -#endif - return 1; -} - -static void __exit unload_sscape(struct address_info *hw_config) -{ - release_region(devc->base + 2, 6); - unload_mpu401(hw_config); - if (sscape_is_pnp) - release_region(devc->codec, 2); -} - -static void __exit unload_ss_ms_sound(struct address_info *hw_config) -{ - ad1848_unload(hw_config->io_base, - hw_config->irq, - devc->dma, - devc->dma, - 0); - sound_unload_audiodev(hw_config->slots[0]); -} - -static struct address_info cfg; -static struct address_info cfg_mpu; - -static int __initdata spea = -1; -static int mss = 0; -static int __initdata dma = -1; -static int __initdata irq = -1; -static int __initdata io = -1; -static int __initdata mpu_irq = -1; -static int __initdata mpu_io = -1; - -module_param(dma, int, 0); -module_param(irq, int, 0); -module_param(io, int, 0); -module_param(spea, int, 0); /* spea=0/1 set the old_hardware */ -module_param(mpu_irq, int, 0); -module_param(mpu_io, int, 0); -module_param(mss, int, 0); - -static int __init init_sscape(void) -{ - printk(KERN_INFO "Soundscape driver Copyright (C) by Hannu Savolainen 1993-1996\n"); - - cfg.irq = irq; - cfg.dma = dma; - cfg.io_base = io; - - cfg_mpu.irq = mpu_irq; - cfg_mpu.io_base = mpu_io; - /* WEH - Try to get right dma channel */ - cfg_mpu.dma = dma; - - devc->codec = cfg.io_base; - devc->codec_irq = cfg.irq; - devc->codec_type = 0; - devc->ic_type = 0; - devc->raw_buf = NULL; - spin_lock_init(&devc->lock); - - if (cfg.dma == -1 || cfg.irq == -1 || cfg.io_base == -1) { - printk(KERN_ERR "DMA, IRQ, and IO port must be specified.\n"); - return -EINVAL; - } - - if (cfg_mpu.irq == -1 && cfg_mpu.io_base != -1) { - printk(KERN_ERR "MPU_IRQ must be specified if MPU_IO is set.\n"); - return -EINVAL; - } - - if(spea != -1) { - old_hardware = spea; - printk(KERN_INFO "Forcing %s hardware support.\n", - spea?"new":"old"); - } - if (probe_sscape(&cfg_mpu) == 0) - return -ENODEV; - - attach_sscape(&cfg_mpu); - - mss = init_ss_ms_sound(&cfg); - - return 0; -} - -static void __exit cleanup_sscape(void) -{ - if (mss) - unload_ss_ms_sound(&cfg); - unload_sscape(&cfg_mpu); -} - -module_init(init_sscape); -module_exit(cleanup_sscape); - -#ifndef MODULE -static int __init setup_sscape(char *str) -{ - /* io, irq, dma, mpu_io, mpu_irq */ - int ints[6]; - - str = get_options(str, ARRAY_SIZE(ints), ints); - - io = ints[1]; - irq = ints[2]; - dma = ints[3]; - mpu_io = ints[4]; - mpu_irq = ints[5]; - - return 1; -} - -__setup("sscape=", setup_sscape); -#endif -MODULE_LICENSE("GPL"); ---------------------------------------------------------------------- Nie dla nich ciepla praca za biurkiem. Sprawdz >>> http://link.interia.pl/f2383

2 1

[alsa-devel] [PATCH] ALSA: Cleanup redundant tests on unsigned
by Roel Kluin 30 Oct '09

30 Oct '09

The variables are unsigned so the test `>= 0' is always true, the `< 0' test always fails. In these cases the other part of the test catches wrapped values. In dac_audio_write() there does not occur a test for wrapped values, but the test appears redundant. Signed-off-by: Roel Kluin <roel.kluin(a)gmail.com> --- I think the test in dac_audio_write() can go, or should it change? sound/oss/sh_dac_audio.c | 3 --- sound/pci/ca0106/ca0106_proc.c | 4 ++-- sound/pci/ctxfi/ctatc.c | 2 +- sound/pci/emu10k1/emu10k1x.c | 3 +-- sound/pci/emu10k1/emuproc.c | 4 ++-- sound/pci/emu10k1/io.c | 2 +- sound/soc/codecs/tlv320aic23.c | 2 +- 7 files changed, 8 insertions(+), 12 deletions(-) diff --git a/sound/oss/sh_dac_audio.c b/sound/oss/sh_dac_audio.c index b2ed875..4153752 100644 --- a/sound/oss/sh_dac_audio.c +++ b/sound/oss/sh_dac_audio.c @@ -164,9 +164,6 @@ static ssize_t dac_audio_write(struct file *file, const char *buf, size_t count, int free; int nbytes; - if (count < 0) - return -EINVAL; - if (!count) { dac_audio_sync(); return 0; diff --git a/sound/pci/ca0106/ca0106_proc.c b/sound/pci/ca0106/ca0106_proc.c index c62b7d1..15523e6 100644 --- a/sound/pci/ca0106/ca0106_proc.c +++ b/sound/pci/ca0106/ca0106_proc.c @@ -304,7 +304,7 @@ static void snd_ca0106_proc_reg_write32(struct snd_info_entry *entry, while (!snd_info_get_line(buffer, line, sizeof(line))) { if (sscanf(line, "%x %x", &reg, &val) != 2) continue; - if ((reg < 0x40) && (reg >=0) && (val <= 0xffffffff) ) { + if (reg < 0x40 && val <= 0xffffffff) { spin_lock_irqsave(&emu->emu_lock, flags); outl(val, emu->port + (reg & 0xfffffffc)); spin_unlock_irqrestore(&emu->emu_lock, flags); @@ -405,7 +405,7 @@ static void snd_ca0106_proc_reg_write(struct snd_info_entry *entry, while (!snd_info_get_line(buffer, line, sizeof(line))) { if (sscanf(line, "%x %x %x", &reg, &channel_id, &val) != 3) continue; - if ((reg < 0x80) && (reg >=0) && (val <= 0xffffffff) && (channel_id >=0) && (channel_id <= 3) ) + if (reg < 0x80 && val <= 0xffffffff && channel_id <= 3) snd_ca0106_ptr_write(emu, reg, channel_id, val); } } diff --git a/sound/pci/ctxfi/ctatc.c b/sound/pci/ctxfi/ctatc.c index 7545464..cb65bd0 100644 --- a/sound/pci/ctxfi/ctatc.c +++ b/sound/pci/ctxfi/ctatc.c @@ -240,7 +240,7 @@ static int select_rom(unsigned int pitch) } else if (pitch == 0x02000000) { /* pitch == 2 */ return 3; - } else if (pitch >= 0x0 && pitch <= 0x08000000) { + } else if (pitch <= 0x08000000) { /* 0 <= pitch <= 8 */ return 0; } else { diff --git a/sound/pci/emu10k1/emu10k1x.c b/sound/pci/emu10k1/emu10k1x.c index 36e08bd..6b8ae7b 100644 --- a/sound/pci/emu10k1/emu10k1x.c +++ b/sound/pci/emu10k1/emu10k1x.c @@ -1040,8 +1040,7 @@ static void snd_emu10k1x_proc_reg_write(struct snd_info_entry *entry, if (sscanf(line, "%x %x %x", &reg, &channel_id, &val) != 3) continue; - if ((reg < 0x49) && (reg >= 0) && (val <= 0xffffffff) - && (channel_id >= 0) && (channel_id <= 2) ) + if (reg < 0x49 && val <= 0xffffffff && channel_id <= 2) snd_emu10k1x_ptr_write(emu, reg, channel_id, val); } } diff --git a/sound/pci/emu10k1/emuproc.c b/sound/pci/emu10k1/emuproc.c index 216f974..baa7cd5 100644 --- a/sound/pci/emu10k1/emuproc.c +++ b/sound/pci/emu10k1/emuproc.c @@ -451,7 +451,7 @@ static void snd_emu_proc_io_reg_write(struct snd_info_entry *entry, while (!snd_info_get_line(buffer, line, sizeof(line))) { if (sscanf(line, "%x %x", &reg, &val) != 2) continue; - if ((reg < 0x40) && (reg >= 0) && (val <= 0xffffffff) ) { + if (reg < 0x40 && val <= 0xffffffff) { spin_lock_irqsave(&emu->emu_lock, flags); outl(val, emu->port + (reg & 0xfffffffc)); spin_unlock_irqrestore(&emu->emu_lock, flags); @@ -527,7 +527,7 @@ static void snd_emu_proc_ptr_reg_write(struct snd_info_entry *entry, while (!snd_info_get_line(buffer, line, sizeof(line))) { if (sscanf(line, "%x %x %x", &reg, &channel_id, &val) != 3) continue; - if ((reg < 0xa0) && (reg >= 0) && (val <= 0xffffffff) && (channel_id >= 0) && (channel_id <= 3) ) + if (reg < 0xa0 && val <= 0xffffffff && channel_id <= 3) snd_ptr_write(emu, iobase, reg, channel_id, val); } } diff --git a/sound/pci/emu10k1/io.c b/sound/pci/emu10k1/io.c index c1a5aa1..5ef7080 100644 --- a/sound/pci/emu10k1/io.c +++ b/sound/pci/emu10k1/io.c @@ -256,7 +256,7 @@ int snd_emu1010_fpga_write(struct snd_emu10k1 * emu, u32 reg, u32 value) if (reg > 0x3f) return 1; reg += 0x40; /* 0x40 upwards are registers. */ - if (value < 0 || value > 0x3f) /* 0 to 0x3f are values */ + if (value > 0x3f) /* 0 to 0x3f are values */ return 1; spin_lock_irqsave(&emu->emu_lock, flags); outl(reg, emu->port + A_IOCFG); diff --git a/sound/soc/codecs/tlv320aic23.c b/sound/soc/codecs/tlv320aic23.c index 0b8dcb5..35606ae 100644 --- a/sound/soc/codecs/tlv320aic23.c +++ b/sound/soc/codecs/tlv320aic23.c @@ -85,7 +85,7 @@ static int tlv320aic23_write(struct snd_soc_codec *codec, unsigned int reg, * of data into val */ - if ((reg < 0 || reg > 9) && (reg != 15)) { + if (reg > 9 && reg != 15) { printk(KERN_WARNING "%s Invalid register R%u\n", __func__, reg); return -1; }

2 1

Re: [alsa-devel] [patch] ALSA: VIA HDA: Add support for VT1818S
by Takashi Iwai 30 Oct '09

30 Oct '09

At Tue, 20 Oct 2009 13:18:04 +0800, lydiawang wrote: > > From: Lydia Wang <lydiawang(a)viatech.com.cn> > Subject: ALSA: VIA HDA: Add support for VT1818S. > > Add support for VT1818S codec, which is similiar with VT1708S. > > Signed-off-by: Lydia Wang <lydiawang(a)viatech.com.cn> Thanks, applied now. BTW, you don't have to log your each change in the source code like: > /* 2009-04-14 Lydai Wang Add support for VT1828S and VT2020 */ > /* 2009-07-08 Lydia Wang Add support for VT2002P */ > /* 2009-07-21 Lydia Wang Add support for VT1812 */ > +/* 2009-09-19 Lydia Wang Add support for VT1818S */ Each change is recorded in GIT log. Takashi

1 0

[alsa-devel] [PATCH 2/14] sound: Move dereference after NULL test and drop unnecessary NULL tests
by Julia Lawall 30 Oct '09

30 Oct '09

From: Julia Lawall <julia(a)diku.dk> In pcm.c, if the NULL test on pcm is needed, then the dereference should be after the NULL test. In dummy.c and ali5451.c, the context of the calls to snd_card_dummy_new_mixer and snd_ali_free_voice show that dummy and pvoice, respectively cannot be NULL. A simplified version of the semantic match that detects this problem is as follows (http://coccinelle.lip6.fr/): // <smpl> @match exists@ expression x, E; identifier fld; @@ * x->fld ... when != $x = E\|&x$ * x == NULL // </smpl> Signed-off-by: Julia Lawall <julia(a)diku.dk> --- sound/core/pcm.c | 5 +++-- sound/drivers/dummy.c | 2 -- sound/pci/ali5451/ali5451.c | 2 +- diff --git a/sound/core/pcm.c b/sound/core/pcm.c index 0c14401..c69c60b 100644 --- a/sound/core/pcm.c +++ b/sound/core/pcm.c @@ -953,11 +953,12 @@ static int snd_pcm_dev_register(struct snd_device *device) struct snd_pcm_substream *substream; struct snd_pcm_notify *notify; char str[16]; - struct snd_pcm *pcm = device->device_data; + struct snd_pcm *pcm; struct device *dev; - if (snd_BUG_ON(!pcm || !device)) + if (snd_BUG_ON(!device || !device->device_data)) return -ENXIO; + pcm = device->device_data; mutex_lock(&register_mutex); err = snd_pcm_add(pcm); if (err) { diff --git a/sound/drivers/dummy.c b/sound/drivers/dummy.c index 6ba066c..146ef00 100644 --- a/sound/drivers/dummy.c +++ b/sound/drivers/dummy.c @@ -808,8 +808,6 @@ static int __devinit snd_card_dummy_new_mixer(struct snd_dummy *dummy) unsigned int idx; int err; - if (snd_BUG_ON(!dummy)) - return -EINVAL; spin_lock_init(&dummy->mixer_lock); strcpy(card->mixername, "Dummy Mixer"); diff --git a/sound/pci/ali5451/ali5451.c b/sound/pci/ali5451/ali5451.c index b458d20..aaf4da6 100644 --- a/sound/pci/ali5451/ali5451.c +++ b/sound/pci/ali5451/ali5451.c @@ -973,7 +973,7 @@ static void snd_ali_free_voice(struct snd_ali * codec, void *private_data; snd_ali_printk("free_voice: channel=%d\n",pvoice->number); - if (pvoice == NULL || !pvoice->use) + if (!pvoice->use) return; snd_ali_clear_voices(codec, pvoice->number, pvoice->number); spin_lock_irq(&codec->voice_alloc);

2 1

[alsa-devel] ASoC updates for 2.6.32
by Mark Brown 30 Oct '09

30 Oct '09

Welcome back! There's a couple of small updates below, one is just enhanced help text and the other fixes support for basic AC97 devices. The following changes since commit 8e8b2d676f3f7c1246b108793fb5690e6c6fcd26: Eero Nurkkala (1): ASoC: Serialize access to dapm_power_widgets() are available in the git repository at: git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound-2.6.git for-2.6.32 Barry Song (1): ASoC: Fix possible codec_dai->ops NULL pointer problems Janusz Krzysztofik (1): ASoC: Amstrad Delta: add info about the line discipline requirement to Kconfig help text sound/soc/omap/Kconfig | 13 ++++++++++++- sound/soc/soc-core.c | 11 ++++++++--- 2 files changed, 20 insertions(+), 4 deletions(-)

2 2

[alsa-devel] ASoC update for 2.6.32
by Mark Brown 30 Oct '09

30 Oct '09

The following changes since commit 8e8b2d676f3f7c1246b108793fb5690e6c6fcd26: Eero Nurkkala (1): ASoC: Serialize access to dapm_power_widgets() are available in the git repository at: git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound-2.6.git for-2.6.32 Barry Song (1): ASoC: Fix possible codec_dai->ops NULL pointer problems sound/soc/soc-core.c | 11 ++++++++--- 1 files changed, 8 insertions(+), 3 deletions(-)

2 2

[alsa-devel] [PATCH 00/11] Intel IbexPeak HDMI codec support
by Wu Fengguang 30 Oct '09

30 Oct '09

Hi Takashi, This series adds support for the Intel IbexPeak HDMI codec, which can connect up to 3 monitors and support 2 independant A/V pipes. The patches are tested OK on IbexPeak and G45. DisplayPort is also working with another in-house KMS patch. However we have not tested dual monitor configurations (which should be rare for now). Thanks, Fengguang

2 12

[alsa-devel] [PATCH] ASoC: sh: FSI: Remove DMA support
by Kuninori Morimoto 30 Oct '09

30 Oct '09

SuperH FSI device have the hardware limitation to use DMA. If DMA is used, LCD output will be broken. Maybe there are some solution. But I don't know how to do it now. This patch remove DMA support and use soft transfer. Signed-off-by: Kuninori Morimoto <morimoto.kuninori(a)renesas.com> --- sound/soc/sh/Kconfig | 1 - sound/soc/sh/fsi.c | 141 +++++++------------------------------------------- 2 files changed, 20 insertions(+), 122 deletions(-) diff --git a/sound/soc/sh/Kconfig b/sound/soc/sh/Kconfig index e7e8297..8072a6d 100644 --- a/sound/soc/sh/Kconfig +++ b/sound/soc/sh/Kconfig @@ -23,7 +23,6 @@ config SND_SOC_SH4_SSI config SND_SOC_SH4_FSI tristate "SH4 FSI support" depends on CPU_SUBTYPE_SH7724 - select SH_DMA help This option enables FSI sound support diff --git a/sound/soc/sh/fsi.c b/sound/soc/sh/fsi.c index 4412324..9742a28 100644 --- a/sound/soc/sh/fsi.c +++ b/sound/soc/sh/fsi.c @@ -26,8 +26,6 @@ #include <sound/pcm_params.h> #include <sound/sh_fsi.h> #include <asm/atomic.h> -#include <asm/dma.h> -#include <asm/dma-sh.h> #define DO_FMT 0x0000 #define DOFF_CTL 0x0004 @@ -97,7 +95,6 @@ struct fsi_priv { int fifo_max; int chan; - int dma_chan; int byte_offset; int period_len; @@ -308,62 +305,6 @@ static int fsi_get_fifo_residue(struct fsi_priv *fsi, int is_play) return residue; } -static int fsi_get_residue(struct fsi_priv *fsi, int is_play) -{ - int residue; - int width; - struct snd_pcm_runtime *runtime; - - runtime = fsi->substream->runtime; - - /* get 1 channel data width */ - width = frames_to_bytes(runtime, 1) / fsi->chan; - - if (2 == width) - residue = fsi_get_fifo_residue(fsi, is_play); - else - residue = get_dma_residue(fsi->dma_chan); - - return residue; -} - -/************************************************************************ - - - basic dma function - - -************************************************************************/ -#define PORTA_DMA 0 -#define PORTB_DMA 1 - -static int fsi_get_dma_chan(void) -{ - if (0 != request_dma(PORTA_DMA, "fsia")) - return -EIO; - - if (0 != request_dma(PORTB_DMA, "fsib")) { - free_dma(PORTA_DMA); - return -EIO; - } - - master->fsia.dma_chan = PORTA_DMA; - master->fsib.dma_chan = PORTB_DMA; - - return 0; -} - -static void fsi_free_dma_chan(void) -{ - dma_wait_for_completion(PORTA_DMA); - dma_wait_for_completion(PORTB_DMA); - free_dma(PORTA_DMA); - free_dma(PORTB_DMA); - - master->fsia.dma_chan = -1; - master->fsib.dma_chan = -1; -} - /************************************************************************ @@ -435,44 +376,6 @@ static void fsi_soft_all_reset(void) mdelay(10); } -static void fsi_16data_push(struct fsi_priv *fsi, - struct snd_pcm_runtime *runtime, - int send) -{ - u16 *dma_start; - u32 snd; - int i; - - /* get dma start position for FSI */ - dma_start = (u16 *)runtime->dma_area; - dma_start += fsi->byte_offset / 2; - - /* - * soft dma - * FSI can not use DMA when 16bpp - */ - for (i = 0; i < send; i++) { - snd = (u32)dma_start[i]; - fsi_reg_write(fsi, DODT, snd << 8); - } -} - -static void fsi_32data_push(struct fsi_priv *fsi, - struct snd_pcm_runtime *runtime, - int send) -{ - u32 *dma_start; - - /* get dma start position for FSI */ - dma_start = (u32 *)runtime->dma_area; - dma_start += fsi->byte_offset / 4; - - dma_wait_for_completion(fsi->dma_chan); - dma_configure_channel(fsi->dma_chan, (SM_INC|0x400|TS_32|TM_BUR)); - dma_write(fsi->dma_chan, (u32)dma_start, - (u32)(fsi->base + DODT), send * 4); -} - /* playback interrupt */ static int fsi_data_push(struct fsi_priv *fsi) { @@ -481,6 +384,8 @@ static int fsi_data_push(struct fsi_priv *fsi) int send; int fifo_free; int width; + u8 *start; + int i; if (!fsi || !fsi->substream || @@ -515,12 +420,22 @@ static int fsi_data_push(struct fsi_priv *fsi) if (fifo_free < send) send = fifo_free; - if (2 == width) - fsi_16data_push(fsi, runtime, send); - else if (4 == width) - fsi_32data_push(fsi, runtime, send); - else + start = runtime->dma_area; + start += fsi->byte_offset; + + switch (width) { + case 2: + for (i = 0; i < send; i++) + fsi_reg_write(fsi, DODT, + ((u32)*((u16 *)start + i) << 8)); + break; + case 4: + for (i = 0; i < send; i++) + fsi_reg_write(fsi, DODT, *((u32 *)start + i)); + break; + default: return -EINVAL; + } fsi->byte_offset += send * width; @@ -664,8 +579,6 @@ static int fsi_dai_startup(struct snd_pcm_substream *substream, } fsi_reg_write(fsi, reg, data); - dev_dbg(dai->dev, "use %s format (%d channel) use %d DMAC\n", - msg, fsi->chan, fsi->dma_chan); /* * clear clk reset if master mode @@ -780,10 +693,9 @@ static snd_pcm_uframes_t fsi_pointer(struct snd_pcm_substream *substream) { struct snd_pcm_runtime *runtime = substream->runtime; struct fsi_priv *fsi = fsi_get(substream); - int is_play = substream->stream == SNDRV_PCM_STREAM_PLAYBACK; long location; - location = (fsi->byte_offset - 1) - fsi_get_residue(fsi, is_play); + location = (fsi->byte_offset - 1); if (location < 0) location = 0; @@ -912,22 +824,13 @@ static int fsi_probe(struct platform_device *pdev) master->fsia.base = master->base; master->fsib.base = master->base + 0x40; - master->fsia.dma_chan = -1; - master->fsib.dma_chan = -1; - - ret = fsi_get_dma_chan(); - if (ret < 0) { - dev_err(&pdev->dev, "cannot get dma api\n"); - goto exit_iounmap; - } - /* FSI is based on SPU mstp */ snprintf(clk_name, sizeof(clk_name), "spu%d", pdev->id); master->clk = clk_get(NULL, clk_name); if (IS_ERR(master->clk)) { dev_err(&pdev->dev, "cannot get %s mstp\n", clk_name); ret = -EIO; - goto exit_free_dma; + goto exit_iounmap; } fsi_soc_dai[0].dev = &pdev->dev; @@ -938,7 +841,7 @@ static int fsi_probe(struct platform_device *pdev) ret = request_irq(irq, &fsi_interrupt, IRQF_DISABLED, "fsi", master); if (ret) { dev_err(&pdev->dev, "irq request err\n"); - goto exit_free_dma; + goto exit_iounmap; } ret = snd_soc_register_platform(&fsi_soc_platform); @@ -951,8 +854,6 @@ static int fsi_probe(struct platform_device *pdev) exit_free_irq: free_irq(irq, master); -exit_free_dma: - fsi_free_dma_chan(); exit_iounmap: iounmap(master->base); exit_kfree: @@ -969,8 +870,6 @@ static int fsi_remove(struct platform_device *pdev) clk_put(master->clk); - fsi_free_dma_chan(); - free_irq(master->irq, master); iounmap(master->base); -- 1.6.0.4

2 1

Re: [alsa-devel] [PATCH] [snd-usb-audio] Add match for JMTek USB sound card
by Takashi Iwai 30 Oct '09

30 Oct '09

At Mon, 12 Oct 2009 10:03:53 +0200, Lubomir Rintel wrote: > > On Mon, 2009-10-12 at 09:18 +0200, Takashi Iwai wrote: > > At Mon, 12 Oct 2009 08:46:26 +0200, > > Clemens Ladisch wrote: > > > > > > Lubomir Rintel wrote: > > > > Entry for JMTek LLC., SSS USB Headphone Set in the quirk table. > > > > > > Please add an explaination why this entry is needed. At first glance, > > > this entry seems to describe a class-compliant device that should not > > > need a quirk. > > > > Ah right. It'd really helpful if Lubomir can give more details... > > A 2.6.31.1-based kernel on my Fedora 12 workstation at hone seemed to > require that, only the input driver attached to the device when plugged > in, the snd-usb-audio didn't seem to load and did not care about the > device when loaded manually. I did not have an idea why, since "alias: > usb:v*p*d*dc*dsc*dp*ic01isc01ip*" really seemed to match my device. > Nevertheless, after finding out that adding an entry to the quirk table > solves my problem I concluded that my understanding (or lack of thereof) > was wrong and that alias is really not meant to match my device. > > Now I plugged the adapter into my work lappy with 2.6.30.8-based Fedora > 11 and the audio interfaces on my adapter got instantly recognized and > claimed by snd-usb-audio (and the input interface by the input > subsystem), without modifying anything. > > Any clues what could have gone wrong then? Hm, I don't see any affecting changes between 2.6.30 and 31. Just as a test, could you copy sound/usb/*.[ch] from 2.6.30 tree to 2.6.31 or 32-rc and check whether the same problem appears? Takashi

2 2

[alsa-devel] [PATCH] ASoC: sh: FSI: Add capture support
by Kuninori Morimoto 30 Oct '09

30 Oct '09

Signed-off-by: Kuninori Morimoto <morimoto.kuninori(a)renesas.com> --- sound/soc/sh/fsi.c | 93 ++++++++++++++++++++++++++++++++++++++++++++++++---- 1 files changed, 86 insertions(+), 7 deletions(-) diff --git a/sound/soc/sh/fsi.c b/sound/soc/sh/fsi.c index 9742a28..e1a3d1a 100644 --- a/sound/soc/sh/fsi.c +++ b/sound/soc/sh/fsi.c @@ -447,6 +447,75 @@ static int fsi_data_push(struct fsi_priv *fsi) return 0; } +static int fsi_data_pop(struct fsi_priv *fsi) +{ + struct snd_pcm_runtime *runtime; + struct snd_pcm_substream *substream = NULL; + int free; + int fifo_fill; + int width; + u8 *start; + int i; + + if (!fsi || + !fsi->substream || + !fsi->substream->runtime) + return -EINVAL; + + runtime = fsi->substream->runtime; + + /* FSI FIFO has limit. + * So, this driver can not send periods data at a time + */ + if (fsi->byte_offset >= + fsi->period_len * (fsi->periods + 1)) { + + substream = fsi->substream; + fsi->periods = (fsi->periods + 1) % runtime->periods; + + if (0 == fsi->periods) + fsi->byte_offset = 0; + } + + /* get 1 channel data width */ + width = frames_to_bytes(runtime, 1) / fsi->chan; + + /* get free space for alsa */ + free = (fsi->buffer_len - fsi->byte_offset) / width; + + /* get recv size */ + fifo_fill = fsi_get_fifo_residue(fsi, 0); + + if (free < fifo_fill) + fifo_fill = free; + + start = runtime->dma_area; + start += fsi->byte_offset; + + switch (width) { + case 2: + for (i = 0; i < fifo_fill; i++) + *((u16 *)start + i) = + (u16)(fsi_reg_read(fsi, DIDT) >> 8); + break; + case 4: + for (i = 0; i < fifo_fill; i++) + *((u32 *)start + i) = fsi_reg_read(fsi, DIDT); + break; + default: + return -EINVAL; + } + + fsi->byte_offset += fifo_fill * width; + + fsi_irq_enable(fsi, 0); + + if (substream) + snd_pcm_period_elapsed(substream); + + return 0; +} + static irqreturn_t fsi_interrupt(int irq, void *data) { u32 status = fsi_master_read(SOFT_RST) & ~0x00000010; @@ -460,6 +529,10 @@ static irqreturn_t fsi_interrupt(int irq, void *data) fsi_data_push(&master->fsia); if (int_st & INT_B_OUT) fsi_data_push(&master->fsib); + if (int_st & INT_A_IN) + fsi_data_pop(&master->fsia); + if (int_st & INT_B_IN) + fsi_data_pop(&master->fsib); fsi_master_write(INT_ST, 0x0000000); @@ -612,16 +685,12 @@ static int fsi_dai_trigger(struct snd_pcm_substream *substream, int cmd, int is_play = substream->stream == SNDRV_PCM_STREAM_PLAYBACK; int ret = 0; - /* capture not supported */ - if (!is_play) - return -ENODEV; - switch (cmd) { case SNDRV_PCM_TRIGGER_START: fsi_stream_push(fsi, substream, frames_to_bytes(runtime, runtime->buffer_size), frames_to_bytes(runtime, runtime->period_size)); - ret = fsi_data_push(fsi); + ret = is_play ? fsi_data_push(fsi) : fsi_data_pop(fsi); break; case SNDRV_PCM_TRIGGER_STOP: fsi_irq_disable(fsi, is_play); @@ -757,7 +826,12 @@ struct snd_soc_dai fsi_soc_dai[] = { .channels_min = 1, .channels_max = 8, }, - /* capture not supported */ + .capture = { + .rates = FSI_RATES, + .formats = FSI_FMTS, + .channels_min = 1, + .channels_max = 8, + }, .ops = &fsi_dai_ops, }, { @@ -769,7 +843,12 @@ struct snd_soc_dai fsi_soc_dai[] = { .channels_min = 1, .channels_max = 8, }, - /* capture not supported */ + .capture = { + .rates = FSI_RATES, + .formats = FSI_FMTS, + .channels_min = 1, + .channels_max = 8, + }, .ops = &fsi_dai_ops, }, }; -- 1.6.0.4

1 0

[alsa-devel] [PATCH 4/4] Audio: Modifying the defconfig for OMAP3517 / AM3517 EVM
by Anuj Aggarwal 29 Oct '09

29 Oct '09

Enabling Audio for OMAP3517 / AM3517 EVM in the defconfig. Also enabling McBSP and I2C drivers as both are required for audio on this EVM. Signed-off-by: Anuj Aggarwal <anuj.aggarwal(a)ti.com> --- arch/arm/configs/am3517_evm_defconfig | 78 +++++++++++++++++++++++++++++++- 1 files changed, 75 insertions(+), 3 deletions(-) diff --git a/arch/arm/configs/am3517_evm_defconfig b/arch/arm/configs/am3517_evm_defconfig index 787f295..316cbaa 100644 --- a/arch/arm/configs/am3517_evm_defconfig +++ b/arch/arm/configs/am3517_evm_defconfig @@ -202,7 +202,7 @@ CONFIG_ARCH_OMAP3=y # CONFIG_OMAP_DEBUG_CLOCKDOMAIN is not set CONFIG_OMAP_RESET_CLOCKS=y # CONFIG_OMAP_MUX is not set -# CONFIG_OMAP_MCBSP is not set +CONFIG_OMAP_MCBSP=y # CONFIG_OMAP_MBOX_FWK is not set # CONFIG_OMAP_MPU_TIMER is not set CONFIG_OMAP_32K_TIMER=y @@ -590,7 +590,46 @@ CONFIG_HW_RANDOM=y # CONFIG_R3964 is not set # CONFIG_RAW_DRIVER is not set # CONFIG_TCG_TPM is not set -# CONFIG_I2C is not set +CONFIG_I2C=y +CONFIG_I2C_BOARDINFO=y +CONFIG_I2C_COMPAT=y +# CONFIG_I2C_CHARDEV is not set +CONFIG_I2C_HELPER_AUTO=y + +# +# I2C Hardware Bus support +# + +# +# I2C system bus drivers (mostly embedded / system-on-chip) +# +# CONFIG_I2C_DESIGNWARE is not set +# CONFIG_I2C_GPIO is not set +# CONFIG_I2C_OCORES is not set +CONFIG_I2C_OMAP=y +# CONFIG_I2C_SIMTEC is not set + +# +# External I2C/SMBus adapter drivers +# +# CONFIG_I2C_PARPORT_LIGHT is not set +# CONFIG_I2C_TAOS_EVM is not set + +# +# Other I2C/SMBus bus drivers +# +# CONFIG_I2C_PCA_PLATFORM is not set +# CONFIG_I2C_STUB is not set + +# +# Miscellaneous I2C Chip support +# +# CONFIG_DS1682 is not set +# CONFIG_SENSORS_TSL2550 is not set +# CONFIG_I2C_DEBUG_CORE is not set +# CONFIG_I2C_DEBUG_ALGO is not set +# CONFIG_I2C_DEBUG_BUS is not set +# CONFIG_I2C_DEBUG_CHIP is not set # CONFIG_SPI is not set # @@ -666,7 +705,40 @@ CONFIG_SSB_POSSIBLE=y # # CONFIG_VGA_CONSOLE is not set CONFIG_DUMMY_CONSOLE=y -# CONFIG_SOUND is not set +CONFIG_SOUND=y +# CONFIG_SOUND_OSS_CORE is not set +CONFIG_SND=y +CONFIG_SND_TIMER=y +CONFIG_SND_PCM=y +CONFIG_SND_JACK=y +# CONFIG_SND_SEQUENCER is not set +# CONFIG_SND_MIXER_OSS is not set +# CONFIG_SND_PCM_OSS is not set +# CONFIG_SND_HRTIMER is not set +# CONFIG_SND_DYNAMIC_MINORS is not set +CONFIG_SND_SUPPORT_OLD_API=y +CONFIG_SND_VERBOSE_PROCFS=y +# CONFIG_SND_VERBOSE_PRINTK is not set +# CONFIG_SND_DEBUG is not set +# CONFIG_SND_RAWMIDI_SEQ is not set +# CONFIG_SND_OPL3_LIB_SEQ is not set +# CONFIG_SND_OPL4_LIB_SEQ is not set +# CONFIG_SND_SBAWE_SEQ is not set +# CONFIG_SND_EMU10K1_SEQ is not set +CONFIG_SND_DRIVERS=y +# CONFIG_SND_DUMMY is not set +# CONFIG_SND_MTPAV is not set +# CONFIG_SND_SERIAL_U16550 is not set +# CONFIG_SND_MPU401 is not set +CONFIG_SND_ARM=y +CONFIG_SND_SOC=y +CONFIG_SND_OMAP_SOC=y +CONFIG_SND_OMAP_SOC_MCBSP=y +CONFIG_SND_OMAP_SOC_AM3517EVM=y +CONFIG_SND_SOC_I2C_AND_SPI=y +# CONFIG_SND_SOC_ALL_CODECS is not set +CONFIG_SND_SOC_TLV320AIC23=y +# CONFIG_SOUND_PRIME is not set # CONFIG_HID_SUPPORT is not set # CONFIG_USB_SUPPORT is not set # CONFIG_MMC is not set -- 1.6.2.4

1 0

[alsa-devel] [PATCH 3/4] Audio: Modifying board-evm file for audio codec
by Anuj Aggarwal 29 Oct '09

29 Oct '09

Adding I2C bus registration code in board-evm file for OMAP3517 / AM3517 EVM for AIC23 audio codec. Signed-off-by: Anuj Aggarwal <anuj.aggarwal(a)ti.com> --- arch/arm/mach-omap2/board-am3517evm.c | 21 +++++++++++++++++++++ 1 files changed, 21 insertions(+), 0 deletions(-) diff --git a/arch/arm/mach-omap2/board-am3517evm.c b/arch/arm/mach-omap2/board-am3517evm.c index 23cf949..5f5f3ee 100644 --- a/arch/arm/mach-omap2/board-am3517evm.c +++ b/arch/arm/mach-omap2/board-am3517evm.c @@ -30,6 +30,25 @@ #include <plat/common.h> /* + * I2C + */ +static struct i2c_board_info __initdata am3517evm_i2c_boardinfo[] = { + { + I2C_BOARD_INFO("tlv320aic23", 0x1A), + }, +}; + +static int __init am3517_evm_i2c_init(void) +{ + omap_register_i2c_bus(1, 400, NULL, 0); + omap_register_i2c_bus(2, 400, am3517evm_i2c_boardinfo, + ARRAY_SIZE(am3517evm_i2c_boardinfo)); + omap_register_i2c_bus(3, 400, NULL, 0); + + return 0; +} + +/* * Board initialization */ static struct omap_board_config_kernel am3517_evm_config[] __initdata = { @@ -50,6 +69,8 @@ static void __init am3517_evm_init_irq(void) static void __init am3517_evm_init(void) { + am3517_evm_i2c_init(); + platform_add_devices(am3517_evm_devices, ARRAY_SIZE(am3517_evm_devices)); -- 1.6.2.4

1 0

[alsa-devel] [PATCH 2/4] Audio: Modifying Kconfig/Makefile for AM3517 EVM
by Anuj Aggarwal 29 Oct '09

29 Oct '09

Modifying the Kconfig and Makefile in sound/soc/omap folder to add support for OMAP3517 / AM3517 EVM in Alsa SoC. Signed-off-by: Anuj Aggarwal <anuj.aggarwal(a)ti.com> --- sound/soc/omap/Kconfig | 9 +++++++++ sound/soc/omap/Makefile | 2 ++ 2 files changed, 11 insertions(+), 0 deletions(-) diff --git a/sound/soc/omap/Kconfig b/sound/soc/omap/Kconfig index 2dee983..6344456 100644 --- a/sound/soc/omap/Kconfig +++ b/sound/soc/omap/Kconfig @@ -55,6 +55,15 @@ config SND_OMAP_SOC_OMAP3EVM help Say Y if you want to add support for SoC audio on the omap3evm board. +config SND_OMAP_SOC_AM3517EVM + tristate "SoC Audio support for OMAP3517 / AM3517 EVM" + depends on SND_OMAP_SOC && MACH_OMAP3517EVM && I2C + select SND_OMAP_SOC_MCBSP + select SND_SOC_TLV320AIC23 + help + Say Y if you want to add support for SoC audio on the OMAP3517 / AM3517 + EVM. + config SND_OMAP_SOC_SDP3430 tristate "SoC Audio support for Texas Instruments SDP3430" depends on TWL4030_CORE && SND_OMAP_SOC && MACH_OMAP_3430SDP diff --git a/sound/soc/omap/Makefile b/sound/soc/omap/Makefile index 02d6947..0c78ae4 100644 --- a/sound/soc/omap/Makefile +++ b/sound/soc/omap/Makefile @@ -12,6 +12,7 @@ snd-soc-osk5912-objs := osk5912.o snd-soc-overo-objs := overo.o snd-soc-omap2evm-objs := omap2evm.o snd-soc-omap3evm-objs := omap3evm.o +snd-soc-am3517evm-objs := am3517evm.o snd-soc-sdp3430-objs := sdp3430.o snd-soc-omap3pandora-objs := omap3pandora.o snd-soc-omap3beagle-objs := omap3beagle.o @@ -23,6 +24,7 @@ obj-$(CONFIG_SND_OMAP_SOC_OSK5912) += snd-soc-osk5912.o obj-$(CONFIG_SND_OMAP_SOC_OVERO) += snd-soc-overo.o obj-$(CONFIG_MACH_OMAP2EVM) += snd-soc-omap2evm.o obj-$(CONFIG_MACH_OMAP3EVM) += snd-soc-omap3evm.o +obj-$(CONFIG_MACH_OMAP3517EVM) += snd-soc-am3517evm.o obj-$(CONFIG_SND_OMAP_SOC_SDP3430) += snd-soc-sdp3430.o obj-$(CONFIG_SND_OMAP_SOC_OMAP3_PANDORA) += snd-soc-omap3pandora.o obj-$(CONFIG_SND_OMAP_SOC_OMAP3_BEAGLE) += snd-soc-omap3beagle.o -- 1.6.2.4

1 0

[alsa-devel] [PATCH 1/4] Audio: Adding OMAP3517 / AM3517 EVM support in ASOC
by Anuj Aggarwal 29 Oct '09

29 Oct '09

Adding support for OMAP3517 / AM3517 EVM in Alsa SoC. Signed-off-by: Anuj Aggarwal <anuj.aggarwal(a)ti.com> --- sound/soc/omap/am3517evm.c | 202 ++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 202 insertions(+), 0 deletions(-) create mode 100644 sound/soc/omap/am3517evm.c diff --git a/sound/soc/omap/am3517evm.c b/sound/soc/omap/am3517evm.c new file mode 100644 index 0000000..135901b --- /dev/null +++ b/sound/soc/omap/am3517evm.c @@ -0,0 +1,202 @@ +/* + * am3517evm.c -- ALSA SoC support for OMAP3517 / AM3517 EVM + * + * Author: Anuj Aggarwal <anuj.aggarwal(a)ti.com> + * + * Based on sound/soc/omap/beagle.c by Steve Sakoman + * + * Copyright (C) 2009 Texas Instruments Incorporated + * + * This program is free software; you can redistribute it and/or modify it + * under the terms of the GNU General Public License as published by the + * Free Software Foundation version 2. + * + * This program is distributed "as is" WITHOUT ANY WARRANTY of any kind, + * whether express or implied; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * General Public License for more details. + */ + +#include <linux/clk.h> +#include <linux/platform_device.h> +#include <sound/core.h> +#include <sound/pcm.h> +#include <sound/soc.h> +#include <sound/soc-dapm.h> + +#include <asm/mach-types.h> +#include <mach/hardware.h> +#include <mach/gpio.h> +#include <plat/mcbsp.h> + +#include "omap-mcbsp.h" +#include "omap-pcm.h" + +#include "../codecs/tlv320aic23.h" + +#define CODEC_CLOCK 12000000 + +static int am3517evm_hw_params(struct snd_pcm_substream *substream, + struct snd_pcm_hw_params *params) +{ + struct snd_soc_pcm_runtime *rtd = substream->private_data; + struct snd_soc_dai *codec_dai = rtd->dai->codec_dai; + struct snd_soc_dai *cpu_dai = rtd->dai->cpu_dai; + int ret; + + /* Set codec DAI configuration */ + ret = snd_soc_dai_set_fmt(codec_dai, + SND_SOC_DAIFMT_DSP_B | + SND_SOC_DAIFMT_NB_NF | + SND_SOC_DAIFMT_CBM_CFM); + if (ret < 0) { + printk(KERN_ERR "can't set codec DAI configuration\n"); + return ret; + } + + /* Set cpu DAI configuration */ + ret = snd_soc_dai_set_fmt(cpu_dai, + SND_SOC_DAIFMT_DSP_B | + SND_SOC_DAIFMT_NB_NF | + SND_SOC_DAIFMT_CBM_CFM); + if (ret < 0) { + printk(KERN_ERR "can't set cpu DAI configuration\n"); + return ret; + } + + /* Set the codec system clock for DAC and ADC */ + ret = snd_soc_dai_set_sysclk(codec_dai, 0, + CODEC_CLOCK, SND_SOC_CLOCK_IN); + if (ret < 0) { + printk(KERN_ERR "can't set codec system clock\n"); + return ret; + } + + ret = snd_soc_dai_set_sysclk(cpu_dai, OMAP_MCBSP_CLKR_SRC_CLKX, 0, + SND_SOC_CLOCK_IN); + if (ret < 0) { + printk(KERN_ERR "can't set CPU system clock OMAP_MCBSP_CLKR_SRC_CLKX\n"); + return ret; + } + + snd_soc_dai_set_sysclk(cpu_dai, OMAP_MCBSP_FSR_SRC_FSX, 0, + SND_SOC_CLOCK_IN); + if (ret < 0) { + printk(KERN_ERR "can't set CPU system clock OMAP_MCBSP_FSR_SRC_FSX\n"); + return ret; + } + + return 0; +} + +static struct snd_soc_ops am3517evm_ops = { + .hw_params = am3517evm_hw_params, +}; + +/* am3517evm machine dapm widgets */ +static const struct snd_soc_dapm_widget tlv320aic23_dapm_widgets[] = { + SND_SOC_DAPM_HP("Line Out", NULL), + SND_SOC_DAPM_LINE("Line In", NULL), + SND_SOC_DAPM_MIC("Mic In", NULL), +}; + +static const struct snd_soc_dapm_route audio_map[] = { + /* Line Out connected to LLOUT, RLOUT */ + {"Line Out", NULL, "LOUT"}, + {"Line Out", NULL, "ROUT"}, + + {"LLINEIN", NULL, "Line In"}, + {"RLINEIN", NULL, "Line In"}, + + {"MICIN", NULL, "Mic In"}, +}; + +static int am3517evm_aic23_init(struct snd_soc_codec *codec) +{ + /* Add am3517-evm specific widgets */ + snd_soc_dapm_new_controls(codec, tlv320aic23_dapm_widgets, + ARRAY_SIZE(tlv320aic23_dapm_widgets)); + + /* Set up davinci-evm specific audio path audio_map */ + snd_soc_dapm_add_routes(codec, audio_map, ARRAY_SIZE(audio_map)); + + /* always connected */ + snd_soc_dapm_enable_pin(codec, "Line Out"); + snd_soc_dapm_enable_pin(codec, "Line In"); + snd_soc_dapm_enable_pin(codec, "Mic In"); + + snd_soc_dapm_sync(codec); + + return 0; +} + +/* Digital audio interface glue - connects codec <--> CPU */ +static struct snd_soc_dai_link am3517evm_dai = { + .name = "TLV320AIC23", + .stream_name = "AIC23", + .cpu_dai = &omap_mcbsp_dai[0], + .codec_dai = &tlv320aic23_dai, + .init = am3517evm_aic23_init, + .ops = &am3517evm_ops, +}; + +/* Audio machine driver */ +static struct snd_soc_card snd_soc_am3517evm = { + .name = "am3517evm", + .platform = &omap_soc_platform, + .dai_link = &am3517evm_dai, + .num_links = 1, +}; + +/* Audio subsystem */ +static struct snd_soc_device am3517evm_snd_devdata = { + .card = &snd_soc_am3517evm, + .codec_dev = &soc_codec_dev_tlv320aic23, +}; + +static struct platform_device *am3517evm_snd_device; + +static int __init am3517evm_soc_init(void) +{ + int ret; + + if (!machine_is_omap3517evm()) { + pr_err("Not OMAP3517 / AM3517 EVM!\n"); + return -ENODEV; + } + pr_info("OMAP3517 / AM3517 EVM SoC init\n"); + + am3517evm_snd_device = platform_device_alloc("soc-audio", -1); + if (!am3517evm_snd_device) { + printk(KERN_ERR "Platform device allocation failed\n"); + return -ENOMEM; + } + + platform_set_drvdata(am3517evm_snd_device, &am3517evm_snd_devdata); + am3517evm_snd_devdata.dev = &am3517evm_snd_device->dev; + *(unsigned int *)am3517evm_dai.cpu_dai->private_data = 0; /* McBSP1 */ + + ret = platform_device_add(am3517evm_snd_device); + if (ret) + goto err1; + + return 0; + +err1: + printk(KERN_ERR "Unable to add platform device\n"); + platform_device_put(am3517evm_snd_device); + + return ret; +} + +static void __exit am3517evm_soc_exit(void) +{ + platform_device_unregister(am3517evm_snd_device); +} + +module_init(am3517evm_soc_init); +module_exit(am3517evm_soc_exit); + +MODULE_AUTHOR("Anuj Aggarwal <anuj.aggarwal(a)ti.com>"); +MODULE_DESCRIPTION("ALSA SoC OMAP3517 / AM3517 EVM"); +MODULE_LICENSE("GPL v2"); -- 1.6.2.4

1 0

[alsa-devel] What am i doing wrong?
by Neil Jones 29 Oct '09

29 Oct '09

Im developing ASoC Driver for an SoC (I2S based). When testing playback with aplay, I get 1 buffers worth of data played back (10 periods) then playback stops due to a XRUN when my dma list wraps back to the start because the available data >= stop_threshold ?? Here are my logs, interrupts are occurring at the correct time and my buffer pointer increments by period size each time. Any help would be appreciated Aplay log: # /usr/bin/aplay -vvv /var/sample96KHz_edit.wav Playing WAVE '/var/sample96KHz_edit.wav' : Signed 16 bit Little Endian, Rate 96000 Hz, Stereo Plug PCM: Route conversion PCM (sformat=S16_LE) Transformation table: 0 <- 0*0.5 + 1*0.5 Its setup is: stream : PLAYBACK access : RW_INTERLEAVED format : S16_LE subformat : STD channels : 2 rate : 96000 exact rate : 96000 (96000/1) msbits : 16 buffer_size : 48000 period_size : 4096 period_time : 42666 tstamp_mode : NONE period_step : 1 avail_min : 4096 period_event : 0 start_threshold : 48000 stop_threshold : 48000 silence_threshold: 0 silence_size : 0 boundary : 1572864000 Slave: Hardware PCM card 0 'Metamorph-Base' device 0 subdevice 0 Its setup is: stream : PLAYBACK access : MMAP_INTERLEAVED format : S16_LE subformat : STD channels : 1 rate : 96000 exact rate : 96000 (96000/1) msbits : 16 buffer_size : 48000 period_size : 4096 period_time : 42666 tstamp_mode : NONE period_step : 1 avail_min : 4096 period_event : 0 start_threshold : 48000 stop_threshold : 48000 silence_threshold: 0 silence_size : 0 boundary : 1572864000 Max peak (8192 samples): 0x00002594 ###### 29% Max peak (8192 samples): 0x00000df8 ### 10% Max peak (8192 samples): 0x00007fff #################### 99% Max peak (8192 samples): 0x00006074 ################ 75% Max peak (8192 samples): 0x00003bff ########## 46% Max peak (8192 samples): 0x00003e7b ########## 48% Max peak (8192 samples): 0x00001abf ##### 20% Max peak (8192 samples): 0x000009e0 ## 7% Max peak (8192 samples): 0x000067df ################# 81% Max peak (8192 samples): 0x00001b45 ##### 21% Max peak (8192 samples): 0x00000b91 ## 9% Max peak (5888 samples): 0x000044a5 ########### 53% underrun!!! (at least 83.448 ms long) Status: state : XRUN trigger_time: 4784.5629989 tstamp : 4784.88220967 delay : 0 avail : 48000 avail_max : 48000 Kernel Log: PCM DMA IRQ: status 100000, timestamp 4483380 ms, ALSA sound/core/pcm_lib.c:250: period_update: pcmC0D0p:0: pos=0x1000/0x1000/0xbb80, hwptr=0x0, hw_base=0x0, hw_intr=0x0 PCM DMA IRQ: status 120000, timestamp 4483430 ms, ALSA sound/core/pcm_lib.c:250: period_update: pcmC0D0p:0: pos=0x2000/0x1000/0xbb80, hwptr=0x1000, hw_base=0x0, hw_intr=0x1000 PCM DMA IRQ: status 120000, timestamp 4483480 ms, ALSA sound/core/pcm_lib.c:250: period_update: pcmC0D0p:0: pos=0x3000/0x1000/0xbb80, hwptr=0x2000, hw_base=0x0, hw_intr=0x2000 PCM DMA IRQ: status 120000, timestamp 4483530 ms, ALSA sound/core/pcm_lib.c:250: period_update: pcmC0D0p:0: pos=0x4000/0x1000/0xbb80, hwptr=0x3000, hw_base=0x0, hw_intr=0x3000 PCM DMA IRQ: status 120000, timestamp 4483580 ms, ALSA sound/core/pcm_lib.c:250: period_update: pcmC0D0p:0: pos=0x5000/0x1000/0xbb80, hwptr=0x4000, hw_base=0x0, hw_intr=0x4000 PCM DMA IRQ: status 120000, timestamp 4483630 ms, ALSA sound/core/pcm_lib.c:250: period_update: pcmC0D0p:0: pos=0x6000/0x1000/0xbb80, hwptr=0x5000, hw_base=0x0, hw_intr=0x5000 PCM DMA IRQ: status 120000, timestamp 4483680 ms, ALSA sound/core/pcm_lib.c:250: period_update: pcmC0D0p:0: pos=0x7000/0x1000/0xbb80, hwptr=0x6000, hw_base=0x0, hw_intr=0x6000 PCM DMA IRQ: status 120000, timestamp 4483730 ms, ALSA sound/core/pcm_lib.c:250: period_update: pcmC0D0p:0: pos=0x8000/0x1000/0xbb80, hwptr=0x7000, hw_base=0x0, hw_intr=0x7000 PCM DMA IRQ: status 120000, timestamp 4483790 ms, ALSA sound/core/pcm_lib.c:250: period_update: pcmC0D0p:0: pos=0x9000/0x1000/0xbb80, hwptr=0x8000, hw_base=0x0, hw_intr=0x8000 PCM DMA IRQ: status 120000, timestamp 4483840 ms, ALSA sound/core/pcm_lib.c:250: period_update: pcmC0D0p:0: pos=0xa000/0x1000/0xbb80, hwptr=0x9000, hw_base=0x0, hw_intr=0x9000 PCM DMA IRQ: status 120000, timestamp 4483890 ms, ALSA sound/core/pcm_lib.c:250: period_update: pcmC0D0p:0: pos=0x0/0x1000/0xbb80, hwptr=0xa000, hw_base=0x0, hw_intr=0xa000 ALSA sound/core/pcm_lib.c:160: XRUN: pcmC0D0p:0 - This message is subject to Imagination Technologies' e-mail terms: http://www.imgtec.com/e-mail.htm Imagination Technologies Ltd is a limited company registered in England No: 1306335 Registered Office: Imagination House, Home Park Estate, Kings Langley, Hertfordshire, WD4 8LZ. Email to and from the company may be monitored for compliance and other administrative purposes. -

3 2

[alsa-devel] [PATCH] ASoC: TWL4030: Add APLL supply for the capture path
by Peter Ujfalusi 29 Oct '09

29 Oct '09

Capture path also need the APLL enabled, adding DAPM_SUPPLY for the Virtual ADCs. Signed-off-by: Peter Ujfalusi <peter.ujfalusi(a)nokia.com> --- I have forgot to run git add, so the capture path DAPM_SUPPLY was missing from the previous series. This also applies on top of Mark's tree, for-2.6.33-pending branch at: git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound-2.6.git and depends on the "ASoC: TWL4030: Change codec_muted to apll_enabled" patch. Sorry about this. sound/soc/codecs/twl4030.c | 5 +++++ 1 files changed, 5 insertions(+), 0 deletions(-) diff --git a/sound/soc/codecs/twl4030.c b/sound/soc/codecs/twl4030.c index 277e99c..f9121ef 100644 --- a/sound/soc/codecs/twl4030.c +++ b/sound/soc/codecs/twl4030.c @@ -1449,6 +1449,11 @@ static const struct snd_soc_dapm_route intercon[] = { {"ADC Virtual Left2", NULL, "TX2 Capture Route"}, {"ADC Virtual Right2", NULL, "TX2 Capture Route"}, + {"ADC Virtual Left1", NULL, "APLL Enable"}, + {"ADC Virtual Right1", NULL, "APLL Enable"}, + {"ADC Virtual Left2", NULL, "APLL Enable"}, + {"ADC Virtual Right2", NULL, "APLL Enable"}, + /* Analog bypass routes */ {"Right1 Analog Loopback", "Switch", "Analog Right"}, {"Left1 Analog Loopback", "Switch", "Analog Left"}, -- 1.6.5.1

2 2

[alsa-devel] [PATCH 0/2] ASoC: TWL4030: Vibra and APLL fixes
by Peter Ujfalusi 29 Oct '09

29 Oct '09

Hello, Audio driven vibrator output fix: To have correct audio routed to the vibra output, we also need to configure the VIBRA_SET register, which in theory has nothing to do with the vibra, when it is driven with audio. and fix for the APLL powering sequence: The APLL in the past was enabled at set_dai_sysclk function, but it has been fixed, which introduced some really strange signals on the outputs. This series applies on top of Mark's tree, for-2.6.33 branch at: git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound-2.6.git Since the underlying twl4030 patches are not yet in the topic/asoc of Takashi's tree. --- Jari Vanhala (1): ASoC: TWL4030: Vibra motor stop fix when it is driven with audio Peter Ujfalusi (1): ASoC: TWL4030: Change APLL powering sequence sound/soc/codecs/twl4030.c | 38 ++++++++++++++++++++++++++++++++++---- 1 files changed, 34 insertions(+), 4 deletions(-)

2 3

[alsa-devel] [PATCH] ASoC: OMAP3EVM: Use the twl4030_setup_data for headset pop-removal
by Anuj Aggarwal 29 Oct '09

29 Oct '09

The pop-removal specific values are configured for TWL4030 codec for OMAP3EVM through this patch. Signed-off-by: Anuj Aggarwal <anuj.aggarwal(a)ti.com> --- sound/soc/omap/omap3evm.c | 7 +++++++ 1 files changed, 7 insertions(+), 0 deletions(-) diff --git a/sound/soc/omap/omap3evm.c b/sound/soc/omap/omap3evm.c index 9114c26..8deb59b 100644 --- a/sound/soc/omap/omap3evm.c +++ b/sound/soc/omap/omap3evm.c @@ -93,10 +93,17 @@ static struct snd_soc_card snd_soc_omap3evm = { .num_links = 1, }; +/* twl4030 setup */ +static struct twl4030_setup_data twl4030_setup = { + .ramp_delay_value = 4, + .sysclk = 26000, +}; + /* Audio subsystem */ static struct snd_soc_device omap3evm_snd_devdata = { .card = &snd_soc_omap3evm, .codec_dev = &soc_codec_dev_twl4030, + .codec_data = &twl4030_setup, }; static struct platform_device *omap3evm_snd_device; -- 1.6.2.4

4 3

[alsa-devel] [PATCH] ALSA: ASoC: CS4270: export de-emphasis filter as ALSA control
by Daniel Mack 29 Oct '09

29 Oct '09

The CS4270 codec features an de-emphasis filter for compensation of audio material filtered by an 50/15 uS algorithm. Not sure whether we should always enable it for 44100Hz sampling frequency, but it should at least be configurable by the user. Signed-off-by: Daniel Mack <daniel(a)caiaq.de> Cc: Timur Tabi <timur(a)freescale.com> Cc: Mark Brown <broonie(a)opensource.wolfsonmicro.com> --- sound/soc/codecs/cs4270.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/sound/soc/codecs/cs4270.c b/sound/soc/codecs/cs4270.c index ca1e24a..8069023 100644 --- a/sound/soc/codecs/cs4270.c +++ b/sound/soc/codecs/cs4270.c @@ -520,6 +520,7 @@ static const struct snd_kcontrol_new cs4270_snd_controls[] = { SOC_SINGLE("Digital Sidetone Switch", CS4270_FORMAT, 5, 1, 0), SOC_SINGLE("Soft Ramp Switch", CS4270_TRANS, 6, 1, 0), SOC_SINGLE("Zero Cross Switch", CS4270_TRANS, 5, 1, 0), + SOC_SINGLE("De-emphasis filter", CS4270_TRANS, 0, 1, 0), SOC_SINGLE("Popguard Switch", CS4270_MODE, 0, 1, 1), SOC_SINGLE("Auto-Mute Switch", CS4270_MUTE, 5, 1, 0), SOC_DOUBLE("Master Capture Switch", CS4270_MUTE, 3, 4, 1, 1), -- 1.6.5

3 2

[alsa-devel] Digital distortion when converting Mono to Stereo?
by Daniel Mack 29 Oct '09

29 Oct '09

While testing with our ASoC enabled embedded platform, we observed a strange phenomena with Mono audio files. We used external audio test equipment for SNR/THD analysis and used a mono wav file (16bit, 44.1 KHz) which plays a simple sweep from ~10Hz to ~20KHz. As the hardware output is Stereo, an implicit conversion takes places (don't know which part of ALSA actually does it, though). Strangely, the measurement showed a phantom frequency which looks like the sweeping test signal frequency was somehow 'mirrored' at 11.025KHz (fs/4). This phantom noise becomes stronger the lower its frequency gets. So while sweeping, those two peaks were approaching each other, they met at 11KHz, and when the 'real' peak aproached 20KHz, the phantom was at something like 1KHz and had comparable level than the 'real' signal. All that was much stronger on one channel and barely there, but still measurable, on the other one. We first though about an analog filter issue, then suspected the digital input stream, but eventually it turned out that with the same test file in stereo, all these effects suddenly went away. So there must be something in the chain from aplay to the actual PXA SSP ports which adds considerable digital distortion to one channel when converting from Mono to Stereo. I didn't dig any deeper, but still wanted to let you know. Can anyone think of a possible reason for that? It doesn't harm us in our application as we will never play Mono audio eventually, but I guess it could affect others. Thanks, Daniel

1 0

[alsa-devel] aloop / asym (ttable-bindings) Merging audio stream with SIP/Skype - .asoundrc struggle
by yvonne barrymore 28 Oct '09

28 Oct '09

(NOTE: RESENT as received an email the alsa-devel mailinglist had moved.) OBJECTIVE: merge (mplayer cli or aplay) audio stream with SIP/Skype so that music can be heard during chat. Really need help from a developer I think as alsa-users mailinglist not able to help during past 2 weeks. 2 weeks happily studying alsa/plugins, posted/searched on mailing lists and tried irc as well. Could really use a guru assist. I get the parts mostly, though obviously not how it all comes together in an .asoundrc. - aloop driver is installed. After scores of attempts now wondering: maybe having the music track playing on it's own soundcard or loopback and having that merge into the microphone? channel of sip/skype's soundcard. Like, have the music play out on the intel card 0, and loopback through aloop card 1, then merge that with asym/dmix onto sip/skype's headset card 2 ???? I kinda know what the plugs do, though not how to hook-up through .asoundrc. I've found 3 or 4 great posts on alsa-devel and alsa-users though ultimately for me just glimmers of working. Rather than glut up the list here I've only posted my aplay -l Can anyone comment on exactly what I'd put in my .asoundrc? What the flow/parts would be even? To stop stuttering (fighting for card control ? etc.) I guessed that the music playing on it's own card might be good? Very happy to post what I've got though thought I should ask first if anyone has found a best practice for this. **** List of PLAYBACK Hardware Devices **** card 0: Intel [HDA Intel], device 0: ALC1200 Analog [ALC1200 Analog] Subdevices: 1/1 Subdevice #0: subdevice #0 card 0: Intel [HDA Intel], device 1: ALC1200 Digital [ALC1200 Digital] Subdevices: 1/1 Subdevice #0: subdevice #0 card 0: Intel [HDA Intel], device 6: Si3054 Modem [Si3054 Modem] Subdevices: 1/1 Subdevice #0: subdevice #0 card 1: Loopback [Loopback], device 0: Loopback PCM [Loopback PCM] Subdevices: 8/8 Subdevice #0: subdevice #0 Subdevice #1: subdevice #1 Subdevice #2: subdevice #2 Subdevice #3: subdevice #3 Subdevice #4: subdevice #4 Subdevice #5: subdevice #5 Subdevice #6: subdevice #6 Subdevice #7: subdevice #7 card 1: Loopback [Loopback], device 1: Loopback PCM [Loopback PCM] Subdevices: 8/8 Subdevice #0: subdevice #0 Subdevice #1: subdevice #1 Subdevice #2: subdevice #2 Subdevice #3: subdevice #3 Subdevice #4: subdevice #4 Subdevice #5: subdevice #5 Subdevice #6: subdevice #6 Subdevice #7: subdevice #7 card 2: default [C-Media USB Headphone Set ], device 0: USB Audio [USB Audio] Subdevices: 1/1 Subdevice #0: subdevice #0

1 0

[alsa-devel] A question about the soc jack status
by Joonyoung Shim 28 Oct '09

28 Oct '09

Hi, all. I have a question about soc jack. I know the soc jack reports the jack status when the jack status is change only. For example when the jack is inserted or released, the soc jack reports the jack status to user via input subsystem. But i want to know the jack status always regardless of the event to insert or release a jack. For example we can check the jack status always if the jack status is reported via sysfs file. So, is there how to know the jack status always the currently?

2 1

[alsa-devel] [PATCH 0/2] ASoC: TWL4030: bypass magic removal and cleanup patch
by Peter Ujfalusi 28 Oct '09

28 Oct '09

Hello, Since the soc core is now handling the codec bias state based on the complete paths as well, there is no need for the bypass tracking in the codec. The second patch replaces the missleading codec_muted to apll_enabled, which is what actually is handled by it. This series applies on top of Mark's tree, for-2.6.33-pending branch at: git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound-2.6.git Since the underlying twl4030 patches are not yet in the topic/asoc of Takashi's tree. --- Peter Ujfalusi (2): ASoC: TWL4030: Remove bypass tracking ASoC: TWL4030: Change codec_muted to apll_enabled sound/soc/codecs/twl4030.c | 146 ++++++++++++-------------------------------- 1 files changed, 39 insertions(+), 107 deletions(-)

2 3

[alsa-devel] still: clicking noise on Sigmatel 9202 - how can I use patches for 2.6.24 kernel on 2.6.30?
by Christian Steffen 28 Oct '09

28 Oct '09

Hello, I still have my problem that I have a constant clicking noise coming out of my boxes with a sigmatel 9202 sound chip on intel-hda (Poulsbo) soundcard. I now found two patches for the alsa driver that can be applied on a 2.6.24 kernel. Those patches are exactly for the sigmatel 9202, so possibly they would fix my problem. http://redirectingat.com/?id=593X1004&url=http%3A%2F%2Flists.moblin.org%2Fpi permail%2Fcommits%2F2007-December%2F001232.html and http://redirectingat.com/?id=593X1004&url=http%3A%2F%2Fwww.google.com%2Furl% 3Fsa%3Dt%26source%3Dweb%26ct%3Dres%26cd%3D9%26ved%3D0CDAQFjAI%26url%3Dhttp%2 53A%252F%252Fwww.soulinfo.com%252F~hugang%252Ftmp%252Fubuntu-hardy%25252Btux onice%252Fdebian%252Fbinary-custom.d%252Flpia%252Fpatchset%252F0010-hda_sigm atel.patch%26ei%3D4AfoSs24OpeG_Abfy7yGCA%26usg%3DAFQjCNH-mrDdDcgvhNh_eM5hy4W hepUtUQ%26sig2%3D2fK3ED_DyaLSexlPlkFufQ I found both patches here: http://software.intel.com/en-us/articles/patches-for-moblin-kernel-on-menlow / I think these patches aren't yet completely integrated into alsa driver 1.0.21? I tried to manually insert them into the files of my kernel 2.6.30 source files but without any expertise this is "impossible" to me. I think this is not the easiest job but I appreciate any help! :) Thank you very much, Cheers Christian

1 0

Re: [alsa-devel] A question about the soc jack status
by Joonyoung Shim 28 Oct '09

28 Oct '09

On 10/28/2009 4:32 PM, Naveen Krishna Ch wrote: > 2009/10/28 Joonyoung Shim <jy0922.shim(a)samsung.com> > >> Hi, all. >> >> I have a question about soc jack. I know the soc jack reports the jack >> status when the jack status is change only. For example when the jack >> is inserted or released, the soc jack reports the jack status to user >> via input subsystem. >> >> But i want to know the jack status always regardless of the event to >> insert or release a jack. For example we can check the jack status >> always if the jack status is reported via sysfs file. >> > There is a /sys/class/soc/jack/status > Dont remember the exact path. > Cat of that file will tell us right > I cannot find "jack" word under /sys directory. Can you give me the exact path? >> So, is there how to know the jack status always the currently? >> _______________________________________________ >> Alsa-devel mailing list >> Alsa-devel(a)alsa-project.org >> http://mailman.alsa-project.org/mailman/listinfo/alsa-devel >> > > >

1 0

[alsa-devel] What can change after suspend ?
by Giuliano Pochini 28 Oct '09

28 Oct '09

I'm adding suspend/resume support to echoaudio drivers. I was reading /Documentation/power/pci.txt: " pci_set_power_state(PCI_D0); pci_restore_state(); /* device's irq possibly is changed, driver should take care */ " The card does not support D[0-3] states. The driver suspends the card by turning the DSP off, without changing the PCI state. Can IRQ, memory mapped regions, whatever, change on resume ? Are pci_save_state() and pci_enable_wake() useful/required in this case ? -- Giuliano.

2 1

[alsa-devel] Problems with snd_pcm_writei() function
by Douglas Lopes Pereira 27 Oct '09

27 Oct '09

Hi, I'm modifying an application that calls snd_pcm_writei() function from libasound2-dev (on verstion 1.0.16-2). I does work. I'm splitting my audio data into 160 bytes buffers but when buffer with different size is passed to that function I hear a noise (like 'Krrr') on my audio device. I tried to add zeroed bytes to complete the buffer but it didn't work. I tried to ignore the last buffer and it worked but with some side effects: No other operation worked properly after that. Please, can anyone help? Thanks in advance. Regards, Douglas

2 2

Re: [alsa-devel] [Intel-gfx] Problems with HDMI audio on Intel DG45FC motherboard
by Wu Fengguang 27 Oct '09

27 Oct '09

On Tue, Oct 27, 2009 at 07:11:25AM +0800, David Härdeman wrote: > On Tue, Oct 20, 2009 at 03:43:53PM -0700, Shane W wrote: > > On Tue, Oct 20, 2009 at 09:26:00AM +0800, Wu Fengguang wrote: > > > HDMI codec/sink seem to take some time to response to the output > > > enable and new infoframe, so there are some delay. I've moved the HDMI > > > output enable command to module load time, this helps. The infoframe > > > is in theory created in run time based on the format of _each_ new > > > audio stream, so infoframe transmission has to be started/stopped > > > for each track.. > > > > I know this has come up before but can't we not start/stop > > the infoframe if the sample format on the new track is the > > same as the old. I mean playing an album, you're gonna get > > 44100, 2ch s16le 95% of the time so that would atleast > > cause the problem to appear much less. > > Tried it, still had the second-track-produces-silence bug on my receiver > so I couldn't test it properly. > > I however did manage to create a different patch which fixed my receiver > bug (yay!)...by sending "refer-to-stream-header" audio infoframes from > pcm close to pcm open...something like this quick hack: This is an important clue, thank you! :) The patch is not quite logical. Hopefully the sticky infoframe patch can help in the same way. Attached is the broken up patches, hope that helps your debugging. The last 4 patches in the series are inspired by your comments. Thanks, Fengguang > > --- linux-2.6.32-rc5/sound/pci/hda/patch_intelhdmi.c 2009-10-16 02:41:50.000000000 +0200 > +++ ../linux-2.6.32-rc5/sound/pci/hda/patch_intelhdmi.c 2009-10-26 23:39:54.000000000 +0100 > @@ -552,8 +552,16 @@ > struct snd_pcm_substream *substream) > { > struct intel_hdmi_spec *spec = codec->spec; > + struct hdmi_audio_infoframe ai = { > + .type = 0x84, > + .ver = 0x01, > + .len = 0x0a, > + .CC02_CT47 = 0x00, > + }; > > hdmi_stop_infoframe_trans(codec); > + hdmi_fill_audio_infoframe(codec, &ai); > + hdmi_start_infoframe_trans(codec); > > return snd_hda_multi_out_dig_close(codec, &spec->multiout); > } > @@ -571,6 +579,7 @@ > > hdmi_set_channel_count(codec, substream->runtime->channels); > > + hdmi_stop_infoframe_trans(codec); > hdmi_setup_audio_infoframe(codec, substream); > > return 0; > > > Not sure how/if something like that could be turned into an acceptable > patch though... > > -- > David Härdeman

1 0

Re: [alsa-devel] [Intel-gfx] Problems with HDMI audio on Intel DG45FC motherboard
by Wu Fengguang 27 Oct '09

27 Oct '09

On Mon, Oct 26, 2009 at 06:31:45AM +0800, David Härdeman wrote: > On Wed, Oct 21, 2009 at 09:38:12AM +0800, Wu Fengguang wrote: > > On Wed, Oct 21, 2009 at 06:37:58AM +0800, David Härdeman wrote: > > > On Tue, Oct 20, 2009 at 09:26:00AM +0800, Wu Fengguang wrote: > > > >On Thu, Oct 15, 2009 at 01:40:53AM +0800, David Härdeman wrote: > > > >> >Complete silence for how much time? > > > >> > > > >> For the entire duration of the particular movie/audio track/video > > > >> clip/whatever. > > > >> > > > > > > > >I actually have a DG45FC box and have not run into this problem for > > > >all the HDMI monitors I have. What's your monitor model? > > > > > > A Samsung LE-55A956 LCD TV. But I think the problem is not with the > > > monitor (TV) but rather with the receiver that is between the DG45FC and > > > the TV. The receiver is a Marantz SR8002 with HDMI support. > > > > Got it. If you have a HDMI capable TV or monitor, it would be possible to get > > rid of the Marantz and check if the problem sticks :) > > Nope, DG45FC <-> TV works fine (although only with stereo of course), so > the culprit is the Marantz which is either being picky or buggy. Judging > from from quick Google searches, HDMI related problems with audio/video > seems par for the course with lots of different manufacturers (oh joy). Hmm.. > > OK. You can get more debug info if turning on > > > > CONFIG_SND_VERBOSE_PROCFS=y > > CONFIG_SND_VERBOSE_PRINTK=y > > CONFIG_SND_DEBUG=y > > CONFIG_SND_DEBUG_VERBOSE=y > > CONFIG_SND_PCM_XRUN_DEBUG=y > > Enabled in my latest tests, dmesg included below... Thanks. > > > >What if you change display > > > >modes with xrandr? > > > > > > Haven't tried that yet...currently running on 1920x1080@60 which should > > > (I guess) be one of the most common modes with modern LCD TV's. > > > > The infoframe would be different for 2-channel pure music and 5.1 channel > > movie. The video timing might also affect audio stream, because the HDMI > > audio data is transfered in the gaps of video data. > > I've tried a couple of different modes with xrandr, with both 2, 6 and 8 > channels of audio but it doesn't seem to change anything. OK. > > > >HDMI codec/sink seem to take some time to response to the output > > > >enable and new infoframe, so there are some delay. I've moved the HDMI > > > >output enable command to module load time, this helps. The infoframe > > > >is in theory created in run time based on the format of _each_ new > > > >audio stream, so infoframe transmission has to be started/stopped > > > >for each track.. > > > > > > So my current theory is along the line of HDMI audio infoframe or video > > > infoframe problems. Do you have any pointers where in the driver(s) > > > the infoframes (both audio and video) are generated so that I can add > > > some debugging statements to dump the frames and compare the working > > > and non-working scenarios? > > > > I guess the infoframe itself should be identical for the same clip. > > Have you tried upgrading to a recent Xorg/intel gfx driver? > > Currently testing with kernel 2.6.32-rc5 (self-compiled) + intel-gfx > 2.9.0 and X11R7.4 (from Debian unstable). That's fairly bleeding edge :) > > Anyway, the kernel driver code is linux/sound/pci/hda/patch_intelhdmi.c > > The relevant function is hdmi_setup_audio_infoframe(). Inside which the > > hdmi_setup_channel_mapping() is not functioning for G45, > > hdmi_setup_channel_allocation() is no-op for 2-channel music. > > hdmi_debug_dip_size() and hdmi_clear_dip_buffers() can also be commented out. > > And feel free to ask more questions :) > > I think I found a bug in the infoframe generation, > hdmi_fill_audio_infoframe from sound/pci/hda/patch_intelhdmi.c has two > for loops which use sizeof(ai) but ai is a pointer to struct > hdmi_audio_infoframe so the size of a pointer is used rather than the > size of the struct meaning that the wrong number of bytes is written. Good catch, thank you very much! > After fixing that, the dmesg output when playing "speaker-test -c8 -twav > -D hdmi -l1" is: > > [ 866.169344] ALSA sound/pci/hda/hda_intel.c:1617: azx_pcm_prepare: > bufsize=0x10000, format=0x17 > [ 866.169353] ALSA sound/pci/hda/hda_codec.c:1083: > hda_codec_setup_stream: NID=0x2, stream=0x5, channel=0, format=0x17 > [ 866.176112] ALSA sound/pci/hda/patch_intelhdmi.c:446: HDMI: select CA > 0x13 for 8-channel allocation: FL/FR LFE FC RL/RR RC FLC/FRC RLC/RRC > FLW/FRW FLH/FRH TC FCH > [ 866.176321] HDMI: ASP channel 0 => slot 0 > [ 866.176354] HDMI: ASP channel 0 => slot 0 > [ 866.176406] HDMI: ASP channel 0 => slot 0 > [ 866.176438] HDMI: ASP channel 0 => slot 0 > [ 866.176490] HDMI: ASP channel 0 => slot 0 > [ 866.176533] HDMI: ASP channel 0 => slot 0 > [ 866.176565] HDMI: ASP channel 0 => slot 0 > [ 866.176617] HDMI: ASP channel 0 => slot 0 > [ 866.176649] HDMI: ELD buf size is 64 > [ 866.176691] HDMI: DIP GP[0] buf size is 13 > [ 866.176733] HDMI: DIP GP[1] buf size is 10 > [ 866.176775] HDMI: DIP GP[2] buf size is 30 > [ 866.176817] HDMI: DIP GP[3] buf size is 30 > [ 866.176859] HDMI: DIP GP[4] buf size is 0 > [ 866.176901] HDMI: DIP GP[5] buf size is 0 > [ 866.176943] HDMI: DIP GP[6] buf size is 0 > [ 866.176986] HDMI: DIP GP[7] buf size is 0 > [ 866.179041] ALSA sound/pci/hda/patch_intelhdmi.c:342: HDMI: DIP GP[0] > buf reported size=13, written=32 > [ 866.181209] ALSA sound/pci/hda/patch_intelhdmi.c:342: HDMI: DIP GP[1] > buf reported size=10, written=32 > [ 866.183271] ALSA sound/pci/hda/patch_intelhdmi.c:342: HDMI: DIP GP[2] > buf reported size=30, written=32 > [ 866.185385] ALSA sound/pci/hda/patch_intelhdmi.c:342: HDMI: DIP GP[3] > buf reported size=30, written=32 > [ 866.185574] XXX: Writing audio inf: 0x84 0x01 0x0A 0x57 0x07 0x00 > 0x00 0x13 0x00 0x00 0x00 0x00 0x00 0x00 > [ 872.032225] ALSA sound/pci/hda/hda_codec.c:1096: > hda_codec_cleanup_stream: NID=0x2 > > (The XXX line was added by me to print the audio infoframe) FYI, I'll write another Intel GPU tool to dump the audio infoframe (among others) directly from the GPU registers :) > I think (if I understood the code correctly), that "DIP GP[0]" holds the > infoframe, but I don't understand why it would report a buf size of > 13...the audio infoframe is 14 bytes (3 header + 1 checksum + 10 body)? Good question. I guess I made it wrong again. The checksum field may be auto-generated by hardware: The HDMI specification defines a data island packet with a header of 4 bytes (3 bytes content + 1 byte ECC) and packet body of 32 bytes (28 bytes content and 4 bytes ECC). Note that the ECC bytes are not present in the DIP content populated by software and are hardware generated. - from HDA-034-A2.pdf > Also, what does the GP[1..3] buffers hold? They are for ACP and ISRC1/2 (not utilized by driver for now): When audio data is transmitted over the HDMI link, associated control information is transmitted as "Data Island Packets" over the link. Some of the packet types applicable to audio are ACP packets (for content protection), ISRC1/2 (for content info), Audio infoframe etc. For a detailed list of control packets and respective formats, please refer to the HDMI specification. > Anyway, even with the above for loops fixed, I still have the same > problems (not that weird perhaps since all the bytes that were being > missed anyway defaulted to 0x00). Yeah. I have always be wondering whether the checksum field is necessary. Removing it seems to change nothing. Anyway the number 13 is a strong indication for removing it. > I've noticed that if a run this: > > while true; do > speaker-test -t wav -c 8 -D hdmi -l 1 > speaker-test -t wav -c 2 -D hdmi -l 1 > done > > it always works, but this: > > while true; do > speaker-test -t wav -c 2 -D hdmi -l 1 > done > > doesn't. This is weird for now. Thanks for the tip! > Not sure what to make of it, the intel hdmi driver doesn't seem to do > anything special if the parameters (like channel count) change between > clips. Thanks, Fengguang

1 0

Re: [alsa-devel] [Intel-gfx] Problems with HDMI audio on Intel DG45FC motherboard
by Wu Fengguang 27 Oct '09

27 Oct '09

Hi Shane, [sorry for late response - I was out traveling] On Wed, Oct 21, 2009 at 06:43:53AM +0800, Shane W wrote: > Hey all, > > On Tue, Oct 20, 2009 at 09:26:00AM +0800, Wu Fengguang wrote: > > It's <= 0.5 second silence from my experience. > > Correct. > > > HDMI codec/sink seem to take some time to response to the output > > enable and new infoframe, so there are some delay. I've moved the HDMI > > output enable command to module load time, this helps. The infoframe > > is in theory created in run time based on the format of _each_ new > > audio stream, so infoframe transmission has to be started/stopped > > for each track.. > > I know this has come up before but can't we not start/stop > the infoframe if the sample format on the new track is the > same as the old. I mean playing an album, you're gonna get > 44100, 2ch s16le 95% of the time so that would atleast > cause the problem to appear much less. Yeah, this is worth trying. The attached (combined) patch have bits to do sticky infoframe. However my tests show that it didn't improve the 0.5s delay.. Thanks, Fengguang

1 0

[alsa-devel] Patches for libasound to support upcoming Audacious 2.2
by John Lindgren 26 Oct '09

26 Oct '09

Hello, I've been working on the ALSA output for the upcoming 2.2 release of Audacious media player and have run into some problems in snd_device_name_hint, which is now used to show the user a list of possible output devices. I've written patches which correct those problems. The biggest problem is that in several places, functions called by snd_device_name_hint call snd_config_delete on sections of the config returned by snd_config_search. Once these sections are deleted, future calls to snd_pcm_open fail miserably. ALSA lib conf.c:4600:(snd_config_expand) Unknown parameters CARD=ICH6,DEV=0 ALSA lib pcm.c:2211:(snd_pcm_open_noupdate) Unknown PCM front:CARD=ICH6,DEV=0 alsa-gapless: snd_pcm_open failed: Invalid argument. ALSA lib pcm.c:2211:(snd_pcm_open_noupdate) Unknown PCM pulse alsa-gapless: snd_pcm_open failed: No such file or directory. A smaller but still annoying problem shows up only once the offending snd_config_delete calls are taken out: software devices, such as "pulse" and "null" are listed twice or three times depending on how many hardware devices I have plugged in. A third problem is that "ctl" seems to be arbitrarily left out of the list of device types that snd_device_name_hint will search for. I've added it to the list in this patch, and it seems to work fine. Finally, a performance issue: snd_device_name_hint indirectly calls snd_dlopen frequently with the parameter name == NULL, meaning to open libasound.so itself. In this case, snd_dlopen calls dladdr every call to find out the path to libasound.so. Caching this path within snd_dlopen so that dladdr is called only once speeds up the execution time of snd_device_name_hint (a somewhat slow call) by 40%. I am attaching three patches that fix these problems: - src/conf.c - src/dlmisc.c - src/control/namehint.c Peace, John Lindgren

1 0

[alsa-devel] snd-usb-caiaq: Locking bug fixes
by Mark Hills 26 Oct '09

26 Oct '09

Hi Takashi, I'll follow up this mail with 3 revised patches for inclusion. They fix a significant bug; Daniel has ack'd them and asked that they go into -rc if possible. Thanks, -- Mark

2 4

[alsa-devel] [PATCH] ASoC: Amstrad Delta: add info about the line discipline requirement to Kconfig help text
by Janusz Krzysztofik 25 Oct '09

25 Oct '09

I thought it could be usefull to add some information on how to get the device fully supported by loading a line discipline on the modem line. Signed-off-by: Janusz Krzysztofik <jkrzyszt(a)tis.icnet.pl> --- As you could probably notice, I am not a native English, so please feel free to correct my poor language if desired. --- linux-2.6.32-rc5/sound/soc/omap/Kconfig.orig 2009-10-16 02:41:50.000000000 +0200 +++ linux-2.6.32-rc5/sound/soc/omap/Kconfig 2009-10-24 00:01:26.000000000 +0200 @@ -21,7 +21,18 @@ config SND_OMAP_SOC_AMS_DELTA select SND_OMAP_SOC_MCBSP select SND_SOC_CX20442 help - Say Y if you want to add support for SoC audio on Amstrad Delta. + Say Y if you want to add support for SoC audio device connected to + a handset and a speakerphone found on Amstrad E3 (Delta) videophone. + + Note that in order to get those devices fully supported, you have to + build the kernel with standard serial port driver included and + configured for at least 4 ports. Then, from userspace, you must load + a line discipline #19 on the modem (ttyS3) serial line. The simplest + way to achieve this is to install util-linux-ng and use the included + ldattach utility. This can be started automatically from udev, + a simple rule like this one should do the trick (it does for me): + ACTION=="add", KERNEL=="controlC0", \ + RUN+="/usr/sbin/ldattach 19 /dev/ttyS3" config SND_OMAP_SOC_OSK5912 tristate "SoC Audio support for omap osk5912"

2 1

[alsa-devel] [PATCH 0/4 v2] MFD/OMAP/ASoC: MFD device for twl4030 codec submodule
by Peter Ujfalusi 25 Oct '09

25 Oct '09

Hello, Changes from the first series: - twl4030-codec MFD driver is using the mfd-core API (and selects MFD_CORE) - Added Acked-by: Tony Lindgren <tony(a)atomide.com> to the patch for the OMAP board files - User selectable Kconfig is removed for the TWL4030_CODEC - soc codec driver patch separated: - Change the header file, and use the include/linux/mfd/twl4030-codec.h for register definitions - The actual change in the soc codec driver - Module alias corrected in soc codec driver - The bias is brought up when the driver comes up, rather than in soc probe. - The soc codec driver is selecting the TWL4030_CODEC driver The series applies on top of sound-2.6:topic/asoc branch Commit message from the first series: The following series adds new MFD device on top of the twl4030 MFD device for the codec part of the chip, and also converts the soc audio driver to use the correct probing (device model). Reason for the twl4030_codec MFD: the vibra control is actually in the codec part of the twl4030. If both the vibra and the audio functionality is needed from the twl4030 at the same time, than they need to control the codec power and APLL at the same time without breaking the other driver. Also these two has to be able to work without the need for the other driver. The proposed solution: Register twl4030_codec as a child for the twl4030 mfd. twl4030_codec is also and mfd and at the moment it has two child: twl4030_codec_audio: for audio codec twl4030_codec_vibra: for vibra driver The twl4030_codec mfd registers the devices for audio and vibra (if the platform data is not NULL for them), and has - at the moment - functions to enable/disable resources, each of these resources has ref-counts, so the twl4030_codec knows, when the resource is need to be turned on or off. The interface is quite simple: int twl4030_codec_enable_resource(enum twl4030_codec_res id); int twl4030_codec_disable_resource(enum twl4030_codec_res id); These functions are returning the content of the given register after the modification (or negative value, if error - the error handling need to be revisited in a near future), so that the caller can update it's local cache if it need to do (the audio driver needs it). There are two resource defined: TWL4030_CODEC_RES_POWER: Controlling the power of the codec TWL4030_CODEC_RES_APLL: For APLL The vibra driver is not part of this series. I have also included a patch, which changes the board files for those, which in my knowledge uses the twl4030 codec as audio device. I might missed some boards... To-Do list: - add the actual vibra driver ;) - coexistence related fixes for the audio and vibra driver - move all audio related configuration from soc machine drivers to the board files (if any) --- Peter Ujfalusi (4): MFD: twl4030: add twl4030_codec MFD as a new child to the core OMAP: Platform support for twl4030_codec MFD ASoC: TWL4030: use the twl4030-codec.h for register descriptions ASoC: TWL4030: Driver registration via twl4030_codec MFD arch/arm/mach-omap2/board-3430sdp.c | 9 + arch/arm/mach-omap2/board-omap3beagle.c | 9 + arch/arm/mach-omap2/board-omap3evm.c | 9 + arch/arm/mach-omap2/board-omap3pandora.c | 9 + arch/arm/mach-omap2/board-overo.c | 9 + arch/arm/mach-omap2/board-zoom2.c | 9 + drivers/mfd/Kconfig | 6 + drivers/mfd/Makefile | 1 + drivers/mfd/twl4030-codec.c | 241 ++++++++++++++++++++++++++ drivers/mfd/twl4030-core.c | 14 ++ include/linux/i2c/twl4030.h | 18 ++ include/linux/mfd/twl4030-codec.h | 271 ++++++++++++++++++++++++++++++ sound/soc/codecs/Kconfig | 1 + sound/soc/codecs/twl4030.c | 203 ++++++++++++++--------- sound/soc/codecs/twl4030.h | 242 +-------------------------- 15 files changed, 738 insertions(+), 313 deletions(-) create mode 100644 drivers/mfd/twl4030-codec.c create mode 100644 include/linux/mfd/twl4030-codec.h

3 9

[alsa-devel] [PATCH 2/2] es18xx: remove snd_audiodrive structure
by Krzysztof Helt 25 Oct '09

25 Oct '09

From: Krzysztof Helt <krzysztof.h1(a)wp.pl> Remove intermediate snd_audiodrive structure between snd_card structure and snd_es18xx. This reduces size of source code and binary driver. Signed-off-by: Krzysztof Helt <krzysztof.h1(a)wp.pl> --- sound/isa/es18xx.c | 71 ++++++++++++++++++--------------------------------- 1 files changed, 25 insertions(+), 46 deletions(-) diff --git a/sound/isa/es18xx.c b/sound/isa/es18xx.c index 160752b..5cf42b4 100644 --- a/sound/isa/es18xx.c +++ b/sound/isa/es18xx.c @@ -139,10 +139,6 @@ struct snd_es18xx { #ifdef CONFIG_PM unsigned char pm_reg; #endif -}; - -struct snd_audiodrive { - struct snd_es18xx *chip; #ifdef CONFIG_PNP struct pnp_dev *dev; struct pnp_dev *devc; @@ -755,8 +751,7 @@ static int snd_es18xx_playback_trigger(struct snd_pcm_substream *substream, static irqreturn_t snd_es18xx_interrupt(int irq, void *dev_id) { struct snd_card *card = dev_id; - struct snd_audiodrive *acard = card->private_data; - struct snd_es18xx *chip = acard->chip; + struct snd_es18xx *chip = card->private_data; unsigned char status; if (chip->caps & ES18XX_CONTROL) { @@ -1699,8 +1694,7 @@ static struct snd_pcm_ops snd_es18xx_capture_ops = { static int __devinit snd_es18xx_pcm(struct snd_card *card, int device, struct snd_pcm **rpcm) { - struct snd_audiodrive *acard = card->private_data; - struct snd_es18xx *chip = acard->chip; + struct snd_es18xx *chip = card->private_data; struct snd_pcm *pcm; char str[16]; int err; @@ -1742,8 +1736,7 @@ static int __devinit snd_es18xx_pcm(struct snd_card *card, int device, #ifdef CONFIG_PM static int snd_es18xx_suspend(struct snd_card *card, pm_message_t state) { - struct snd_audiodrive *acard = card->private_data; - struct snd_es18xx *chip = acard->chip; + struct snd_es18xx *chip = card->private_data; snd_power_change_state(card, SNDRV_CTL_POWER_D3hot); @@ -1760,8 +1753,7 @@ static int snd_es18xx_suspend(struct snd_card *card, pm_message_t state) static int snd_es18xx_resume(struct snd_card *card) { - struct snd_audiodrive *acard = card->private_data; - struct snd_es18xx *chip = acard->chip; + struct snd_es18xx *chip = card->private_data; /* restore PM register, we won't wake till (not 0x07) i/o activity though */ snd_es18xx_write(chip, ES18XX_PM, chip->pm_reg ^= ES18XX_PM_FM); @@ -1773,8 +1765,7 @@ static int snd_es18xx_resume(struct snd_card *card) static int snd_es18xx_free(struct snd_card *card) { - struct snd_audiodrive *acard = card->private_data; - struct snd_es18xx *chip = acard->chip; + struct snd_es18xx *chip = card->private_data; release_and_free_resource(chip->res_port); release_and_free_resource(chip->res_ctrl_port); @@ -1789,7 +1780,6 @@ static int snd_es18xx_free(struct snd_card *card) disable_dma(chip->dma2); free_dma(chip->dma2); } - kfree(chip); return 0; } @@ -1802,19 +1792,14 @@ static int __devinit snd_es18xx_new_device(struct snd_card *card, unsigned long port, unsigned long mpu_port, unsigned long fm_port, - int irq, int dma1, int dma2, - struct snd_es18xx ** rchip) + int irq, int dma1, int dma2) { - struct snd_es18xx *chip; + struct snd_es18xx *chip = card->private_data; static struct snd_device_ops ops = { .dev_free = snd_es18xx_dev_free, }; int err; - *rchip = NULL; - chip = kzalloc(sizeof(*chip), GFP_KERNEL); - if (chip == NULL) - return -ENOMEM; spin_lock_init(&chip->reg_lock); spin_lock_init(&chip->mixer_lock); spin_lock_init(&chip->ctrl_lock); @@ -1865,14 +1850,12 @@ static int __devinit snd_es18xx_new_device(struct snd_card *card, snd_es18xx_free(card); return err; } - *rchip = chip; return 0; } static int __devinit snd_es18xx_mixer(struct snd_card *card) { - struct snd_audiodrive *acard = card->private_data; - struct snd_es18xx *chip = acard->chip; + struct snd_es18xx *chip = card->private_data; int err; unsigned int idx; @@ -2074,11 +2057,11 @@ static int __devinit snd_audiodrive_pnp_init_main(int dev, struct pnp_dev *pdev) return 0; } -static int __devinit snd_audiodrive_pnp(int dev, struct snd_audiodrive *acard, +static int __devinit snd_audiodrive_pnp(int dev, struct snd_es18xx *chip, struct pnp_dev *pdev) { - acard->dev = pdev; - if (snd_audiodrive_pnp_init_main(dev, acard->dev) < 0) + chip->dev = pdev; + if (snd_audiodrive_pnp_init_main(dev, chip->dev) < 0) return -EBUSY; return 0; } @@ -2104,26 +2087,26 @@ static struct pnp_card_device_id snd_audiodrive_pnpids[] = { MODULE_DEVICE_TABLE(pnp_card, snd_audiodrive_pnpids); -static int __devinit snd_audiodrive_pnpc(int dev, struct snd_audiodrive *acard, +static int __devinit snd_audiodrive_pnpc(int dev, struct snd_es18xx *chip, struct pnp_card_link *card, const struct pnp_card_device_id *id) { - acard->dev = pnp_request_card_device(card, id->devs[0].id, NULL); - if (acard->dev == NULL) + chip->dev = pnp_request_card_device(card, id->devs[0].id, NULL); + if (chip->dev == NULL) return -EBUSY; - acard->devc = pnp_request_card_device(card, id->devs[1].id, NULL); - if (acard->devc == NULL) + chip->devc = pnp_request_card_device(card, id->devs[1].id, NULL); + if (chip->devc == NULL) return -EBUSY; /* Control port initialization */ - if (pnp_activate_dev(acard->devc) < 0) { + if (pnp_activate_dev(chip->devc) < 0) { snd_printk(KERN_ERR PFX "PnP control configure failure (out of resources?)\n"); return -EAGAIN; } snd_printdd("pnp: port=0x%llx\n", - (unsigned long long)pnp_port_start(acard->devc, 0)); - if (snd_audiodrive_pnp_init_main(dev, acard->dev) < 0) + (unsigned long long)pnp_port_start(chip->devc, 0)); + if (snd_audiodrive_pnp_init_main(dev, chip->dev) < 0) return -EBUSY; return 0; @@ -2139,24 +2122,20 @@ static int __devinit snd_audiodrive_pnpc(int dev, struct snd_audiodrive *acard, static int snd_es18xx_card_new(int dev, struct snd_card **cardp) { return snd_card_create(index[dev], id[dev], THIS_MODULE, - sizeof(struct snd_audiodrive), cardp); + sizeof(struct snd_es18xx), cardp); } static int __devinit snd_audiodrive_probe(struct snd_card *card, int dev) { - struct snd_audiodrive *acard = card->private_data; - struct snd_es18xx *chip; + struct snd_es18xx *chip = card->private_data; struct snd_opl3 *opl3; int err; - if ((err = snd_es18xx_new_device(card, - port[dev], - mpu_port[dev], - fm_port[dev], - irq[dev], dma1[dev], dma2[dev], - &chip)) < 0) + err = snd_es18xx_new_device(card, + port[dev], mpu_port[dev], fm_port[dev], + irq[dev], dma1[dev], dma2[dev]); + if (err < 0) return err; - acard->chip = chip; sprintf(card->driver, "ES%x", chip->version); -- 1.6.0.3 ---------------------------------------------------------------------- Nie dla nich ciepla praca za biurkiem. Sprawdz >>> http://link.interia.pl/f2383

1 0

[alsa-devel] Problems in snd_device_name_hint
by John Lindgren 25 Oct '09

25 Oct '09

Hello, I haven't frequented the alsa-devel list in the past, but Debian's maintainer apparently prefers that I go directly to the ALSA developers. While developing a new ALSA output plugin for Audacious audio player, I have run into several problems in snd_device_name_hint. I've already described the problems in the Debian bug tracker and made up some patches, which I would like someone to review. Here are the links: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=549531 http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=552240 I'm also attaching the patches here. Peace, John Lindgren

1 0

Re: [alsa-devel] How to close ALSA device nodes?
by Rémi Denis-Courmont 24 Oct '09

24 Oct '09

Le dimanche 18 octobre 2009 20:13:15 Robert Hancock, vous avez écrit : > > From the earlier thread, I reckon that ALSA developers consider that this > > is an upper-layer issue. Maybe so, but then how is the upper-layer > > supposed to find which file descriptors ALSA-lib has opened - if any? > > Conversely, if ALSA- lib won't tell while file descriptors it is using, > > what could possibly be the use case for not closing those on exec? > > I agree that it's a difficult problem for an app that wants to fork > and exec another process.. I'd think really should be some way for an > app to control the CLOEXEC flag for the file descriptors that alsa-lib > has open.. Right. The kernel recently introduced the O_CLOEXEC open flag, to support thread-safe close-on-exec. The only way to leverage this is for ALSA-lib to set close-on-exec itself when it opens a file (whether by default or when the application requests it). That said, I still fail to see any potential use case to not set the flag. Since ALSA-lib won't let the application know about the file handles, any application cannot a use them across exec() in the first place. For the reference, glibc is now setting close-on-exec in similar cases, e.g. syslog(). > I guess the alternative would be to shutdown all open PCMs, etc. in > ALSA in the child process after forking and before the exec, so that > they don't end up still open for the new process.. I suspect such an approach would be painful both for ALSA and for the applications. From ALSA, this would need safety with regards to fork in another thread. That probably requires pthread_atfork() *glurp* if ALSA is to keep its SMP & thread-safety promise *ouch*. From the application, this require calling an ALSA function between fork and exec. That would forbid using system(), popen() or -faster- posix_spawn*(). That also means linking to ALSA in every place that executes. Considering that VLC is heavily plugin- based, this would be so impractical that I'd even rather scan through /proc/self/fd... -- Rémi Denis-Courmont http://git.remlab.net/cgi-bin/gitweb.cgi?p=vlc-courmisch.git;a=summary

2 5

[alsa-devel] What is the meaning of the mask values in the pcm hw constraints struct ?
by Neil Jones 24 Oct '09

24 Oct '09

I am developing an ASoC driver for a custom SoC (not in tree yet), I have written the platform and board modules and my hardware detects and installs ok, im now trying to play sound using aplay but im having issues. I get the error "aplay: set_params:1022: Unable to install hw params:" I have traced the problem to a failing ioctl call (snd_pcm_playback_ioctl) the error occurs in snd_pcm_hw_refine when refining the mask for the SNDRV_PCM_HW_PARAM_ACCESS mask, all the bit fields in my runtime->hw_constraints are zero for this field, but the requested params have the value 7, Im not sure what this means, the SNDRV_PCM_ACCESS_xxx defines in asound.h only go upto 4 ? I have attached logs below (with RULES_DEBUG turned on) hopefully this may shed some light. Thanks in advance for any help, Neil Jones Logs: # /usr/bin/aplay /var/snd48khz.wav Playing WAVE '/var/snd48khz.wav' : Signed 16 bit Little Endian, Rate 48000 Hz, Stereo aplay: set_params:1022: Unable to install hw params: ACCESS: RW_INTERLEAVED FORMAT: S16_LE SUBFORMAT: STD SAMPLE_BITS: 16 FRAME_BITS: 32 CHANNELS: 2 RATE: 48000 PERIOD_TIME: (85333 85334) PERIOD_SIZE: 4096 PERIOD_BYTES: 16384 PERIODS: (5 6) BUFFER_TIME: 500000 BUFFER_SIZE: 24000 BUFFER_BYTES: 96000 TICK_TIME: 0 (klog) ... Rule 0 [4030f9f4]: FORMAT = 4 -> 4 Rule 2 [4030f750]: SAMPLE_BITS = [16 16] -> [16 16] Rule 4 [4030f90c]: FRAME_BITS = [16 16] -> [16 16] Rule 5 [4030f90c]: FRAME_BITS = [16 16] -> [16 16] Rule 7 [4030f90c]: RATE = [48000 48000] -> [48000 48000] Rule 8 [4030f90c]: RATE = [48000 48000] -> [48000 48000] Rule 9 [4030f750]: PERIODS = [1 128] -> [1 128] Rule 10 [4030f750]: PERIOD_SIZE = [16 4096] -> [16 4096] Rule 12 [4030f828]: PERIOD_SIZE = [16 4096] -> [16 4096] Rule 15 [4030f828]: BUFFER_SIZE = [16 65536] -> [16 65536] Rule 18 [4030f90c]: PERIOD_TIME = (166 128000] -> (333 85334) Rule 19 [4030f90c]: BUFFER_TIME = (166 2048000] -> (333 1365334) Rule 7 [4030f90c]: RATE = [48000 48000] -> [48000 48000] Rule 8 [4030f90c]: RATE = [48000 48000] -> [48000 48000] Rule 12 [4030f828]: PERIOD_SIZE = [16 4096] -> [16 4096] Rule 15 [4030f828]: BUFFER_SIZE = [16 65536] -> [16 65536] ACCESS = 0000000000000007 -> 0000000000000000 - This message is subject to Imagination Technologies' e-mail terms: http://www.imgtec.com/e-mail.htm Imagination Technologies Ltd is a limited company registered in England No: 1306335 Registered Office: Imagination House, Home Park Estate, Kings Langley, Hertfordshire, WD4 8LZ. Email to and from the company may be monitored for compliance and other administrative purposes. -

2 3

[alsa-devel] libasound2: snd_device_name_hint() wrongly calls snd_config_delete()
by Elimar Riesebieter 23 Oct '09

23 Oct '09

forwarded 549531 alsa-devel(a)alsa-project.org thanks This looks more like a general problem and shouldn't be solved distribution specific so request for help to the alsa developers. Elimar * John Lindgren [091003 20:34 -0400] > Package: libasound2 > Version: 1.0.21a-1 > Severity: normal > Tags: patch > > Symptoms > -------- > > This bug first showed up because of a new ALSA output plugin for > Audacious audio player: > > http://jira.atheme.org/browse/AUDPLUG-77#action_10640 > > Essentially, any call to snd_device_name_hint() causes later calls to > snd_pcm_open() to fail with messages like these: > > ALSA lib conf.c:4600:(snd_config_expand) Unknown parameters CARD=Live,DEV=0 > ALSA lib pcm.c:2211:(snd_pcm_open_noupdate) Unknown PCM rear:CARD=Live,DEV=0 > > This happens only for PCMs defined in ALSA config files (such as the > ones under /usr/share/alsa/cards), not for "default" or "hw:0,0"-style. > It does not seem to depend on a particular sound card. It can be > reproduced without Audacious by adding a call to pcm_list() before the > call to snd_pcm_open() in aplay.c from the alsa-utils package: > > $ ./aplay -D front:CARD=ICH6,DEV=0 Test.wav > default:CARD=ICH6 > Intel ICH6, Intel ICH6 > Default Audio Device > front:CARD=ICH6,DEV=0 > Intel ICH6, Intel ICH6 > Front speakers > surround40:CARD=ICH6,DEV=0 > Intel ICH6, Intel ICH6 > 4.0 Surround output to Front and Rear speakers > surround41:CARD=ICH6,DEV=0 > Intel ICH6, Intel ICH6 > 4.1 Surround output to Front, Rear and Subwoofer speakers > surround50:CARD=ICH6,DEV=0 > Intel ICH6, Intel ICH6 > 5.0 Surround output to Front, Center and Rear speakers > surround51:CARD=ICH6,DEV=0 > Intel ICH6, Intel ICH6 > 5.1 Surround output to Front, Center, Rear and Subwoofer speakers > iec958:CARD=ICH6,DEV=0 > Intel ICH6, Intel ICH6 - IEC958 > IEC958 (S/PDIF) Digital Audio Output > null > Discard all samples (playback) or generate zero samples (capture) > ALSA lib conf.c:4600:(snd_config_expand) Unknown parameters CARD=ICH6,DEV=0 > ALSA lib pcm.c:2211:(snd_pcm_open_noupdate) Unknown PCM front:CARD=ICH6,DEV=0 > aplay: main:610: audio open error: Invalid argument > > Diagnosis > --------- > > try_config(), called by snd_device_name_hint(), calls > snd_config_search_definition() at namehint.c line 243 and > snd_config_search_alias_hooks() at line 339, then calls > snd_config_delete() on the returned nodes at lines 331 and 383. This > was probably meant to prevent leaking memory returned by the search > functions, but in fact it removes information from the config that is > needed by later calls, such as snd_pcm_open. Hence, snd_pcm_open > behaves as though devices like "front" and "rear" do not exist. > > I have attached a patch for aplay.c to reproduce the problem and a patch > for namehint.c to fix it. One side effect of the fix (on my system at > least) is that two "null" devices are now listed by "aplay -L" and in > Audacious. > > Peace, > John Lindgren > > > -- System Information: > Debian Release: squeeze/sid > APT prefers testing > APT policy: (500, 'testing') > Architecture: i386 (i686) > > Kernel: Linux 2.6.30-1-686 (SMP w/1 CPU core) > Locale: LANG=en_US.UTF-8, LC_CTYPE=en_US.UTF-8 (charmap=UTF-8) > Shell: /bin/sh linked to /bin/dash > > Versions of packages libasound2 depends on: > ii libc6 2.9-25 GNU C Library: Shared libraries > > libasound2 recommends no packages. > > Versions of packages libasound2 suggests: > pn libasound2-plugins <none> (no description available) > > -- no debconf information > --- aplay.0.c 2009-08-31 11:13:36.000000000 -0400 > +++ aplay.c 2009-10-03 19:54:43.000000000 -0400 > @@ -603,6 +603,8 @@ > goto __end; > } > > + pcm_list(); > + > err = snd_pcm_open(&handle, pcm_name, stream, open_mode); > if (err < 0) { > error(_("audio open error: %s"), snd_strerror(err)); > --- namehint.0.c 2009-09-09 08:34:54.000000000 -0400 > +++ namehint.c 2009-10-03 17:39:23.000000000 -0400 > @@ -328,7 +328,6 @@ > if (snd_config_search(cfg1, "slave", &cfg) >= 0 && > snd_config_search(cfg, base, &cfg1) >= 0) > goto __hint; > - snd_config_delete(res); > res = NULL; > if (strchr(buf, ':') != NULL) > goto __ok; > @@ -379,8 +378,6 @@ > err = hint_list_add(list, buf, buf1); > } > __skip_add: > - if (res) > - snd_config_delete(res); > if (buf1) > free(buf1); > free(buf); > _______________________________________________ > Pkg-alsa-devel mailing list > Pkg-alsa-devel(a)lists.alioth.debian.org > http://lists.alioth.debian.org/mailman/listinfo/pkg-alsa-devel -- It's a good thing we don't get all the government we pay for.

1 0

[alsa-devel] Exemple of source code for capture without using callback
by brunal2496 gmail 23 Oct '09

23 Oct '09

Hi all, it's my first time on this list and my knowledge about using poll() mutex and thread creation is a bit far away from now, so please, if this list is the wrong place for such a question, could you point me in the right direction? Does anyone can point me a place to find a good exemple of source code for capturing sound with alsa without using callbacks? I'm trying to interface a voice recognition software with the alsa drivers. I have to get audio from alsa convert it and then send to the recognition engine. I've read everywhere that using callback is a bad method to use the alsa drivers. As the recognition software is a server, it needs to be synchronized with my application. And so my main() cannot loop on a endless loop with the snd_pcm_readi() function inside. My first idea was to create a new thread and to let this thread running with a endless loop that do the snd_pcm_readi() and send the buffer to the recognition software. But I 've read the existence of smd_pcm_poll_descriptors() function. For now I not shure was it is for and how to use it properly. What do you think? I'm sorry if my question is a real newbie question, but exemple online are only for playback not capture. Many thanks for all your answers. Bruno.

3 4

[alsa-devel] Developing and cross-compiling an ASoC driver
by Szabolcs Erki 22 Oct '09

22 Oct '09

Hello, I recently designed a custom board based on an AT91SAM9 microcontroller connected with an ADC via I2S. In the project we need a data acquisition application, which can store audio stream to wav files. On my opinion arecord fulfills our requirements. The "only" thing we have to do is writing an ASoC driver especially for the ADC (ADS1274), and cross compile it to the Linux4SAM embedded Linux environment. I didn't find any suitable description how to do a cross-platform driver development process. Could you please give me some introduction how to: - cross compile alsa-driver (AFAIK ASoC is part of it, and ALSA is part of the linux kernel), and alsa-utils (for getting arecord) - cross compile the newly developed alsa driver - integrate ASoC and the custom driver to the patched kernel (Linux4SAM) and cross compile them to one image. Thank you for your help in advance! Br, Szabolcs Erki

2 4

[alsa-devel] [PATCH alsa-lib 1/3] Open device nodes with close-on-exec flag
by Rémi Denis-Courmont 22 Oct '09

22 Oct '09

From: Rémi Denis-Courmont <remi(a)remlab.net> This avoid leaking device descriptors through exec. Thus ALSA applications can safely spawn other processes in their background. Signed-off-by: Rémi Denis-Courmont <remi(a)remlab.net> --- include/local.h | 23 +++++++++++++++++------ 1 files changed, 17 insertions(+), 6 deletions(-) diff --git a/include/local.h b/include/local.h index b5a1c45..5b54def 100644 --- a/include/local.h +++ b/include/local.h @@ -230,22 +230,33 @@ extern snd_lib_error_handler_t snd_err_msg; # define link_warning(symbol, msg) #endif -/* open with resmgr */ -#ifdef SUPPORT_RESMGR static inline int snd_open_device(const char *filename, int fmode) { - int fd = open(filename, fmode); + int fd; + +#ifdef O_CLOEXEC + fd = open(filename, fmode|O_CLOEXEC); if (fd >= 0) return fd; + if (errno == EINVAL) +#endif + { + fd = open(filename, fmode); + if (fd >= 0) { + fcntl(fd, F_SETFD, FD_CLOEXEC); + return fd; + } + } + +/* open with resmgr */ +#ifdef SUPPORT_RESMGR if (errno == EAGAIN || errno == EBUSY) return fd; if (! access(filename, F_OK)) return rsm_open_device(filename, fmode); +#endif return -1; } -#else -#define snd_open_device(filename, fmode) open(filename, fmode); -#endif /* make local functions really local */ #define snd_dlobj_cache_lookup \ -- 1.6.5

1 2

[alsa-devel] [PATCH alsa-lib 1/3] Open device nodes with close-on-exec flag
by Rémi Denis-Courmont 22 Oct '09

22 Oct '09

This avoid leaking device descriptors through exec. Thus ALSA applications can safely spawn other processes in their background. Signed-off-by: Rémi Denis-Courmont <remi(a)remlab.net> --- include/local.h | 23 +++++++++++++++++------ 1 files changed, 17 insertions(+), 6 deletions(-) diff --git a/include/local.h b/include/local.h index b5a1c45..5b54def 100644 --- a/include/local.h +++ b/include/local.h @@ -230,22 +230,33 @@ extern snd_lib_error_handler_t snd_err_msg; # define link_warning(symbol, msg) #endif -/* open with resmgr */ -#ifdef SUPPORT_RESMGR static inline int snd_open_device(const char *filename, int fmode) { - int fd = open(filename, fmode); + int fd; + +#ifdef O_CLOEXEC + fd = open(filename, fmode|O_CLOEXEC); if (fd >= 0) return fd; + if (errno == EINVAL) +#endif + { + fd = open(filename, fmode); + if (fd >= 0) { + fcntl(fd, F_SETFD, FD_CLOEXEC); + return fd; + } + } + +/* open with resmgr */ +#ifdef SUPPORT_RESMGR if (errno == EAGAIN || errno == EBUSY) return fd; if (! access(filename, F_OK)) return rsm_open_device(filename, fmode); +#endif return -1; } -#else -#define snd_open_device(filename, fmode) open(filename, fmode); -#endif /* make local functions really local */ #define snd_dlobj_cache_lookup \ -- 1.6.5

1 2

[alsa-devel] patchmix application for EMU1616m
by Dominik Zalewski 22 Oct '09

22 Oct '09

Is there anybody working on patchmix application for alsa? I'm wondering what would be the guidelines. - Should it be a clone of a patchmix for Windows: a separate program? - Or maybe there is already some infrastructure in Alsa that should be extended with that functionality? - Alsamixer already has some of that functionality, should be replicated in new patchmix application? - Are there any restrictions for the GUI libraries that may be used? - Does it have to be written in C/C++, or is Java also applicable? -- Dominik Zalewski

2 1