Skip to content

Commit 72ba1de

Browse files
pyavitzpyavitz
committedSep 9, 2024
BananaPi CM4: improve SDIO WiFi speeds
Improve overall WiFi experience Default freq now set to 100MHz (optional overlay to 200MHz) Resolved incompatibility with the github driver: https://github.com/jethome-ru/rtl88x2cs If the github driver is preferred blacklist RTW88 /etc/modprobe.d/blacklist-rtw88.conf blacklist rtw88_8822c blacklist rtw88_8822cs EXTRA: Waveshare DTS fixup Signed-off-by: Patrick Yavitz <pyavitz@gmail.com>
1 parent 95b6348 commit 72ba1de

7 files changed

+154
-20
lines changed
 

‎patch/kernel/archive/meson64-6.10/board-bananapi-cm4-cm4io.patch

+46-2
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
2-
From: Patrick Yavitz <pyavitz@xxxxx.com>
2+
From: Patrick Yavitz <pyavitz@armbian.com>
33
Date: Tue, 25 Jul 2023 13:31:54 -0400
44
Subject: arch: arm64: dts: amlogic: meson g12b bananapi cm4
55

6-
Signed-off-by: Patrick Yavitz <pyavitz@xxxxx.com>
6+
Signed-off-by: Patrick Yavitz <pyavitz@armbian.com>
77
---
88
arch/arm64/boot/dts/amlogic/meson-g12b-bananapi-cm4-cm4io.dts | 9 +++++--
99
arch/arm64/boot/dts/amlogic/meson-g12b-bananapi-cm4.dtsi | 12 ++++++++--
@@ -75,3 +75,47 @@ index 111111111111..222222222222 100644
7575
--
7676
Armbian
7777

