Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 4038a12e authored by Takashi Iwai's avatar Takashi Iwai
Browse files

Merge branch 'fix/asoc' into for-linus

parents 2e1210bc 5013951b

MAINTAINERS

+4 −0
Original line number Diff line number Diff line
@@ -7200,6 +7200,9 @@ W: http://opensource.wolfsonmicro.com/content/linux-drivers-wolfson-devices 
S:	Supported

F:	Documentation/hwmon/wm83??

F:	drivers/leds/leds-wm83*.c

F:	drivers/input/misc/wm831x-on.c

F:	drivers/input/touchscreen/wm831x-ts.c

F:	drivers/input/touchscreen/wm97*.c

F:	drivers/mfd/wm8*.c

F:	drivers/power/wm83*.c

F:	drivers/rtc/rtc-wm83*.c
@@ -7209,6 +7212,7 @@ F: drivers/watchdog/wm83*_wdt.c 
F:	include/linux/mfd/wm831x/

F:	include/linux/mfd/wm8350/

F:	include/linux/mfd/wm8400*

F:	include/linux/wm97xx.h

F:	include/sound/wm????.h

F:	sound/soc/codecs/wm*

sound/soc/blackfin/bf5xx-ad193x.c

+2 −2
Original line number Diff line number Diff line
@@ -103,7 +103,7 @@ static struct snd_soc_dai_link bf5xx_ad193x_dai[] = { 
		.cpu_dai_name = "bfin-tdm.0",

		.codec_dai_name ="ad193x-hifi",

		.platform_name = "bfin-tdm-pcm-audio",

		.codec_name = "ad193x.5",

		.codec_name = "spi0.5",

		.ops = &bf5xx_ad193x_ops,

	},

	{
@@ -112,7 +112,7 @@ static struct snd_soc_dai_link bf5xx_ad193x_dai[] = { 
		.cpu_dai_name = "bfin-tdm.1",

		.codec_dai_name ="ad193x-hifi",

		.platform_name = "bfin-tdm-pcm-audio",

		.codec_name = "ad193x.5",

		.codec_name = "spi0.5",

		.ops = &bf5xx_ad193x_ops,

	},

};

sound/soc/fsl/mpc5200_dma.c

+3 −3
Original line number Diff line number Diff line
@@ -369,7 +369,7 @@ static struct snd_soc_platform_driver mpc5200_audio_dma_platform = { 
	.pcm_free	= &psc_dma_free,

};



static int mpc5200_hpcd_probe(struct of_device *op)

static int mpc5200_hpcd_probe(struct platform_device *op)

{

	phys_addr_t fifo;

	struct psc_dma *psc_dma;
@@ -487,7 +487,7 @@ static int mpc5200_hpcd_probe(struct of_device *op) 
	return ret;

}



static int mpc5200_hpcd_remove(struct of_device *op)

static int mpc5200_hpcd_remove(struct platform_device *op)

{

	struct psc_dma *psc_dma = dev_get_drvdata(&op->dev);
@@ -519,7 +519,7 @@ MODULE_DEVICE_TABLE(of, mpc5200_hpcd_match); 
static struct platform_driver mpc5200_hpcd_of_driver = {

	.probe		= mpc5200_hpcd_probe,

	.remove		= mpc5200_hpcd_remove,

	.dev = {

	.driver = {

		.owner		= THIS_MODULE,

		.name		= "mpc5200-pcm-audio",

		.of_match_table    = mpc5200_hpcd_match,

sound/soc/imx/imx-pcm-fiq.c

+0 −1
Original line number Diff line number Diff line
@@ -240,7 +240,6 @@ static int ssi_irq = 0; 


static int imx_pcm_fiq_new(struct snd_soc_pcm_runtime *rtd)

{

	struct snd_card *card = rtd->card->snd_card;

	struct snd_soc_dai *dai = rtd->cpu_dai;

	struct snd_pcm *pcm = rtd->pcm;

	int ret;

sound/soc/kirkwood/kirkwood-i2s.c

+1 −1
Original line number Diff line number Diff line
@@ -424,7 +424,7 @@ static __devinit int kirkwood_i2s_dev_probe(struct platform_device *pdev) 
	if (!priv->mem) {

		dev_err(&pdev->dev, "request_mem_region failed\n");

		err = -EBUSY;

		goto error_alloc;

		goto err_alloc;

	}



	priv->io = ioremap(priv->mem->start, SZ_16K);