mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-09-05 18:39:59 +00:00
Merge branch 'topic/asoc' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6 into for-2.6.40
This commit is contained in:
commit
de0853c000
13 changed files with 24 additions and 23 deletions
|
@ -5840,7 +5840,7 @@ F: include/sound/
|
||||||
F: sound/
|
F: sound/
|
||||||
|
|
||||||
SOUND - SOC LAYER / DYNAMIC AUDIO POWER MANAGEMENT (ASoC)
|
SOUND - SOC LAYER / DYNAMIC AUDIO POWER MANAGEMENT (ASoC)
|
||||||
M: Liam Girdwood <lrg@slimlogic.co.uk>
|
M: Liam Girdwood <lrg@ti.com>
|
||||||
M: Mark Brown <broonie@opensource.wolfsonmicro.com>
|
M: Mark Brown <broonie@opensource.wolfsonmicro.com>
|
||||||
T: git git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound-2.6.git
|
T: git git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound-2.6.git
|
||||||
L: alsa-devel@alsa-project.org (moderated for non-subscribers)
|
L: alsa-devel@alsa-project.org (moderated for non-subscribers)
|
||||||
|
@ -6093,7 +6093,7 @@ F: drivers/mmc/host/tifm_sd.c
|
||||||
F: include/linux/tifm.h
|
F: include/linux/tifm.h
|
||||||
|
|
||||||
TI TWL4030 SERIES SOC CODEC DRIVER
|
TI TWL4030 SERIES SOC CODEC DRIVER
|
||||||
M: Peter Ujfalusi <peter.ujfalusi@nokia.com>
|
M: Peter Ujfalusi <peter.ujfalusi@ti.com>
|
||||||
L: alsa-devel@alsa-project.org (moderated for non-subscribers)
|
L: alsa-devel@alsa-project.org (moderated for non-subscribers)
|
||||||
S: Maintained
|
S: Maintained
|
||||||
F: sound/soc/codecs/twl4030*
|
F: sound/soc/codecs/twl4030*
|
||||||
|
@ -6736,7 +6736,7 @@ F: drivers/scsi/vmw_pvscsi.c
|
||||||
F: drivers/scsi/vmw_pvscsi.h
|
F: drivers/scsi/vmw_pvscsi.h
|
||||||
|
|
||||||
VOLTAGE AND CURRENT REGULATOR FRAMEWORK
|
VOLTAGE AND CURRENT REGULATOR FRAMEWORK
|
||||||
M: Liam Girdwood <lrg@slimlogic.co.uk>
|
M: Liam Girdwood <lrg@ti.com>
|
||||||
M: Mark Brown <broonie@opensource.wolfsonmicro.com>
|
M: Mark Brown <broonie@opensource.wolfsonmicro.com>
|
||||||
W: http://opensource.wolfsonmicro.com/node/15
|
W: http://opensource.wolfsonmicro.com/node/15
|
||||||
W: http://www.slimlogic.co.uk/?p=48
|
W: http://www.slimlogic.co.uk/?p=48
|
||||||
|
|
|
@ -1,7 +1,7 @@
|
||||||
/*
|
/*
|
||||||
* Platform header for Texas Instruments TLV320DAC33 codec driver
|
* Platform header for Texas Instruments TLV320DAC33 codec driver
|
||||||
*
|
*
|
||||||
* Author: Peter Ujfalusi <peter.ujfalusi@nokia.com>
|
* Author: Peter Ujfalusi <peter.ujfalusi@ti.com>
|
||||||
*
|
*
|
||||||
* Copyright: (C) 2009 Nokia Corporation
|
* Copyright: (C) 2009 Nokia Corporation
|
||||||
*
|
*
|
||||||
|
|
|
@ -3,7 +3,7 @@
|
||||||
*
|
*
|
||||||
* Copyright (C) Nokia Corporation
|
* Copyright (C) Nokia Corporation
|
||||||
*
|
*
|
||||||
* Written by Peter Ujfalusi <peter.ujfalusi@nokia.com>
|
* Author: Peter Ujfalusi <peter.ujfalusi@ti.com>
|
||||||
*
|
*
|
||||||
* This program is free software; you can redistribute it and/or
|
* This program is free software; you can redistribute it and/or
|
||||||
* modify it under the terms of the GNU General Public License
|
* modify it under the terms of the GNU General Public License
|
||||||
|
|
|
@ -1,7 +1,7 @@
|
||||||
/*
|
/*
|
||||||
* ALSA SoC Texas Instruments TLV320DAC33 codec driver
|
* ALSA SoC Texas Instruments TLV320DAC33 codec driver
|
||||||
*
|
*
|
||||||
* Author: Peter Ujfalusi <peter.ujfalusi@nokia.com>
|
* Author: Peter Ujfalusi <peter.ujfalusi@ti.com>
|
||||||
*
|
*
|
||||||
* Copyright: (C) 2009 Nokia Corporation
|
* Copyright: (C) 2009 Nokia Corporation
|
||||||
*
|
*
|
||||||
|
@ -1658,5 +1658,5 @@ module_exit(dac33_module_exit);
|
||||||
|
|
||||||
|
|
||||||
MODULE_DESCRIPTION("ASoC TLV320DAC33 codec driver");
|
MODULE_DESCRIPTION("ASoC TLV320DAC33 codec driver");
|
||||||
MODULE_AUTHOR("Peter Ujfalusi <peter.ujfalusi@nokia.com>");
|
MODULE_AUTHOR("Peter Ujfalusi <peter.ujfalusi@ti.com>");
|
||||||
MODULE_LICENSE("GPL");
|
MODULE_LICENSE("GPL");
|
||||||
|
|
|
@ -1,7 +1,7 @@
|
||||||
/*
|
/*
|
||||||
* ALSA SoC Texas Instruments TLV320DAC33 codec driver
|
* ALSA SoC Texas Instruments TLV320DAC33 codec driver
|
||||||
*
|
*
|
||||||
* Author: Peter Ujfalusi <peter.ujfalusi@nokia.com>
|
* Author: Peter Ujfalusi <peter.ujfalusi@ti.com>
|
||||||
*
|
*
|
||||||
* Copyright: (C) 2009 Nokia Corporation
|
* Copyright: (C) 2009 Nokia Corporation
|
||||||
*
|
*
|
||||||
|
|
|
@ -3,7 +3,7 @@
|
||||||
*
|
*
|
||||||
* Copyright (C) Nokia Corporation
|
* Copyright (C) Nokia Corporation
|
||||||
*
|
*
|
||||||
* Author: Peter Ujfalusi <peter.ujfalusi@nokia.com>
|
* Author: Peter Ujfalusi <peter.ujfalusi@ti.com>
|
||||||
*
|
*
|
||||||
* This program is free software; you can redistribute it and/or
|
* This program is free software; you can redistribute it and/or
|
||||||
* modify it under the terms of the GNU General Public License
|
* modify it under the terms of the GNU General Public License
|
||||||
|
@ -495,7 +495,7 @@ static void __exit tpa6130a2_exit(void)
|
||||||
i2c_del_driver(&tpa6130a2_i2c_driver);
|
i2c_del_driver(&tpa6130a2_i2c_driver);
|
||||||
}
|
}
|
||||||
|
|
||||||
MODULE_AUTHOR("Peter Ujfalusi");
|
MODULE_AUTHOR("Peter Ujfalusi <peter.ujfalusi@ti.com>");
|
||||||
MODULE_DESCRIPTION("TPA6130A2 Headphone amplifier driver");
|
MODULE_DESCRIPTION("TPA6130A2 Headphone amplifier driver");
|
||||||
MODULE_LICENSE("GPL");
|
MODULE_LICENSE("GPL");
|
||||||
|
|
||||||
|
|
|
@ -3,7 +3,7 @@
|
||||||
*
|
*
|
||||||
* Copyright (C) Nokia Corporation
|
* Copyright (C) Nokia Corporation
|
||||||
*
|
*
|
||||||
* Author: Peter Ujfalusi <peter.ujfalusi@nokia.com>
|
* Author: Peter Ujfalusi <peter.ujfalusi@ti.com>
|
||||||
*
|
*
|
||||||
* This program is free software; you can redistribute it and/or
|
* This program is free software; you can redistribute it and/or
|
||||||
* modify it under the terms of the GNU General Public License
|
* modify it under the terms of the GNU General Public License
|
||||||
|
|
|
@ -960,9 +960,9 @@ static DECLARE_TLV_DB_SCALE(mic_amp_tlv, -600, 600, 0);
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* AFMGAIN volume control:
|
* AFMGAIN volume control:
|
||||||
* from 18 to 24 dB in 6 dB steps
|
* from -18 to 24 dB in 6 dB steps
|
||||||
*/
|
*/
|
||||||
static DECLARE_TLV_DB_SCALE(afm_amp_tlv, 1800, 600, 0);
|
static DECLARE_TLV_DB_SCALE(afm_amp_tlv, -1800, 600, 0);
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* HSGAIN volume control:
|
* HSGAIN volume control:
|
||||||
|
@ -1049,7 +1049,7 @@ static const struct snd_kcontrol_new twl6040_snd_controls[] = {
|
||||||
|
|
||||||
/* AFM gains */
|
/* AFM gains */
|
||||||
SOC_DOUBLE_TLV("Aux FM Volume",
|
SOC_DOUBLE_TLV("Aux FM Volume",
|
||||||
TWL6040_REG_LINEGAIN, 0, 4, 0xF, 0, afm_amp_tlv),
|
TWL6040_REG_LINEGAIN, 0, 3, 7, 0, afm_amp_tlv),
|
||||||
|
|
||||||
/* Playback gains */
|
/* Playback gains */
|
||||||
SOC_TWL6040_DOUBLE_TLV("Headset Playback Volume",
|
SOC_TWL6040_DOUBLE_TLV("Headset Playback Volume",
|
||||||
|
|
|
@ -4,7 +4,7 @@
|
||||||
* Copyright (C) 2008 Nokia Corporation
|
* Copyright (C) 2008 Nokia Corporation
|
||||||
*
|
*
|
||||||
* Contact: Jarkko Nikula <jhnikula@gmail.com>
|
* Contact: Jarkko Nikula <jhnikula@gmail.com>
|
||||||
* Peter Ujfalusi <peter.ujfalusi@nokia.com>
|
* Peter Ujfalusi <peter.ujfalusi@ti.com>
|
||||||
*
|
*
|
||||||
* This program is free software; you can redistribute it and/or
|
* This program is free software; you can redistribute it and/or
|
||||||
* modify it under the terms of the GNU General Public License
|
* modify it under the terms of the GNU General Public License
|
||||||
|
@ -146,7 +146,7 @@ static int omap_mcbsp_dai_startup(struct snd_pcm_substream *substream,
|
||||||
* 2 channels (stereo): size is 128 / 2 = 64 frames (2 * 64 words)
|
* 2 channels (stereo): size is 128 / 2 = 64 frames (2 * 64 words)
|
||||||
* 4 channels: size is 128 / 4 = 32 frames (4 * 32 words)
|
* 4 channels: size is 128 / 4 = 32 frames (4 * 32 words)
|
||||||
*/
|
*/
|
||||||
if (cpu_is_omap343x() || cpu_is_omap44xx()) {
|
if (cpu_is_omap34xx() || cpu_is_omap44xx()) {
|
||||||
/*
|
/*
|
||||||
* Rule for the buffer size. We should not allow
|
* Rule for the buffer size. We should not allow
|
||||||
* smaller buffer than the FIFO size to avoid underruns
|
* smaller buffer than the FIFO size to avoid underruns
|
||||||
|
@ -258,7 +258,7 @@ static int omap_mcbsp_dai_hw_params(struct snd_pcm_substream *substream,
|
||||||
default:
|
default:
|
||||||
return -EINVAL;
|
return -EINVAL;
|
||||||
}
|
}
|
||||||
if (cpu_is_omap343x()) {
|
if (cpu_is_omap34xx()) {
|
||||||
dma_data->set_threshold = omap_mcbsp_set_threshold;
|
dma_data->set_threshold = omap_mcbsp_set_threshold;
|
||||||
/* TODO: Currently, MODE_ELEMENT == MODE_FRAME */
|
/* TODO: Currently, MODE_ELEMENT == MODE_FRAME */
|
||||||
if (omap_mcbsp_get_dma_op_mode(bus_id) ==
|
if (omap_mcbsp_get_dma_op_mode(bus_id) ==
|
||||||
|
|
|
@ -4,7 +4,7 @@
|
||||||
* Copyright (C) 2008 Nokia Corporation
|
* Copyright (C) 2008 Nokia Corporation
|
||||||
*
|
*
|
||||||
* Contact: Jarkko Nikula <jhnikula@gmail.com>
|
* Contact: Jarkko Nikula <jhnikula@gmail.com>
|
||||||
* Peter Ujfalusi <peter.ujfalusi@nokia.com>
|
* Peter Ujfalusi <peter.ujfalusi@ti.com>
|
||||||
*
|
*
|
||||||
* This program is free software; you can redistribute it and/or
|
* This program is free software; you can redistribute it and/or
|
||||||
* modify it under the terms of the GNU General Public License
|
* modify it under the terms of the GNU General Public License
|
||||||
|
|
|
@ -4,7 +4,7 @@
|
||||||
* Copyright (C) 2008 Nokia Corporation
|
* Copyright (C) 2008 Nokia Corporation
|
||||||
*
|
*
|
||||||
* Contact: Jarkko Nikula <jhnikula@gmail.com>
|
* Contact: Jarkko Nikula <jhnikula@gmail.com>
|
||||||
* Peter Ujfalusi <peter.ujfalusi@nokia.com>
|
* Peter Ujfalusi <peter.ujfalusi@ti.com>
|
||||||
*
|
*
|
||||||
* This program is free software; you can redistribute it and/or
|
* This program is free software; you can redistribute it and/or
|
||||||
* modify it under the terms of the GNU General Public License
|
* modify it under the terms of the GNU General Public License
|
||||||
|
@ -37,7 +37,8 @@ static const struct snd_pcm_hardware omap_pcm_hardware = {
|
||||||
SNDRV_PCM_INFO_MMAP_VALID |
|
SNDRV_PCM_INFO_MMAP_VALID |
|
||||||
SNDRV_PCM_INFO_INTERLEAVED |
|
SNDRV_PCM_INFO_INTERLEAVED |
|
||||||
SNDRV_PCM_INFO_PAUSE |
|
SNDRV_PCM_INFO_PAUSE |
|
||||||
SNDRV_PCM_INFO_RESUME,
|
SNDRV_PCM_INFO_RESUME |
|
||||||
|
SNDRV_PCM_INFO_NO_PERIOD_WAKEUP,
|
||||||
.formats = SNDRV_PCM_FMTBIT_S16_LE |
|
.formats = SNDRV_PCM_FMTBIT_S16_LE |
|
||||||
SNDRV_PCM_FMTBIT_S32_LE,
|
SNDRV_PCM_FMTBIT_S32_LE,
|
||||||
.period_bytes_min = 32,
|
.period_bytes_min = 32,
|
||||||
|
@ -195,7 +196,7 @@ static int omap_pcm_prepare(struct snd_pcm_substream *substream)
|
||||||
if ((cpu_is_omap1510()))
|
if ((cpu_is_omap1510()))
|
||||||
omap_enable_dma_irq(prtd->dma_ch, OMAP_DMA_FRAME_IRQ |
|
omap_enable_dma_irq(prtd->dma_ch, OMAP_DMA_FRAME_IRQ |
|
||||||
OMAP_DMA_LAST_IRQ | OMAP_DMA_BLOCK_IRQ);
|
OMAP_DMA_LAST_IRQ | OMAP_DMA_BLOCK_IRQ);
|
||||||
else
|
else if (!substream->runtime->no_period_wakeup)
|
||||||
omap_enable_dma_irq(prtd->dma_ch, OMAP_DMA_FRAME_IRQ);
|
omap_enable_dma_irq(prtd->dma_ch, OMAP_DMA_FRAME_IRQ);
|
||||||
|
|
||||||
if (!(cpu_class_is_omap1())) {
|
if (!(cpu_class_is_omap1())) {
|
||||||
|
|
|
@ -4,7 +4,7 @@
|
||||||
* Copyright (C) 2008 Nokia Corporation
|
* Copyright (C) 2008 Nokia Corporation
|
||||||
*
|
*
|
||||||
* Contact: Jarkko Nikula <jhnikula@gmail.com>
|
* Contact: Jarkko Nikula <jhnikula@gmail.com>
|
||||||
* Peter Ujfalusi <peter.ujfalusi@nokia.com>
|
* Peter Ujfalusi <peter.ujfalusi@ti.com>
|
||||||
*
|
*
|
||||||
* This program is free software; you can redistribute it and/or
|
* This program is free software; you can redistribute it and/or
|
||||||
* modify it under the terms of the GNU General Public License
|
* modify it under the terms of the GNU General Public License
|
||||||
|
|
|
@ -3,7 +3,7 @@
|
||||||
*
|
*
|
||||||
* Copyright (C) 2008 - 2009 Nokia Corporation
|
* Copyright (C) 2008 - 2009 Nokia Corporation
|
||||||
*
|
*
|
||||||
* Contact: Peter Ujfalusi <peter.ujfalusi@nokia.com>
|
* Contact: Peter Ujfalusi <peter.ujfalusi@ti.com>
|
||||||
* Eduardo Valentin <eduardo.valentin@nokia.com>
|
* Eduardo Valentin <eduardo.valentin@nokia.com>
|
||||||
* Jarkko Nikula <jhnikula@gmail.com>
|
* Jarkko Nikula <jhnikula@gmail.com>
|
||||||
*
|
*
|
||||||
|
|
Loading…
Reference in a new issue