Skip to contentSkip to conversation

arm64: dts: rockchip: rename rfkill label for Radxa ROCK 5B

PATCH Superseded FUKAUMI Naoki 3 participants 4 messages Nov 27, 2024 – Nov 28, 2024

Subsystems (2)

v1 of 2 Superseded Latest is v2 →

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 arm64: dts: rockchip: rename rfkill label for Radxa ROCK 5B

on ROCK 5B, there is no PCIe slot, instead there is a M.2 slot. rfkill pin is not exclusive to PCIe devices, there is SDIO Wi-Fi devices.

rename rfkill label from "rfkill-pcie-wlan" to "rfkill-m2-wlan", it matches with rfkill-bt.

---
 arch/arm64/boot/dts/rockchip/rk3588-rock-5b.dts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
arch/arm64/boot/dts/rockchip/rk3588-rock-5b.dts +1 -1
index c44d001da169..d597112f1d5b 100644
@@ -72,7 +72,7 @@ fan: pwm-fan {
 
 	rfkill {
 		compatible = "rfkill-gpio";
-		label = "rfkill-pcie-wlan";
+		label = "rfkill-m2-wlan";
 		radio-type = "wlan";
 		shutdown-gpios = <&gpio4 RK_PA2 GPIO_ACTIVE_HIGH>;
 	};
Signature · 7 lines
2.43.0


_______________________________________________
Linux-rockchip mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/linux-rockchip
Reviewed-by on v1 1/1
#1 lore raw

Hello Fukaumi,

Quoted 8 lines · FUKAUMI Naoki

on ROCK 5B, there is no PCIe slot, instead there is a M.2 slot. rfkill pin is not exclusive to PCIe devices, there is SDIO Wi-Fi devices.

rename rfkill label from "rfkill-pcie-wlan" to "rfkill-m2-wlan", it matches with rfkill-bt.

Thanks for this patch, renaming the rfkill label this way makes sense to me.

Quoted 10 lines
---
 arch/arm64/boot/dts/rockchip/rk3588-rock-5b.dts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
arch/arm64/boot/dts/rockchip/rk3588-rock-5b.dts +0 -0
index c44d001da169..d597112f1d5b 100644

arch/arm64/boot/dts/rockchip/rk3588-rock-5b.dts fan: pwm-fan { · line 78

Quoted 8 lines
arch/arm64/boot/dts/rockchip/rk3588-rock-5b.dts +1 -1
@@ -72,7 +72,7 @@ fan: pwm-fan {
 
 	rfkill {
 		compatible = "rfkill-gpio";
-		label = "rfkill-pcie-wlan";
+		label = "rfkill-m2-wlan";
 		radio-type = "wlan";
 		shutdown-gpios = <&gpio4 RK_PA2 GPIO_ACTIVE_HIGH>;
 	};

_______________________________________________
Linux-rockchip mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/linux-rockchip

#2 lore raw
In reply to FUKAUMI Naoki

Hi,

I forgot one thing...

Quoted 7 lines · FUKAUMI Naoki

on ROCK 5B, there is no PCIe slot, instead there is a M.2 slot. rfkill pin is not exclusive to PCIe devices, there is SDIO Wi-Fi devices.

rename rfkill label from "rfkill-pcie-wlan" to "rfkill-m2-wlan", it matches with rfkill-bt.

Fixes 82d40b141a4c ("arm64: dts: rockchip: add rfkill node for M.2 Key E WiFi on rock-5b")

--
FUKAUMI Naoki
Radxa Computer (Shenzhen) Co., Ltd.

Quoted 19 lines
---
  arch/arm64/boot/dts/rockchip/rk3588-rock-5b.dts | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
arch/arm64/boot/dts/rockchip/rk3588-rock-5b.dts +1 -1
index c44d001da169..d597112f1d5b 100644
@@ -72,7 +72,7 @@ fan: pwm-fan {
 
  	rfkill {
  		compatible = "rfkill-gpio";
-		label = "rfkill-pcie-wlan";
+		label = "rfkill-m2-wlan";
  		radio-type = "wlan";
  		shutdown-gpios = <&gpio4 RK_PA2 GPIO_ACTIVE_HIGH>;
  	};
#3 lore raw
Quoted 10 lines · FUKAUMI Naoki

Hi,

I forgot one thing...

Quoted 4 lines · FUKAUMI Naoki

on ROCK 5B, there is no PCIe slot, instead there is a M.2 slot. rfkill pin is not exclusive to PCIe devices, there is SDIO Wi-Fi devices.

Quoted 6 lines
Quoted 3 lines

rename rfkill label from "rfkill-pcie-wlan" to "rfkill-m2-wlan", it matches with rfkill-bt.

Fixes 82d40b141a4c ("arm64: dts: rockchip: add rfkill node for M.2 Key

E WiFi on rock-5b")

Indeed, this makes sense, thank you. Should a similar change be applied to other boards that followed the Rock 5B example, such as orangepi-5-plus?

Best regards,
Alexey