Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
Merge tag 'amlogic-arm-dt-for-v6.4' of https://git.kernel.org/pub/scm/linux/kernel/git/amlogic/linux into soc/dt
Amlogic ARM DT changes for v6.4:
- adjust order of some compatibles
- meson8: add the xtal_32k_out pin
- meson8: add the SDXC_A pins
- mxiii-plus: Enable Bluetooth and WiFi support
* tag 'amlogic-arm-dt-for-v6.4' of https://git.kernel.org/pub/scm/linux/kernel/git/amlogic/linux:
ARM: dts: meson8m2: mxiii-plus: Enable Bluetooth and WiFi support
ARM: dts: meson8: add the SDXC_A pins
ARM: dts: meson8: add the xtal_32k_out pin
arm: dts: meson: adjust order of some compatibles
Link: https://lore.kernel.org/r/eb1f32f8-822d-9cfc-fca6-9e044bf4a5ab@linaro.org
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
+66
-3
+17
arch/arm/boot/dts/meson8.dtsi
+17
arch/arm/boot/dts/meson8.dtsi
···
506
506
};
507
507
};
508
508
509
+
sdxc_a_pins: sdxc-a {
510
+
mux {
511
+
groups = "sdxc_d0_a", "sdxc_d13_a",
512
+
"sdxc_clk_a", "sdxc_cmd_a";
513
+
function = "sdxc_a";
514
+
bias-pull-up;
515
+
};
516
+
};
517
+
509
518
sdxc_b_pins: sdxc-b {
510
519
mux {
511
520
groups = "sdxc_d0_b", "sdxc_d13_b",
···
574
565
groups = "uart_cts_a1",
575
566
"uart_rts_a1";
576
567
function = "uart_a";
568
+
bias-disable;
569
+
};
570
+
};
571
+
572
+
xtal_32k_out_pins: xtal-32k-out {
573
+
mux {
574
+
groups = "xtal_32k_out";
575
+
function = "xtal";
577
576
bias-disable;
578
577
};
579
578
};
+2
-2
arch/arm/boot/dts/meson8b.dtsi
+2
-2
arch/arm/boot/dts/meson8b.dtsi
+47
-1
arch/arm/boot/dts/meson8m2-mxiii-plus.dts
+47
-1
arch/arm/boot/dts/meson8m2-mxiii-plus.dts
···
19
19
ethernet0 = ðmac;
20
20
i2c0 = &i2c_AO;
21
21
serial0 = &uart_AO;
22
-
serial1 = &uart_A;
23
22
mmc0 = &sd_card_slot;
24
23
};
25
24
···
44
45
};
45
46
};
46
47
48
+
sdio_pwrseq: sdio-pwrseq {
49
+
compatible = "mmc-pwrseq-simple";
50
+
51
+
pinctrl-0 = <&xtal_32k_out_pins>;
52
+
pinctrl-names = "default";
53
+
54
+
reset-gpios = <&gpio GPIOX_11 GPIO_ACTIVE_LOW>,
55
+
<&gpio_ao GPIOAO_6 GPIO_ACTIVE_LOW>;
56
+
57
+
clocks = <&xtal_32k_out>;
58
+
clock-names = "ext_clock";
59
+
};
60
+
47
61
vcc_3v3: regulator-vcc3v3 {
48
62
compatible = "regulator-fixed";
49
63
regulator-name = "VCC3V3";
50
64
regulator-min-microvolt = <3300000>;
51
65
regulator-max-microvolt = <3300000>;
66
+
};
67
+
68
+
xtal_32k_out: xtal-32k-out-clk {
69
+
compatible = "fixed-clock";
70
+
#clock-cells = <0>;
71
+
clock-frequency = <32768>;
72
+
clock-output-names = "xtal_32k_out";
52
73
};
53
74
};
54
75
···
211
192
vref-supply = <&vddio_ao1v8>;
212
193
};
213
194
195
+
/* SDIO wifi */
196
+
&sdhc {
197
+
status = "okay";
198
+
199
+
pinctrl-0 = <&sdxc_a_pins>;
200
+
pinctrl-names = "default";
201
+
202
+
bus-width = <4>;
203
+
max-frequency = <50000000>;
204
+
205
+
disable-wp;
206
+
non-removable;
207
+
cap-mmc-highspeed;
208
+
cap-sd-highspeed;
209
+
210
+
mmc-pwrseq = <&sdio_pwrseq>;
211
+
212
+
vmmc-supply = <&vcc_3v3>;
213
+
vqmmc-supply = <&vcc_3v3>;
214
+
};
215
+
214
216
&sdio {
215
217
status = "okay";
216
218
···
262
222
pinctrl-0 = <&uart_a1_pins>, <&uart_a1_cts_rts_pins>;
263
223
pinctrl-names = "default";
264
224
uart-has-rtscts;
225
+
226
+
bluetooth {
227
+
compatible = "brcm,bcm20702a1";
228
+
shutdown-gpios = <&gpio GPIOX_20 GPIO_ACTIVE_HIGH>;
229
+
max-speed = <2000000>;
230
+
};
265
231
};
266
232
267
233
&uart_AO {