78+
From cd42f604cd3298eb563c2d8788cbde1eb8e23970 Mon Sep 17 00:00:00 2001
79+
From: Patrick Yavitz <pyavitz@armbian.com>
80+
Date: Sun, 8 Sep 2024 05:55:13 -0400
81+
Subject: [PATCH] BananaPi CM4: improve SDIO WiFi speeds
82+
83+
Signed-off-by: Patrick Yavitz <pyavitz@armbian.com>
84+
---
85+
arch/arm64/boot/dts/amlogic/meson-g12b-bananapi-cm4.dtsi | 9 +++++++--
86+
1 file changed, 7 insertions(+), 2 deletions(-)
87+
88+
diff --git a/arch/arm64/boot/dts/amlogic/meson-g12b-bananapi-cm4.dtsi b/arch/arm64/boot/dts/amlogic/meson-g12b-bananapi-cm4.dtsi
89+
index 995ce10d5c81..32cf5ae2ee36 100644
90+
--- a/arch/arm64/boot/dts/amlogic/meson-g12b-bananapi-cm4.dtsi
91+
+++ b/arch/arm64/boot/dts/amlogic/meson-g12b-bananapi-cm4.dtsi
92+
@@ -294,8 +294,10 @@ &sd_emmc_a {
93+
#size-cells = <0>;
94+
95+
bus-width = <4>;
96+
+ cap-sd-highspeed;
97+
+ sd-uhs-sdr50;
98+
sd-uhs-sdr104;
99+
- max-frequency = <50000000>;
100+
+ max-frequency = <100000000>;
101+
102+
non-removable;
103+
disable-wp;
104+
@@ -303,10 +305,13 @@ &sd_emmc_a {
105+
/* WiFi firmware requires power in suspend */
106+
keep-power-in-suspend;
107+
108+
+ /* Removing quirk improves WiFi performance */
109+
+ /delete-property/ amlogic,dram-access-quirk;
110+
+
111+
mmc-pwrseq = <&sdio_pwrseq>;
112+
113+
vmmc-supply = <&vddao_3v3>;
114+
- vqmmc-supply = <&vddao_3v3>;
115+
+ vqmmc-supply = <&vddao_1v8>;
116+
117+
status = "okay";
118+
119+
--
120+
2.39.2
121+

‎patch/kernel/archive/meson64-6.10/overlay/Makefile

+1
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@ dtbo-$(CONFIG_ARCH_MESON) += \
2222
meson-g12a-radxa-zero-uart-ao-b-on-gpioao-8-gpioao-9.dtbo \
2323
meson-g12a-radxa-zero-uart-ee-c.dtbo \
2424
meson-g12b-bananapi-cm4-pwm-gpioh-5-fan.dtbo \
25+
meson-g12b-bananapi-cm4-wifi-freq-200mhz.dtbo \
2526
meson-g12b-bananapi-m2s-rtl8822cs.dtbo \
2627
meson-g12b-odroid-n2-spi.dtbo \
2728
meson-g12b-waveshare-cm4-io-base-usb.dtbo \

‎patch/kernel/archive/meson64-6.10/overlay/meson-g12b-bananapi-cm4-wifi-freq-200mhz.dtso

+22
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
1+
/dts-v1/;
2+
/plugin/;
3+
4+
/ {
5+
compatible = "bananapi,bpi-cm4io", "bananapi,bpi-cm4", "amlogic,a311d", "amlogic,g12b";
6+
7+
fragment@0 {
8+
target-path = "/";
9+
__overlay__ {
10+
sdio-pwrseq {
11+
post-power-on-delay-ms = <200>;
12+
};
13+
};
14+
};
15+
16+
fragment@1 {
17+
target = <&sd_emmc_a>;
18+
__overlay__ {
19+
max-frequency = <200000000>;
20+
};
21+
};
22+
};

‎patch/kernel/archive/meson64-6.6/board-bananapi-cm4-cm4io.patch

+46-2
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
From 5fb77258c07ec1cbad6f21d66bafde7c64a4f89a Mon Sep 17 00:00:00 2001
2-
From: Patrick Yavitz <pyavitz@xxxxx.com>
2+
From: Patrick Yavitz <pyavitz@armbian.com>
33
Date: Tue, 25 Jul 2023 13:31:54 -0400
44
Subject: [PATCH] arch: arm64: dts: amlogic: meson g12b bananapi cm4
55

6-
Signed-off-by: Patrick Yavitz <pyavitz@xxxxx.com>
6+
Signed-off-by: Patrick Yavitz <pyavitz@armbian.com>
77
---
88
.../dts/amlogic/meson-g12b-bananapi-cm4-cm4io.dts | 9 +++++++--
99
.../boot/dts/amlogic/meson-g12b-bananapi-cm4.dtsi | 12 ++++++++++--
@@ -75,3 +75,47 @@ index 97e522921b06..b90097f07be9 100644
7575
--
7676
2.39.2
7777

78+
From cd42f604cd3298eb563c2d8788cbde1eb8e23970 Mon Sep 17 00:00:00 2001
79+
From: Patrick Yavitz <pyavitz@armbian.com>
80+
Date: Sun, 8 Sep 2024 05:55:13 -0400
81+
Subject: [PATCH] BananaPi CM4: improve SDIO WiFi speeds
82+
83+
Signed-off-by: Patrick Yavitz <pyavitz@armbian.com>
84+
---
85+
arch/arm64/boot/dts/amlogic/meson-g12b-bananapi-cm4.dtsi | 9 +++++++--
86+
1 file changed, 7 insertions(+), 2 deletions(-)
87+
88+
diff --git a/arch/arm64/boot/dts/amlogic/meson-g12b-bananapi-cm4.dtsi b/arch/arm64/boot/dts/amlogic/meson-g12b-bananapi-cm4.dtsi
89+
index 995ce10d5c81..32cf5ae2ee36 100644
90+
--- a/arch/arm64/boot/dts/amlogic/meson-g12b-bananapi-cm4.dtsi
91+
+++ b/arch/arm64/boot/dts/amlogic/meson-g12b-bananapi-cm4.dtsi
92+
@@ -294,8 +294,10 @@ &sd_emmc_a {
93+
#size-cells = <0>;
94+
95+
bus-width = <4>;
96+
+ cap-sd-highspeed;
97+
+ sd-uhs-sdr50;
98+
sd-uhs-sdr104;
99+
- max-frequency = <50000000>;
100+
+ max-frequency = <100000000>;
101+
102+
non-removable;
103+
disable-wp;
104+
@@ -303,10 +305,13 @@ &sd_emmc_a {
105+
/* WiFi firmware requires power in suspend */
106+
keep-power-in-suspend;
107+
108+
+ /* Removing quirk improves WiFi performance */
109+
+ /delete-property/ amlogic,dram-access-quirk;
110+
+
111+
mmc-pwrseq = <&sdio_pwrseq>;
112+
113+
vmmc-supply = <&vddao_3v3>;
114+
- vqmmc-supply = <&vddao_3v3>;
115+
+ vqmmc-supply = <&vddao_1v8>;
116+
117+
status = "okay";
118+
119+
--
120+
2.39.2
121+

‎patch/kernel/archive/meson64-6.6/dt/meson-g12b-waveshare-cm4-io-base-b.dts

+16-16
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
// SPDX-License-Identifier: (GPL-2.0+ OR MIT)
22
/*
3-
* Copyright (c) 2024 Patrick Yavitz <pyavitz@xxxxx.com>
3+
* Copyright (c) 2024 Patrick Yavitz <pyavitz@armbian.com>
44
*/
55

66
/dts-v1/;
@@ -16,21 +16,6 @@
1616
};
1717
};
1818

19-
&i2c1 {
20-
rtc: rtc@51 {
21-
compatible = "nxp,pcf85063a";
22-
reg = <0x51>;
23-
wakeup-source;
24-
};
25-
26-
fanctrl: emc2305@2f {
27-
compatible = "smsc,emc2305";
28-
reg = <0x2f>;
29-
#cooling-cells = <0x02>;
30-
wakeup-source;
31-
};
32-
};
33-
3419
&cpu_thermal {
3520
trips {
3621
fanmid0: fanmid0 {
@@ -59,6 +44,21 @@
5944
};
6045
};
6146

47+
&i2c1 {
48+
rtc: rtc@51 {
49+
compatible = "nxp,pcf85063a";
50+
reg = <0x51>;
51+
wakeup-source;
52+
};
53+
54+
fanctrl: emc2305@2f {
55+
compatible = "smsc,emc2305";
56+
reg = <0x2f>;
57+
#cooling-cells = <0x02>;
58+
wakeup-source;
59+
};
60+
};
61+
6262
&usb {
6363
dr_mode = "host";
6464
};

‎patch/kernel/archive/meson64-6.6/overlay/Makefile

+1
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@ dtbo-$(CONFIG_ARCH_MESON) += \
2222
meson-g12a-radxa-zero-uart-ao-b-on-gpioao-8-gpioao-9.dtbo \
2323
meson-g12a-radxa-zero-uart-ee-c.dtbo \
2424
meson-g12b-bananapi-cm4-pwm-gpioh-5-fan.dtbo \
25+
meson-g12b-bananapi-cm4-wifi-freq-200mhz.dtbo \
2526
meson-g12b-bananapi-m2s-rtl8822cs.dtbo \
2627
meson-g12b-odroid-n2-spi.dtbo \
2728
meson-g12b-waveshare-cm4-io-base-usb.dtbo \

‎patch/kernel/archive/meson64-6.6/overlay/meson-g12b-bananapi-cm4-wifi-freq-200mhz.dts

+22
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
1+
/dts-v1/;
2+
/plugin/;
3+
4+
/ {
5+
compatible = "bananapi,bpi-cm4io", "bananapi,bpi-cm4", "amlogic,a311d", "amlogic,g12b";
6+
7+
fragment@0 {
8+
target-path = "/";
9+
__overlay__ {
10+
sdio-pwrseq {
11+
post-power-on-delay-ms = <200>;
12+
};
13+
};
14+
};
15+
16+
fragment@1 {
17+
target = <&sd_emmc_a>;
18+
__overlay__ {
19+
max-frequency = <200000000>;
20+
};
21+
};
22+
};

0 commit comments

Comments
 (0)
Please sign in to comment.