From 401867f9e6bd8630a002fd27526f22236971016b Mon Sep 17 00:00:00 2001
From: Arturo Buzarra <arturo.buzarra@digi.com>
Date: Mon, 24 Jun 2019 10:43:11 +0200
Subject: [PATCH] bluez5: use node status to trigger bluetooth initialization

Signed-off-by: Arturo Buzarra <arturo.buzarra@digi.com>
---
 .../bluez/bluez5-5.50/ccimx6qpsbc/bluetooth-init          | 8 +++++---
 .../bluez/bluez5-5.50/ccimx6sbc/bluetooth-init            | 8 +++++---
 .../bluez/bluez5-5.50/ccimx6ul/bluetooth-init             | 8 +++++---
 .../bluez/bluez5-5.50/ccimx8x/bluetooth-init              | 8 +++++---
 4 files changed, 20 insertions(+), 12 deletions(-)

diff --git a/meta-digi-dey/recipes-connectivity/bluez/bluez5-5.50/ccimx6qpsbc/bluetooth-init b/meta-digi-dey/recipes-connectivity/bluez/bluez5-5.50/ccimx6qpsbc/bluetooth-init
index f6fbc3047..d3816119d 100644
--- a/meta-digi-dey/recipes-connectivity/bluez/bluez5-5.50/ccimx6qpsbc/bluetooth-init
+++ b/meta-digi-dey/recipes-connectivity/bluez/bluez5-5.50/ccimx6qpsbc/bluetooth-init
@@ -67,9 +67,11 @@ bluetooth_init() {
 case "$1" in
 	start)
 		if [ -d "/proc/device-tree/bluetooth" ]; then
-			echo -n "Starting bluetooth hardware: "
-			bluetooth_init
-			echo "${BT_ERROR:-done.}"
+			if [ "$(tr -d '\0' 2>/dev/null </proc/device-tree/bluetooth/status)" != "disabled" ]; then
+				echo -n "Starting bluetooth hardware: "
+				bluetooth_init
+				echo "${BT_ERROR:-done.}"
+			fi
 		fi
 		;;
 	stop)
diff --git a/meta-digi-dey/recipes-connectivity/bluez/bluez5-5.50/ccimx6sbc/bluetooth-init b/meta-digi-dey/recipes-connectivity/bluez/bluez5-5.50/ccimx6sbc/bluetooth-init
index ff7e24476..7085f8782 100644
--- a/meta-digi-dey/recipes-connectivity/bluez/bluez5-5.50/ccimx6sbc/bluetooth-init
+++ b/meta-digi-dey/recipes-connectivity/bluez/bluez5-5.50/ccimx6sbc/bluetooth-init
@@ -111,9 +111,11 @@ bluetooth_init() {
 case "$1" in
 	start)
 		if [ -d "/proc/device-tree/bluetooth" ]; then
-			echo -n "Starting bluetooth hardware: "
-			bluetooth_init
-			echo "done."
+			if [ "$(tr -d '\0' 2>/dev/null </proc/device-tree/bluetooth/status)" != "disabled" ]; then
+				echo -n "Starting bluetooth hardware: "
+				bluetooth_init
+				echo "${BT_ERROR:-done.}"
+			fi
 		fi
 		;;
 	stop)
diff --git a/meta-digi-dey/recipes-connectivity/bluez/bluez5-5.50/ccimx6ul/bluetooth-init b/meta-digi-dey/recipes-connectivity/bluez/bluez5-5.50/ccimx6ul/bluetooth-init
index e6a509279..27b1d11d0 100644
--- a/meta-digi-dey/recipes-connectivity/bluez/bluez5-5.50/ccimx6ul/bluetooth-init
+++ b/meta-digi-dey/recipes-connectivity/bluez/bluez5-5.50/ccimx6ul/bluetooth-init
@@ -93,9 +93,11 @@ bluetooth_init() {
 case "$1" in
 	start)
 		if [ -d "/proc/device-tree/bluetooth" ]; then
-			echo -n "Starting bluetooth hardware: "
-			bluetooth_init
-			echo "${BT_ERROR:-done.}"
+			if [ "$(tr -d '\0' 2>/dev/null </proc/device-tree/bluetooth/status)" != "disabled" ]; then
+				echo -n "Starting bluetooth hardware: "
+				bluetooth_init
+				echo "${BT_ERROR:-done.}"
+			fi
 		fi
 		;;
 	stop)
diff --git a/meta-digi-dey/recipes-connectivity/bluez/bluez5-5.50/ccimx8x/bluetooth-init b/meta-digi-dey/recipes-connectivity/bluez/bluez5-5.50/ccimx8x/bluetooth-init
index fb7f0c7b5..01f57c95f 100644
--- a/meta-digi-dey/recipes-connectivity/bluez/bluez5-5.50/ccimx8x/bluetooth-init
+++ b/meta-digi-dey/recipes-connectivity/bluez/bluez5-5.50/ccimx8x/bluetooth-init
@@ -42,9 +42,11 @@ bluetooth_init() {
 case "$1" in
 	start)
 		if [ -d "/proc/device-tree/bluetooth" ]; then
-			echo -n "Starting bluetooth hardware: "
-			bluetooth_init
-			echo "${BT_ERROR:-done.}"
+			if [ "$(tr -d '\0' 2>/dev/null </proc/device-tree/bluetooth/status)" != "disabled" ]; then
+				echo -n "Starting bluetooth hardware: "
+				bluetooth_init
+				echo "${BT_ERROR:-done.}"
+			fi
 		fi
 		;;
 	stop)