diff --git a/meta-digi-dey/recipes-connectivity/bluez/bluez5-5.41/ccimx6ul/0003-bluetooth-Add-bluetooth-support-for-QCA6174-chip.patch b/meta-digi-dey/recipes-connectivity/bluez/bluez5-5.41/0003-bluetooth-Add-bluetooth-support-for-QCA6174-chip.patch similarity index 100% rename from meta-digi-dey/recipes-connectivity/bluez/bluez5-5.41/ccimx6ul/0003-bluetooth-Add-bluetooth-support-for-QCA6174-chip.patch rename to meta-digi-dey/recipes-connectivity/bluez/bluez5-5.41/0003-bluetooth-Add-bluetooth-support-for-QCA6174-chip.patch diff --git a/meta-digi-dey/recipes-connectivity/bluez/bluez5-5.41/ccimx6ul/0004-bluetooth-Enable-bluetooth-low-power-mode-functional.patch b/meta-digi-dey/recipes-connectivity/bluez/bluez5-5.41/0004-bluetooth-Enable-bluetooth-low-power-mode-functional.patch similarity index 100% rename from meta-digi-dey/recipes-connectivity/bluez/bluez5-5.41/ccimx6ul/0004-bluetooth-Enable-bluetooth-low-power-mode-functional.patch rename to meta-digi-dey/recipes-connectivity/bluez/bluez5-5.41/0004-bluetooth-Enable-bluetooth-low-power-mode-functional.patch diff --git a/meta-digi-dey/recipes-connectivity/bluez/bluez5-5.41/ccimx6ul/0005-bluetooth-Fix-bug-in-firmware-parsing-mechanism.patch b/meta-digi-dey/recipes-connectivity/bluez/bluez5-5.41/0005-bluetooth-Fix-bug-in-firmware-parsing-mechanism.patch similarity index 100% rename from meta-digi-dey/recipes-connectivity/bluez/bluez5-5.41/ccimx6ul/0005-bluetooth-Fix-bug-in-firmware-parsing-mechanism.patch rename to meta-digi-dey/recipes-connectivity/bluez/bluez5-5.41/0005-bluetooth-Fix-bug-in-firmware-parsing-mechanism.patch diff --git a/meta-digi-dey/recipes-connectivity/bluez/bluez5-5.41/ccimx6ul/0006-bluetooth-Configure-BD-Address.patch b/meta-digi-dey/recipes-connectivity/bluez/bluez5-5.41/0006-bluetooth-Configure-BD-Address.patch similarity index 100% rename from meta-digi-dey/recipes-connectivity/bluez/bluez5-5.41/ccimx6ul/0006-bluetooth-Configure-BD-Address.patch rename to meta-digi-dey/recipes-connectivity/bluez/bluez5-5.41/0006-bluetooth-Configure-BD-Address.patch diff --git a/meta-digi-dey/recipes-connectivity/bluez/bluez5-5.41/ccimx6ul/0007-bluetooth-Remove-unused-functions-in-the-firmware-do.patch b/meta-digi-dey/recipes-connectivity/bluez/bluez5-5.41/0007-bluetooth-Remove-unused-functions-in-the-firmware-do.patch similarity index 100% rename from meta-digi-dey/recipes-connectivity/bluez/bluez5-5.41/ccimx6ul/0007-bluetooth-Remove-unused-functions-in-the-firmware-do.patch rename to meta-digi-dey/recipes-connectivity/bluez/bluez5-5.41/0007-bluetooth-Remove-unused-functions-in-the-firmware-do.patch diff --git a/meta-digi-dey/recipes-connectivity/bluez/bluez5-5.41/ccimx6ul/0008-bluetooth-Enable-3Mbps-baud-rate-support.patch b/meta-digi-dey/recipes-connectivity/bluez/bluez5-5.41/0008-bluetooth-Enable-3Mbps-baud-rate-support.patch similarity index 100% rename from meta-digi-dey/recipes-connectivity/bluez/bluez5-5.41/ccimx6ul/0008-bluetooth-Enable-3Mbps-baud-rate-support.patch rename to meta-digi-dey/recipes-connectivity/bluez/bluez5-5.41/0008-bluetooth-Enable-3Mbps-baud-rate-support.patch diff --git a/meta-digi-dey/recipes-connectivity/bluez/bluez5-5.41/ccimx6ul/0009-bluetooth-Check-TTY-buffer-for-data-availability-bef.patch b/meta-digi-dey/recipes-connectivity/bluez/bluez5-5.41/0009-bluetooth-Check-TTY-buffer-for-data-availability-bef.patch similarity index 100% rename from meta-digi-dey/recipes-connectivity/bluez/bluez5-5.41/ccimx6ul/0009-bluetooth-Check-TTY-buffer-for-data-availability-bef.patch rename to meta-digi-dey/recipes-connectivity/bluez/bluez5-5.41/0009-bluetooth-Check-TTY-buffer-for-data-availability-bef.patch diff --git a/meta-digi-dey/recipes-connectivity/bluez/bluez5-5.41/ccimx6ul/0010-bluetooth-Add-support-for-TUFEELO-firmware-download.patch b/meta-digi-dey/recipes-connectivity/bluez/bluez5-5.41/0010-bluetooth-Add-support-for-TUFEELO-firmware-download.patch similarity index 100% rename from meta-digi-dey/recipes-connectivity/bluez/bluez5-5.41/ccimx6ul/0010-bluetooth-Add-support-for-TUFEELO-firmware-download.patch rename to meta-digi-dey/recipes-connectivity/bluez/bluez5-5.41/0010-bluetooth-Add-support-for-TUFEELO-firmware-download.patch diff --git a/meta-digi-dey/recipes-connectivity/bluez/bluez5-5.41/ccimx6ul/0011-bluetooth-Add-support-for-ROME-3.2-SOC.patch b/meta-digi-dey/recipes-connectivity/bluez/bluez5-5.41/0011-bluetooth-Add-support-for-ROME-3.2-SOC.patch similarity index 100% rename from meta-digi-dey/recipes-connectivity/bluez/bluez5-5.41/ccimx6ul/0011-bluetooth-Add-support-for-ROME-3.2-SOC.patch rename to meta-digi-dey/recipes-connectivity/bluez/bluez5-5.41/0011-bluetooth-Add-support-for-ROME-3.2-SOC.patch diff --git a/meta-digi-dey/recipes-connectivity/bluez/bluez5-5.41/ccimx6ul/0012-bluetooth-Use-correct-TTY-ioctl-calls-for-flow-contr.patch b/meta-digi-dey/recipes-connectivity/bluez/bluez5-5.41/0012-bluetooth-Use-correct-TTY-ioctl-calls-for-flow-contr.patch similarity index 100% rename from meta-digi-dey/recipes-connectivity/bluez/bluez5-5.41/ccimx6ul/0012-bluetooth-Use-correct-TTY-ioctl-calls-for-flow-contr.patch rename to meta-digi-dey/recipes-connectivity/bluez/bluez5-5.41/0012-bluetooth-Use-correct-TTY-ioctl-calls-for-flow-contr.patch diff --git a/meta-digi-dey/recipes-connectivity/bluez/bluez5-5.41/ccimx6ul/0013-bluetooth-Add-support-for-multi-baud-rate.patch b/meta-digi-dey/recipes-connectivity/bluez/bluez5-5.41/0013-bluetooth-Add-support-for-multi-baud-rate.patch similarity index 100% rename from meta-digi-dey/recipes-connectivity/bluez/bluez5-5.41/ccimx6ul/0013-bluetooth-Add-support-for-multi-baud-rate.patch rename to meta-digi-dey/recipes-connectivity/bluez/bluez5-5.41/0013-bluetooth-Add-support-for-multi-baud-rate.patch diff --git a/meta-digi-dey/recipes-connectivity/bluez/bluez5-5.41/ccimx6ul/0014-Override-PCM-Settings-by-reading-configuration-file.patch b/meta-digi-dey/recipes-connectivity/bluez/bluez5-5.41/0014-Override-PCM-Settings-by-reading-configuration-file.patch similarity index 100% rename from meta-digi-dey/recipes-connectivity/bluez/bluez5-5.41/ccimx6ul/0014-Override-PCM-Settings-by-reading-configuration-file.patch rename to meta-digi-dey/recipes-connectivity/bluez/bluez5-5.41/0014-Override-PCM-Settings-by-reading-configuration-file.patch diff --git a/meta-digi-dey/recipes-connectivity/bluez/bluez5-5.41/ccimx6ul/0015-Add-support-for-Tufello-1.1-SOC.patch b/meta-digi-dey/recipes-connectivity/bluez/bluez5-5.41/0015-Add-support-for-Tufello-1.1-SOC.patch similarity index 100% rename from meta-digi-dey/recipes-connectivity/bluez/bluez5-5.41/ccimx6ul/0015-Add-support-for-Tufello-1.1-SOC.patch rename to meta-digi-dey/recipes-connectivity/bluez/bluez5-5.41/0015-Add-support-for-Tufello-1.1-SOC.patch diff --git a/meta-digi-dey/recipes-connectivity/bluez/bluez5-5.41/ccimx6ul/0016-bluetooth-Vote-UART-CLK-ON-prior-to-firmware-downloa.patch b/meta-digi-dey/recipes-connectivity/bluez/bluez5-5.41/0016-bluetooth-Vote-UART-CLK-ON-prior-to-firmware-downloa.patch similarity index 100% rename from meta-digi-dey/recipes-connectivity/bluez/bluez5-5.41/ccimx6ul/0016-bluetooth-Vote-UART-CLK-ON-prior-to-firmware-downloa.patch rename to meta-digi-dey/recipes-connectivity/bluez/bluez5-5.41/0016-bluetooth-Vote-UART-CLK-ON-prior-to-firmware-downloa.patch diff --git a/meta-digi-dey/recipes-connectivity/bluez/bluez5-5.41/ccimx6ul/0017-Override-IBS-settings-by-reading-configuration-file.patch b/meta-digi-dey/recipes-connectivity/bluez/bluez5-5.41/0017-Override-IBS-settings-by-reading-configuration-file.patch similarity index 100% rename from meta-digi-dey/recipes-connectivity/bluez/bluez5-5.41/ccimx6ul/0017-Override-IBS-settings-by-reading-configuration-file.patch rename to meta-digi-dey/recipes-connectivity/bluez/bluez5-5.41/0017-Override-IBS-settings-by-reading-configuration-file.patch diff --git a/meta-digi-dey/recipes-connectivity/bluez/bluez5-5.41/ccimx6ul/0018-Handle-NULL-Pointer-derefrencing-in-AVRCP-Target-rol.patch b/meta-digi-dey/recipes-connectivity/bluez/bluez5-5.41/0018-Handle-NULL-Pointer-derefrencing-in-AVRCP-Target-rol.patch similarity index 100% rename from meta-digi-dey/recipes-connectivity/bluez/bluez5-5.41/ccimx6ul/0018-Handle-NULL-Pointer-derefrencing-in-AVRCP-Target-rol.patch rename to meta-digi-dey/recipes-connectivity/bluez/bluez5-5.41/0018-Handle-NULL-Pointer-derefrencing-in-AVRCP-Target-rol.patch diff --git a/meta-digi-dey/recipes-connectivity/bluez/bluez5-5.41/ccimx6ul/0019-bluetooth-Fix-flow-control-operation.patch b/meta-digi-dey/recipes-connectivity/bluez/bluez5-5.41/0019-bluetooth-Fix-flow-control-operation.patch similarity index 100% rename from meta-digi-dey/recipes-connectivity/bluez/bluez5-5.41/ccimx6ul/0019-bluetooth-Fix-flow-control-operation.patch rename to meta-digi-dey/recipes-connectivity/bluez/bluez5-5.41/0019-bluetooth-Fix-flow-control-operation.patch diff --git a/meta-digi-dey/recipes-connectivity/bluez/bluez5-5.41/ccimx6ul/0020-Adding-MDM-specific-code-under-_PLATFORM_MDM_.patch b/meta-digi-dey/recipes-connectivity/bluez/bluez5-5.41/0020-Adding-MDM-specific-code-under-_PLATFORM_MDM_.patch similarity index 100% rename from meta-digi-dey/recipes-connectivity/bluez/bluez5-5.41/ccimx6ul/0020-Adding-MDM-specific-code-under-_PLATFORM_MDM_.patch rename to meta-digi-dey/recipes-connectivity/bluez/bluez5-5.41/0020-Adding-MDM-specific-code-under-_PLATFORM_MDM_.patch diff --git a/meta-digi-dey/recipes-connectivity/bluez/bluez5-5.41/ccimx6ul/0021-Bluetooth-Fix-static-analysis-issues.patch b/meta-digi-dey/recipes-connectivity/bluez/bluez5-5.41/0021-Bluetooth-Fix-static-analysis-issues.patch similarity index 100% rename from meta-digi-dey/recipes-connectivity/bluez/bluez5-5.41/ccimx6ul/0021-Bluetooth-Fix-static-analysis-issues.patch rename to meta-digi-dey/recipes-connectivity/bluez/bluez5-5.41/0021-Bluetooth-Fix-static-analysis-issues.patch diff --git a/meta-digi-dey/recipes-connectivity/bluez/bluez5-5.41/ccimx6ul/0022-hciattach_rome-Respect-the-user-indication-for-noflo.patch b/meta-digi-dey/recipes-connectivity/bluez/bluez5-5.41/0022-hciattach_rome-Respect-the-user-indication-for-noflo.patch similarity index 100% rename from meta-digi-dey/recipes-connectivity/bluez/bluez5-5.41/ccimx6ul/0022-hciattach_rome-Respect-the-user-indication-for-noflo.patch rename to meta-digi-dey/recipes-connectivity/bluez/bluez5-5.41/0022-hciattach_rome-Respect-the-user-indication-for-noflo.patch diff --git a/meta-digi-dey/recipes-connectivity/bluez/bluez5-5.41/ccimx6ul/0023-hciattach-If-the-user-supplies-a-bdaddr-use-it.patch b/meta-digi-dey/recipes-connectivity/bluez/bluez5-5.41/0023-hciattach-If-the-user-supplies-a-bdaddr-use-it.patch similarity index 100% rename from meta-digi-dey/recipes-connectivity/bluez/bluez5-5.41/ccimx6ul/0023-hciattach-If-the-user-supplies-a-bdaddr-use-it.patch rename to meta-digi-dey/recipes-connectivity/bluez/bluez5-5.41/0023-hciattach-If-the-user-supplies-a-bdaddr-use-it.patch diff --git a/meta-digi-dey/recipes-connectivity/bluez/bluez5-5.41/ccimx6ul/0024-hciattach-Add-verbosity-option.patch b/meta-digi-dey/recipes-connectivity/bluez/bluez5-5.41/0024-hciattach-Add-verbosity-option.patch similarity index 100% rename from meta-digi-dey/recipes-connectivity/bluez/bluez5-5.41/ccimx6ul/0024-hciattach-Add-verbosity-option.patch rename to meta-digi-dey/recipes-connectivity/bluez/bluez5-5.41/0024-hciattach-Add-verbosity-option.patch diff --git a/meta-digi-dey/recipes-connectivity/bluez/bluez5-5.41/ccimx6qpsbc/bluetooth-init b/meta-digi-dey/recipes-connectivity/bluez/bluez5-5.41/ccimx6qpsbc/bluetooth-init new file mode 100644 index 000000000..1a9741841 --- /dev/null +++ b/meta-digi-dey/recipes-connectivity/bluez/bluez5-5.41/ccimx6qpsbc/bluetooth-init @@ -0,0 +1,87 @@ +#!/bin/sh +#=============================================================================== +# +# Copyright (C) 2012-2017 by Digi International Inc. +# All rights reserved. +# +# This program is free software; you can redistribute it and/or modify it +# under the terms of the GNU General Public License version 2 as published by +# the Free Software Foundation. +# +# +# !Description: Initialize bluetooth hardware +# +#=============================================================================== + +# Bluetooth power GPIO +BT_EN_QCA_GPIO_NR="244" + +# set_gpio_value +set_gpio_value() { + local SG_GPIONR="${1}" + local SG_GPIOVAL="${2}" + local SG_GPIOPATH="/sys/class/gpio/gpio${SG_GPIONR}" + + [ -d "${SG_GPIOPATH}" ] || printf "%s" "${SG_GPIONR}" > /sys/class/gpio/export + printf out > "${SG_GPIOPATH}/direction" && sleep .2 + printf "${SG_GPIOVAL}" > "${SG_GPIOPATH}/value" && sleep .2 + [ -d "${SG_GPIOPATH}" ] && printf "%s" "${SG_GPIONR}" > /sys/class/gpio/unexport +} + +# powercycle_gpio +powercycle_gpio() { + set_gpio_value "${1}" 0 + set_gpio_value "${1}" 1 +} + +error() { + echo ${1} + exit 1 +} + +bluetooth_init() { + # Get MAC address from the device tree. Use a default value if it has not been set. + BT_MACADDR="$(hexdump -ve '1/1 "%02X" ":"' /proc/device-tree/bluetooth/mac-address 2>/dev/null | sed 's/:$//g')" + if [ -z "${BT_MACADDR}" ] || [ "${BT_MACADDR}" = "00:00:00:00:00:00" ]; then + BT_MACADDR="00:04:F3:FF:FF:BB" + fi + + # Start the Bluetooth driver and bring up the interface + HCIATTACH_LOG="/var/log/hciattach.log" + killproc hciattach + powercycle_gpio "${BT_EN_QCA_GPIO_NR}" + if ! hciattach ttyBt qca ${BT_RATE:-3000000} -t30 ${BT_FLOW:-flow} unused ${BT_MACADDR} >${HCIATTACH_LOG} 2>&1; then + BT_ERROR="FAIL (hciattach)" + fi +} + +# Source function library +. /etc/init.d/functions + +case "$1" in + start) + if [ -d "/proc/device-tree/bluetooth" ]; then + echo -n "Starting bluetooth hardware: " + bluetooth_init + echo "${BT_ERROR:-done.}" + fi + ;; + stop) + if [ -d "/sys/class/bluetooth/hci0" ]; then + echo -n "Stopping bluetooth hardware: " + killproc hciattach + # Power down bluetooth + set_gpio_value "${BT_EN_QCA_GPIO_NR}" 0 + echo "done." + fi + ;; + restart) + $0 stop + sleep 1 + $0 start + ;; + *) + echo "Usage: $0 {start|stop|restart}" + exit 1 + ;; +esac diff --git a/meta-digi-dey/recipes-connectivity/bluez/bluez5-5.41/ccimx6qpsbc/main.conf b/meta-digi-dey/recipes-connectivity/bluez/bluez5-5.41/ccimx6qpsbc/main.conf new file mode 100644 index 000000000..332d38fad --- /dev/null +++ b/meta-digi-dey/recipes-connectivity/bluez/bluez5-5.41/ccimx6qpsbc/main.conf @@ -0,0 +1,12 @@ +[General] + +# Default adapter name +# Defaults to 'BlueZ X.YZ' +Name = cc6qp + +[Policy] + +# AutoEnable defines option to enable all controllers when they are found. +# This includes adapters present on start as well as adapters that are plugged +# in later on. Defaults to 'false'. +AutoEnable=true diff --git a/meta-digi-dey/recipes-connectivity/bluez/bluez5-5.41/ccimx6/bluetooth-init b/meta-digi-dey/recipes-connectivity/bluez/bluez5-5.41/ccimx6sbc/bluetooth-init similarity index 100% rename from meta-digi-dey/recipes-connectivity/bluez/bluez5-5.41/ccimx6/bluetooth-init rename to meta-digi-dey/recipes-connectivity/bluez/bluez5-5.41/ccimx6sbc/bluetooth-init diff --git a/meta-digi-dey/recipes-connectivity/bluez/bluez5-5.41/ccimx6/main.conf b/meta-digi-dey/recipes-connectivity/bluez/bluez5-5.41/ccimx6sbc/main.conf similarity index 100% rename from meta-digi-dey/recipes-connectivity/bluez/bluez5-5.41/ccimx6/main.conf rename to meta-digi-dey/recipes-connectivity/bluez/bluez5-5.41/ccimx6sbc/main.conf diff --git a/meta-digi-dey/recipes-connectivity/bluez/bluez5_5.41.bbappend b/meta-digi-dey/recipes-connectivity/bluez/bluez5_5.41.bbappend index 45b7f10d3..188c4533f 100644 --- a/meta-digi-dey/recipes-connectivity/bluez/bluez5_5.41.bbappend +++ b/meta-digi-dey/recipes-connectivity/bluez/bluez5_5.41.bbappend @@ -11,7 +11,7 @@ SRC_URI += " \ file://0027-example-gatt-server-update-example-to-master-version.patch \ " -SRC_URI_append_ccimx6ul = " \ +QCA6564_COMMON_PATCHES = " \ file://0003-bluetooth-Add-bluetooth-support-for-QCA6174-chip.patch \ file://0004-bluetooth-Enable-bluetooth-low-power-mode-functional.patch \ file://0005-bluetooth-Fix-bug-in-firmware-parsing-mechanism.patch \ @@ -36,6 +36,9 @@ SRC_URI_append_ccimx6ul = " \ file://0024-hciattach-Add-verbosity-option.patch \ " +SRC_URI_append_ccimx6ul = " ${QCA6564_COMMON_PATCHES}" +SRC_URI_append_ccimx6qpsbc = " ${QCA6564_COMMON_PATCHES}" + inherit update-rc.d PACKAGECONFIG_append = " experimental"