Skip to contentSkip to conversation

some BPI-R4Pro dts updates

PATCH Applied Frank Wunderlich 3 participants 7 messages Apr 12 – May 11

Subsystems (2)
lore
Share & tools
lore
#0 lore raw

v2 cover some BPI-R4Pro dts updates

From: Frank Wunderlich <[email protected]>

There are some parts of BPI-R4Pro DTS that need to be changed. Currently there should be not much users of the mainline-dts and we noticed some things while openwrt integration.

v2:
- added mgmt port renaming as this patch is still outstanding to keep all in one series
https://patchwork.kernel.org/project/linux-mediatek/patch/[email protected]/
- dropped default-state in gpio-leds patch as suggested by daniel

Frank Wunderlich (4):
arm64: dts: mediatek: mt7988a-bpi-r4pro: rename mgmt port to lan5
arm64: dts: mediatek: mt7988a-bpi-r4pro: drop duplicate fan properties
arm64: dts: mediatek: mt7988a-bpi-r4pro: update gpio-leds
arm64: dts: mediatek: mt7988a-bpi-r4pro: rework pcie gpio-hog handling

 arch/arm64/boot/dts/mediatek/Makefile         |  8 ++++++++
 .../mt7988a-bananapi-bpi-r4-pro-cn13.dtso     | 20 +++++++++++++++++++
 .../mt7988a-bananapi-bpi-r4-pro-cn14.dtso     | 20 +++++++++++++++++++
 .../mediatek/mt7988a-bananapi-bpi-r4-pro.dtsi | 15 +++-----------
 4 files changed, 51 insertions(+), 12 deletions(-)
 create mode 100644 arch/arm64/boot/dts/mediatek/mt7988a-bananapi-bpi-r4-pro-cn13.dtso
 create mode 100644 arch/arm64/boot/dts/mediatek/mt7988a-bananapi-bpi-r4-pro-cn14.dtso
Signature · 1 line
2.43.0
#1 lore raw

PATCH v2 1/4 arm64: dts: mediatek: mt7988a-bpi-r4pro: rename mgmt port to lan5

From: Frank Wunderlich <[email protected]>

It turns out that the label mgmt confuses users and now official case is released where the port is labeled with number 5. So just rename it to lan5 to follow naming convension (lan1-4 from mxl switch and lan6 for lan- combo).

---
 arch/arm64/boot/dts/mediatek/mt7988a-bananapi-bpi-r4-pro.dtsi | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
arch/arm64/boot/dts/mediatek/mt7988a-bananapi-bpi-r4-pro.dtsi +1 -1
index a48132f09411..1175ee156cb3 100644
@@ -207,7 +207,7 @@ &gsw_phy0_led0 {
 };
 
 &gsw_port0 {
-	label = "mgmt";
+	label = "lan5";
 };
 
 /* R4Pro has only port 0 connected, so disable the others */
Signature · 1 line
2.43.0
#2 lore raw

PATCH v2 2/4 arm64: dts: mediatek: mt7988a-bpi-r4pro: drop duplicate fan properties

In reply to Frank Wunderlich

From: Frank Wunderlich <[email protected]>

These properties are already set in the original node and do not need to be defined again.

---
 .../boot/dts/mediatek/mt7988a-bananapi-bpi-r4-pro.dtsi     | 7 -------
 1 file changed, 7 deletions(-)
arch/arm64/boot/dts/mediatek/mt7988a-bananapi-bpi-r4-pro.dtsi +0 -7
index 1175ee156cb3..759f608d1081 100644
@@ -185,13 +185,6 @@ &eth {
 	status = "okay";
 };
 
-&fan {
-	pinctrl-0 = <&pwm0_pins>;
-	pinctrl-names = "default";
-	pwms = <&pwm 0 50000>;
-	status = "okay";
-};
-
 &gmac0 {
 	status = "okay";
 };
Signature · 1 line
2.43.0
#3 lore raw

PATCH v2 3/4 arm64: dts: mediatek: mt7988a-bpi-r4pro: update gpio-leds

In reply to Frank Wunderlich

From: Frank Wunderlich <[email protected]>

