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
|
Add support for TI WL1837
This patch adds description of TI WL1837 and links interfaces
to communicate with the IC.
Signed-off-by: ito.yoshiki001 <ito.yoshiki001@jp.panasonic.com>
Reworked:
- WL1837 specific devicetree configuration moved to the board
specific r8a7795-agl-refhw.dts from agl-refhw-common.dtsi.
- Switched to HCI_LL driver for BT support to match other upstream
users and prepare for btwilink driver going away (dropped in 5.5
upstream).
- WLAN_PWR_EN enabling moved to GPIO initialization to work around
BT initialization problems.
- Update sound configuration to enable WL1837 BT audio, and disable
the HDMI1 audio left over from the original Salvator-X devicetree.
The latter is clean up, as HDMI1 as defined uses a SSI that
conflicts with the ak4613 configuration.
Signed-off-by: Scott Murray <scott.murray@konsulko.com>
---
arch/arm64/boot/dts/renesas/agl-refhw-common.dtsi | 37 +++++++---
arch/arm64/boot/dts/renesas/r8a7795-agl-refhw.dts | 84 ++++++++++++++++++-----
2 files changed, 94 insertions(+), 27 deletions(-)
diff --git a/arch/arm64/boot/dts/renesas/agl-refhw-common.dtsi b/arch/arm64/boot/dts/renesas/agl-refhw-common.dtsi
index 796ac4c078e0..6f34b54c6ce1 100644
--- a/arch/arm64/boot/dts/renesas/agl-refhw-common.dtsi
+++ b/arch/arm64/boot/dts/renesas/agl-refhw-common.dtsi
@@ -183,6 +183,18 @@
1800000 0>;
};
+ wlan_en: regulator-wlan_en {
+ compatible = "regulator-fixed";
+
+ regulator-name = "wlan-en-regulator";
+ regulator-min-microvolt = <3300000>;
+ regulator-max-microvolt = <3300000>;
+
+ gpio = <&gpio7 2 GPIO_ACTIVE_HIGH>;
+ startup-delay-us = <70000>;
+ enable-active-high;
+ };
+
hdmi0-out {
compatible = "hdmi-connector";
label = "HDMI0 OUT";
@@ -672,7 +684,8 @@
};
sound_pins: sound {
- groups = "ssi349_ctrl", "ssi3_data", "ssi4_data";
+ groups = "ssi349_ctrl", "ssi3_data", "ssi4_data",
+ "ssi78_ctrl", "ssi7_data", "ssi8_data";
function = "ssi";
};
@@ -827,24 +840,28 @@
};
&sdhi3 {
+ /* Default WLAN card configuration */
pinctrl-0 = <&sdhi3_pins>;
- pinctrl-1 = <&sdhi3_pins_uhs>;
- pinctrl-names = "default", "state_uhs";
+ pinctrl-names = "default";
- vmmc-supply = <&vcc_sdhi3>;
- vqmmc-supply = <&vccq_sdhi3>;
- cd-gpios = <&gpio4 15 GPIO_ACTIVE_LOW>;
- wp-gpios = <&gpio4 16 GPIO_ACTIVE_HIGH>;
+ vmmc-supply = <&wlan_en>;
bus-width = <4>;
- sd-uhs-sdr50;
- sd-uhs-sdr104;
- status = "okay";
+ no-1-8-v;
+ non-removable;
+ cap-power-off-card;
+ keep-power-in-suspend;
+
+ /* leave disabled by default */
};
&ssi4 {
shared-pin;
};
+&ssi8 {
+ shared-pin;
+};
+
&usb_extal_clk {
clock-frequency = <50000000>;
};
diff --git a/arch/arm64/boot/dts/renesas/r8a7795-agl-refhw.dts b/arch/arm64/boot/dts/renesas/r8a7795-agl-refhw.dts
index 83638a6228c0..97cc6e08ee8f 100644
--- a/arch/arm64/boot/dts/renesas/r8a7795-agl-refhw.dts
+++ b/arch/arm64/boot/dts/renesas/r8a7795-agl-refhw.dts
@@ -119,6 +119,23 @@
};
};
+ sound_wl18xx {
+ compatible = "audio-graph-card";
+ label = "wl18xx";
+
+ dais = <&rsnd_port2>;
+ };
+
+ wl18xx_pcm {
+ compatible = "ti,wl18xx-pcm";
+ status = "okay";
+
+ port {
+ wl18xx_endpoint: endpoint {
+ remote-endpoint = <&rsnd_for_wl18xx>;
+ };
+ };
+ };
};
&adsp {
@@ -155,8 +172,14 @@
&sound_card {
dais = <&rsnd_port0 /* ak4613 */
- &rsnd_port1 /* HDMI0 */
- &rsnd_port2>; /* HDMI1 */
+ &rsnd_port1>; /* HDMI0 */
+};
+
+&hscif0 {
+ bluetooth {
+ compatible = "ti,wl1837-st";
+ enable-gpios = <&gpio7 3 GPIO_ACTIVE_HIGH>;
+ };
};
&hdmi0 {
@@ -192,12 +215,6 @@
remote-endpoint = <&hdmi1_con>;
};
};
- port@2 {
- reg = <2>;
- dw_hdmi1_snd_in: endpoint {
- remote-endpoint = <&rsnd_endpoint2>;
- };
- };
};
};
@@ -215,8 +232,11 @@
};
&rcar_sound {
+ /* Multi DAI */
+ #sound-dai-cells = <1>;
+
ports {
- /* rsnd_port0 is on salvator-common */
+ /* rsnd_port0 is in agl-refhw-common */
rsnd_port1: port@1 {
reg = <1>;
rsnd_endpoint1: endpoint {
@@ -231,14 +251,15 @@
};
rsnd_port2: port@2 {
reg = <2>;
- rsnd_endpoint2: endpoint {
- remote-endpoint = <&dw_hdmi1_snd_in>;
+ rsnd_for_wl18xx: endpoint {
+ remote-endpoint = <&wl18xx_endpoint>;
- dai-format = "i2s";
- bitclock-master = <&rsnd_endpoint2>;
- frame-master = <&rsnd_endpoint2>;
+ simple-audio-card,format = "i2s";
+ bitclock-master = <&wl18xx_endpoint>;
+ frame-master = <&wl18xx_endpoint>;
- playback = <&ssi3>;
+ playback = <&ssi7>;
+ capture = <&ssi8>;
};
};
};
@@ -373,11 +394,40 @@
};
&sdhi3 {
- /delete-property/ wp-gpios;
- non-removable;
+ status = "okay";
+
+ max-frequency = <50000000>;
+
+ #address-cells = <1>;
+ #size-cells = <0>;
+ wlcore: wlcore@2 {
+ compatible = "ti,wl1837";
+ reg = <2>;
+ interrupt-parent = <&gpio1>;
+ interrupts = <25 IRQ_TYPE_EDGE_FALLING>;
+ };
};
&gpio6 {
+ /*
+ * Enable WLAN_PWR_EN right from boot to get reliable BT
+ * initialization, as doing it at SDHI initialization
+ * does not seem to do so, no matter how much BT_EN is
+ * delayed.
+ *
+ * This is perhaps not ideal per the requirements described
+ * in the "Level Shifting WL18xx/WL18xxMOD/WL18xxQ I/Os"
+ * document (SWRA448A)[1], but the BT UART seems unusable
+ * otherwise.
+ *
+ * [1] https://www.ti.com/lit/an/swra448a/swra448a.pdf
+ */
+ wlan-pwr-en {
+ gpio-hog;
+ gpios = <9 GPIO_ACTIVE_HIGH>;
+ output-high;
+ };
+
/* Enable the CAN 1 & 2 transceivers */
can-1-transceiver-stb {
gpio-hog;
|
