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

Commit 80ca3186 authored by Mark Brown's avatar Mark Brown
Browse files

Merge remote-tracking branch 'asoc/topic/atmel' into asoc-next

parents c4c2361a 8aa99652

sound/soc/atmel/atmel-pcm.c

+1 −1
Original line number Diff line number Diff line
@@ -50,7 +50,7 @@ static int atmel_pcm_preallocate_dma_buffer(struct snd_pcm *pcm, 
	buf->area = dma_alloc_coherent(pcm->card->dev, size,

			&buf->addr, GFP_KERNEL);

	pr_debug("atmel-pcm: alloc dma buffer: area=%p, addr=%p, size=%zu\n",

			(void *)buf->area, (void *)buf->addr, size);

			(void *)buf->area, (void *)(long)buf->addr, size);



	if (!buf->area)

		return -ENOMEM;

sound/soc/atmel/atmel_wm8904.c

+0 −8
Original line number Diff line number Diff line
@@ -12,7 +12,6 @@ 
#include <linux/module.h>

#include <linux/of.h>

#include <linux/of_device.h>

#include <linux/pinctrl/consumer.h>



#include <sound/soc.h>
@@ -155,15 +154,8 @@ static int atmel_asoc_wm8904_probe(struct platform_device *pdev) 
	struct snd_soc_card *card = &atmel_asoc_wm8904_card;

	struct snd_soc_dai_link *dailink = &atmel_asoc_wm8904_dailink;

	struct clk *clk_src;

	struct pinctrl *pinctrl;

	int id, ret;



	pinctrl = devm_pinctrl_get_select_default(&pdev->dev);

	if (IS_ERR(pinctrl)) {

		dev_err(&pdev->dev, "failed to request pinctrl\n");

		return PTR_ERR(pinctrl);

	}



	card->dev = &pdev->dev;

	ret = atmel_asoc_wm8904_dt_init(pdev);

	if (ret) {

sound/soc/atmel/sam9g20_wm8731.c

+1 −0
Original line number Diff line number Diff line
@@ -37,6 +37,7 @@ 
#include <linux/interrupt.h>

#include <linux/platform_device.h>

#include <linux/i2c.h>

#include <linux/of.h>



#include <linux/atmel-ssc.h>