On the official case the red LED is named ERR, the blue LED is named ACT.​​​​​​​​​​​​​​​​ Reflect these labels in function and set them default off.

---
v2:
- dropped default-state as suggested by daniel

---
 arch/arm64/boot/dts/mediatek/mt7988a-bananapi-bpi-r4-pro.dtsi | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
arch/arm64/boot/dts/mediatek/mt7988a-bananapi-bpi-r4-pro.dtsi +2 -2
index 759f608d1081..bbd6c16a8cb0 100644
@@ -61,14 +61,14 @@ gpio-leds {
 
 		led_red: sys-led-red {
 			color = <LED_COLOR_ID_RED>;
+			function = LED_FUNCTION_FAULT;
 			gpios = <&pca9555 15 GPIO_ACTIVE_HIGH>;
-			default-state = "on";
 		};
 
 		led_blue: sys-led-blue {
 			color = <LED_COLOR_ID_BLUE>;
+			function = LED_FUNCTION_ACTIVITY;
 			gpios = <&pca9555 14 GPIO_ACTIVE_HIGH>;
-			default-state = "on";
 		};
 	};
 
Signature · 1 line
2.43.0
#4 lore raw

PATCH v2 4/4 arm64: dts: mediatek: mt7988a-bpi-r4pro: rework pcie gpio-hog handling

In reply to Frank Wunderlich

From: Frank Wunderlich <[email protected]>

The active-high property in base-dt cannot be overwritten and must be set in separate overlay.

Fixes f397471a6a8c ("arm64: dts: mediatek: mt7988: Add devicetree for BananaPi R4 Pro")
---
 arch/arm64/boot/dts/mediatek/Makefile         |  8 ++++++++
 .../mt7988a-bananapi-bpi-r4-pro-cn13.dtso     | 20 +++++++++++++++++++
 .../mt7988a-bananapi-bpi-r4-pro-cn14.dtso     | 20 +++++++++++++++++++
 .../mediatek/mt7988a-bananapi-bpi-r4-pro.dtsi |  2 --
 4 files changed, 48 insertions(+), 2 deletions(-)
 create mode 100644 arch/arm64/boot/dts/mediatek/mt7988a-bananapi-bpi-r4-pro-cn13.dtso
 create mode 100644 arch/arm64/boot/dts/mediatek/mt7988a-bananapi-bpi-r4-pro-cn14.dtso
arch/arm64/boot/dts/mediatek/Makefile +8 -0
index 387faa9c2a09..a86fb313b1a9 100644
@@ -47,6 +47,8 @@ dtb-$(CONFIG_ARCH_MEDIATEK) += mt7988a-bananapi-bpi-r4-2g5.dtb
 dtb-$(CONFIG_ARCH_MEDIATEK) += mt7988a-bananapi-bpi-r4-emmc.dtbo
 dtb-$(CONFIG_ARCH_MEDIATEK) += mt7988a-bananapi-bpi-r4-pro-4e.dtb
 dtb-$(CONFIG_ARCH_MEDIATEK) += mt7988a-bananapi-bpi-r4-pro-8x.dtb
+dtb-$(CONFIG_ARCH_MEDIATEK) += mt7988a-bananapi-bpi-r4-pro-cn13.dtbo
+dtb-$(CONFIG_ARCH_MEDIATEK) += mt7988a-bananapi-bpi-r4-pro-cn14.dtbo
 dtb-$(CONFIG_ARCH_MEDIATEK) += mt7988a-bananapi-bpi-r4-pro-cn15.dtbo
 dtb-$(CONFIG_ARCH_MEDIATEK) += mt7988a-bananapi-bpi-r4-pro-cn18.dtbo
 dtb-$(CONFIG_ARCH_MEDIATEK) += mt7988a-bananapi-bpi-r4-pro-emmc.dtbo
@@ -70,18 +72,24 @@ mt7988a-bananapi-bpi-r4-2g5-sd-dtbs := \
 dtb-$(CONFIG_ARCH_MEDIATEK) += mt7988a-bananapi-bpi-r4-2g5-sd.dtb
 mt7988a-bananapi-bpi-r4-pro-8x-emmc-dtbs := \
 	mt7988a-bananapi-bpi-r4-pro-8x.dtb \
