From d172d37dd8342f79b03a5f1a009a543e93ea58c7 Mon Sep 17 00:00:00 2001
From: Igor Pecovnik <igor.pecovnik@gmail.com>
Date: Sun, 9 Jun 2019 17:15:02 +0200
Subject: [PATCH] [ rk3399 bluetooth ] Fixed and tested on Rockpi4, NanopiM4,
 Orangepi RK3399

---
 config/sources/rk3399.conf                        |   7 ++++---
 config/sources/rockchip64.conf                    |   6 +++---
 ...hram_plus_rockpi => brcm_patchram_plus_rk3399} | Bin
 packages/bsp/rk3399/nanopi-bluetooth.service      |  14 --------------
 ...bluetooth.service => rk3399-bluetooth.service} |   2 +-
 5 files changed, 8 insertions(+), 21 deletions(-)
 rename packages/bsp/rk3399/{brcm_patchram_plus_rockpi => brcm_patchram_plus_rk3399} (100%)
 delete mode 100644 packages/bsp/rk3399/nanopi-bluetooth.service
 rename packages/bsp/rk3399/{rockpi4-bluetooth.service => rk3399-bluetooth.service} (84%)

diff --git a/config/sources/rk3399.conf b/config/sources/rk3399.conf
index 0de38c778f..94a8d83dcd 100644
--- a/config/sources/rk3399.conf
+++ b/config/sources/rk3399.conf
@@ -93,7 +93,7 @@ family_tweaks()
 	[[ $BOARD == firefly-rk3399 ]] && echo "fdtfile=rockchip/rk3399-firefly.dtb" >> $SDCARD/boot/armbianEnv.txt
 	# install and enable Bluetooth
 	chroot $SDCARD /bin/bash -c "apt-get -y -qq install bluetooth bluez bluez-tools"
-	chroot $SDCARD /bin/bash -c "systemctl --no-reload enable nanopi-bluetooth.service >/dev/null 2>&1"
+	chroot $SDCARD /bin/bash -c "systemctl --no-reload enable rk3399-bluetooth.service >/dev/null 2>&1"
 }
 
 family_tweaks_bsp()
@@ -104,6 +104,7 @@ family_tweaks_bsp()
 		cp $SRC/packages/bsp/rk3399/50-rk3399-vpu.rules $destination/etc/udev/rules.d/
 		mkdir -p $destination/etc/sysfs.d
 		cp $SRC/packages/bsp/rk3399/20-gpu-governor.conf $destination/etc/sysfs.d/
-		# Copy Bluetooth service
-		cp $SRC/packages/bsp/rk3399/nanopi-bluetooth.service $destination/lib/systemd/system/
+		# Bluetooth
+                install -m 755 $SRC/packages/bsp/rk3399/brcm_patchram_plus_rk3399 $destination/usr/bin
+		cp $SRC/packages/bsp/rk3399/rk3399-bluetooth.service $destination/lib/systemd/system/
 }
diff --git a/config/sources/rockchip64.conf b/config/sources/rockchip64.conf
index 18cdf381b7..65ee8d66fd 100644
--- a/config/sources/rockchip64.conf
+++ b/config/sources/rockchip64.conf
@@ -126,7 +126,7 @@ family_tweaks()
 
 	if [[ $BOARD == rockpi-4b ]]; then
 		chroot $SDCARD /bin/bash -c "apt-get -y -qq install bluetooth bluez bluez-tools"
-		chroot $SDCARD /bin/bash -c "systemctl --no-reload enable rockpi4-bluetooth.service >/dev/null 2>&1"
+		chroot $SDCARD /bin/bash -c "systemctl --no-reload enable rk3399-bluetooth.service >/dev/null 2>&1"
 	fi
 }
 
@@ -142,7 +142,7 @@ family_tweaks_bsp()
 
 	if [[ $BOARD == rockpi-4b ]]; then
 		# Bluetooth
-                install -m 755 $SRC/packages/bsp/rk3399/brcm_patchram_plus_rockpi $destination/usr/bin
-		cp $SRC/packages/bsp/rk3399/rockpi4-bluetooth.service $destination/lib/systemd/system/
+                install -m 755 $SRC/packages/bsp/rk3399/brcm_patchram_plus_rk3399 $destination/usr/bin
+		cp $SRC/packages/bsp/rk3399/rk3399-bluetooth.service $destination/lib/systemd/system/
 	fi
 }
diff --git a/packages/bsp/rk3399/brcm_patchram_plus_rockpi b/packages/bsp/rk3399/brcm_patchram_plus_rk3399
similarity index 100%
rename from packages/bsp/rk3399/brcm_patchram_plus_rockpi
rename to packages/bsp/rk3399/brcm_patchram_plus_rk3399
diff --git a/packages/bsp/rk3399/nanopi-bluetooth.service b/packages/bsp/rk3399/nanopi-bluetooth.service
deleted file mode 100644
index 61719bc406..0000000000
--- a/packages/bsp/rk3399/nanopi-bluetooth.service
+++ /dev/null
@@ -1,14 +0,0 @@
-[Unit]
-Description=Bluetooth nanopi
-After=bluetooth.target
-
-[Service]
-Type=forking
-ExecStartPre=/bin/echo 1 > /sys/class/rfkill/rfkill0/state
-ExecStart=/usr/bin/hciattach /dev/ttyS0 bcm43xx 115200 > /dev/null
-TimeoutSec=0
-RemainAfterExit=yes
-SysVStartPriority=99
-
-[Install]
-WantedBy=multi-user.target
diff --git a/packages/bsp/rk3399/rockpi4-bluetooth.service b/packages/bsp/rk3399/rk3399-bluetooth.service
similarity index 84%
rename from packages/bsp/rk3399/rockpi4-bluetooth.service
rename to packages/bsp/rk3399/rk3399-bluetooth.service
index 5a8ed73328..56c03af851 100644
--- a/packages/bsp/rk3399/rockpi4-bluetooth.service
+++ b/packages/bsp/rk3399/rk3399-bluetooth.service
@@ -5,7 +5,7 @@ After=bluetooth.target
 [Service]
 Type=forking
 ExecStartPre=/usr/sbin/rfkill unblock all
-ExecStart=/usr/bin/brcm_patchram_plus_rockpi -d --enable_hci --no2bytes --use_baudrate_for_downloade --tosleep 200000 --baudrate 1500000 --patchram /lib/firmware/brcm/BCM4345C5.hcd /dev/ttyS0
+ExecStart=/usr/bin/brcm_patchram_plus_rk3399 -d --enable_hci --no2bytes --use_baudrate_for_downloade --tosleep 200000 --baudrate 1500000 --patchram /lib/firmware/brcm/BCM4345C5.hcd /dev/ttyS0
 TimeoutSec=0
 RemainAfterExit=yes
 SysVStartPriority=99