1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
|
From 627e9a60b75ebc7876c655fca169250adaad3199 Mon Sep 17 00:00:00 2001
From: Dave Stevenson <dave.stevenson@raspberrypi.org>
Date: Tue, 4 Dec 2018 20:41:19 +0000
Subject: [PATCH 287/773] Revert "staging: bcm2835-audio: Drop DT dependency"
This reverts commit 933bc853bb764e476b0b0f633588f46d20f1f76a.
Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.org>
---
.../vc04_services/bcm2835-audio/bcm2835.c | 41 ++++++++++---------
1 file changed, 22 insertions(+), 19 deletions(-)
--- a/drivers/staging/vc04_services/bcm2835-audio/bcm2835.c
+++ b/drivers/staging/vc04_services/bcm2835-audio/bcm2835.c
@@ -4,17 +4,15 @@
#include <linux/platform_device.h>
#include <linux/init.h>
-#include <linux/dma-mapping.h>
-#include <linux/of_device.h>
#include <linux/slab.h>
#include <linux/module.h>
+#include <linux/of.h>
#include "bcm2835.h"
static bool enable_hdmi;
static bool enable_headphones;
static bool enable_compat_alsa = true;
-static int num_channels = MAX_SUBSTREAMS;
module_param(enable_hdmi, bool, 0444);
MODULE_PARM_DESC(enable_hdmi, "Enables HDMI virtual audio device");
@@ -23,8 +21,6 @@ MODULE_PARM_DESC(enable_headphones, "Ena
module_param(enable_compat_alsa, bool, 0444);
MODULE_PARM_DESC(enable_compat_alsa,
"Enables ALSA compatibility virtual audio device");
-module_param(num_channels, int, 0644);
-MODULE_PARM_DESC(num_channels, "Number of audio channels (default: 8)");
static void snd_devm_unregister_child(struct device *dev, void *res)
{
@@ -411,30 +407,31 @@ static int snd_add_child_devices(struct
return 0;
}
-static int snd_bcm2835_alsa_probe(struct platform_device *pdev)
+static int snd_bcm2835_alsa_probe_dt(struct platform_device *pdev)
{
struct device *dev = &pdev->dev;
+ u32 numchans;
int err;
- if (num_channels <= 0 || num_channels > MAX_SUBSTREAMS) {
- num_channels = MAX_SUBSTREAMS;
- dev_warn(dev, "Illegal num_channels value, will use %u\n",
- num_channels);
- }
-
- dev->coherent_dma_mask = DMA_BIT_MASK(32);
- dev->dma_mask = &dev->coherent_dma_mask;
- err = of_dma_configure(dev, NULL, true);
+ err = of_property_read_u32(dev->of_node, "brcm,pwm-channels",
+ &numchans);
if (err) {
- dev_err(dev, "Unable to setup DMA: %d\n", err);
+ dev_err(dev, "Failed to get DT property 'brcm,pwm-channels'");
return err;
}
+ if (numchans == 0 || numchans > MAX_SUBSTREAMS) {
+ numchans = MAX_SUBSTREAMS;
+ dev_warn(dev,
+ "Illegal 'brcm,pwm-channels' value, will use %u\n",
+ numchans);
+ }
+
err = bcm2835_devm_add_vchi_ctx(dev);
if (err)
return err;
- err = snd_add_child_devices(dev, num_channels);
+ err = snd_add_child_devices(dev, numchans);
if (err)
return err;
@@ -456,14 +453,21 @@ static int snd_bcm2835_alsa_resume(struc
#endif
+static const struct of_device_id snd_bcm2835_of_match_table[] = {
+ { .compatible = "brcm,bcm2835-audio",},
+ {},
+};
+MODULE_DEVICE_TABLE(of, snd_bcm2835_of_match_table);
+
static struct platform_driver bcm2835_alsa0_driver = {
- .probe = snd_bcm2835_alsa_probe,
+ .probe = snd_bcm2835_alsa_probe_dt,
#ifdef CONFIG_PM
.suspend = snd_bcm2835_alsa_suspend,
.resume = snd_bcm2835_alsa_resume,
#endif
.driver = {
.name = "bcm2835_audio",
+ .of_match_table = snd_bcm2835_of_match_table,
},
};
module_platform_driver(bcm2835_alsa0_driver);
@@ -471,4 +475,3 @@ module_platform_driver(bcm2835_alsa0_dri
MODULE_AUTHOR("Dom Cobley");
MODULE_DESCRIPTION("Alsa driver for BCM2835 chip");
MODULE_LICENSE("GPL");
-MODULE_ALIAS("platform:bcm2835_audio");
|
