Skip to content

Commit 74c97b6

Browse files
chainsxigorpecovnik
authored andcommitted
khadas-vim3: add mainline npu support
1 parent 0b14d56 commit 74c97b6

File tree

4 files changed

+58
-0
lines changed

4 files changed

+58
-0
lines changed

config/kernel/linux-meson64-current.config

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2497,6 +2497,7 @@ CONFIG_DRM_CDNS_DSI=m
24972497
CONFIG_DRM_CDNS_MHDP8546=m
24982498
CONFIG_DRM_DW_HDMI_I2S_AUDIO=m
24992499
CONFIG_DRM_DW_HDMI_GP_AUDIO=m
2500+
CONFIG_DRM_ETNAVIV=m
25002501
CONFIG_DRM_HISI_KIRIN=m
25012502
CONFIG_DRM_LOGICVC=m
25022503
CONFIG_DRM_MESON=y
@@ -2553,6 +2554,7 @@ CONFIG_BACKLIGHT_GPIO=m
25532554
CONFIG_BACKLIGHT_RAVE_SP=m
25542555
CONFIG_BACKLIGHT_LED=m
25552556
CONFIG_FRAMEBUFFER_CONSOLE_ROTATION=y
2557+
CONFIG_DRM_ACCEL=y
25562558
CONFIG_SOUND=m
25572559
CONFIG_SND=m
25582560
CONFIG_SND_SEQUENCER=m

config/kernel/linux-meson64-edge.config

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2485,6 +2485,7 @@ CONFIG_DRM_CDNS_DSI=m
24852485
CONFIG_DRM_CDNS_MHDP8546=m
24862486
CONFIG_DRM_DW_HDMI_I2S_AUDIO=m
24872487
CONFIG_DRM_DW_HDMI_GP_AUDIO=m
2488+
CONFIG_DRM_ETNAVIV=m
24882489
CONFIG_DRM_HISI_KIRIN=m
24892490
CONFIG_DRM_LOGICVC=m
24902491
CONFIG_DRM_MESON=y
@@ -2537,6 +2538,7 @@ CONFIG_BACKLIGHT_GPIO=m
25372538
CONFIG_BACKLIGHT_RAVE_SP=m
25382539
CONFIG_BACKLIGHT_LED=m
25392540
CONFIG_FRAMEBUFFER_CONSOLE_ROTATION=y
2541+
CONFIG_DRM_ACCEL=y
25402542
CONFIG_SOUND=m
25412543
CONFIG_SND=m
25422544
CONFIG_SND_SEQUENCER=m
Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,27 @@
1+
From 4e44bc6b46bf3a0fc0de72755293a918467613fe Mon Sep 17 00:00:00 2001
2+
From: Hsun Lai <[email protected]>
3+
Date: Mon, 29 Sep 2025 09:59:25 +0800
4+
Subject: [PATCH] arm64: dts: amlogic: enable npu node for khadas vim3 (a311d)
5+
6+
---
7+
arch/arm64/boot/dts/amlogic/meson-g12b-a311d-khadas-vim3.dts | 4 ++++
8+
1 file changed, 4 insertions(+)
9+
10+
diff --git a/arch/arm64/boot/dts/amlogic/meson-g12b-a311d-khadas-vim3.dts b/arch/arm64/boot/dts/amlogic/meson-g12b-a311d-khadas-vim3.dts
11+
index 124a80901..73f3d87dc 100644
12+
--- a/arch/arm64/boot/dts/amlogic/meson-g12b-a311d-khadas-vim3.dts
13+
+++ b/arch/arm64/boot/dts/amlogic/meson-g12b-a311d-khadas-vim3.dts
14+
@@ -15,6 +15,10 @@ / {
15+
compatible = "khadas,vim3", "amlogic,a311d", "amlogic,g12b";
16+
};
17+
18+
+&npu {
19+
+ status = "okay";
20+
+};
21+
+
22+
/*
23+
* The VIM3 on-board MCU can mux the PCIe/USB3.0 shared differential
24+
* lines using a FUSB340TMX USB 3.1 SuperSpeed Data Switch between
25+
--
26+
2.43.0
27+
Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,27 @@
1+
From 4e44bc6b46bf3a0fc0de72755293a918467613fe Mon Sep 17 00:00:00 2001
2+
From: Hsun Lai <[email protected]>
3+
Date: Mon, 29 Sep 2025 09:59:25 +0800
4+
Subject: [PATCH] arm64: dts: amlogic: enable npu node for khadas vim3 (a311d)
5+
6+
---
7+
arch/arm64/boot/dts/amlogic/meson-g12b-a311d-khadas-vim3.dts | 4 ++++
8+
1 file changed, 4 insertions(+)
9+
10+
diff --git a/arch/arm64/boot/dts/amlogic/meson-g12b-a311d-khadas-vim3.dts b/arch/arm64/boot/dts/amlogic/meson-g12b-a311d-khadas-vim3.dts
11+
index 124a80901..73f3d87dc 100644
12+
--- a/arch/arm64/boot/dts/amlogic/meson-g12b-a311d-khadas-vim3.dts
13+
+++ b/arch/arm64/boot/dts/amlogic/meson-g12b-a311d-khadas-vim3.dts
14+
@@ -15,6 +15,10 @@ / {
15+
compatible = "khadas,vim3", "amlogic,a311d", "amlogic,g12b";
16+
};
17+
18+
+&npu {
19+
+ status = "okay";
20+
+};
21+
+
22+
/*
23+
* The VIM3 on-board MCU can mux the PCIe/USB3.0 shared differential
24+
* lines using a FUSB340TMX USB 3.1 SuperSpeed Data Switch between
25+
--
26+
2.43.0
27+

0 commit comments

Comments
 (0)