wwan: Rename apps and drivers to follow common naming conventions

quectel_MHI -> quectel-mhi-pcie
quectel_QMI_WWAN -> quectel-qmi-wwan
app/quectel-cm -> utils/quectel-cm

Signed-off-by: Sean Khan <datapronix@protonmail.com>

wwan/app/luci-app-pcimodem/Makefile

@@ -8,7 +8,7 @@
 include $(TOPDIR)/rules.mk
 
 LUCI_TITLE:=PCI Modem Server
-LUCI_DEPENDS:=+kmod-pcie_mhi +pciutils +quectel-cm
+LUCI_DEPENDS:=+kmod-mhi-pcie +pciutils +quectel-cm
 
 include $(TOPDIR)/feeds/luci/luci.mk
 

wwan/app/luci-app-usbmodem/Makefile

@@ -12,7 +12,7 @@ LUCI_DEPENDS:=+luci-compat +quectel-cm +kmod-usb-acm \
 	+kmod-usb-net-cdc-ether +kmod-usb-net-cdc-mbim \
 	+kmod-usb-net-qmi-wwan +kmod-usb-net-rndis \
 	+kmod-usb-serial-option +kmod-usb-wdm \
-	+kmod-qmi_wwan_q
+	+kmod-usb-net-qmi-wwan-quectel
 
 include $(TOPDIR)/feeds/luci/luci.mk
 

wwan/driver/quectel-mhi-pcie/Makefile

@@ -1,25 +1,25 @@
 include $(TOPDIR)/rules.mk
 
-PKG_NAME:=pcie_mhi
+PKG_NAME:=quectel-mhi-pcie
 PKG_VERSION:=1.3.8
-PKG_RELEASE:=2
+PKG_RELEASE:=3
 
 include $(INCLUDE_DIR)/kernel.mk
 include $(INCLUDE_DIR)/package.mk
 
 PKG_BUILD_PARALLEL:=1
 
-define KernelPackage/pcie_mhi
+define KernelPackage/mhi-pcie
   SUBMENU:=Network Devices
   TITLE:=Kernel PCIe driver for MHI device
   DEPENDS:=@(TARGET_qualcommax_ipq807x||TARGET_qualcommax_ipq50xx) \
-	    +pciids +pciutils +quectel-cm \
+	    @PCI_SUPPORT \
 	    +PACKAGE_kmod-rmnet-nss:kmod-rmnet-nss
   FILES:=$(PKG_BUILD_DIR)/pcie_mhi.ko
   AUTOLOAD:=$(call AutoLoad,90,pcie_mhi)
 endef
 
-define KernelPackage/pcie_mhi/description
+define KernelPackage/mhi-pcie/description
   Kernel module for register a custom pciemhi platform device.
 endef
 
@@ -38,4 +38,4 @@ define Build/Compile
 		modules
 endef
 
-$(eval $(call KernelPackage,pcie_mhi))
+$(eval $(call KernelPackage,mhi-pcie))

wwan/driver/quectel-qmi-wwan/Makefile

@@ -1,6 +1,6 @@
 include $(TOPDIR)/rules.mk
 
-PKG_NAME:=qmi_wwan_q
+PKG_NAME:=quectel-qmi-wwan
 PKG_VERSION:=1.2.9
 PKG_RELEASE:=2
 
@@ -9,9 +9,10 @@ include $(INCLUDE_DIR)/package.mk
 
 PKG_BUILD_PARALLEL:=1
 
-define KernelPackage/qmi_wwan_q
-  SUBMENU:=WWAN Support
-  TITLE:=Quectel Linux USB QMI WWAN Driver
+define KernelPackage/usb-net-qmi-wwan-quectel
+  SUBMENU:=USB Support
+  TITLE:=QMI WWAN driver for Quectel modules
+  DEPENDS:=+kmod-usb-net +kmod-usb-wdm
   DEPENDS:=@(TARGET_qualcommax_ipq807x||TARGET_qualcommax_ipq50xx) \
 	    +kmod-usb-net \
 	    +kmod-usb-wdm \
@@ -20,7 +21,6 @@ define KernelPackage/qmi_wwan_q
   AUTOLOAD:=$(call AutoLoad,81,qmi_wwan_q)
 endef
 
-
 EXTRA_CFLAGS+= \
 	-Wno-unused-function \
 	-Wno-missing-prototypes \
@@ -36,4 +36,4 @@ define Build/Compile
 		modules
 endef
 
-$(eval $(call KernelPackage,qmi_wwan_q))
+$(eval $(call KernelPackage,usb-net-qmi-wwan-quectel))

wwan/utils/quectel-cm/Makefile

@@ -2,7 +2,7 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=quectel-cm
 PKG_VERSION:=1.6.5
-PKG_RELEASE:=3
+PKG_RELEASE:=4
 
 include $(INCLUDE_DIR)/package.mk
 include $(INCLUDE_DIR)/cmake.mk
@@ -15,7 +15,7 @@ define Package/quectel-cm
   DEPENDS:= \
     +kmod-usb-net-cdc-mbim \
     +kmod-usb-net-qmi-wwan \
-    +kmod-qmi_wwan_q \
+    +kmod-usb-net-qmi-wwan-quectel \
     +kmod-usb-serial-option
 endef