Commit 250acc70 authored by Mark Brown's avatar Mark Brown
Browse files

Merge remote-tracking branches 'asoc/fix/ak4642', 'asoc/fix/atmel',... 

Merge remote-tracking branches 'asoc/fix/ak4642', 'asoc/fix/atmel', 'asoc/fix/cs4271', 'asoc/fix/davinci' and 'asoc/fix/rcar' into asoc-linus
parents a37a9407 c01673e0 3a82002c 74ff9602 a57069e3 2f78dd7f

MAINTAINERS

+1 −1
Original line number Diff line number Diff line
@@ -1762,7 +1762,7 @@ S: Supported 
F:	drivers/tty/serial/atmel_serial.c



ATMEL Audio ALSA driver

M:	Bo Shen <voice.shen@atmel.com>

M:	Nicolas Ferre <nicolas.ferre@atmel.com>

L:	alsa-devel@alsa-project.org (moderated for non-subscribers)

S:	Supported

F:	sound/soc/atmel

sound/soc/codecs/ak4642.c

+2 −2
Original line number Diff line number Diff line
@@ -468,13 +468,13 @@ static struct snd_soc_dai_driver ak4642_dai = { 
	.name = "ak4642-hifi",

	.playback = {

		.stream_name = "Playback",

		.channels_min = 1,

		.channels_min = 2,

		.channels_max = 2,

		.rates = SNDRV_PCM_RATE_8000_48000,

		.formats = SNDRV_PCM_FMTBIT_S16_LE },

	.capture = {

		.stream_name = "Capture",

		.channels_min = 1,

		.channels_min = 2,

		.channels_max = 2,

		.rates = SNDRV_PCM_RATE_8000_48000,

		.formats = SNDRV_PCM_FMTBIT_S16_LE },

sound/soc/codecs/cs4271.c

+2 −2
Original line number Diff line number Diff line
@@ -561,10 +561,10 @@ static int cs4271_codec_probe(struct snd_soc_codec *codec) 
	if (gpio_is_valid(cs4271->gpio_nreset)) {

		/* Reset codec */

		gpio_direction_output(cs4271->gpio_nreset, 0);

		udelay(1);

		mdelay(1);

		gpio_set_value(cs4271->gpio_nreset, 1);

		/* Give the codec time to wake up */

		udelay(1);

		mdelay(1);

	}



	ret = regmap_update_bits(cs4271->regmap, CS4271_MODE2,

sound/soc/davinci/davinci-evm.c

+0 −10
Original line number Diff line number Diff line
@@ -425,18 +425,8 @@ static int davinci_evm_probe(struct platform_device *pdev) 
	return ret;

}



static int davinci_evm_remove(struct platform_device *pdev)

{

	struct snd_soc_card *card = platform_get_drvdata(pdev);



	snd_soc_unregister_card(card);



	return 0;

}



static struct platform_driver davinci_evm_driver = {

	.probe		= davinci_evm_probe,

	.remove		= davinci_evm_remove,

	.driver		= {

		.name	= "davinci_evm",

		.pm	= &snd_soc_pm_ops,

sound/soc/sh/rcar/core.c

+23 −1
Original line number Diff line number Diff line
@@ -149,16 +149,29 @@ char *rsnd_mod_dma_name(struct rsnd_mod *mod) 
	return mod->ops->dma_name(mod);

}



void rsnd_mod_init(struct rsnd_mod *mod,

int rsnd_mod_init(struct rsnd_mod *mod,

		   struct rsnd_mod_ops *ops,

		   struct clk *clk,

		   enum rsnd_mod_type type,

		   int id)

{

	int ret = clk_prepare(clk);



	if (ret)

		return ret;



	mod->id		= id;

	mod->ops	= ops;

	mod->type	= type;

	mod->clk	= clk;



	return ret;

}



void rsnd_mod_quit(struct rsnd_mod *mod)

{

	if (mod->clk)

		clk_unprepare(mod->clk);

}



/*
@@ -1290,6 +1303,12 @@ static int rsnd_remove(struct platform_device *pdev) 
{

	struct rsnd_priv *priv = dev_get_drvdata(&pdev->dev);

	struct rsnd_dai *rdai;

	void (*remove_func[])(struct platform_device *pdev,

			      struct rsnd_priv *priv) = {

		rsnd_ssi_remove,

		rsnd_src_remove,

		rsnd_dvc_remove,

	};

	int ret = 0, i;



	pm_runtime_disable(&pdev->dev);
@@ -1299,6 +1318,9 @@ static int rsnd_remove(struct platform_device *pdev) 
		ret |= rsnd_dai_call(remove, &rdai->capture, priv);

	}



	for (i = 0; i < ARRAY_SIZE(remove_func); i++)

		remove_func[i](pdev, priv);



	snd_soc_unregister_component(&pdev->dev);

	snd_soc_unregister_platform(&pdev->dev);