Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

opi3b: fix mainline uboot with vendor kernel and fix uwe5622 bt for rk35xx #7025

Merged
merged 2 commits into from
Sep 13, 2024
Merged

opi3b: fix mainline uboot with vendor kernel and fix uwe5622 bt for rk35xx #7025

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
6c6c295
uwe5622: fix for rk35xx vendor kernel
amazingfate Aug 4, 2024
0dfc288
opi3b: use mainline uboot v2024.10-rc3
amazingfate Aug 27, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions config/boards/orangepi3b.csc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,9 +19,9 @@ MODULES_BLACKLIST_LEGACY="bcmdhd"
function post_family_config__orangepi3b_use_mainline_uboot() {
display_alert "$BOARD" "mainline (Kwiboo's tree) u-boot overrides" "info"

BOOTSOURCE="https://github.com/Kwiboo/u-boot-rockchip.git"
BOOTBRANCH="branch:rk3xxx-2024.04" # specific commit tested is commit:ccef7dfc453bc03c5b5c61fa67d2745b96fa7da6
BOOTPATCHDIR="v2024.04-orangepi3b" # empty, patches are already in Kwiboo's branch:rk3xxx-2024.04
BOOTSOURCE='https://github.com/u-boot/u-boot'
BOOTBRANCH="tag:v2024.10-rc3"
BOOTPATCHDIR="v2024.10-orangepi3b"

BOOTDIR="u-boot-${BOARD}" # do not share u-boot directory

Expand Down
2 changes: 1 addition & 1 deletion lib/functions/compilation/patch/drivers_network.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -501,7 +501,7 @@ driver_uwe5622() {
fi

# Apply patches that adjust the driver only for rockchip platforms
if [[ "$LINUXFAMILY" == rockchip* ]]; then
if [[ "$LINUXFAMILY" == rockchip* || "$LINUXFAMILY" == "rk35xx" ]]; then
if linux-version compare "${version}" le 6.1; then
process_patch_file "${SRC}/patch/misc/wireless-uwe5622/uwe5622-adjust-for-rockchip-pre-6.1.patch"
else
Expand Down
34 changes: 34 additions & 0 deletions patch/u-boot/v2024.10-orangepi3b/0001-rockchip-rk3566-orangepi-3b-enable-npu-regulator.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,34 @@
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: Jonas Karlman <[email protected]>
Date: Wed, 14 Aug 2024 21:35:16 +0000
Subject: rockchip: rk3566-orangepi-3b: enable npu regulator

The power-domain driver in Linux does not know what regulator is
supplying power to a specific power-domain. This prevent use of NPU with
vendor kernel because vdd_npu is disabled.

Change vdd_npu to use always-on/boot-on to enable the regulator at boot
and set initial 0v9 voltage, the recommended voltage in soc datasheet.

Signed-off-by: Jonas Karlman <[email protected]>
---
arch/arm/dts/rk3566-orangepi-3b-u-boot.dtsi | 6 ++++++
1 file changed, 6 insertions(+)

diff --git a/arch/arm/dts/rk3566-orangepi-3b-u-boot.dtsi b/arch/arm/dts/rk3566-orangepi-3b-u-boot.dtsi
index 111111111111..222222222222 100644
--- a/arch/arm/dts/rk3566-orangepi-3b-u-boot.dtsi
+++ b/arch/arm/dts/rk3566-orangepi-3b-u-boot.dtsi
@@ -12,3 +12,9 @@
bootph-some-ram;
};
};
+
+&vdd_npu {
+ regulator-always-on;
+ regulator-boot-on;
+ regulator-init-microvolt = <900000>;
+};
--
Armbian