Skip to content

Commit 7c0a149

Browse files
committed
Orange Pi 3/3 LTS: load WiFi and Bluetooth modules as needed
1 parent 9107d82 commit 7c0a149

File tree

2 files changed

+8
-7
lines changed

2 files changed

+8
-7
lines changed

CHANGELOG.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@ Enhancement:
1616
Bug fixes:
1717
- Radxa ZERO 3 | Resolved an issue where onboard WiFi on the 3W did not work with the new kernel. Many thanks to @lsx285 and others for reporting this issue and testing fixed kernel builds: https://github.com/MichaIng/DietPi/issues/7867. The kernel has been updated on our AP repository, hence the issue won't appear anymore when updating DietPi or the package.
1818
- Orange Pi 3B v2.1 | Resolved an issue where boot stalled if WiFi was enabled, which includes fresh images. The UNISOC/Spreadtrum 3rd party driver was tried to be loaded, which is not only unnecessary on revision 2.1 with Broadcom WiFi/Bluetooth chip, but causes a NULL pointer dereference from a certain Linux version on. The board revision is now detected in our scripts and the UNISOC driver loaded on v1.1 only. Many thanks to @techplayz32 and @Girb826 for reporting this issue: https://github.com/MichaIng/DietPi/issues/7728
19+
- Orange Pi 3/3 LTS | Resolved an issue where WiFi and Bluetooth did not work without manually loading the related kernel modules "sprdwl_ng" and "sprdbt_tty" respectively. This is now done when toggling WiFi and Bluetooth via dietpi-config or dietpi.txt. Many thanks to @iMagz for reporting this issue: https://github.com/MichaIng/DietPi/issues/7878
1920
- DietPi-Software | Home Assistant: Resolved an issue where the installation could have failed on RISC-V and ARMv6/7 Bookworm systems due to missing dependencies.
2021
- DietPi-Software | Home Assistant: Worked around an issue where the installation and service start failed due to a missing upper dependency declaration. The issue has been solved at Home Assistant for their upcoming release, which will make our workaround obsolete.
2122

dietpi/func/dietpi-set_hardware

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1157,7 +1157,7 @@ _EOF_
11571157

11581158
case $G_HW_MODEL in
11591159
[0-9]) (( $G_HW_ONBOARD_WIFI )) && aBLUETOOTH_MODULES+=('hci_uart');; # RPi. This kernel module is used by other SBCs, but e.g. on ROCK 4 SE it is needed as well for WiFi: https://github.com/MichaIng/DietPi/issues/6943
1160-
83|88) aBLUETOOTH_MODULES+=('sprdbt_tty');; # Orange Pi Zero 3/Zero 2W
1160+
83|88|89|99) aBLUETOOTH_MODULES+=('sprdbt_tty');; # Orange Pi Zero 3/Zero 2W/3 LTS/3
11611161
87) [[ $G_HW_REVISION == '1.1' ]] && aBLUETOOTH_MODULES+=('sprdbt_tty');; # Orange Pi 3B v1.1
11621162
*) :;;
11631163
esac
@@ -1245,8 +1245,8 @@ _EOF_
12451245
then
12461246
G_EXEC systemctl enable hciuart
12471247

1248-
# Orange Pi Zero 3/Zero 2W/3B v1.1: Module does not load automatically
1249-
elif [[ $G_HW_MODEL =~ ^(83|88)$ || ( $G_HW_MODEL == 87 && $G_HW_REVISION == '1.1' ) ]]
1248+
# Orange Pi Zero 3/Zero 2W/3B v1.1/3 LTS/3: Module does not load automatically
1249+
elif [[ $G_HW_MODEL =~ ^(83|88|89|99)$ || ( $G_HW_MODEL == 87 && $G_HW_REVISION == '1.1' ) ]]
12501250
then
12511251
G_EXEC eval 'echo '\''sprdbt_tty'\'' > /etc/modules-load.d/dietpi-enable_bluetooth.conf'
12521252
G_AG_CHECK_INSTALL_PREREQ sprd-bluetooth
@@ -1333,8 +1333,8 @@ _EOF_
13331333
then
13341334
aWIFI_MODULES+=('8723bs')
13351335

1336-
# + Orange Pi Zero 3/Zero 2W/3B v1.1
1337-
elif [[ $G_HW_MODEL =~ ^(83|88)$ || ( $G_HW_MODEL == 87 && $G_HW_REVISION == '1.1' ) ]]
1336+
# + Orange Pi Zero 3/Zero 2W/3B v1.1/3 LTS/3
1337+
elif [[ $G_HW_MODEL =~ ^(83|88|89|99)$ || ( $G_HW_MODEL == 87 && $G_HW_REVISION == '1.1' ) ]]
13381338
then
13391339
aWIFI_MODULES+=('sprdwl_ng')
13401340
fi
@@ -1375,8 +1375,8 @@ _EOF_
13751375
then
13761376
G_EXEC eval 'echo '\''options 8723bs rtw_power_mgnt=0'\'' > /etc/modprobe.d/dietpi-disable_wifi_powersaving.conf'
13771377

1378-
# - Orange Pi Zero 3/Zero 2W/3B v1.1: Module does not load automatically
1379-
elif [[ $G_HW_MODEL =~ ^(83|88)$ || ( $G_HW_MODEL == 87 && $G_HW_REVISION == '1.1' ) ]]
1378+
# - Orange Pi Zero 3/Zero 2W/3B v1.1/3 LTS/3: Module does not load automatically
1379+
elif [[ $G_HW_MODEL =~ ^(83|88|89|99)$ || ( $G_HW_MODEL == 87 && $G_HW_REVISION == '1.1' ) ]]
13801380
then
13811381
G_EXEC eval 'echo '\''sprdwl_ng'\'' > /etc/modules-load.d/dietpi-enable_wifi.conf'
13821382
fi

0 commit comments

Comments
 (0)