Unverified Commit f954054c authored by Mark Brown's avatar Mark Brown
Browse files

Merge remote-tracking branches 'asoc/topic/88pm860x', 'asoc/topic/amd',... 

Merge remote-tracking branches 'asoc/topic/88pm860x', 'asoc/topic/amd', 'asoc/topic/atmel', 'asoc/topic/au1x' and 'asoc/topic/bcm2835' into asoc-next
parents e2ab6dd5 79b48859 7afa535e 4b952275 123af904 8d5737a5

sound/soc/amd/acp-pcm-dma.c

+30 −5
Original line number Diff line number Diff line
@@ -850,6 +850,9 @@ static snd_pcm_uframes_t acp_dma_pointer(struct snd_pcm_substream *substream) 
	struct snd_pcm_runtime *runtime = substream->runtime;

	struct audio_substream_data *rtd = runtime->private_data;



	if (!rtd)

		return -EINVAL;



	buffersize = frames_to_bytes(runtime, runtime->buffer_size);

	bytescount = acp_get_byte_count(rtd->acp_mmio, substream->stream);
@@ -875,6 +878,8 @@ static int acp_dma_prepare(struct snd_pcm_substream *substream) 
	struct snd_pcm_runtime *runtime = substream->runtime;

	struct audio_substream_data *rtd = runtime->private_data;



	if (!rtd)

		return -EINVAL;

	if (substream->stream == SNDRV_PCM_STREAM_PLAYBACK) {

		config_acp_dma_channel(rtd->acp_mmio, SYSRAM_TO_ACP_CH_NUM,

					PLAYBACK_START_DMA_DESCR_CH12,
@@ -1091,7 +1096,11 @@ static int acp_audio_probe(struct platform_device *pdev) 
	dev_set_drvdata(&pdev->dev, audio_drv_data);



	/* Initialize the ACP */

	acp_init(audio_drv_data->acp_mmio, audio_drv_data->asic_type);

	status = acp_init(audio_drv_data->acp_mmio, audio_drv_data->asic_type);

	if (status) {

		dev_err(&pdev->dev, "ACP Init failed status:%d\n", status);

		return status;

	}



	status = snd_soc_register_platform(&pdev->dev, &acp_asoc_platform);

	if (status != 0) {
@@ -1108,9 +1117,12 @@ static int acp_audio_probe(struct platform_device *pdev) 


static int acp_audio_remove(struct platform_device *pdev)

{

	int status;

	struct audio_drv_data *adata = dev_get_drvdata(&pdev->dev);



	acp_deinit(adata->acp_mmio);

	status = acp_deinit(adata->acp_mmio);

	if (status)

		dev_err(&pdev->dev, "ACP Deinit failed status:%d\n", status);

	snd_soc_unregister_platform(&pdev->dev);

	pm_runtime_disable(&pdev->dev);
@@ -1120,9 +1132,14 @@ static int acp_audio_remove(struct platform_device *pdev) 
static int acp_pcm_resume(struct device *dev)

{

	u16 bank;

	int status;

	struct audio_drv_data *adata = dev_get_drvdata(dev);



	acp_init(adata->acp_mmio, adata->asic_type);

	status = acp_init(adata->acp_mmio, adata->asic_type);

	if (status) {

		dev_err(dev, "ACP Init failed status:%d\n", status);

		return status;

	}



	if (adata->play_stream && adata->play_stream->runtime) {

		/* For Stoney, Memory gating is disabled,i.e SRAM Banks
@@ -1154,18 +1171,26 @@ static int acp_pcm_resume(struct device *dev) 


static int acp_pcm_runtime_suspend(struct device *dev)

{

	int status;

	struct audio_drv_data *adata = dev_get_drvdata(dev);



	acp_deinit(adata->acp_mmio);

	status = acp_deinit(adata->acp_mmio);

	if (status)

		dev_err(dev, "ACP Deinit failed status:%d\n", status);

	acp_reg_write(0, adata->acp_mmio, mmACP_EXTERNAL_INTR_ENB);

	return 0;

}



static int acp_pcm_runtime_resume(struct device *dev)

{

	int status;

	struct audio_drv_data *adata = dev_get_drvdata(dev);



	acp_init(adata->acp_mmio, adata->asic_type);

	status = acp_init(adata->acp_mmio, adata->asic_type);

	if (status) {

		dev_err(dev, "ACP Init failed status:%d\n", status);

		return status;

	}

	acp_reg_write(1, adata->acp_mmio, mmACP_EXTERNAL_INTR_ENB);

	return 0;

}

sound/soc/atmel/atmel-classd.c

+0 −6
Original line number Diff line number Diff line
@@ -308,15 +308,9 @@ static int atmel_classd_codec_resume(struct snd_soc_codec *codec) 
	return regcache_sync(dd->regmap);

}



static struct regmap *atmel_classd_codec_get_remap(struct device *dev)

{

	return dev_get_regmap(dev, NULL);

}



static struct snd_soc_codec_driver soc_codec_dev_classd = {

	.probe		= atmel_classd_codec_probe,

	.resume		= atmel_classd_codec_resume,

	.get_regmap	= atmel_classd_codec_get_remap,

	.component_driver = {

		.controls		= atmel_classd_snd_controls,

		.num_controls		= ARRAY_SIZE(atmel_classd_snd_controls),

sound/soc/au1x/ac97c.c

+3 −3
Original line number Diff line number Diff line
@@ -91,8 +91,8 @@ static unsigned short au1xac97c_ac97_read(struct snd_ac97 *ac97, 
	do {

		mutex_lock(&ctx->lock);



		tmo = 5;

		while ((RD(ctx, AC97_STATUS) & STAT_CP) && tmo--)

		tmo = 6;

		while ((RD(ctx, AC97_STATUS) & STAT_CP) && --tmo)

			udelay(21);	/* wait an ac97 frame time */

		if (!tmo) {

			pr_debug("ac97rd timeout #1\n");
@@ -105,7 +105,7 @@ static unsigned short au1xac97c_ac97_read(struct snd_ac97 *ac97, 
		 * poll, Forrest, poll...

		 */

		tmo = 0x10000;

		while ((RD(ctx, AC97_STATUS) & STAT_CP) && tmo--)

		while ((RD(ctx, AC97_STATUS) & STAT_CP) && --tmo)

			asm volatile ("nop");

		data = RD(ctx, AC97_CMDRESP);

sound/soc/bcm/bcm2835-i2s.c

+14 −6
Original line number Diff line number Diff line
@@ -130,6 +130,7 @@ struct bcm2835_i2s_dev { 
	struct regmap				*i2s_regmap;

	struct clk				*clk;

	bool					clk_prepared;

	int					clk_rate;

};



static void bcm2835_i2s_start_clock(struct bcm2835_i2s_dev *dev)
@@ -419,10 +420,19 @@ static int bcm2835_i2s_hw_params(struct snd_pcm_substream *substream, 
	}



	/* Clock should only be set up here if CPU is clock master */

	if (bit_clock_master) {

	if (bit_clock_master &&

	    (!dev->clk_prepared || dev->clk_rate != bclk_rate)) {

		if (dev->clk_prepared)

			bcm2835_i2s_stop_clock(dev);



		if (dev->clk_rate != bclk_rate) {

			ret = clk_set_rate(dev->clk, bclk_rate);

			if (ret)

				return ret;

			dev->clk_rate = bclk_rate;

		}



		bcm2835_i2s_start_clock(dev);

	}



	/* Setup the frame format */
@@ -618,8 +628,6 @@ static int bcm2835_i2s_prepare(struct snd_pcm_substream *substream, 
	struct bcm2835_i2s_dev *dev = snd_soc_dai_get_drvdata(dai);

	uint32_t cs_reg;



	bcm2835_i2s_start_clock(dev);



	/*

	 * Clear both FIFOs if the one that should be started

	 * is not empty at the moment. This should only happen

sound/soc/codecs/88pm860x-codec.c

+1 −8
Original line number Diff line number Diff line
@@ -1319,6 +1319,7 @@ static int pm860x_probe(struct snd_soc_codec *codec) 
	int i, ret;



	pm860x->codec = codec;

	snd_soc_codec_init_regmap(codec,  pm860x->regmap);



	for (i = 0; i < 4; i++) {

		ret = request_threaded_irq(pm860x->irq[i], NULL,
@@ -1348,18 +1349,10 @@ static int pm860x_remove(struct snd_soc_codec *codec) 
	return 0;

}



static struct regmap *pm860x_get_regmap(struct device *dev)

{

	struct pm860x_priv *pm860x = dev_get_drvdata(dev);



	return pm860x->regmap;

}



static const struct snd_soc_codec_driver soc_codec_dev_pm860x = {

	.probe		= pm860x_probe,

	.remove		= pm860x_remove,

	.set_bias_level	= pm860x_set_bias_level,

	.get_regmap	= pm860x_get_regmap,



	.component_driver = {

		.controls		= pm860x_snd_controls,