Skip to contentSkip to conversation

Enable Bluetooth and WiFi on K3 Pico ITX

PATCH Superseded Aurelien Jarno 2 participants 8 messages Aug 31 – Sep 27

Subsystems (3)

v3 of 5 Superseded Latest is v5 →

lore
Share & tools
lore
#0 lore raw

v3 cover Enable Bluetooth and WiFi on K3 Pico ITX

This patchset enables Bluetooth through USB on the K3 Pico ITX board and adds the rfkill nodes for Bluetooth and WLAN so that the devices can be activated.

Note that WLAN support also require the following patch series, but both can be applied independently:
- https://lore.kernel.org/spacemit/[email protected]/

Changes v3 -> v4
- fully move the phy definition and the board level
- rebase on 7.3-rc1

Aurelien Jarno (5):
riscv: dts: spacemit: k3: move USB3 phy to board level
riscv: dts: spacemit: k3: add USB3 B and C controllers for Pico-ITX
board
riscv: dts: spacemit: k3: add rfkill node for Bluetooth on Pico-ITX
board
riscv: dts: spacemit: k3: add rfkill node for WLAN on the K3 Pico-ITX
board
riscv64: defconfig: Enable BT and WLAN support for SpacemiT K3
Pico-ITX board

 arch/riscv/boot/dts/spacemit/k3-pico-itx.dts | 38 ++++++++++++
 arch/riscv/boot/dts/spacemit/k3.dtsi         | 63 +++++++++++++++++++-
 arch/riscv/configs/defconfig                 |  8 +++
 3 files changed, 106 insertions(+), 3 deletions(-)
Signature · 1 line
2.53.0
#1 lore raw

PATCH v3 1/5 riscv: dts: spacemit: k3: move USB3 phy to board level

On the SpacemiT K3 SoC, the combo phy provides 8 lines that can either be used for PCIe or USB3, depending on its configuration (spacemit,apmu). This configuration is defined at the board level, and assigning a phy line to a USB3 controller while it is configured as PCIe results in an "Invalid PHY mode" error.

Move the USB phy definitions at the board level, as it is done for the submitted PCIe controller [1].

[1] https://lore.kernel.org/[email protected]/

Fixes 46380e4b1534 ("riscv: dts: spacemit: k3: add USB controller and USB phy support")
Cc Inochi Amaoto <[email protected]>
---
 arch/riscv/boot/dts/spacemit/k3-pico-itx.dts | 2 ++
 arch/riscv/boot/dts/spacemit/k3.dtsi         | 3 ---
 2 files changed, 2 insertions(+), 3 deletions(-)
arch/riscv/boot/dts/spacemit/k3-pico-itx.dts +2 -0
index b084a35aa00e3..0a6f669d509a9 100644
@@ -328,5 +328,7 @@ &usb3d_u2phy {
 };
 
 &usb3d {
+	phys = <&usb3d_u2phy>, <&combophy 4 PHY_TYPE_USB3>;
+	phy-names = "usb2-phy", "usb3-phy";
 	status = "okay";
 };
