BananaPi BPI-F3: Reduce mods needed to enable Bluetooth

Signed-off-by: Patrick Yavitz <[email protected]>

patch/kernel/archive/spacemit-6.6/001-Add-board-BananaPi-BPI-F3.patch

@@ -1,13 +1,16 @@
-From 728ce5fbf9ac7b23c03ebd6ae6e450ffbf73ca29 Mon Sep 17 00:00:00 2001
+From aa3491a3d44201bda360ffce0b7ed94de6a25049 Mon Sep 17 00:00:00 2001
 From: Patrick Yavitz <[email protected]>
-Date: Sat, 28 Dec 2024 19:50:44 -0500
+Date: Tue, 31 Dec 2024 07:57:24 -0500
 Subject: [PATCH] Add board BananaPi BPI-F3
 
+Enable bluetooth via uart2 node
+
 Signed-off-by: Patrick Yavitz <[email protected]>
 ---
- arch/riscv/boot/dts/spacemit/Makefile         |  1 +
- .../boot/dts/spacemit/k1-bananapi-f3.dts      | 23 +++++++++++++++++++
- 2 files changed, 24 insertions(+)
+ arch/riscv/boot/dts/spacemit/Makefile           |  1 +
+ arch/riscv/boot/dts/spacemit/k1-bananapi-f3.dts | 12 ++++++++++++
+ arch/riscv/boot/dts/spacemit/k1-x_deb1.dts      | 13 +++++++++++--
+ 3 files changed, 24 insertions(+), 2 deletions(-)
  create mode 100644 arch/riscv/boot/dts/spacemit/k1-bananapi-f3.dts
 
 diff --git a/arch/riscv/boot/dts/spacemit/Makefile b/arch/riscv/boot/dts/spacemit/Makefile
@@ -21,12 +24,14 @@ index 32f23816fe28..5036b31e5f7b 100644
  				  k1-x_MUSE-Pi.dtb k1-x_milkv-jupiter.dtb m1-x_milkv-jupiter.dtb \
 diff --git a/arch/riscv/boot/dts/spacemit/k1-bananapi-f3.dts b/arch/riscv/boot/dts/spacemit/k1-bananapi-f3.dts
 new file mode 100644
-index 000000000000..1ea3c80ae996
+index 000000000000..755e07aa1eb7
 --- /dev/null
 +++ b/arch/riscv/boot/dts/spacemit/k1-bananapi-f3.dts
-@@ -0,0 +1,23 @@
+@@ -0,0 +1,12 @@
 +// SPDX-License-Identifier: (GPL-2.0 OR MIT)
-+/* Copyright (c) 2024 Spacemit, Inc */
++/*
++ * Copyright (c) 2024 Spacemit, Inc
++ */
 +
 +/dts-v1/;
 +
@@ -35,19 +40,39 @@ index 000000000000..1ea3c80ae996
 +/ {
 +	model = "BananaPi BPI-F3";
 +};
-+
-+&uart2 {
-+	status = "okay";
-+	pinctrl-0 = <&pinctrl_uart2>, <&pinctrl_uart2_rts_cts>;
+diff --git a/arch/riscv/boot/dts/spacemit/k1-x_deb1.dts b/arch/riscv/boot/dts/spacemit/k1-x_deb1.dts
+index 30c03d0f803e..edb31fcee3e4 100644
+--- a/arch/riscv/boot/dts/spacemit/k1-x_deb1.dts
++++ b/arch/riscv/boot/dts/spacemit/k1-x_deb1.dts
+@@ -190,10 +190,18 @@ &uart0 {
+ 	status = "okay";
+ };
+
++/* Bluetooth */
+ &uart2 {
+-	pinctrl-names = "default";
+-	pinctrl-0 = <&pinctrl_uart2>;
+ 	status = "okay";
++	pinctrl-0 = <&pinctrl_uart2>;
 +	pinctrl-names = "default";
 +	uart-has-rtscts;
 +
 +	bluetooth {
-+		compatible = "realtek,rtl8852bs-bt";
-+		device-wake-gpios = <&gpio 64 GPIO_ACTIVE_LOW>;
++		compatible = "realtek,rtl8723ds-bt";
++		device-wake-gpios = <&gpio 64 GPIO_ACTIVE_HIGH>;
 +		host-wake-gpios = <&gpio 65 GPIO_ACTIVE_HIGH>;
 +	};
-+};
+ };
+
+ &pwm14 {
+@@ -544,6 +552,7 @@ &pinctrl {
+ 		&range GPIO_49  2 (MUX_MODE0 | EDGE_NONE | PULL_UP   | PAD_3V_DS4)
+ 		&range GPIO_58  1 (MUX_MODE0 | EDGE_NONE | PULL_UP   | PAD_1V8_DS2)
+ 		&range GPIO_63  2 (MUX_MODE0 | EDGE_NONE | PULL_UP   | PAD_1V8_DS2)
++		&range GPIO_64  1 (MUX_MODE0 | EDGE_NONE | PULL_UP   | PAD_1V8_DS2)
+ 		&range GPIO_65  1 (MUX_MODE0 | EDGE_NONE | PULL_UP   | PAD_1V8_DS2)
+ 		&range GPIO_67  1 (MUX_MODE0 | EDGE_NONE | PULL_UP   | PAD_3V_DS4)
+ 		&range PRI_TDI  2 (MUX_MODE1 | EDGE_NONE | PULL_UP   | PAD_1V8_DS2)
 -- 
 2.39.5