---

yaml
---
r: 142701
b: refs/heads/master
c: 1661c61
h: refs/heads/master
i:
  142699: 2830934
v: v3

[refs]

@@ -1,2 +1,2 @@
 ---
-refs/heads/master: b114701c0e8d580a05643c874d87e2501ab729cb
+refs/heads/master: 1661c6155589f8faa1338f3cda696ea3f4cb2da1

trunk/sound/arm/pxa2xx-ac97-lib.c

@@ -238,8 +238,6 @@ static inline void pxa_ac97_cold_pxa3xx(void)
 
 bool pxa2xx_ac97_try_warm_reset(struct snd_ac97 *ac97)
 {
-	unsigned long gsr;
-
 #ifdef CONFIG_PXA25x
 	if (cpu_is_pxa25x())
 		pxa_ac97_warm_pxa25x();
@@ -256,10 +254,10 @@ bool pxa2xx_ac97_try_warm_reset(struct snd_ac97 *ac97)
 	else
 #endif
 		BUG();
-	gsr = GSR | gsr_bits;
-	if (!(gsr & (GSR_PCR | GSR_SCR))) {
+
+	if (!((GSR | gsr_bits) & (GSR_PCR | GSR_SCR))) {
 		printk(KERN_INFO "%s: warm reset timeout (GSR=%#lx)\n",
-				 __func__, gsr);
+				 __func__, gsr_bits);
 
 		return false;
 	}
@@ -270,8 +268,6 @@ EXPORT_SYMBOL_GPL(pxa2xx_ac97_try_warm_reset);
 
 bool pxa2xx_ac97_try_cold_reset(struct snd_ac97 *ac97)
 {
-	unsigned long gsr;
-
 #ifdef CONFIG_PXA25x
 	if (cpu_is_pxa25x())
 		pxa_ac97_cold_pxa25x();
@@ -289,10 +285,9 @@ bool pxa2xx_ac97_try_cold_reset(struct snd_ac97 *ac97)
 #endif
 		BUG();
 
-	gsr = GSR | gsr_bits;
-	if (!(gsr & (GSR_PCR | GSR_SCR))) {
+	if (!((GSR | gsr_bits) & (GSR_PCR | GSR_SCR))) {
 		printk(KERN_INFO "%s: cold reset timeout (GSR=%#lx)\n",
-				 __func__, gsr);
+				 __func__, gsr_bits);
 
 		return false;
 	}

trunk/sound/isa/opl3sa2.c

@@ -481,6 +481,7 @@ OPL3SA2_DOUBLE_TLV("Master Playback Volume", 0, 0x07, 0x08, 0, 0, 15, 1,
 OPL3SA2_SINGLE("Mic Playback Switch", 0, 0x09, 7, 1, 1),
 OPL3SA2_SINGLE_TLV("Mic Playback Volume", 0, 0x09, 0, 31, 1,
 		   db_scale_5bit_12db_max),
+OPL3SA2_SINGLE("ZV Port Switch", 0, 0x02, 0, 1, 0),
 };
 
 static struct snd_kcontrol_new snd_opl3sa2_tone_controls[] = {

trunk/sound/soc/codecs/twl4030.c

@@ -122,9 +122,6 @@ struct twl4030_priv {
 	unsigned int bypass_state;
 	unsigned int codec_powered;
 	unsigned int codec_muted;
-
-	struct snd_pcm_substream *master_substream;
-	struct snd_pcm_substream *slave_substream;
 };
 
 /*
@@ -1220,64 +1217,15 @@ static int twl4030_set_bias_level(struct snd_soc_codec *codec,
 	return 0;
 }
 
-static int twl4030_startup(struct snd_pcm_substream *substream)
-{
-	struct snd_soc_pcm_runtime *rtd = substream->private_data;
-	struct snd_soc_device *socdev = rtd->socdev;
-	struct snd_soc_codec *codec = socdev->codec;
-	struct twl4030_priv *twl4030 = codec->private_data;
-
-	/* If we already have a playback or capture going then constrain
-	 * this substream to match it.
-	 */
-	if (twl4030->master_substream) {
-		struct snd_pcm_runtime *master_runtime;
-		master_runtime = twl4030->master_substream->runtime;
-
-		snd_pcm_hw_constraint_minmax(substream->runtime,
-					     SNDRV_PCM_HW_PARAM_RATE,
-					     master_runtime->rate,
-					     master_runtime->rate);
-
-		snd_pcm_hw_constraint_minmax(substream->runtime,
-					     SNDRV_PCM_HW_PARAM_SAMPLE_BITS,
-					     master_runtime->sample_bits,
-					     master_runtime->sample_bits);
-
-		twl4030->slave_substream = substream;
-	} else
-		twl4030->master_substream = substream;
-
-	return 0;
-}
-
-static void twl4030_shutdown(struct snd_pcm_substream *substream)
-{
-	struct snd_soc_pcm_runtime *rtd = substream->private_data;
-	struct snd_soc_device *socdev = rtd->socdev;
-	struct snd_soc_codec *codec = socdev->codec;
-	struct twl4030_priv *twl4030 = codec->private_data;
-
-	if (twl4030->master_substream == substream)
-		twl4030->master_substream = twl4030->slave_substream;
-
-	twl4030->slave_substream = NULL;
-}
-
 static int twl4030_hw_params(struct snd_pcm_substream *substream,
 			   struct snd_pcm_hw_params *params,
 			   struct snd_soc_dai *dai)
 {
 	struct snd_soc_pcm_runtime *rtd = substream->private_data;
 	struct snd_soc_device *socdev = rtd->socdev;
 	struct snd_soc_codec *codec = socdev->card->codec;
-	struct twl4030_priv *twl4030 = codec->private_data;
 	u8 mode, old_mode, format, old_format;
 
-	if (substream == twl4030->slave_substream)
-		/* Ignoring hw_params for slave substream */
-		return 0;
-
 	/* bit rate */
 	old_mode = twl4030_read_reg_cache(codec,
 			TWL4030_REG_CODEC_MODE) & ~TWL4030_CODECPDZ;
@@ -1311,9 +1259,6 @@ static int twl4030_hw_params(struct snd_pcm_substream *substream,
 	case 48000:
 		mode |= TWL4030_APLL_RATE_48000;
 		break;
-	case 96000:
-		mode |= TWL4030_APLL_RATE_96000;
-		break;
 	default:
 		printk(KERN_ERR "TWL4030 hw params: unknown rate %d\n",
 			params_rate(params));
@@ -1439,8 +1384,6 @@ static int twl4030_set_dai_fmt(struct snd_soc_dai *codec_dai,
 #define TWL4030_FORMATS	 (SNDRV_PCM_FMTBIT_S16_LE | SNDRV_PCM_FORMAT_S24_LE)
 
 static struct snd_soc_dai_ops twl4030_dai_ops = {
-	.startup	= twl4030_startup,
-	.shutdown	= twl4030_shutdown,
 	.hw_params	= twl4030_hw_params,
 	.set_sysclk	= twl4030_set_dai_sysclk,
 	.set_fmt	= twl4030_set_dai_fmt,
@@ -1452,7 +1395,7 @@ struct snd_soc_dai twl4030_dai = {
 		.stream_name = "Playback",
 		.channels_min = 2,
 		.channels_max = 2,
-		.rates = TWL4030_RATES | SNDRV_PCM_RATE_96000,
+		.rates = TWL4030_RATES,
 		.formats = TWL4030_FORMATS,},
 	.capture = {
 		.stream_name = "Capture",

trunk/sound/soc/codecs/twl4030.h

@@ -109,7 +109,6 @@
 #define TWL4030_APLL_RATE_32000		0x80
 #define TWL4030_APLL_RATE_44100		0x90
 #define TWL4030_APLL_RATE_48000		0xA0
-#define TWL4030_APLL_RATE_96000		0xE0
 #define TWL4030_SEL_16K			0x04
 #define TWL4030_CODECPDZ		0x02
 #define TWL4030_OPT_MODE		0x01

trunk/sound/soc/codecs/wm9705.c

@@ -317,41 +317,6 @@ static int wm9705_reset(struct snd_soc_codec *codec)
 	return -EIO;
 }
 
-#ifdef CONFIG_PM
-static int wm9705_soc_suspend(struct platform_device *pdev)
-{
-	struct snd_soc_device *socdev = platform_get_drvdata(pdev);
-	struct snd_soc_codec *codec = socdev->card->codec;
-
-	soc_ac97_ops.write(codec->ac97, AC97_POWERDOWN, 0xffff);
-
-	return 0;
-}
-
-static int wm9705_soc_resume(struct platform_device *pdev)
-{
-	struct snd_soc_device *socdev = platform_get_drvdata(pdev);
-	struct snd_soc_codec *codec = socdev->card->codec;
-	int i, ret;
-	u16 *cache = codec->reg_cache;
-
-	ret = wm9705_reset(codec);
-	if (ret < 0) {
-		printk(KERN_ERR "could not reset AC97 codec\n");
-		return ret;
-	}
-
-	for (i = 2; i < ARRAY_SIZE(wm9705_reg) << 1; i += 2) {
-		soc_ac97_ops.write(codec->ac97, i, cache[i>>1]);
-	}
-
-	return 0;
-}
-#else
-#define wm9705_soc_suspend NULL
-#define wm9705_soc_resume NULL
-#endif
-
 static int wm9705_soc_probe(struct platform_device *pdev)
 {
 	struct snd_soc_device *socdev = platform_get_drvdata(pdev);
@@ -442,8 +407,6 @@ static int wm9705_soc_remove(struct platform_device *pdev)
 struct snd_soc_codec_device soc_codec_dev_wm9705 = {
 	.probe = 	wm9705_soc_probe,
 	.remove = 	wm9705_soc_remove,
-	.suspend =	wm9705_soc_suspend,
-	.resume =	wm9705_soc_resume,
 };
 EXPORT_SYMBOL_GPL(soc_codec_dev_wm9705);
 

trunk/sound/soc/fsl/fsl_dma.c

@@ -697,23 +697,6 @@ static snd_pcm_uframes_t fsl_dma_pointer(struct snd_pcm_substream *substream)
 	else
 		position = in_be32(&dma_channel->dar);
 
-	/*
-	 * When capture is started, the SSI immediately starts to fill its FIFO.
-	 * This means that the DMA controller is not started until the FIFO is
-	 * full.  However, ALSA calls this function before that happens, when
-	 * MR.DAR is still zero.  In this case, just return zero to indicate
-	 * that nothing has been received yet.
-	 */
-	if (!position)
-		return 0;
-
-	if ((position < dma_private->dma_buf_phys) ||
-	    (position > dma_private->dma_buf_end)) {
-		dev_err(substream->pcm->card->dev,
-			"dma pointer is out of range, halting stream\n");
-		return SNDRV_PCM_POS_XRUN;
-	}
-
 	frames = bytes_to_frames(runtime, position - dma_private->dma_buf_phys);
 
 	/*