diff options
-rw-r--r-- | sound/soc/atmel/atmel-pcm.c | 2 | ||||
-rw-r--r-- | sound/soc/atmel/atmel_wm8904.c | 8 | ||||
-rw-r--r-- | sound/soc/atmel/sam9g20_wm8731.c | 1 |
3 files changed, 2 insertions, 9 deletions
diff --git a/sound/soc/atmel/atmel-pcm.c b/sound/soc/atmel/atmel-pcm.c index 3109db7b9017..612e5801003f 100644 --- a/sound/soc/atmel/atmel-pcm.c +++ b/sound/soc/atmel/atmel-pcm.c | |||
@@ -50,7 +50,7 @@ static int atmel_pcm_preallocate_dma_buffer(struct snd_pcm *pcm, | |||
50 | buf->area = dma_alloc_coherent(pcm->card->dev, size, | 50 | buf->area = dma_alloc_coherent(pcm->card->dev, size, |
51 | &buf->addr, GFP_KERNEL); | 51 | &buf->addr, GFP_KERNEL); |
52 | pr_debug("atmel-pcm: alloc dma buffer: area=%p, addr=%p, size=%zu\n", | 52 | pr_debug("atmel-pcm: alloc dma buffer: area=%p, addr=%p, size=%zu\n", |
53 | (void *)buf->area, (void *)buf->addr, size); | 53 | (void *)buf->area, (void *)(long)buf->addr, size); |
54 | 54 | ||
55 | if (!buf->area) | 55 | if (!buf->area) |
56 | return -ENOMEM; | 56 | return -ENOMEM; |
diff --git a/sound/soc/atmel/atmel_wm8904.c b/sound/soc/atmel/atmel_wm8904.c index 7222380131ea..b4e36901a40b 100644 --- a/sound/soc/atmel/atmel_wm8904.c +++ b/sound/soc/atmel/atmel_wm8904.c | |||
@@ -12,7 +12,6 @@ | |||
12 | #include <linux/module.h> | 12 | #include <linux/module.h> |
13 | #include <linux/of.h> | 13 | #include <linux/of.h> |
14 | #include <linux/of_device.h> | 14 | #include <linux/of_device.h> |
15 | #include <linux/pinctrl/consumer.h> | ||
16 | 15 | ||
17 | #include <sound/soc.h> | 16 | #include <sound/soc.h> |
18 | 17 | ||
@@ -155,15 +154,8 @@ static int atmel_asoc_wm8904_probe(struct platform_device *pdev) | |||
155 | struct snd_soc_card *card = &atmel_asoc_wm8904_card; | 154 | struct snd_soc_card *card = &atmel_asoc_wm8904_card; |
156 | struct snd_soc_dai_link *dailink = &atmel_asoc_wm8904_dailink; | 155 | struct snd_soc_dai_link *dailink = &atmel_asoc_wm8904_dailink; |
157 | struct clk *clk_src; | 156 | struct clk *clk_src; |
158 | struct pinctrl *pinctrl; | ||
159 | int id, ret; | 157 | int id, ret; |
160 | 158 | ||
161 | pinctrl = devm_pinctrl_get_select_default(&pdev->dev); | ||
162 | if (IS_ERR(pinctrl)) { | ||
163 | dev_err(&pdev->dev, "failed to request pinctrl\n"); | ||
164 | return PTR_ERR(pinctrl); | ||
165 | } | ||
166 | |||
167 | card->dev = &pdev->dev; | 159 | card->dev = &pdev->dev; |
168 | ret = atmel_asoc_wm8904_dt_init(pdev); | 160 | ret = atmel_asoc_wm8904_dt_init(pdev); |
169 | if (ret) { | 161 | if (ret) { |
diff --git a/sound/soc/atmel/sam9g20_wm8731.c b/sound/soc/atmel/sam9g20_wm8731.c index 802717eccbd0..f15bff1548f8 100644 --- a/sound/soc/atmel/sam9g20_wm8731.c +++ b/sound/soc/atmel/sam9g20_wm8731.c | |||
@@ -37,6 +37,7 @@ | |||
37 | #include <linux/interrupt.h> | 37 | #include <linux/interrupt.h> |
38 | #include <linux/platform_device.h> | 38 | #include <linux/platform_device.h> |
39 | #include <linux/i2c.h> | 39 | #include <linux/i2c.h> |
40 | #include <linux/of.h> | ||
40 | 41 | ||
41 | #include <linux/atmel-ssc.h> | 42 | #include <linux/atmel-ssc.h> |
42 | 43 | ||