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
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
|
From cdf6acdd6a6270538b0fdd08e79986d4a553062a Mon Sep 17 00:00:00 2001
From: gtrainavicius <gtrainavicius@users.noreply.github.com>
Date: Sat, 10 Dec 2016 16:05:25 +0200
Subject: [PATCH] Pisound dynamic overlay (#1760)
Restructuring pisound-overlay.dts, so it can be loaded and unloaded dynamically using dtoverlay.
Print a logline when the kernel module is removed.
---
arch/arm/boot/dts/overlays/pisound-overlay.dts | 94 ++++++++++++++------------
sound/soc/bcm/pisound.c | 2 +
2 files changed, 52 insertions(+), 44 deletions(-)
diff --git a/arch/arm/boot/dts/overlays/pisound-overlay.dts b/arch/arm/boot/dts/overlays/pisound-overlay.dts
index 7cdfc29..5197e65 100644
--- a/arch/arm/boot/dts/overlays/pisound-overlay.dts
+++ b/arch/arm/boot/dts/overlays/pisound-overlay.dts
@@ -26,6 +26,54 @@
compatible = "brcm,bcm2708";
fragment@0 {
+ target = <&spi0>;
+ __overlay__ {
+ status = "okay";
+ };
+ };
+
+ fragment@1 {
+ target = <&spidev0>;
+ __overlay__ {
+ status = "disabled";
+ };
+ };
+
+ fragment@2 {
+ target = <&spidev1>;
+ __overlay__ {
+ status = "okay";
+ };
+ };
+
+ fragment@3 {
+ target = <&spi0>;
+ __overlay__ {
+ #address-cells = <1>;
+ #size-cells = <0>;
+
+ pisound_spi: pisound_spi@0{
+ compatible = "blokaslabs,pisound-spi";
+ reg = <0>;
+ pinctrl-names = "default";
+ pinctrl-0 = <&spi0_pins>;
+ spi-max-frequency = <1000000>;
+ };
+ };
+ };
+
+ fragment@4 {
+ target-path = "/";
+ __overlay__ {
+ pcm5102a-codec {
+ #sound-dai-cells = <0>;
+ compatible = "ti,pcm5102a";
+ status = "okay";
+ };
+ };
+ };
+
+ fragment@5 {
target = <&sound>;
__overlay__ {
compatible = "blokaslabs,pisound";
@@ -49,7 +97,7 @@
};
};
- fragment@1 {
+ fragment@6 {
target = <&gpio>;
__overlay__ {
pinctrl-names = "default";
@@ -63,52 +111,10 @@
};
};
- fragment@2 {
+ fragment@7 {
target = <&i2s>;
__overlay__ {
status = "okay";
};
};
-
- fragment@3 {
- target-path = "/";
- __overlay__ {
- pcm5102a-codec {
- #sound-dai-cells = <0>;
- compatible = "ti,pcm5102a";
- status = "okay";
- };
- };
- };
-
- fragment@4 {
- target = <&spi0>;
- __overlay__ {
- status = "okay";
-
- spidev@0{
- status = "disabled";
- };
-
- spidev@1{
- status = "okay";
- };
- };
- };
-
- fragment@5 {
- target = <&spi0>;
- __overlay__ {
- #address-cells = <1>;
- #size-cells = <0>;
-
- pisound_spi: pisound_spi@0{
- compatible = "blokaslabs,pisound-spi";
- reg = <0>;
- pinctrl-names = "default";
- pinctrl-0 = <&spi0_pins>;
- spi-max-frequency = <1000000>;
- };
- };
- };
};
diff --git a/sound/soc/bcm/pisound.c b/sound/soc/bcm/pisound.c
index a3cd089..30903fcf 100644
--- a/sound/soc/bcm/pisound.c
+++ b/sound/soc/bcm/pisound.c
@@ -954,6 +954,8 @@ static int pisnd_probe(struct platform_device *pdev)
static int pisnd_remove(struct platform_device *pdev)
{
+ printi("Unloading.\n");
+
if (pisnd_kobj) {
kobject_put(pisnd_kobj);
pisnd_kobj = NULL;
--
2.1.4
|