+	mt7988a-bananapi-bpi-r4-pro-cn13.dtbo \
+	mt7988a-bananapi-bpi-r4-pro-cn14.dtbo \
 	mt7988a-bananapi-bpi-r4-pro-emmc.dtbo
 dtb-$(CONFIG_ARCH_MEDIATEK) += mt7988a-bananapi-bpi-r4-pro-8x-emmc.dtb
 mt7988a-bananapi-bpi-r4-pro-8x-sd-dtbs := \
 	mt7988a-bananapi-bpi-r4-pro-8x.dtb \
+	mt7988a-bananapi-bpi-r4-pro-cn13.dtbo \
+	mt7988a-bananapi-bpi-r4-pro-cn14.dtbo \
 	mt7988a-bananapi-bpi-r4-pro-sd.dtbo
 dtb-$(CONFIG_ARCH_MEDIATEK) += mt7988a-bananapi-bpi-r4-pro-8x-sd.dtb
 mt7988a-bananapi-bpi-r4-pro-8x-sd-cn15-dtbs := \
 	mt7988a-bananapi-bpi-r4-pro-8x-sd.dtb \
+	mt7988a-bananapi-bpi-r4-pro-cn14.dtbo \
 	mt7988a-bananapi-bpi-r4-pro-cn15.dtbo
 dtb-$(CONFIG_ARCH_MEDIATEK) += mt7988a-bananapi-bpi-r4-pro-8x-sd-cn15.dtb
 mt7988a-bananapi-bpi-r4-pro-8x-sd-cn18-dtbs := \
 	mt7988a-bananapi-bpi-r4-pro-8x-sd.dtb \
+	mt7988a-bananapi-bpi-r4-pro-cn13.dtbo \
 	mt7988a-bananapi-bpi-r4-pro-cn18.dtbo
 dtb-$(CONFIG_ARCH_MEDIATEK) += mt7988a-bananapi-bpi-r4-pro-8x-sd-cn18.dtb
 dtb-$(CONFIG_ARCH_MEDIATEK) += mt8167-pumpkin.dtb
