Merge branch 'for-2.6.40' of git://git.kernel.org/pub/scm/linux/kernel/git/lrg/asoc-2.6 into topic/asoc

MAINTAINERS

···
 F:	sound/
 
 SOUND - SOC LAYER / DYNAMIC AUDIO POWER MANAGEMENT (ASoC)
-M:	Liam Girdwood <[e-mail]>
+M:	Liam Girdwood <[e-mail]>
 M:	Mark Brown <[e-mail]>
 T:	git git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound-2.6.git
 L:	[e-mail] (moderated for non-subscribers)
···
 F:	include/linux/tifm.h
 
 TI TWL4030 SERIES SOC CODEC DRIVER
-M:	Peter Ujfalusi <[e-mail]>
+M:	Peter Ujfalusi <[e-mail]>
 L:	[e-mail] (moderated for non-subscribers)
 S:	Maintained
 F:	sound/soc/codecs/twl4030*
···
 F:	drivers/scsi/vmw_pvscsi.h
 
 VOLTAGE AND CURRENT REGULATOR FRAMEWORK
-M:	Liam Girdwood <[e-mail]>
+M:	Liam Girdwood <[e-mail]>
 M:	Mark Brown <[e-mail]>
 W:	http://opensource.wolfsonmicro.com/node/15
 W:	http://www.slimlogic.co.uk/?p=48

include/sound/tlv320dac33-plat.h

···
 /*
  * Platform header for Texas Instruments TLV320DAC33 codec driver
  *
- * Author:	Peter Ujfalusi <[e-mail]>
+ * Author: Peter Ujfalusi <[e-mail]>
  *
  * Copyright:   (C) 2009 Nokia Corporation
  *

include/sound/tpa6130a2-plat.h

···
  *
  * Copyright (C) Nokia Corporation
  *
- * Written by Peter Ujfalusi <[e-mail]>
+ * Author: Peter Ujfalusi <[e-mail]>
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License

sound/soc/codecs/tlv320dac33.c

···
 /*
  * ALSA SoC Texas Instruments TLV320DAC33 codec driver
  *
- * Author:	Peter Ujfalusi <[e-mail]>
+ * Author: Peter Ujfalusi <[e-mail]>
  *
  * Copyright:   (C) 2009 Nokia Corporation
  *
···
 
 
 MODULE_DESCRIPTION("ASoC TLV320DAC33 codec driver");
-MODULE_AUTHOR("Peter Ujfalusi <[e-mail]>");
+MODULE_AUTHOR("Peter Ujfalusi <[e-mail]>");
 MODULE_LICENSE("GPL");

sound/soc/codecs/tlv320dac33.h

···
 /*
  * ALSA SoC Texas Instruments TLV320DAC33 codec driver
  *
- * Author:	Peter Ujfalusi <[e-mail]>
+ * Author: Peter Ujfalusi <[e-mail]>
  *
  * Copyright:   (C) 2009 Nokia Corporation
  *

sound/soc/codecs/tpa6130a2.c

···
  *
  * Copyright (C) Nokia Corporation
  *
- * Author: Peter Ujfalusi <[e-mail]>
+ * Author: Peter Ujfalusi <[e-mail]>
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
···
 	i2c_del_driver(&tpa6130a2_i2c_driver);
 }
 
-MODULE_AUTHOR("Peter Ujfalusi");
+MODULE_AUTHOR("Peter Ujfalusi <[e-mail]>");
 MODULE_DESCRIPTION("TPA6130A2 Headphone amplifier driver");
 MODULE_LICENSE("GPL");
 

sound/soc/codecs/tpa6130a2.h

···
  *
  * Copyright (C) Nokia Corporation
  *
- * Author: Peter Ujfalusi <[e-mail]>
+ * Author: Peter Ujfalusi <[e-mail]>
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License

sound/soc/codecs/twl6040.c

···
 
 /*
  * 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:
···
 
 	/* AFM gains */
 	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 */
 	SOC_TWL6040_DOUBLE_TLV("Headset Playback Volume",

sound/soc/omap/omap-mcbsp.c

···
  * Copyright (C) 2008 Nokia Corporation
  *
  * Contact: Jarkko Nikula <[e-mail]>
- *          Peter Ujfalusi <[e-mail]>
+ *          Peter Ujfalusi <[e-mail]>
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
···
 	 * 2 channels (stereo): size is 128 / 2 = 64 frames (2 * 64 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
 		* smaller buffer than the FIFO size to avoid underruns
···
 	default:
 		return -EINVAL;
 	}
-	if (cpu_is_omap343x()) {
+	if (cpu_is_omap34xx()) {
 		dma_data->set_threshold = omap_mcbsp_set_threshold;
 		/* TODO: Currently, MODE_ELEMENT == MODE_FRAME */
 		if (omap_mcbsp_get_dma_op_mode(bus_id) ==

sound/soc/omap/omap-mcbsp.h

···
  * Copyright (C) 2008 Nokia Corporation
  *
  * Contact: Jarkko Nikula <[e-mail]>
- *          Peter Ujfalusi <[e-mail]>
+ *          Peter Ujfalusi <[e-mail]>
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License

sound/soc/omap/omap-pcm.c

···
  * Copyright (C) 2008 Nokia Corporation
  *
  * Contact: Jarkko Nikula <[e-mail]>
- *          Peter Ujfalusi <[e-mail]>
+ *          Peter Ujfalusi <[e-mail]>
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
···
 				  SNDRV_PCM_INFO_MMAP_VALID |
 				  SNDRV_PCM_INFO_INTERLEAVED |
 				  SNDRV_PCM_INFO_PAUSE |
-				  SNDRV_PCM_INFO_RESUME,
+				  SNDRV_PCM_INFO_RESUME |
+				  SNDRV_PCM_INFO_NO_PERIOD_WAKEUP,
 	.formats		= SNDRV_PCM_FMTBIT_S16_LE |
 				  SNDRV_PCM_FMTBIT_S32_LE,
 	.period_bytes_min	= 32,
···
 	if ((cpu_is_omap1510()))
 		omap_enable_dma_irq(prtd->dma_ch, OMAP_DMA_FRAME_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);
 
 	if (!(cpu_class_is_omap1())) {

sound/soc/omap/omap-pcm.h

···
  * Copyright (C) 2008 Nokia Corporation
  *
  * Contact: Jarkko Nikula <[e-mail]>
- *          Peter Ujfalusi <[e-mail]>
+ *          Peter Ujfalusi <[e-mail]>
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License

sound/soc/omap/rx51.c

···
  *
  * Copyright (C) 2008 - 2009 Nokia Corporation
  *
- * Contact: Peter Ujfalusi <[e-mail]>
+ * Contact: Peter Ujfalusi <[e-mail]>
  *          Eduardo Valentin <[e-mail]>
  *          Jarkko Nikula <[e-mail]>
  *