arch/riscv/boot/dts/spacemit/k3.dtsi +0 -3
index c3f2dce0969c0..6f8d55eae6f6b 100644
@@ -452,9 +452,6 @@ usb3d: usb@81a00000 {
 				 <&syscon_apmu RESET_APMU_USB3_D_VCC>,
 				 <&syscon_apmu RESET_APMU_USB3_D_PHY>;
 			reset-names = "ahb", "vcc", "phy";
-			phys = <&usb3d_u2phy>,
-			       <&combophy 4 PHY_TYPE_USB3>;
-			phy-names = "usb2-phy", "usb3-phy";
 			phy_type = "utmi";
 			snps,dis_enblslpm_quirk;
 			snps,dis_u2_susphy_quirk;
Signature · 1 line
2.53.0
#2 lore raw

Re: [PATCH v3 1/5] riscv: dts: spacemit: k3: move USB3 phy to board level

Thank you for your contribution! Sashiko AI review found 1 potential issue(s) to consider: - [Low] Removing 'phys' and 'phy-names' from the base k3.dtsi breaks DT schema validation (dtbs_check) for…

Thank you for your contribution! Sashiko AI review found 1 potential issue(s) to consider:
- [Low] Removing 'phys' and 'phy-names' from the base k3.dtsi breaks DT schema validation (dtbs_check) for disabled nodes and improperly delegates fixed SoC routing to board files. --

commit e9dc7ad92d5f4a805cf362fdd51c6ae160da1934
Author: Aurelien Jarno <[email protected]>

riscv: dts: spacemit: k3: move USB3 phy to board level

This commit moves the USB3 phy definitions from the SoC dtsi to the board level dts files for the SpacemiT K3 SoC. It aims to prevent PHY mode configuration errors when the combo PHY lines are used for PCIe rather than USB3.

[ ... ]

arch/riscv/boot/dts/spacemit/k3.dtsi usb3d: usb@81a00000 { · line 457

Quoted 11 lines
arch/riscv/boot/dts/spacemit/k3.dtsi +0 -3
index c3f2dce0969c0..6f8d55eae6f6b 100644
@@ -452,9 +452,6 @@ usb3d: usb@81a00000 {
 				 <&syscon_apmu RESET_APMU_USB3_D_VCC>,
 				 <&syscon_apmu RESET_APMU_USB3_D_PHY>;
 			reset-names = "ahb", "vcc", "phy";
-			phys = <&usb3d_u2phy>,
-			       <&combophy 4 PHY_TYPE_USB3>;
-			phy-names = "usb2-phy", "usb3-phy";

[Severity: Low]
Does removing phys and phy-names from the base k3.dtsi break DT schema validation (dtbs_check) for disabled nodes?

To satisfy the schema's minItems: 1 requirement while supporting board-level combo PHY configuration, should the dedicated internal SoC PHY (usb3d_u2phy) have been retained in the base file?

The dtbs_check validation will fail for any board DT that includes k3.dtsi but does not override the usb3d node to provide the phys and phy-names properties (e.g., k3-com260-ifx.dts and k3-deepcomputing-fml13v05.dts).

This happens because the schema spacemit,k1-dwc3.yaml unconditionally requires these properties, and dt-schema evaluates all nodes, even disabled ones.

Quoted 3 lines
arch/riscv/boot/dts/spacemit/k3.dtsi +0 -0
 			phy_type = "utmi";
 			snps,dis_enblslpm_quirk;
 			snps,dis_u2_susphy_quirk;
Signature · 1 line
Sashiko AI review · https://sashiko.dev/#/patchset/[email protected]?part=1
#3 lore raw

Re: [PATCH v3 1/5] riscv: dts: spacemit: k3: move USB3 phy to board level

Hi,

Quoted 15 lines · On 2026-08-31 04:54, [email protected] wrote:

Thank you for your contribution! Sashiko AI review found 1 potential issue(s) to consider:
- [Low] Removing 'phys' and 'phy-names' from the base k3.dtsi breaks DT schema validation (dtbs_check) for disabled nodes and improperly delegates fixed SoC routing to board files. --

commit e9dc7ad92d5f4a805cf362fdd51c6ae160da1934
Author: Aurelien Jarno <[email protected]>

riscv: dts: spacemit: k3: move USB3 phy to board level

This commit moves the USB3 phy definitions from the SoC dtsi to the board level dts files for the SpacemiT K3 SoC. It aims to prevent PHY mode configuration errors when the combo PHY lines are used for PCIe rather than USB3.

[ ... ]

Quoted 15 lines

arch/riscv/boot/dts/spacemit/k3.dtsi usb3d: usb@81a00000 { · line 457

Quoted 11 lines
arch/riscv/boot/dts/spacemit/k3.dtsi +0 -3
index c3f2dce0969c0..6f8d55eae6f6b 100644
@@ -452,9 +452,6 @@ usb3d: usb@81a00000 {
 				 <&syscon_apmu RESET_APMU_USB3_D_VCC>,
 				 <&syscon_apmu RESET_APMU_USB3_D_PHY>;
 			reset-names = "ahb", "vcc", "phy";
-			phys = <&usb3d_u2phy>,
-			       <&combophy 4 PHY_TYPE_USB3>;
-			phy-names = "usb2-phy", "usb3-phy";

[Severity: Low]
Does removing phys and phy-names from the base k3.dtsi break DT schema validation (dtbs_check) for disabled nodes?

No it doesn't. dtbs_check seems to ignore disabled nodes.

Quoted 7 lines

To satisfy the schema's minItems: 1 requirement while supporting board-level combo PHY configuration, should the dedicated internal SoC PHY (usb3d_u2phy) have been retained in the base file?

The dtbs_check validation will fail for any board DT that includes k3.dtsi but does not override the usb3d node to provide the phys and phy-names properties (e.g., k3-com260-ifx.dts and k3-deepcomputing-fml13v05.dts).

I have just tried, in practice it doesn't. I'll send a new version mentioning that.

Quoted 11 lines

This happens because the schema spacemit,k1-dwc3.yaml unconditionally requires these properties, and dt-schema evaluates all nodes, even disabled ones.

Quoted 3 lines
arch/riscv/boot/dts/spacemit/k3.dtsi +0 -0
 			phy_type = "utmi";
 			snps,dis_enblslpm_quirk;
 			snps,dis_u2_susphy_quirk;
Signature · 1 line
Sashiko AI review · https://sashiko.dev/#/patchset/[email protected]?part=1
Signature · 2 lines
Aurelien Jarno                          GPG: 4096R/1DDD8C9B
[email protected]                     http://aurel32.net
#4 lore raw

PATCH v3 2/5 riscv: dts: spacemit: k3: add USB3 B and C controllers for Pico-ITX board

In reply to Aurelien Jarno

The SpacemiT K3 has 4 USB3 controllers labelled A to D.

On the K3 Pico-ITX board, the controllers B and C are used in USB2 mode only respectively for the M.2 B-Key slot and for the RTL8852BE Bluetooth controller.

Add the two controller nodes. On the K3 Pico-ITX board, enable the controllers nodes and add the two corresponding USB2 PHY nodes.

---
 arch/riscv/boot/dts/spacemit/k3-pico-itx.dts | 22 +++++++
 arch/riscv/boot/dts/spacemit/k3.dtsi         | 60 ++++++++++++++++++++
 2 files changed, 82 insertions(+)
arch/riscv/boot/dts/spacemit/k3-pico-itx.dts +22 -0
index 0a6f669d509a9..5aa6fa89cab58 100644
@@ -323,6 +323,28 @@ &usb2_phy {
 	status = "okay";
 };
 
+&usb3b {
+	phys = <&usb3b_u2phy>;
+	phy-names = "usb2-phy";
+	maximum-speed = "high-speed";
+	status = "okay";
+};
+
+&usb3b_u2phy {
+	status = "okay";
+};
+
+&usb3c {
+	phys = <&usb3c_u2phy>;
+	phy-names = "usb2-phy";
+	maximum-speed = "high-speed";
+	status = "okay";
+};
+
+&usb3c_u2phy {
+	status = "okay";
+};
+
 &usb3d_u2phy {
 	status = "okay";
 };
arch/riscv/boot/dts/spacemit/k3.dtsi +60 -0

66 lines not on this page · raw message

Signature · 1 line
2.53.0
#5 lore raw

PATCH v3 3/5 riscv: dts: spacemit: k3: add rfkill node for Bluetooth on Pico-ITX board

In reply to Aurelien Jarno

On the K3 Pico-ITX board, by default the GPIO pin that connects to the RTL8852BE Bluetooth enable signal is driven low, resulting in impossibility to use Bluetooth. Add a DT node to expose it as an RFKILL device, which lets the Bluetooth driver or userspace toggle it as required.

---
 arch/riscv/boot/dts/spacemit/k3-pico-itx.dts | 7 +++++++
 1 file changed, 7 insertions(+)
arch/riscv/boot/dts/spacemit/k3-pico-itx.dts +7 -0
index 5aa6fa89cab58..d3f256dffb4fd 100644
@@ -43,6 +43,13 @@ reg_aux_vcc5v: regulator-aux-vcc5v {
 		regulator-max-microvolt = <5000000>;
 		regulator-always-on;
 	};
+
+	rfkill-usb-bt {
+		compatible = "rfkill-gpio";
+		label = "rfkill-usb-bt";
+		radio-type = "bluetooth";
+		shutdown-gpios = <&gpio 0 30 GPIO_ACTIVE_HIGH>;
+	};
 };
 
 &i2c2 {
Signature · 1 line
2.53.0
#6 lore raw

PATCH v3 4/5 riscv: dts: spacemit: k3: add rfkill node for WLAN on the K3 Pico-ITX board

In reply to Aurelien Jarno

On the K3 Pico-ITX board, by default the GPIO pin that connects to the RTL8852BE WLAN enable signal is driven low, resulting in impossibility to connect to any network. Add a DT node to expose it as an RFKILL device, which lets the WLAN driver or userspace toggle it as required.

---
 arch/riscv/boot/dts/spacemit/k3-pico-itx.dts | 7 +++++++
 1 file changed, 7 insertions(+)
arch/riscv/boot/dts/spacemit/k3-pico-itx.dts +7 -0
index d3f256dffb4fd..dda420900aa2c 100644
@@ -44,6 +44,13 @@ reg_aux_vcc5v: regulator-aux-vcc5v {
 		regulator-always-on;
 	};
 
+	rfkill-pcie-wlan {
+		compatible = "rfkill-gpio";
+		label = "rfkill-pcie-wlan";
+		radio-type = "wlan";
+		shutdown-gpios = <&gpio 1 3 GPIO_ACTIVE_HIGH>;
+	};
+
 	rfkill-usb-bt {
 		compatible = "rfkill-gpio";
 		label = "rfkill-usb-bt";
Signature · 1 line
2.53.0
#7 lore raw

PATCH v3 5/5 riscv64: defconfig: Enable BT and WLAN support for SpacemiT K3 Pico-ITX board

In reply to Aurelien Jarno

The SpacemiT K3 Pico-ITX board has a RTL8852BE Bluetooth and WLAN controller connected through PCIe and USB. For the WLAN part, enable CFG80211, MAC80211, RTW89 and RTW89_8852BE as modules. For the Bluetooth, enable CONFIG_BT and CONFIG_BT_HCIBTUSB as modules.

Both also require RFKILL and RFKILL_GPIO.

---
 arch/riscv/configs/defconfig | 8 ++++++++
 1 file changed, 8 insertions(+)
arch/riscv/configs/defconfig +8 -0
index 04ae305d5511b..1bc79ba2ee649 100644
@@ -100,6 +100,12 @@ CONFIG_NET_CLS_CGROUP=m
 CONFIG_NETLINK_DIAG=y
 CONFIG_CGROUP_NET_PRIO=y
 CONFIG_CAN=m
+CONFIG_BT=m
+CONFIG_BT_HCIBTUSB=m
+CONFIG_CFG80211=m
+CONFIG_MAC80211=m
+CONFIG_RFKILL=m
+CONFIG_RFKILL_GPIO=m
 CONFIG_NET_9P=y
 CONFIG_NET_9P_VIRTIO=y
 CONFIG_PCI=y
@@ -143,6 +149,8 @@ CONFIG_DWMAC_THEAD=m
 CONFIG_MICREL_PHY=y
 CONFIG_MICROSEMI_PHY=y
 CONFIG_MOTORCOMM_PHY=y
+CONFIG_RTW89=m
+CONFIG_RTW89_8852BE=m
 CONFIG_INPUT_MOUSEDEV=y
 CONFIG_INPUT_EVDEV=y
 CONFIG_KEYBOARD_GPIO=y
Signature · 1 line
2.53.0