arch/arm64/boot/dts/mediatek/mt7988a-bananapi-bpi-r4-pro-cn13.dtso new file +20 -0
new file mode 100644
index 000000000000..973b76ba0cbf
@@ -0,0 +1,20 @@
+// SPDX-License-Identifier: (GPL-2.0 OR MIT)
+/*
+ * Copyright (C) 2025 MediaTek Inc.
+ * Author: Frank Wunderlich <[email protected]>
+ */
+
+/* This enables key-m slot CN13 on pcie2(11280000 1L0) on BPI-R4-Pro */
+
+/dts-v1/;
+/plugin/;
+
+#include <dt-bindings/gpio/gpio.h>
+
+/ {
+	compatible = "bananapi,bpi-r4-pro", "mediatek,mt7988a";
+};
+
+&{/soc/pinctrl@1001f000/pcie-2-hog} {
+	output-high;
+};
arch/arm64/boot/dts/mediatek/mt7988a-bananapi-bpi-r4-pro-cn14.dtso new file +20 -0
new file mode 100644
index 000000000000..90b2a64459c3
@@ -0,0 +1,20 @@
+// SPDX-License-Identifier: (GPL-2.0 OR MIT)
+/*
+ * Copyright (C) 2025 MediaTek Inc.
+ * Author: Frank Wunderlich <[email protected]>
+ */
+
+/* This enables key-m slot CN14 on pcie3(11290000 1L1) on BPI-R4-Pro */
+
+/dts-v1/;
+/plugin/;
+
+#include <dt-bindings/gpio/gpio.h>
+
+/ {
+	compatible = "bananapi,bpi-r4-pro", "mediatek,mt7988a";
+};
+
+&{/soc/pinctrl@1001f000/pcie-3-hog} {
+	output-high;
+};
arch/arm64/boot/dts/mediatek/mt7988a-bananapi-bpi-r4-pro.dtsi +0 -2
index bbd6c16a8cb0..1eeb72108b9b 100644
@@ -430,14 +430,12 @@ mux {
 	pcie-2-hog {
 		gpio-hog;
 		gpios = <79 GPIO_ACTIVE_HIGH>;
-		output-high;
 	};
 
 	/* 1L1 0=key-b (CN18), 1=key-m (CN14) */
 	pcie-3-hog {
 		gpio-hog;
 		gpios = <63 GPIO_ACTIVE_HIGH>;
-		output-high;
 	};
 
 	pwm0_pins: pwm0-pins {
Signature · 1 line
2.43.0
#5 lore raw
In reply to Frank Wunderlich

Hi

just a gentle ping

do i need to change anything? i wonder why i do not see this series in devicetree patchwork...

Am 12. April 2026 um 11:23 schrieb "Frank Wunderlich" <[email protected] mailto:[email protected]?to=%22Frank%20Wunderlich%22%20%3Clinux%40fw-web.de%3E >:

Quoted 19 lines

From: Frank Wunderlich <[email protected]>

There are some parts of BPI-R4Pro DTS that need to be changed. Currently there should be not much users of the mainline-dts and we noticed some things while openwrt integration.

v2:
- added mgmt port renaming as this patch is still outstanding to keep all in one series
https://patchwork.kernel.org/project/linux-mediatek/patch/[email protected]/
- dropped default-state in gpio-leds patch as suggested by daniel

Frank Wunderlich (4):
arm64: dts: mediatek: mt7988a-bpi-r4pro: rename mgmt port to lan5
arm64: dts: mediatek: mt7988a-bpi-r4pro: drop duplicate fan properties
arm64: dts: mediatek: mt7988a-bpi-r4pro: update gpio-leds
arm64: dts: mediatek: mt7988a-bpi-r4pro: rework pcie gpio-hog handling

Quoted 11 lines
 arch/arm64/boot/dts/mediatek/Makefile | 8 ++++++++
 .../mt7988a-bananapi-bpi-r4-pro-cn13.dtso | 20 +++++++++++++++++++
 .../mt7988a-bananapi-bpi-r4-pro-cn14.dtso | 20 +++++++++++++++++++
 .../mediatek/mt7988a-bananapi-bpi-r4-pro.dtsi | 15 +++-----------
 4 files changed, 51 insertions(+), 12 deletions(-)
 create mode 100644 arch/arm64/boot/dts/mediatek/mt7988a-bananapi-bpi-r4-pro-cn13.dtso
 create mode 100644 arch/arm64/boot/dts/mediatek/mt7988a-bananapi-bpi-r4-pro-cn14.dtso
Signature · 1 line
2.43.0

regards Frank

maintainer Applied
#6 lore raw
In reply to Frank Wunderlich
Quoted 6 lines · Frank Wunderlich

From: Frank Wunderlich <[email protected]>

There are some parts of BPI-R4Pro DTS that need to be changed. Currently there should be not much users of the mainline-dts and we noticed some things while openwrt integration.

Quoted 7 lines

v2:
- added mgmt port renaming as this patch is still outstanding to keep all in one series
https://patchwork.kernel.org/project/linux-mediatek/patch/[email protected]/
- dropped default-state in gpio-leds patch as suggested by daniel

[...]

Applied to v7.1-next/dts64, thanks!

[1/4] arm64: dts: mediatek: mt7988a-bpi-r4pro: rename mgmt port to lan5

      commit: 3ee1389fb19691cddc437dd6ba9979100d691051
[2/4] arm64: dts: mediatek: mt7988a-bpi-r4pro: drop duplicate fan properties
      commit: f639e17553da08eff5957e8a2657253a26d47c12
[3/4] arm64: dts: mediatek: mt7988a-bpi-r4pro: update gpio-leds
      commit: 993d54a4f987959998cb47d9cf5f9bb1d35287df
[4/4] arm64: dts: mediatek: mt7988a-bpi-r4pro: rework pcie gpio-hog handling
      commit: 2df54c0b376c2691f6887a4f445d36935b9e8f87

Cheers,
Angelo