[PATCH] arm64: dts: rockchip: rock-3a: Remove bluetooth node

[PATCH] arm64: dts: rockchip: rock-3a: Remove bluetooth node

[Chen-Yu Tsai]

From: Chen-Yu Tsai <wens@csie.org>

The Bluetooth node described in the device tree is actually on an M.2
slot. What module is present depends on what the end user installed,
and should be left to an overlay.

Remove the existing bluetooth node. This gets rid of bogus timeout
errors.

Fixes: 8cf890aabd45 ("arm64: dts: rockchip: Add nodes for SDIO/UART Wi-Fi/Bluetooth modules to Radxa Rock 3A")
Signed-off-by: Chen-Yu Tsai <wens@csie.org>
---
 arch/arm64/boot/dts/rockchip/rk3568-rock-3a.dts | 14 --------------
 1 file changed, 14 deletions(-)

diff --git a/arch/arm64/boot/dts/rockchip/rk3568-rock-3a.dts b/arch/arm64/boot/dts/rockchip/rk3568-rock-3a.dts
index ac79140a9ecd..44cfdfeed668 100644
--- a/arch/arm64/boot/dts/rockchip/rk3568-rock-3a.dts
+++ b/arch/arm64/boot/dts/rockchip/rk3568-rock-3a.dts
@@ -778,20 +778,6 @@ &uart1 {
 	pinctrl-0 = <&uart1m0_xfer &uart1m0_ctsn &uart1m0_rtsn>;
 	uart-has-rtscts;
 	status = "okay";
-
-	bluetooth {
-		compatible = "brcm,bcm43438-bt";
-		clocks = <&rk809 1>;
-		clock-names = "lpo";
-		device-wakeup-gpios = <&gpio4 RK_PB5 GPIO_ACTIVE_HIGH>;
-		host-wakeup-gpios = <&gpio4 RK_PB4 GPIO_ACTIVE_HIGH>;
-		shutdown-gpios = <&gpio4 RK_PB2 GPIO_ACTIVE_HIGH>;
-		pinctrl-names = "default";
-		pinctrl-0 = <&bt_host_wake &bt_wake &bt_enable>;
-		vbat-supply = <&vcc3v3_sys>;
-		vddio-supply = <&vcc_1v8>;
-		/* vddio comes from regulator on module, use IO bank voltage instead */
-	};
 };
 
 &uart2 {
-- 
2.39.5

Re: [PATCH] arm64: dts: rockchip: rock-3a: Remove bluetooth node

[Shengyu Qu]

[-- Attachment #1.1.1: Type: text/plain, Size: 1712 bytes --]

Hi,

What about adding another patch that converts it to a dtso?

Best regards,
Shengyu

在 2025/2/21 0:50, Chen-Yu Tsai 写道:
> From: Chen-Yu Tsai <wens@csie.org>
> 
> The Bluetooth node described in the device tree is actually on an M.2
> slot. What module is present depends on what the end user installed,
> and should be left to an overlay.
> 
> Remove the existing bluetooth node. This gets rid of bogus timeout
> errors.
> 
> Fixes: 8cf890aabd45 ("arm64: dts: rockchip: Add nodes for SDIO/UART Wi-Fi/Bluetooth modules to Radxa Rock 3A")
> Signed-off-by: Chen-Yu Tsai <wens@csie.org>
> ---
>   arch/arm64/boot/dts/rockchip/rk3568-rock-3a.dts | 14 --------------
>   1 file changed, 14 deletions(-)
> 
> diff --git a/arch/arm64/boot/dts/rockchip/rk3568-rock-3a.dts b/arch/arm64/boot/dts/rockchip/rk3568-rock-3a.dts
> index ac79140a9ecd..44cfdfeed668 100644
> --- a/arch/arm64/boot/dts/rockchip/rk3568-rock-3a.dts
> +++ b/arch/arm64/boot/dts/rockchip/rk3568-rock-3a.dts
> @@ -778,20 +778,6 @@ &uart1 {
>   	pinctrl-0 = <&uart1m0_xfer &uart1m0_ctsn &uart1m0_rtsn>;
>   	uart-has-rtscts;
>   	status = "okay";
> -
> -	bluetooth {
> -		compatible = "brcm,bcm43438-bt";
> -		clocks = <&rk809 1>;
> -		clock-names = "lpo";
> -		device-wakeup-gpios = <&gpio4 RK_PB5 GPIO_ACTIVE_HIGH>;
> -		host-wakeup-gpios = <&gpio4 RK_PB4 GPIO_ACTIVE_HIGH>;
> -		shutdown-gpios = <&gpio4 RK_PB2 GPIO_ACTIVE_HIGH>;
> -		pinctrl-names = "default";
> -		pinctrl-0 = <&bt_host_wake &bt_wake &bt_enable>;
> -		vbat-supply = <&vcc3v3_sys>;
> -		vddio-supply = <&vcc_1v8>;
> -		/* vddio comes from regulator on module, use IO bank voltage instead */
> -	};
>   };
>   
>   &uart2 {


[-- Attachment #1.1.2: OpenPGP public key --]
[-- Type: application/pgp-keys, Size: 6977 bytes --]

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 840 bytes --]

Re: [PATCH] arm64: dts: rockchip: rock-3a: Remove bluetooth node

[Heiko Stuebner]

On Fri, 21 Feb 2025 00:50:51 +0800, Chen-Yu Tsai wrote:
> The Bluetooth node described in the device tree is actually on an M.2
> slot. What module is present depends on what the end user installed,
> and should be left to an overlay.
> 
> Remove the existing bluetooth node. This gets rid of bogus timeout
> errors.
> 
> [...]

Applied, thanks!

[1/1] arm64: dts: rockchip: rock-3a: Remove bluetooth node
      commit: 9602f47fe6dcca9318f35f7b72b4e98b91c5a5cf

Best regards,
-- 
Heiko Stuebner <heiko@sntech.de>