-
Notifications
You must be signed in to change notification settings - Fork 1
/
add-support-for-sonomkr-card.patch
305 lines (301 loc) · 10.1 KB
/
add-support-for-sonomkr-card.patch
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
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
227
228
229
230
231
232
233
234
235
236
237
238
239
240
241
242
243
244
245
246
247
248
249
250
251
252
253
254
255
256
257
258
259
260
261
262
263
264
265
266
267
268
269
270
271
272
273
274
275
276
277
278
279
280
281
282
283
284
285
286
287
288
289
290
291
292
293
294
295
296
297
298
299
300
301
302
303
304
From 44b073127a9fad048137a324787d796da027ebaf Mon Sep 17 00:00:00 2001
From: Nitnelav <[email protected]>
Date: Sun, 19 Mar 2017 16:15:17 +0100
Subject: [PATCH] add support for the SonoMKR Audio Card
---
.../devicetree/bindings/vendor-prefixes.txt | 1 +
arch/arm/boot/dts/overlays/Makefile | 1 +
arch/arm/boot/dts/sonomkr-card-overlay.dts | 36 +++++
arch/arm/configs/bcm2709_defconfig | 1 +
arch/arm/configs/bcmrpi_defconfig | 1 +
sound/soc/bcm/Kconfig | 7 +
sound/soc/bcm/Makefile | 2 +
sound/soc/bcm/sonomkr-card.c | 156 +++++++++++++++++++++
8 files changed, 205 insertions(+)
create mode 100644 arch/arm/boot/dts/sonomkr-card-overlay.dts
create mode 100644 sound/soc/bcm/sonomkr-card.c
diff --git a/Documentation/devicetree/bindings/vendor-prefixes.txt b/Documentation/devicetree/bindings/vendor-prefixes.txt
index 779c190..ce97713 100644
--- a/Documentation/devicetree/bindings/vendor-prefixes.txt
+++ b/Documentation/devicetree/bindings/vendor-prefixes.txt
@@ -257,6 +257,7 @@ snps Synopsys, Inc.
socionext Socionext Inc.
solidrun SolidRun
solomon Solomon Systech Limited
+sonomkr SonoMKR Project Team
sony Sony Corporation
spansion Spansion Inc.
sprd Spreadtrum Communications Inc.
diff --git a/arch/arm/boot/dts/overlays/Makefile b/arch/arm/boot/dts/overlays/Makefile
index 0f73407..32301a3 100644
--- a/arch/arm/boot/dts/overlays/Makefile
+++ b/arch/arm/boot/dts/overlays/Makefile
@@ -88,6 +88,7 @@ dtbo-$(CONFIG_ARCH_BCM2835) += \
smi.dtbo \
smi-dev.dtbo \
smi-nand.dtbo \
+ sonomkr-card.dtbo \
spi-gpio35-39.dtbo \
spi-rtc.dtbo \
spi0-cs.dtbo \
diff --git a/arch/arm/boot/dts/sonomkr-card-overlay.dts b/arch/arm/boot/dts/sonomkr-card-overlay.dts
new file mode 100644
index 0000000..8360d8b
--- /dev/null
+++ b/arch/arm/boot/dts/sonomkr-card-overlay.dts
@@ -0,0 +1,36 @@
+// Definitions for SonoMKR Audio Card
+
+/dts-v1/;
+/plugin/;
+
+/ {
+ compatible = "brcm,bcm2708";
+
+ fragment@0 {
+ target = <&i2s>;
+ __overlay__ {
+ status = "okay";
+ };
+ };
+
+ fragment@1 {
+ target-path = "/";
+ __overlay__ {
+ wm8782 {
+ #sound-dai-cells = <0>;
+ compatible = "wlf,wm8782";
+ status = "okay";
+ };
+ };
+ };
+
+ fragment@2 {
+ target = <&sound>;
+ __overlay__ {
+ compatible = "sonomkr,card-wm8782";
+ i2s-controller = <&i2s>;
+ status = "okay";
+ };
+ };
+};
+
diff --git a/arch/arm/configs/bcm2709_defconfig b/arch/arm/configs/bcm2709_defconfig
index 598b4bf..ce0904f 100644
--- a/arch/arm/configs/bcm2709_defconfig
+++ b/arch/arm/configs/bcm2709_defconfig
@@ -896,6 +896,7 @@ CONFIG_SND_BCM2708_SOC_DIONAUDIO_LOCO_V2=m
CONFIG_SND_BCM2708_SOC_ALLO_PIANO_DAC=m
CONFIG_SND_BCM2708_SOC_FE_PI_AUDIO=m
CONFIG_SND_PISOUND=m
+CONFIG_SND_SONOMKR_CARD=m
CONFIG_SND_SOC_ADAU1701=m
CONFIG_SND_SOC_ADAU7002=m
CONFIG_SND_SOC_AK4554=m
diff --git a/arch/arm/configs/bcmrpi_defconfig b/arch/arm/configs/bcmrpi_defconfig
index 8d64ce4..36be1b9 100644
--- a/arch/arm/configs/bcmrpi_defconfig
+++ b/arch/arm/configs/bcmrpi_defconfig
@@ -889,6 +889,7 @@ CONFIG_SND_BCM2708_SOC_DIONAUDIO_LOCO_V2=m
CONFIG_SND_BCM2708_SOC_ALLO_PIANO_DAC=m
CONFIG_SND_BCM2708_SOC_FE_PI_AUDIO=m
CONFIG_SND_PISOUND=m
+CONFIG_SND_SONOMKR_CARD=m
CONFIG_SND_SOC_ADAU1701=m
CONFIG_SND_SOC_ADAU7002=m
CONFIG_SND_SOC_AK4554=m
diff --git a/sound/soc/bcm/Kconfig b/sound/soc/bcm/Kconfig
index 58d03b9..9fcfa6f 100644
--- a/sound/soc/bcm/Kconfig
+++ b/sound/soc/bcm/Kconfig
@@ -166,3 +166,10 @@ config SND_PISOUND
depends on SND_BCM2708_SOC_I2S || SND_BCM2835_SOC_I2S
help
Say Y or M if you want to add support for Blokas Labs pisound.
+
+config SND_SONOMKR_CARD
+ tristate "Support for the SonoMKR Audio Card"
+ depends on SND_BCM2708_SOC_I2S || SND_BCM2835_SOC_I2S
+ select SND_SOC_WM8782
+ help
+ Say Y or M if you want to add support for SonoMKR Audio Card.
diff --git a/sound/soc/bcm/Makefile b/sound/soc/bcm/Makefile
index d448aa5..fa62d56 100644
--- a/sound/soc/bcm/Makefile
+++ b/sound/soc/bcm/Makefile
@@ -30,6 +30,7 @@ snd-soc-dionaudio-loco-v2-objs := dionaudio_loco-v2.o
snd-soc-allo-piano-dac-objs := allo-piano-dac.o
snd-soc-pisound-objs := pisound.o
snd-soc-fe-pi-audio-objs := fe-pi-audio.o
+snd-soc-sonomkr-card-objs := sonomkr-card.o
obj-$(CONFIG_SND_BCM2708_SOC_ADAU1977_ADC) += snd-soc-adau1977-adc.o
obj-$(CONFIG_SND_BCM2708_SOC_HIFIBERRY_AMP) += snd-soc-hifiberry-amp.o
@@ -52,3 +53,4 @@ obj-$(CONFIG_SND_BCM2708_SOC_DIONAUDIO_LOCO_V2) += snd-soc-dionaudio-loco-v2.o
obj-$(CONFIG_SND_BCM2708_SOC_ALLO_PIANO_DAC) += snd-soc-allo-piano-dac.o
obj-$(CONFIG_SND_PISOUND) += snd-soc-pisound.o
obj-$(CONFIG_SND_BCM2708_SOC_FE_PI_AUDIO) += snd-soc-fe-pi-audio.o
+obj-$(CONFIG_SND_SONOMKR_CARD) += snd-soc-sonomkr-card.o
diff --git a/sound/soc/bcm/sonomkr-card.c b/sound/soc/bcm/sonomkr-card.c
new file mode 100644
index 0000000..9371b5a
--- /dev/null
+++ b/sound/soc/bcm/sonomkr-card.c
@@ -0,0 +1,156 @@
+ /*SoC Driver for The SonoMKR Project Audio Card
+ *
+ * Author: Valentin LE BESCOND <[email protected]>
+ * Copyright 2017
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * version 2 as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ */
+
+#include <linux/module.h>
+#include <linux/platform_device.h>
+
+#include <sound/core.h>
+#include <sound/pcm.h>
+#include <sound/pcm_params.h>
+#include <sound/soc.h>
+#include <sound/jack.h>
+
+static const unsigned int wm8782_rates_6144000[] = {
+ 48000,
+};
+
+static struct snd_pcm_hw_constraint_list wm8782_constraints_6144000 = {
+ .list = wm8782_rates_6144000,
+ .count = ARRAY_SIZE(wm8782_rates_6144000),
+};
+
+static int snd_rpi_sonomkr_card_startup(struct snd_pcm_substream *substream)
+{
+ /* Setup constraints, because there is a 6.144 MHz XTAL on the board */
+ snd_pcm_hw_constraint_list(substream->runtime, 0,
+ SNDRV_PCM_HW_PARAM_RATE,
+ &wm8782_constraints_6144000);
+ return 0;
+}
+
+static int snd_rpi_sonomkr_card_hw_params(
+ struct snd_pcm_substream *substream, struct snd_pcm_hw_params *params)
+{
+ struct snd_soc_pcm_runtime *rtd = substream->private_data;
+ struct snd_soc_codec *codec = rtd->codec;
+ struct snd_soc_dai *codec_dai = rtd->codec_dai;
+ struct snd_soc_dai *cpu_dai = rtd->cpu_dai;
+ int sysclk = 6144000; /* This is fixed on this board */
+
+ /* Set bclk */
+ int ret = snd_soc_dai_set_bclk_ratio(cpu_dai,32*2);
+ if (ret < 0){
+ dev_err(codec->dev,
+ "Failed to set BCLK ratio %d\n", ret);
+ return ret;
+ }
+
+ /* Set sysclk
+ ret = snd_soc_dai_set_sysclk(codec_dai, 1, sysclk, SND_SOC_CLOCK_IN);
+ if (ret < 0) {
+ dev_err(codec->dev,
+ "Failed to set WM8782 SYSCLK: %d\n", ret);
+ return ret;
+ }
+ */
+
+ return 0;
+}
+
+/* machine stream operations */
+static struct snd_soc_ops snd_rpi_sonomkr_card_ops = {
+ .startup = snd_rpi_sonomkr_card_startup,
+ .hw_params = snd_rpi_sonomkr_card_hw_params,
+};
+
+static struct snd_soc_dai_link snd_rpi_sonomkr_card_dai[] = {
+{
+ .name = "SonoMKR Card",
+ .stream_name = "SonoMKR Audio Card",
+ .cpu_dai_name = "bcm2708-i2s.0",
+ .codec_dai_name = "wm8782",
+ .platform_name = "bcm2708-i2s.0",
+ .codec_name = "wm8782",
+ .dai_fmt = SND_SOC_DAIFMT_I2S |
+ SND_SOC_DAIFMT_NB_NF |
+ SND_SOC_DAIFMT_CBM_CFM,
+ .ops = &snd_rpi_sonomkr_card_ops,
+},
+};
+
+/* audio machine driver */
+static struct snd_soc_card snd_rpi_sonomkr_card = {
+ .name = "SonoMKRCard",
+ .owner = THIS_MODULE,
+ .dai_link = snd_rpi_sonomkr_card_dai,
+ .num_links = ARRAY_SIZE(snd_rpi_sonomkr_card_dai),
+};
+
+static int snd_rpi_sonomkr_card_probe(struct platform_device *pdev)
+{
+ struct device_node *np;
+ int ret = 0;
+
+ snd_rpi_sonomkr_card.dev = &pdev->dev;
+
+ np = pdev->dev.of_node;
+ if (np) {
+ struct snd_soc_dai_link *dai = &snd_rpi_sonomkr_card_dai[0];
+ struct device_node *i2s_np;
+
+ i2s_np = of_parse_phandle(np, "i2s-controller", 0);
+ if (i2s_np) {
+ dai->cpu_dai_name = NULL;
+ dai->cpu_of_node = i2s_np;
+ dai->platform_name = NULL;
+ dai->platform_of_node = i2s_np;
+ }
+ }
+
+ ret = snd_soc_register_card(&snd_rpi_sonomkr_card);
+ if (ret)
+ dev_err(&pdev->dev, "snd_soc_register_card() failed: %d\n",
+ ret);
+
+ return ret;
+}
+
+static int snd_rpi_sonomkr_card_remove(struct platform_device *pdev)
+{
+ return snd_soc_unregister_card(&snd_rpi_sonomkr_card);
+}
+
+static const struct of_device_id snd_rpi_sonomkr_card_of_match[] = {
+ { .compatible = "sonomkr,card-wm8782", },
+ { /* sentinel */ },
+};
+MODULE_DEVICE_TABLE(of, snd_rpi_sonomkr_card_of_match);
+
+static struct platform_driver snd_rpi_sonomkr_card_driver = {
+ .driver = {
+ .name = "snd-sonomkr-card",
+ .owner = THIS_MODULE,
+ .of_match_table = snd_rpi_sonomkr_card_of_match,
+ },
+ .probe = snd_rpi_sonomkr_card_probe,
+ .remove = snd_rpi_sonomkr_card_remove,
+};
+
+module_platform_driver(snd_rpi_sonomkr_card_driver);
+
+MODULE_AUTHOR("Valentin LE BESCOND <[email protected]>");
+MODULE_DESCRIPTION("ASoC Driver for SonoMKR Audio Card");
+MODULE_LICENSE("GPL v2");
+
--
1.9.1