From 7ea02c26aa17d6e49a6553a645a323b551e96f3d Mon Sep 17 00:00:00 2001
From: Gabriel Valcazar <gabriel.valcazar@digi.com>
Date: Thu, 16 Sep 2021 09:44:12 +0200
Subject: [PATCH] qualcomm: adapt firmware and module recipes to be compatible
 with the ccimx6sbc

This allows the packages to be included in the ccimx6sbc images. While at it,
include the Qualcomm bluez patches in ccimx6 builds. These patches aren't
destructive, they simply add functionality required by the Qualcomm chip, so
they shouldn't have any secondary effects when using the Atheros chip.

https://onedigi.atlassian.net/browse/DEL-7661
https://onedigi.atlassian.net/browse/DEL-7666

Signed-off-by: Gabriel Valcazar <gabriel.valcazar@digi.com>
---
 .../firmware-qualcomm/firmware-qualcomm.bb          |   6 +++---
 .../{ccimx6qpsbc => ccimx6}/bdwlan30_US.bin         | Bin
 .../kernel-module-qualcomm.bb                       |   4 ++--
 .../recipes-connectivity/bluez/bluez5_5.41.bbappend |   4 ++--
 .../recipes-connectivity/bluez/bluez5_5.55.bbappend |   4 ++--
 5 files changed, 9 insertions(+), 9 deletions(-)
 rename meta-digi-arm/recipes-bsp/firmware-qualcomm/firmware-qualcomm/{ccimx6qpsbc => ccimx6}/bdwlan30_US.bin (100%)

diff --git a/meta-digi-arm/recipes-bsp/firmware-qualcomm/firmware-qualcomm.bb b/meta-digi-arm/recipes-bsp/firmware-qualcomm/firmware-qualcomm.bb
index 9bd3028a9..917147706 100644
--- a/meta-digi-arm/recipes-bsp/firmware-qualcomm/firmware-qualcomm.bb
+++ b/meta-digi-arm/recipes-bsp/firmware-qualcomm/firmware-qualcomm.bb
@@ -1,4 +1,4 @@
-# Copyright (C) 2016-2020 Digi International.
+# Copyright (C) 2016-2021 Digi International.
 
 SUMMARY = "Qualcomm firmware files for Digi's platforms."
 SECTION = "base"
@@ -11,7 +11,7 @@ QUALCOMM_WIFI_DRIVER ?= "proprietary"
 # Selects whether to apply the "Deep Sleep + Internal Clock" workaround
 BT_INTCLOCK_WORKAROUND ?= "0"
 BT_INTCLOCK_WORKAROUND_ccimx6ul = "1"
-BT_INTCLOCK_WORKAROUND_ccimx6qpsbc = "1"
+BT_INTCLOCK_WORKAROUND_ccimx6 = "1"
 
 # Bluetooth 5.0 firmware files
 FW_QUALCOMM_BT_5 = " \
@@ -115,4 +115,4 @@ FILES_${PN}-${QCA_MODEL}-bt = "/lib/firmware/qca"
 FILES_${PN}-${QCA_MODEL}-wifi = "/lib/firmware"
 
 PACKAGE_ARCH = "${MACHINE_ARCH}"
-COMPATIBLE_MACHINE = "(ccimx6qpsbc|ccimx6ul|ccimx8x|ccimx8m)"
+COMPATIBLE_MACHINE = "(ccimx6$|ccimx6ul|ccimx8x|ccimx8m)"
diff --git a/meta-digi-arm/recipes-bsp/firmware-qualcomm/firmware-qualcomm/ccimx6qpsbc/bdwlan30_US.bin b/meta-digi-arm/recipes-bsp/firmware-qualcomm/firmware-qualcomm/ccimx6/bdwlan30_US.bin
similarity index 100%
rename from meta-digi-arm/recipes-bsp/firmware-qualcomm/firmware-qualcomm/ccimx6qpsbc/bdwlan30_US.bin
rename to meta-digi-arm/recipes-bsp/firmware-qualcomm/firmware-qualcomm/ccimx6/bdwlan30_US.bin
diff --git a/meta-digi-arm/recipes-kernel/kernel-module-qualcomm/kernel-module-qualcomm.bb b/meta-digi-arm/recipes-kernel/kernel-module-qualcomm/kernel-module-qualcomm.bb
index d3543ea9c..7240a332d 100644
--- a/meta-digi-arm/recipes-kernel/kernel-module-qualcomm/kernel-module-qualcomm.bb
+++ b/meta-digi-arm/recipes-kernel/kernel-module-qualcomm/kernel-module-qualcomm.bb
@@ -1,4 +1,4 @@
-# Copyright (C) 2016-2020 Digi International.
+# Copyright (C) 2016-2021 Digi International.
 
 SUMMARY = "Qualcomm's wireless driver for qca65xx"
 DESCRIPTION = "qcacld-2.0 module"
@@ -82,4 +82,4 @@ FILES_${PN} += " \
     ${base_libdir}/firmware/wlan/qcom_cfg.ini \
 "
 
-COMPATIBLE_MACHINE = "(ccimx6qpsbc|ccimx6ul|ccimx8x|ccimx8m)"
+COMPATIBLE_MACHINE = "(ccimx6$|ccimx6ul|ccimx8x|ccimx8m)"
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 d188cd039..114a8f963 100644
--- a/meta-digi-dey/recipes-connectivity/bluez/bluez5_5.41.bbappend
+++ b/meta-digi-dey/recipes-connectivity/bluez/bluez5_5.41.bbappend
@@ -1,4 +1,4 @@
-# Copyright (C) 2015-2019 Digi International.
+# Copyright (C) 2015-2021 Digi International.
 
 SRC_URI += " \
     file://bluetooth-init \
@@ -27,7 +27,7 @@ QCA65XX_COMMON_PATCHES = " \
 "
 
 SRC_URI_append_ccimx6ul = " ${QCA65XX_COMMON_PATCHES}"
-SRC_URI_append_ccimx6qpsbc = " ${QCA65XX_COMMON_PATCHES}"
+SRC_URI_append_ccimx6 = " ${QCA65XX_COMMON_PATCHES}"
 
 inherit update-rc.d
 
diff --git a/meta-digi-dey/recipes-connectivity/bluez/bluez5_5.55.bbappend b/meta-digi-dey/recipes-connectivity/bluez/bluez5_5.55.bbappend
index 64f5d498f..f94752b63 100644
--- a/meta-digi-dey/recipes-connectivity/bluez/bluez5_5.55.bbappend
+++ b/meta-digi-dey/recipes-connectivity/bluez/bluez5_5.55.bbappend
@@ -1,4 +1,4 @@
-# Copyright (C) 2015-2020 Digi International.
+# Copyright (C) 2015-2021 Digi International.
 
 FILESEXTRAPATHS_prepend := "${THISDIR}/${BPN}:${THISDIR}/${BP}:"
 
@@ -20,7 +20,7 @@ QCA65XX_COMMON_PATCHES = " \
 "
 
 SRC_URI_append_ccimx6ul = " ${QCA65XX_COMMON_PATCHES}"
-SRC_URI_append_ccimx6qpsbc = " ${QCA65XX_COMMON_PATCHES}"
+SRC_URI_append_ccimx6 = " ${QCA65XX_COMMON_PATCHES}"
 SRC_URI_append_ccimx8x = " ${QCA65XX_COMMON_PATCHES}"
 SRC_URI_append_ccimx8m = " ${QCA65XX_COMMON_PATCHES}"