From 6529fce1f85a670c87ba84bfda49414a4cbc714f Mon Sep 17 00:00:00 2001
From: Marcel Ziswiler <marcel.ziswiler@toradex.com>
Date: Thu, 28 Sep 2023 09:57:01 +0200
Subject: mwifiex: rename mwifiexap to mwifiexconf

Rename mwifiexap to mwifiexconf as it now handles more than just the AP
mode with disabling power saving on Verdin AM62 as well.

Signed-off-by: Marcel Ziswiler <marcel.ziswiler@toradex.com>
(cherry picked from commit cd2bef82186ae5862d1d9b6948697b4a7e755cf0)
---
 recipes-bsp/mwifiexap/mwifiexap/mwifiex.conf       |  1 -
 .../mwifiexap/mwifiexap/verdin-am62/mwifiex.conf   |  1 -
 recipes-bsp/mwifiexap/mwifiexap_1.0.bb             | 17 ----------------
 recipes-bsp/mwifiexconf/mwifiexconf/mwifiex.conf   |  1 +
 .../mwifiexconf/verdin-am62/mwifiex.conf           |  1 +
 recipes-bsp/mwifiexconf/mwifiexconf_1.0.bb         | 23 ++++++++++++++++++++++
 6 files changed, 25 insertions(+), 19 deletions(-)
 delete mode 100644 recipes-bsp/mwifiexap/mwifiexap/mwifiex.conf
 delete mode 100644 recipes-bsp/mwifiexap/mwifiexap/verdin-am62/mwifiex.conf
 delete mode 100644 recipes-bsp/mwifiexap/mwifiexap_1.0.bb
 create mode 100644 recipes-bsp/mwifiexconf/mwifiexconf/mwifiex.conf
 create mode 100644 recipes-bsp/mwifiexconf/mwifiexconf/verdin-am62/mwifiex.conf
 create mode 100644 recipes-bsp/mwifiexconf/mwifiexconf_1.0.bb

diff --git a/recipes-bsp/mwifiexap/mwifiexap/mwifiex.conf b/recipes-bsp/mwifiexap/mwifiexap/mwifiex.conf
deleted file mode 100644
index ccbeae4..0000000
--- a/recipes-bsp/mwifiexap/mwifiexap/mwifiex.conf
+++ /dev/null
@@ -1 +0,0 @@
-options mwifiex driver_mode=0x3
diff --git a/recipes-bsp/mwifiexap/mwifiexap/verdin-am62/mwifiex.conf b/recipes-bsp/mwifiexap/mwifiexap/verdin-am62/mwifiex.conf
deleted file mode 100644
index 7413f0e..0000000
--- a/recipes-bsp/mwifiexap/mwifiexap/verdin-am62/mwifiex.conf
+++ /dev/null
@@ -1 +0,0 @@
-options mwifiex disable_auto_ds=1 driver_mode=0x3
diff --git a/recipes-bsp/mwifiexap/mwifiexap_1.0.bb b/recipes-bsp/mwifiexap/mwifiexap_1.0.bb
deleted file mode 100644
index 43bb386..0000000
--- a/recipes-bsp/mwifiexap/mwifiexap_1.0.bb
+++ /dev/null
@@ -1,17 +0,0 @@
-SUMMARY = "MWiFiEx AP mode"
-DESCRIPTION = "Currently wifi chip fw \
-doesn't support mode changes, this creates\ 
-multiple interfaces on boot"
-
-inherit systemd
-
-LICENSE = "CLOSED"
-
-SRC_URI = "file://mwifiex.conf \
-		   "
-
-do_install () {
-	install -d ${D}/etc/modprobe.d/
-	install -m 0755 ${WORKDIR}/mwifiex.conf ${D}/etc/modprobe.d/mwifiex.conf
-}
-
diff --git a/recipes-bsp/mwifiexconf/mwifiexconf/mwifiex.conf b/recipes-bsp/mwifiexconf/mwifiexconf/mwifiex.conf
new file mode 100644
index 0000000..ccbeae4
--- /dev/null
+++ b/recipes-bsp/mwifiexconf/mwifiexconf/mwifiex.conf
@@ -0,0 +1 @@
+options mwifiex driver_mode=0x3
diff --git a/recipes-bsp/mwifiexconf/mwifiexconf/verdin-am62/mwifiex.conf b/recipes-bsp/mwifiexconf/mwifiexconf/verdin-am62/mwifiex.conf
new file mode 100644
index 0000000..7413f0e
--- /dev/null
+++ b/recipes-bsp/mwifiexconf/mwifiexconf/verdin-am62/mwifiex.conf
@@ -0,0 +1 @@
+options mwifiex disable_auto_ds=1 driver_mode=0x3
diff --git a/recipes-bsp/mwifiexconf/mwifiexconf_1.0.bb b/recipes-bsp/mwifiexconf/mwifiexconf_1.0.bb
new file mode 100644
index 0000000..ef61b83
--- /dev/null
+++ b/recipes-bsp/mwifiexconf/mwifiexconf_1.0.bb
@@ -0,0 +1,23 @@
+SUMMARY = "MWiFiEx Configuration"
+DESCRIPTION = "AP mode: Currently wifi chip fw doesn't support mode \
+changes, this createsi multiple interfaces on boot; \
+Power saving disable: Currently IW416 on Verdin AM62 is not stable \
+with power saving enabled, so disable it."
+
+inherit systemd
+
+LICENSE = "CLOSED"
+
+# For backwards compatibility
+PROVIDES += "mwifiexap"
+RREPLACES:${PN} = "mwifiexap"
+RPROVIDES:${PN} = "mwifiexap"
+RCONFLICTS:${PN} = "mwifiexap"
+
+SRC_URI = "file://mwifiex.conf \
+"
+
+do_install () {
+	install -d ${D}/etc/modprobe.d/
+	install -m 0755 ${WORKDIR}/mwifiex.conf ${D}/etc/modprobe.d/mwifiex.conf
+}
-- 
cgit v1.2.3