[d-kernel] [PATCH 1/1] rk3568-firefly-roc-pc.dts: fix bluetooth support

[antohami на basealt.ru]

From: Anton Midyukov <antohami на altlinux.org>

Update dts from Armbian.
Link: https://github.com/150balbes/build/commit/1346fd210af2b00b68b31716a4180c67f8cef0e7
Link: https://github.com/150balbes/build/commit/0a915c15db0dca4eca4f318633f5c461cff94f16
Signed-off-by: Anton Midyukov <antohami на altlinux.org>
---
 .../dts/rockchip/rk3568-firefly-roc-pc.dts    | 74 +++++++------------
 1 file changed, 26 insertions(+), 48 deletions(-)
 mode change 100644 => 100755 arch/arm64/boot/dts/rockchip/rk3568-firefly-roc-pc.dts

diff --git a/arch/arm64/boot/dts/rockchip/rk3568-firefly-roc-pc.dts b/arch/arm64/boot/dts/rockchip/rk3568-firefly-roc-pc.dts
old mode 100644
new mode 100755
index 7a8d0e550f239..f2650d6eacdad
--- a/arch/arm64/boot/dts/rockchip/rk3568-firefly-roc-pc.dts
+++ b/arch/arm64/boot/dts/rockchip/rk3568-firefly-roc-pc.dts
@@ -7,6 +7,7 @@
 /dts-v1/;
 #include <dt-bindings/gpio/gpio.h>
 #include <dt-bindings/pwm/pwm.h>
+#include <dt-bindings/leds/common.h>
 #include <dt-bindings/pinctrl/rockchip.h>
 #include <dt-bindings/soc/rockchip,vop2.h>
 #include "rk3568.dtsi"
@@ -262,31 +263,7 @@ sdio_pwrseq: sdio-pwrseq {
 		pinctrl-names = "default";
 		pinctrl-0 = <&wifi_enable_h>;
 		reset-gpios = <&gpio3 RK_PD5 GPIO_ACTIVE_LOW>;
-	};
-
-	wireless_wlan: wireless-wlan {
-		compatible = "wlan-platdata";
-		rockchip,grf = <&grf>;
-		wifi_chip_type = "ap6398s";
-		pinctrl-names = "default";
-		pinctrl-0 = <&wifi_host_wake_irq>;
-		WIFI,host_wake_irq = <&gpio3 RK_PD4 GPIO_ACTIVE_HIGH>;
-		status = "okay";
-	};
-
-	wireless_bluetooth: wireless-bluetooth {
-		compatible = "bluetooth-platdata";
-		clocks = <&rk809 1>;
-		clock-names = "ext_clock";
-		//wifi-bt-power-toggle;
-		uart_rts_gpios = <&gpio2 RK_PB1 GPIO_ACTIVE_LOW>;
-		pinctrl-names = "default", "rts_gpio";
-		pinctrl-0 = <&uart8m0_rtsn>;
-		pinctrl-1 = <&uart8_gpios>;
-		BT,reset_gpio    = <&gpio3 RK_PA0 GPIO_ACTIVE_HIGH>;
-		BT,wake_gpio     = <&gpio3 RK_PA1 GPIO_ACTIVE_HIGH>;
-		BT,wake_host_irq = <&gpio3 RK_PA2 GPIO_ACTIVE_HIGH>;
-		status = "okay";
+		post-power-on-delay-ms = <100>;
 	};
 
 	flash_led: flash-led {
@@ -773,15 +750,17 @@ wifi_enable_h: wifi-enable-h {
 		};
 	};
 
-	wireless-wlan {
-		wifi_host_wake_irq: wifi-host-wake-irq {
-			rockchip,pins = <3 RK_PD4 RK_FUNC_GPIO &pcfg_pull_down>;
+	bt {
+		bt_enable_h: bt-enable-h {
+			rockchip,pins = <3 RK_PA2 RK_FUNC_GPIO &pcfg_pull_none>;
 		};
-	};
 
-	wireless-bluetooth {
-		uart8_gpios: uart8-gpios {
-			rockchip,pins = <2 RK_PB1 RK_FUNC_GPIO &pcfg_pull_none>;
+		bt_host_wake_l: bt-host-wake-l {
+			rockchip,pins = <3 RK_PA1 RK_FUNC_GPIO &pcfg_pull_down>;
+		};
+
+		bt_wake_l: bt-wake-l {
+			rockchip,pins = <3 RK_PA0 RK_FUNC_GPIO &pcfg_pull_none>;
 		};
 	};
 
@@ -904,21 +883,6 @@ &sdmmc2 {
 	status = "okay";
 };
 
-&sdio_pwrseq {
-	status = "okay";
-	reset-gpios = <&gpio3 RK_PD5 GPIO_ACTIVE_LOW>;
-	post-power-on-delay-ms = <100>;
-};
-
-&wireless_wlan {
-	wifi_chip_type = "ap6275s";
-	status = "okay";
-};
-
-&wireless_bluetooth {
-	status = "okay";
-};
-
 &tsadc {
 	rockchip,hw-tshut-mode = <1>;
 	rockchip,hw-tshut-polarity = <0>;
@@ -942,9 +906,23 @@ &uart4 {
 };
 
 &uart8 {
-	status = "okay";
 	pinctrl-names = "default";
 	pinctrl-0 = <&uart8m0_xfer &uart8m0_ctsn>;
+	status = "okay";
+	uart-has-rtscts;
+
+	bluetooth {
+		compatible = "brcm,bcm43438-bt";
+		clocks = <&rk809 1>;
+		clock-names = "lpo";
+		device-wakeup-gpios = <&gpio3 RK_PA2 GPIO_ACTIVE_HIGH>;
+		host-wakeup-gpios = <&gpio3 RK_PA1 GPIO_ACTIVE_HIGH>;
+		shutdown-gpios = <&gpio3 RK_PA0 GPIO_ACTIVE_HIGH>;
+		pinctrl-names = "default";
+		pinctrl-0 = <&bt_host_wake_l &bt_wake_l &bt_enable_h>;
+		vbat-supply = <&vcc3v3_sys>;
+		vddio-supply = <&vcca1v8_pmu>;
+	};
 };
 
 &usb_host0_ehci {
-- 
2.33.8