From afae4f6bfdf7cbea37d59d65aee1a573f8433156 Mon Sep 17 00:00:00 2001
From: Gabriel Valcazar <gabriel.valcazar@digi.com>
Date: Fri, 24 Aug 2018 11:43:57 +0200
Subject: [PATCH] kernel-module-qualcomm: add a new udev rule to load the
 module on the cc8x

The module was being loaded by the default udev rules. With this new rule, the
module will be loaded with our custom qualcomm.sh script.

https://jira.digi.com/browse/DEL-6067

Signed-off-by: Gabriel Valcazar <gabriel.valcazar@digi.com>
---
 .../kernel-module-qualcomm/kernel-module-qualcomm.bb        | 6 +++---
 .../kernel-module-qualcomm/81-qcom-wifi.rules               | 4 ++++
 .../kernel-module-qualcomm/81-sdio-qcom.rules               | 2 --
 3 files changed, 7 insertions(+), 5 deletions(-)
 create mode 100644 meta-digi-arm/recipes-kernel/kernel-module-qualcomm/kernel-module-qualcomm/81-qcom-wifi.rules
 delete mode 100644 meta-digi-arm/recipes-kernel/kernel-module-qualcomm/kernel-module-qualcomm/81-sdio-qcom.rules

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 e4c2469c6..a43c986a6 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
@@ -24,11 +24,11 @@ QUALCOMM_WIFI_INTERFACE ?= "sdio"
 QUALCOMM_WIFI_INTERFACE_ccimx8x = "pci"
 
 SRC_URI_append = " \
+    file://81-qcom-wifi.rules \
     file://qualcomm.sh \
 "
 
 FILES_SDIO = " \
-    file://81-sdio-qcom.rules \
     file://modprobe-qualcomm.conf \
 "
 
@@ -62,8 +62,6 @@ do_install_append() {
 	if [ "${QUALCOMM_WIFI_INTERFACE}" = "sdio" ]; then
 		install -d ${D}${sysconfdir}/modprobe.d
 		install -m 0644 ${WORKDIR}/modprobe-qualcomm.conf ${D}${sysconfdir}/modprobe.d/qualcomm.conf
-		install -d ${D}${sysconfdir}/udev/rules.d
-		install -m 0644 ${WORKDIR}/81-sdio-qcom.rules ${D}${sysconfdir}/udev/rules.d/
 	fi
 
 	install -d ${D}${base_libdir}/firmware/wlan/
@@ -71,6 +69,8 @@ do_install_append() {
 	install -m 0644 ${WORKDIR}/git/firmware_bin/WCNSS_qcom_cfg.ini ${D}${base_libdir}/firmware/wlan/qcom_cfg.ini
 	install -d ${D}${sysconfdir}/udev/scripts
 	install -m 0755 ${WORKDIR}/qualcomm.sh ${D}${sysconfdir}/udev/scripts/
+	install -d ${D}${sysconfdir}/udev/rules.d
+	install -m 0644 ${WORKDIR}/81-qcom-wifi.rules ${D}${sysconfdir}/udev/rules.d/
 }
 
 FILES_${PN} += " \
diff --git a/meta-digi-arm/recipes-kernel/kernel-module-qualcomm/kernel-module-qualcomm/81-qcom-wifi.rules b/meta-digi-arm/recipes-kernel/kernel-module-qualcomm/kernel-module-qualcomm/81-qcom-wifi.rules
new file mode 100644
index 000000000..b717ebf0b
--- /dev/null
+++ b/meta-digi-arm/recipes-kernel/kernel-module-qualcomm/kernel-module-qualcomm/81-qcom-wifi.rules
@@ -0,0 +1,4 @@
+# Load Qualcomm wireless module (sdio)
+SUBSYSTEM=="sdio", ACTION=="add", ENV{MODALIAS}=="sdio:c00v0271d050A", RUN="/etc/udev/scripts/qualcomm.sh"
+# Load Qualcomm wireless module (pci)
+SUBSYSTEM=="pci", ACTION=="add", ENV{MODALIAS}=="pci:v0000168Cd0000003Esv*sd*bc*sc*i*", RUN="/etc/udev/scripts/qualcomm.sh"
diff --git a/meta-digi-arm/recipes-kernel/kernel-module-qualcomm/kernel-module-qualcomm/81-sdio-qcom.rules b/meta-digi-arm/recipes-kernel/kernel-module-qualcomm/kernel-module-qualcomm/81-sdio-qcom.rules
deleted file mode 100644
index a69152b59..000000000
--- a/meta-digi-arm/recipes-kernel/kernel-module-qualcomm/kernel-module-qualcomm/81-sdio-qcom.rules
+++ /dev/null
@@ -1,2 +0,0 @@
-# Load Qualcomm wireless module
-SUBSYSTEM=="sdio", ACTION=="add", ENV{MODALIAS}=="sdio:c00v0271d050A", RUN="/etc/udev/scripts/qualcomm.sh"