diff --git a/build.sh b/build.sh
index ccfc9475..c5522462 100755
--- a/build.sh
+++ b/build.sh
@@ -243,6 +243,10 @@ if [ "$OMR_KERNEL" != "5.4" ] && [ "$OMR_TARGET" != "x86_64" ] && [ "$OMR_TARGET
 	echo "# CONFIG_PACKAGE_kmod-r8168 is not set" >> "$OMR_TARGET/source/.config"
 fi
 
+if [ "$OMR_TARGET" = "rutx" -a "$OMR_KERNEL" = "5.4" ]; then
+	echo "CONFIG_PACKAGE_kmod-r2ec=y" >> "$OMR_TARGET/source/.config"
+fi
+
 if [ "$OMR_TARGET" = "bpi-r1" -a "$OMR_OPENWRT" = "master" ]; then
 	# We disable mc in master, because it leads to unknown compilation errors on bpi-r1 target
 	# No time to check this, now, cause i am focused on make this target work
@@ -432,9 +436,9 @@ if [ -f target/linux/mediatek/patches-5.4/0999-hnat.patch ]; then
 	rm -f target/linux/mediatek/patches-5.4/0999-hnat.patch
 fi
 
-if [ -f target/linux/ipq40xx/patches-5.4/100-GPIO-add-named-gpio-exports.patch ]; then
-	rm -f target/linux/ipq40xx/patches-5.4/100-GPIO-add-named-gpio-exports.patch
-fi
+#if [ -f target/linux/ipq40xx/patches-5.4/100-GPIO-add-named-gpio-exports.patch ]; then
+#	rm -f target/linux/ipq40xx/patches-5.4/100-GPIO-add-named-gpio-exports.patch
+#fi
 
 if [ -f package/boot/uboot-rockchip/patches/100-rockchip-rk3328-Add-support-for-FriendlyARM-NanoPi-R.patch ]; then
 	rm -f package/boot/uboot-rockchip/patches/100-rockchip-rk3328-Add-support-for-FriendlyARM-NanoPi-R.patch
diff --git a/root/include/target.mk b/root/include/target.mk
new file mode 100644
index 00000000..948bc50f
--- /dev/null
+++ b/root/include/target.mk
@@ -0,0 +1,352 @@
+# SPDX-License-Identifier: GPL-2.0-only
+#
+# Copyright (C) 2007-2008 OpenWrt.org
+# Copyright (C) 2016 LEDE Project
+
+ifneq ($(__target_inc),1)
+__target_inc=1
+
+# default device type
+DEVICE_TYPE?=router
+
+# Default packages - the really basic set
+DEFAULT_PACKAGES:=\
+	base-files \
+	ca-bundle \
+	dropbear \
+	fstools \
+	libc \
+	libgcc \
+	libustream-wolfssl \
+	logd \
+	mtd \
+	netifd \
+	opkg \
+	uci \
+	uclient-fetch \
+	urandom-seed \
+	urngd
+
+ifneq ($(CONFIG_SELINUX),)
+DEFAULT_PACKAGES+=busybox-selinux procd-selinux
+else
+DEFAULT_PACKAGES+=busybox procd
+endif
+
+# include ujail on systems with enough storage
+ifeq ($(CONFIG_SMALL_FLASH),)
+DEFAULT_PACKAGES+=procd-ujail
+endif
+
+# include seccomp ld-preload hooks if kernel supports it
+ifneq ($(CONFIG_SECCOMP),)
+DEFAULT_PACKAGES+=procd-seccomp
+endif
+
+# For the basic set
+DEFAULT_PACKAGES.basic:=
+# For nas targets
+DEFAULT_PACKAGES.nas:=\
+	block-mount \
+	fdisk \
+	lsblk \
+	mdadm
+# For router targets
+DEFAULT_PACKAGES.router:=\
+	dnsmasq \
+	firewall \
+	ip6tables \
+	iptables \
+	kmod-nft-offload \
+	odhcp6c \
+	odhcpd-ipv6only \
+	ppp \
+	ppp-mod-pppoe
+
+ifneq ($(DUMP),)
+  all: dumpinfo
+endif
+
+target_conf=$(subst .,_,$(subst -,_,$(subst /,_,$(1))))
+ifeq ($(DUMP),)
+  PLATFORM_DIR:=$(TOPDIR)/target/linux/$(BOARD)
+  SUBTARGET:=$(strip $(foreach subdir,$(patsubst $(PLATFORM_DIR)/%/target.mk,%,$(wildcard $(PLATFORM_DIR)/*/target.mk)),$(if $(CONFIG_TARGET_$(call target_conf,$(BOARD)_$(subdir))),$(subdir))))
+else
+  PLATFORM_DIR:=${CURDIR}
+  ifeq ($(SUBTARGETS),)
+    SUBTARGETS:=$(strip $(patsubst $(PLATFORM_DIR)/%/target.mk,%,$(wildcard $(PLATFORM_DIR)/*/target.mk)))
+  endif
+endif
+
+TARGETID:=$(BOARD)$(if $(SUBTARGET),/$(SUBTARGET))
+PLATFORM_SUBDIR:=$(PLATFORM_DIR)$(if $(SUBTARGET),/$(SUBTARGET))
+
+ifneq ($(TARGET_BUILD),1)
+  ifndef DUMP
+    include $(PLATFORM_DIR)/Makefile
+    ifneq ($(PLATFORM_DIR),$(PLATFORM_SUBDIR))
+      include $(PLATFORM_SUBDIR)/target.mk
+    endif
+  endif
+else
+  ifneq ($(SUBTARGET),)
+    -include ./$(SUBTARGET)/target.mk
+  endif
+endif
+
+# Add device specific packages (here below to allow device type set from subtarget)
+DEFAULT_PACKAGES += $(DEFAULT_PACKAGES.$(DEVICE_TYPE))
+
+filter_packages = $(filter-out -% $(patsubst -%,%,$(filter -%,$(1))),$(1))
+extra_packages = $(if $(filter wpad wpad-% nas,$(1)),iwinfo)
+
+define ProfileDefault
+  NAME:=
+  PRIORITY:=
+  PACKAGES:=
+endef
+
+ifndef Profile
+define Profile
+  $(eval $(call ProfileDefault))
+  $(eval $(call Profile/$(1)))
+  dumpinfo : $(call shexport,Profile/$(1)/Description)
+  PACKAGES := $(filter-out -%,$(PACKAGES))
+  DUMPINFO += \
+	echo "Target-Profile: $(1)"; \
+	$(if $(PRIORITY), echo "Target-Profile-Priority: $(PRIORITY)"; ) \
+	echo "Target-Profile-Name: $(NAME)"; \
+	echo "Target-Profile-Packages: $(PACKAGES) $(call extra_packages,$(DEFAULT_PACKAGES) $(PACKAGES))"; \
+	echo "Target-Profile-Description:"; \
+	echo "$$$$$$$$$(call shvar,Profile/$(1)/Description)"; \
+	echo "@@"; \
+	echo;
+endef
+endif
+
+ifneq ($(PLATFORM_DIR),$(PLATFORM_SUBDIR))
+  define IncludeProfiles
+    -include $(sort $(wildcard $(PLATFORM_DIR)/profiles/*.mk))
+    -include $(sort $(wildcard $(PLATFORM_SUBDIR)/profiles/*.mk))
+  endef
+else
+  define IncludeProfiles
+    -include $(sort $(wildcard $(PLATFORM_DIR)/profiles/*.mk))
+  endef
+endif
+
+PROFILE?=$(call qstrip,$(CONFIG_TARGET_PROFILE))
+
+ifeq ($(TARGET_BUILD),1)
+  ifneq ($(DUMP),)
+    $(eval $(call IncludeProfiles))
+  endif
+endif
+
+ifneq ($(TARGET_BUILD)$(if $(DUMP),,1),)
+  include $(INCLUDE_DIR)/kernel-version.mk
+endif
+
+GENERIC_PLATFORM_DIR := $(TOPDIR)/target/linux/generic
+GENERIC_BACKPORT_DIR := $(GENERIC_PLATFORM_DIR)/backport$(if $(wildcard $(GENERIC_PLATFORM_DIR)/backport-$(KERNEL_PATCHVER)),-$(KERNEL_PATCHVER))
+GENERIC_PATCH_DIR := $(GENERIC_PLATFORM_DIR)/pending$(if $(wildcard $(GENERIC_PLATFORM_DIR)/pending-$(KERNEL_PATCHVER)),-$(KERNEL_PATCHVER))
+GENERIC_HACK_DIR := $(GENERIC_PLATFORM_DIR)/hack$(if $(wildcard $(GENERIC_PLATFORM_DIR)/hack-$(KERNEL_PATCHVER)),-$(KERNEL_PATCHVER))
+GENERIC_FILES_DIR := $(foreach dir,$(wildcard $(GENERIC_PLATFORM_DIR)/files $(GENERIC_PLATFORM_DIR)/files-$(KERNEL_PATCHVER)),"$(dir)")
+
+__config_name_list = $(1)/config-$(KERNEL_PATCHVER) $(1)/config-default
+__config_list = $(firstword $(wildcard $(call __config_name_list,$(1))))
+find_kernel_config=$(if $(__config_list),$(__config_list),$(lastword $(__config_name_list)))
+
+GENERIC_LINUX_CONFIG = $(call find_kernel_config,$(GENERIC_PLATFORM_DIR))
+LINUX_TARGET_CONFIG = $(call find_kernel_config,$(PLATFORM_DIR))
+ifneq ($(PLATFORM_DIR),$(PLATFORM_SUBDIR))
+  LINUX_SUBTARGET_CONFIG = $(call find_kernel_config,$(PLATFORM_SUBDIR))
+endif
+
+# config file list used for compiling
+LINUX_KCONFIG_LIST = $(wildcard $(GENERIC_LINUX_CONFIG) $(LINUX_TARGET_CONFIG) $(LINUX_SUBTARGET_CONFIG) $(TOPDIR)/env/kernel-config)
+
+# default config list for reconfiguring
+# defaults to subtarget if subtarget exists and target does not
+# defaults to target otherwise
+USE_SUBTARGET_CONFIG = $(if $(wildcard $(LINUX_TARGET_CONFIG)),,$(if $(LINUX_SUBTARGET_CONFIG),1))
+
+LINUX_RECONFIG_LIST = $(wildcard $(GENERIC_LINUX_CONFIG) $(LINUX_TARGET_CONFIG) $(if $(USE_SUBTARGET_CONFIG),$(LINUX_SUBTARGET_CONFIG)))
+LINUX_RECONFIG_TARGET = $(if $(USE_SUBTARGET_CONFIG),$(LINUX_SUBTARGET_CONFIG),$(LINUX_TARGET_CONFIG))
+
+# select the config file to be changed by kernel_menuconfig/kernel_oldconfig
+ifeq ($(CONFIG_TARGET),platform)
+  LINUX_RECONFIG_LIST = $(wildcard $(GENERIC_LINUX_CONFIG) $(LINUX_TARGET_CONFIG))
+  LINUX_RECONFIG_TARGET = $(LINUX_TARGET_CONFIG)
+endif
+ifeq ($(CONFIG_TARGET),subtarget)
+  LINUX_RECONFIG_LIST = $(wildcard $(GENERIC_LINUX_CONFIG) $(LINUX_TARGET_CONFIG) $(LINUX_SUBTARGET_CONFIG))
+  LINUX_RECONFIG_TARGET = $(LINUX_SUBTARGET_CONFIG)
+endif
+ifeq ($(CONFIG_TARGET),subtarget_platform)
+  LINUX_RECONFIG_LIST = $(wildcard $(GENERIC_LINUX_CONFIG) $(LINUX_SUBTARGET_CONFIG) $(LINUX_TARGET_CONFIG))
+  LINUX_RECONFIG_TARGET = $(LINUX_TARGET_CONFIG)
+endif
+ifeq ($(CONFIG_TARGET),env)
+  LINUX_RECONFIG_LIST = $(LINUX_KCONFIG_LIST)
+  LINUX_RECONFIG_TARGET = $(TOPDIR)/env/kernel-config
+endif
+
+__linux_confcmd = $(2) $(patsubst %,+,$(wordlist 2,9999,$(1))) $(1)
+
+LINUX_CONF_CMD = $(SCRIPT_DIR)/kconfig.pl $(call __linux_confcmd,$(LINUX_KCONFIG_LIST))
+LINUX_RECONF_CMD = $(SCRIPT_DIR)/kconfig.pl $(call __linux_confcmd,$(LINUX_RECONFIG_LIST))
+LINUX_RECONF_DIFF = $(SCRIPT_DIR)/kconfig.pl - '>' $(call __linux_confcmd,$(filter-out $(LINUX_RECONFIG_TARGET),$(LINUX_RECONFIG_LIST))) $(1) $(GENERIC_PLATFORM_DIR)/config-filter
+
+ifeq ($(DUMP),1)
+  BuildTarget=$(BuildTargets/DumpCurrent)
+
+  CPU_CFLAGS = -Os -pipe
+  ifneq ($(findstring mips,$(ARCH)),)
+    ifneq ($(findstring mips64,$(ARCH)),)
+      CPU_TYPE ?= mips64
+    else
+      CPU_TYPE ?= mips32
+    endif
+    CPU_CFLAGS += -mno-branch-likely
+    CPU_CFLAGS_mips32 = -mips32 -mtune=mips32
+    CPU_CFLAGS_mips64 = -mips64 -mtune=mips64 -mabi=64
+    CPU_CFLAGS_mips64r2 = -mips64r2 -mtune=mips64r2 -mabi=64
+    CPU_CFLAGS_4kec = -mips32r2 -mtune=4kec
+    CPU_CFLAGS_24kc = -mips32r2 -mtune=24kc
+    CPU_CFLAGS_74kc = -mips32r2 -mtune=74kc
+    CPU_CFLAGS_octeonplus = -march=octeon+ -mabi=64
+  endif
+  ifeq ($(ARCH),i386)
+    CPU_TYPE ?= pentium-mmx
+    CPU_CFLAGS_pentium-mmx = -march=pentium-mmx
+    CPU_CFLAGS_pentium4 = -march=pentium4
+  endif
+  ifneq ($(findstring arm,$(ARCH)),)
+    CPU_TYPE ?= xscale
+  endif
+  ifeq ($(ARCH),powerpc)
+    CPU_CFLAGS_603e:=-mcpu=603e
+    CPU_CFLAGS_8540:=-mcpu=8540
+    CPU_CFLAGS_405:=-mcpu=405
+    CPU_CFLAGS_440:=-mcpu=440
+    CPU_CFLAGS_464fp:=-mcpu=464fp
+  endif
+  ifeq ($(ARCH),powerpc64)
+    CPU_TYPE ?= powerpc64
+    CPU_CFLAGS_e5500:=-mcpu=e5500
+    CPU_CFLAGS_powerpc64:=-mcpu=powerpc64
+  endif
+  ifeq ($(ARCH),sparc)
+    CPU_TYPE = sparc
+    CPU_CFLAGS_ultrasparc = -mcpu=ultrasparc
+  endif
+  ifeq ($(ARCH),aarch64)
+    CPU_TYPE ?= generic
+    CPU_CFLAGS_generic = -mcpu=generic
+    CPU_CFLAGS_cortex-a53 = -mcpu=cortex-a53
+  endif
+  ifeq ($(ARCH),arc)
+    CPU_TYPE ?= arc700
+    CPU_CFLAGS += -matomic
+    CPU_CFLAGS_arc700 = -mcpu=arc700
+    CPU_CFLAGS_archs = -mcpu=archs
+  endif
+  ifneq ($(CPU_TYPE),)
+    ifndef CPU_CFLAGS_$(CPU_TYPE)
+      $(warning CPU_TYPE "$(CPU_TYPE)" doesn't correspond to a known type)
+    endif
+  endif
+  DEFAULT_CFLAGS=$(strip $(CPU_CFLAGS) $(CPU_CFLAGS_$(CPU_TYPE)) $(CPU_CFLAGS_$(CPU_SUBTYPE)))
+
+  ifneq ($(BOARD),)
+    TMP_CONFIG:=$(TMP_DIR)/.kconfig-$(call target_conf,$(TARGETID))
+    $(TMP_CONFIG): $(LINUX_KCONFIG_LIST)
+		$(LINUX_CONF_CMD) > $@ || rm -f $@
+    -include $(TMP_CONFIG)
+    .SILENT: $(TMP_CONFIG)
+    .PRECIOUS: $(TMP_CONFIG)
+
+    ifdef KERNEL_TESTING_PATCHVER
+      ifneq ($(KERNEL_TESTING_PATCHVER),$(KERNEL_PATCHVER))
+        FEATURES += testing-kernel
+      endif
+    endif
+    ifneq ($(CONFIG_OF),)
+      FEATURES += dt
+    endif
+    ifneq ($(CONFIG_GENERIC_GPIO)$(CONFIG_GPIOLIB),)
+      FEATURES += gpio
+    endif
+    ifneq ($(CONFIG_PCI),)
+      FEATURES += pci
+    endif
+    ifneq ($(CONFIG_PCIEPORTBUS),)
+      FEATURES += pcie
+    endif
+    ifneq ($(CONFIG_USB)$(CONFIG_USB_SUPPORT),)
+      ifneq ($(CONFIG_USB_ARCH_HAS_HCD)$(CONFIG_USB_EHCI_HCD),)
+        FEATURES += usb
+      endif
+    endif
+    ifneq ($(CONFIG_PCMCIA)$(CONFIG_PCCARD),)
+      FEATURES += pcmcia
+    endif
+    ifneq ($(CONFIG_VGA_CONSOLE)$(CONFIG_FB),)
+      FEATURES += display
+    endif
+    ifneq ($(CONFIG_RTC_CLASS),)
+      FEATURES += rtc
+    endif
+    ifneq ($(CONFIG_VIRTIO),)
+      FEATURES += virtio
+    endif
+    ifneq ($(CONFIG_CPU_MIPS32_R2),)
+      FEATURES += mips16
+    endif
+    FEATURES += $(foreach v,6 7,$(if $(CONFIG_CPU_V$(v)),arm_v$(v)))
+
+    # remove duplicates
+    FEATURES:=$(sort $(FEATURES))
+  endif
+endif
+
+CUR_SUBTARGET:=$(SUBTARGET)
+ifeq ($(SUBTARGETS),)
+  CUR_SUBTARGET := default
+endif
+
+define BuildTargets/DumpCurrent
+  .PHONY: dumpinfo
+  dumpinfo : export DESCRIPTION=$$(Target/Description)
+  dumpinfo:
+	@echo 'Target: $(TARGETID)'; \
+	 echo 'Target-Board: $(BOARD)'; \
+	 echo 'Target-Name: $(BOARDNAME)$(if $(SUBTARGETS),$(if $(SUBTARGET),))'; \
+	 echo 'Target-Arch: $(ARCH)'; \
+	 echo 'Target-Arch-Packages: $(if $(ARCH_PACKAGES),$(ARCH_PACKAGES),$(ARCH)$(if $(CPU_TYPE),_$(CPU_TYPE))$(if $(CPU_SUBTYPE),_$(CPU_SUBTYPE)))'; \
+	 echo 'Target-Features: $(FEATURES)'; \
+	 echo 'Target-Depends: $(DEPENDS)'; \
+	 echo 'Target-Optimization: $(if $(CFLAGS),$(CFLAGS),$(DEFAULT_CFLAGS))'; \
+	 echo 'CPU-Type: $(CPU_TYPE)$(if $(CPU_SUBTYPE),+$(CPU_SUBTYPE))'; \
+	 echo 'Linux-Version: $(LINUX_VERSION)'; \
+	$(if $(LINUX_TESTING_VERSION),echo 'Linux-Testing-Version: $(LINUX_TESTING_VERSION)';) \
+	 echo 'Linux-Release: $(LINUX_RELEASE)'; \
+	 echo 'Linux-Kernel-Arch: $(LINUX_KARCH)'; \
+	$(if $(SUBTARGET),,$(if $(DEFAULT_SUBTARGET), echo 'Default-Subtarget: $(DEFAULT_SUBTARGET)'; )) \
+	 echo 'Target-Description:'; \
+	 echo "$$$$DESCRIPTION"; \
+	 echo '@@'; \
+	 echo 'Default-Packages: $(DEFAULT_PACKAGES) $(call extra_packages,$(DEFAULT_PACKAGES))'; \
+	 $(DUMPINFO)
+	$(if $(CUR_SUBTARGET),$(SUBMAKE) -r --no-print-directory -C image -s DUMP=1 SUBTARGET=$(CUR_SUBTARGET))
+	$(if $(SUBTARGET),,@$(foreach SUBTARGET,$(SUBTARGETS),$(SUBMAKE) -s DUMP=1 SUBTARGET=$(SUBTARGET); ))
+endef
+
+include $(INCLUDE_DIR)/kernel.mk
+ifeq ($(TARGET_BUILD),1)
+  include $(INCLUDE_DIR)/kernel-build.mk
+  BuildTarget?=$(BuildKernel)
+endif
+
+endif #__target_inc
diff --git a/root/package/modems/Makefile b/root/package/modems/Makefile
new file mode 100644
index 00000000..a6da5603
--- /dev/null
+++ b/root/package/modems/Makefile
@@ -0,0 +1,39 @@
+#
+# Copyright (C) 2019 Teltonika
+#
+
+include $(TOPDIR)/rules.mk
+include $(INCLUDE_DIR)/download.mk
+
+PKG_NAME:=modems
+PKG_VERSION:=1
+
+PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)
+
+include $(INCLUDE_DIR)/package.mk
+
+define Package/modems
+	SECTION:=utils
+	CATEGORY:=Utilities
+	TITLE:=3G/4G modem list
+endef
+
+define Build/Compile
+endef
+
+define Package/modems/install
+	$(INSTALL_DIR) $(1)/lib/network/wwan/
+	$(INSTALL_DATA) $(PKG_BUILD_DIR)/data/* $(1)/lib/network/wwan/
+	#in order to keep the Lede GIT repo free of filenames with colons,
+	#we name the files xxxx-yyyy
+	# and rename here after copying to the build directory
+	shopt -s nullglob ; \
+	for filevar in $(1)/lib/network/wwan/*-* ; \
+	do \
+		FILENAME=$$$$(basename $$$$filevar) ; \
+		NEWNAME=$$$${FILENAME//-/:} ; \
+		mv "$(1)/lib/network/wwan/$$$$FILENAME" "$(1)/lib/network/wwan/$$$$NEWNAME" ; \
+	done
+endef
+
+$(eval $(call BuildPackage,modems))
diff --git a/root/package/modems/src/README.md b/root/package/modems/src/README.md
new file mode 100644
index 00000000..a7e58915
--- /dev/null
+++ b/root/package/modems/src/README.md
@@ -0,0 +1,2 @@
+# modems
+
diff --git a/root/package/modems/src/data/0421-03a7 b/root/package/modems/src/data/0421-03a7
new file mode 100644
index 00000000..13134013
--- /dev/null
+++ b/root/package/modems/src/data/0421-03a7
@@ -0,0 +1,6 @@
+{
+	"desc": "Nokia C5-00 Mobile phone",
+	"control": 0,
+	"data": 0
+}	"acm": 1
+}
diff --git a/root/package/modems/src/data/0421-060d b/root/package/modems/src/data/0421-060d
new file mode 100644
index 00000000..a9ad650d
--- /dev/null
+++ b/root/package/modems/src/data/0421-060d
@@ -0,0 +1,6 @@
+{
+	"desc": "Nokia CS-10",
+	"control": 0,
+	"data": 0
+}	"acm": 1
+}
diff --git a/root/package/modems/src/data/0421-060e b/root/package/modems/src/data/0421-060e
new file mode 100644
index 00000000..a9ad650d
--- /dev/null
+++ b/root/package/modems/src/data/0421-060e
@@ -0,0 +1,6 @@
+{
+	"desc": "Nokia CS-10",
+	"control": 0,
+	"data": 0
+}	"acm": 1
+}
diff --git a/root/package/modems/src/data/0421-0612 b/root/package/modems/src/data/0421-0612
new file mode 100644
index 00000000..bc3e780b
--- /dev/null
+++ b/root/package/modems/src/data/0421-0612
@@ -0,0 +1,6 @@
+{
+	"desc": "Nokia CS-15/CS-18",
+	"control": 0,
+	"data": 0
+}	"acm": 1
+}
diff --git a/root/package/modems/src/data/0421-0619 b/root/package/modems/src/data/0421-0619
new file mode 100644
index 00000000..52fbf584
--- /dev/null
+++ b/root/package/modems/src/data/0421-0619
@@ -0,0 +1,6 @@
+{
+	"desc": "Nokia CS-12",
+	"control": 0,
+	"data": 0
+}	"acm": 1
+}
diff --git a/root/package/modems/src/data/0421-061e b/root/package/modems/src/data/0421-061e
new file mode 100644
index 00000000..c1cb9f44
--- /dev/null
+++ b/root/package/modems/src/data/0421-061e
@@ -0,0 +1,6 @@
+{
+	"desc": "Nokia CS-11",
+	"control": 0,
+	"data": 0
+}	"acm": 1
+}
diff --git a/root/package/modems/src/data/0421-0623 b/root/package/modems/src/data/0421-0623
new file mode 100644
index 00000000..f6674bac
--- /dev/null
+++ b/root/package/modems/src/data/0421-0623
@@ -0,0 +1,6 @@
+{
+	"desc": "Nokia CS-17",
+	"control": 0,
+	"data": 0
+}	"acm": 1
+}
diff --git a/root/package/modems/src/data/0421-0629 b/root/package/modems/src/data/0421-0629
new file mode 100644
index 00000000..b637c344
--- /dev/null
+++ b/root/package/modems/src/data/0421-0629
@@ -0,0 +1,6 @@
+{
+	"desc": "Nokia CS-18",
+	"control": 0,
+	"data": 0
+}	"acm": 1
+}
diff --git a/root/package/modems/src/data/0421-062d b/root/package/modems/src/data/0421-062d
new file mode 100644
index 00000000..a95192b8
--- /dev/null
+++ b/root/package/modems/src/data/0421-062d
@@ -0,0 +1,6 @@
+{
+	"desc": "Nokia CS-19",
+	"control": 0,
+	"data": 0
+}	"acm": 1
+}
diff --git a/root/package/modems/src/data/0421-062f b/root/package/modems/src/data/0421-062f
new file mode 100644
index 00000000..a95192b8
--- /dev/null
+++ b/root/package/modems/src/data/0421-062f
@@ -0,0 +1,6 @@
+{
+	"desc": "Nokia CS-19",
+	"control": 0,
+	"data": 0
+}	"acm": 1
+}
diff --git a/root/package/modems/src/data/0421-0638 b/root/package/modems/src/data/0421-0638
new file mode 100644
index 00000000..5fa7d498
--- /dev/null
+++ b/root/package/modems/src/data/0421-0638
@@ -0,0 +1,6 @@
+{
+	"desc": "Nokia 21M-02",
+	"control": 0,
+	"data": 0
+}	"acm": 1
+}
diff --git a/root/package/modems/src/data/05c6-0016 b/root/package/modems/src/data/05c6-0016
new file mode 100644
index 00000000..1a4a796b
--- /dev/null
+++ b/root/package/modems/src/data/05c6-0016
@@ -0,0 +1,6 @@
+{
+	"desc": "iBall 3.5G Connect",
+	"control": 2,
+	"data": 2
+}	"generic": 1
+}
diff --git a/root/package/modems/src/data/05c6-0023 b/root/package/modems/src/data/05c6-0023
new file mode 100644
index 00000000..ce288ed4
--- /dev/null
+++ b/root/package/modems/src/data/05c6-0023
@@ -0,0 +1,5 @@
+{
+	"desc": "Leoxsys LN-72V",
+	"control": 2,
+	"data": 0
+}}
diff --git a/root/package/modems/src/data/05c6-00a0 b/root/package/modems/src/data/05c6-00a0
new file mode 100644
index 00000000..0b961602
--- /dev/null
+++ b/root/package/modems/src/data/05c6-00a0
@@ -0,0 +1,6 @@
+{
+	"desc": "Axesstel MV241",
+	"control": 2,
+	"data": 0
+}	"generic": 1
+}
diff --git a/root/package/modems/src/data/05c6-6000 b/root/package/modems/src/data/05c6-6000
new file mode 100644
index 00000000..e8863b9e
--- /dev/null
+++ b/root/package/modems/src/data/05c6-6000
@@ -0,0 +1,5 @@
+{
+	"desc": "Siemens SG75",
+	"control": 2,
+	"data": 0
+}}
diff --git a/root/package/modems/src/data/05c6-9000 b/root/package/modems/src/data/05c6-9000
new file mode 100644
index 00000000..6a72f4ff
--- /dev/null
+++ b/root/package/modems/src/data/05c6-9000
@@ -0,0 +1,5 @@
+{
+	"desc": "Generic Qualcomm",
+	"control": 1,
+	"data": 2
+}}
diff --git a/root/package/modems/src/data/05c6-9215 b/root/package/modems/src/data/05c6-9215
new file mode 100644
index 00000000..14317a03
--- /dev/null
+++ b/root/package/modems/src/data/05c6-9215
@@ -0,0 +1,8 @@
+{
+	"desc": "Quectel EC20",
+	"type": "gobinet",
+	"control": 2,
+	"boudrate": 115200,
+	"stop_bits": 8,
+	"gps": 1
+}
diff --git a/root/package/modems/src/data/07d1-3e01 b/root/package/modems/src/data/07d1-3e01
new file mode 100644
index 00000000..b1da1770
--- /dev/null
+++ b/root/package/modems/src/data/07d1-3e01
@@ -0,0 +1,5 @@
+{
+	"desc": "D-Link DWM-152",
+	"control": 1,
+	"data": 0
+}}
diff --git a/root/package/modems/src/data/07d1-3e02 b/root/package/modems/src/data/07d1-3e02
new file mode 100644
index 00000000..cd1eceed
--- /dev/null
+++ b/root/package/modems/src/data/07d1-3e02
@@ -0,0 +1,5 @@
+{
+	"desc": "D-Link DWM-156",
+	"control": 1,
+	"data": 0
+}}
diff --git a/root/package/modems/src/data/07d1-7e11 b/root/package/modems/src/data/07d1-7e11
new file mode 100644
index 00000000..84705b75
--- /dev/null
+++ b/root/package/modems/src/data/07d1-7e11
@@ -0,0 +1,6 @@
+{
+	"desc": "D-Link DWM-156",
+	"control": 1,
+	"data": 2
+}	"generic": 1
+}
diff --git a/root/package/modems/src/data/0af0-4005 b/root/package/modems/src/data/0af0-4005
new file mode 100644
index 00000000..5ab6c127
--- /dev/null
+++ b/root/package/modems/src/data/0af0-4005
@@ -0,0 +1,4 @@
+{
+	"desc": "Option GIO711",
+	"type": "qmi"
+}
diff --git a/root/package/modems/src/data/0af0-6901 b/root/package/modems/src/data/0af0-6901
new file mode 100644
index 00000000..06b26643
--- /dev/null
+++ b/root/package/modems/src/data/0af0-6901
@@ -0,0 +1,5 @@
+{
+	"desc": "Option GI0201",
+	"control": 1,
+	"data": 0
+}}
diff --git a/root/package/modems/src/data/0af0-7201 b/root/package/modems/src/data/0af0-7201
new file mode 100644
index 00000000..20b18b76
--- /dev/null
+++ b/root/package/modems/src/data/0af0-7201
@@ -0,0 +1,5 @@
+{
+	"desc": "Option GTM380",
+	"control": 1,
+	"data": 0
+}}
diff --git a/root/package/modems/src/data/0af0-8120 b/root/package/modems/src/data/0af0-8120
new file mode 100644
index 00000000..c378e7fa
--- /dev/null
+++ b/root/package/modems/src/data/0af0-8120
@@ -0,0 +1,4 @@
+{
+	"desc": "Option GTM681W",
+	"type": "qmi"
+}
diff --git a/root/package/modems/src/data/0af0-9200 b/root/package/modems/src/data/0af0-9200
new file mode 100644
index 00000000..7e55a366
--- /dev/null
+++ b/root/package/modems/src/data/0af0-9200
@@ -0,0 +1,5 @@
+{
+	"desc": "Option GTM671WFS",
+	"control": 2,
+	"data": 2
+}}
diff --git a/root/package/modems/src/data/0b3c-c000 b/root/package/modems/src/data/0b3c-c000
new file mode 100644
index 00000000..b45bbf41
--- /dev/null
+++ b/root/package/modems/src/data/0b3c-c000
@@ -0,0 +1,4 @@
+{
+	"desc": "Olivetti Olicard 100",
+	"type": "qmi"
+}
diff --git a/root/package/modems/src/data/0b3c-c001 b/root/package/modems/src/data/0b3c-c001
new file mode 100644
index 00000000..74a03346
--- /dev/null
+++ b/root/package/modems/src/data/0b3c-c001
@@ -0,0 +1,4 @@
+{
+	"desc": "Olivetti Olicard 120",
+	"type": "qmi"
+}
diff --git a/root/package/modems/src/data/0b3c-c002 b/root/package/modems/src/data/0b3c-c002
new file mode 100644
index 00000000..ed4f2fd3
--- /dev/null
+++ b/root/package/modems/src/data/0b3c-c002
@@ -0,0 +1,4 @@
+{
+	"desc": "Olivetti Olicard 140",
+	"type": "qmi"
+}
diff --git a/root/package/modems/src/data/0b3c-c003 b/root/package/modems/src/data/0b3c-c003
new file mode 100644
index 00000000..5b4ea480
--- /dev/null
+++ b/root/package/modems/src/data/0b3c-c003
@@ -0,0 +1,5 @@
+{
+	"desc": "Olivetti Olicard 145",
+	"control": 0,
+	"data": 4
+}}
diff --git a/root/package/modems/src/data/0b3c-c004 b/root/package/modems/src/data/0b3c-c004
new file mode 100644
index 00000000..d8193790
--- /dev/null
+++ b/root/package/modems/src/data/0b3c-c004
@@ -0,0 +1,4 @@
+{
+	"desc": "Olivetti Olicard 155",
+	"type": "qmi"
+}
diff --git a/root/package/modems/src/data/0b3c-c005 b/root/package/modems/src/data/0b3c-c005
new file mode 100644
index 00000000..f3768c6d
--- /dev/null
+++ b/root/package/modems/src/data/0b3c-c005
@@ -0,0 +1,4 @@
+{
+	"desc": "Olivetti Olicard 200",
+	"type": "qmi"
+}
diff --git a/root/package/modems/src/data/0b3c-c00a b/root/package/modems/src/data/0b3c-c00a
new file mode 100644
index 00000000..a2ba14ab
--- /dev/null
+++ b/root/package/modems/src/data/0b3c-c00a
@@ -0,0 +1,4 @@
+{
+	"desc": "Olivetti Olicard 160",
+	"type": "qmi"
+}
diff --git a/root/package/modems/src/data/0b3c-c00b b/root/package/modems/src/data/0b3c-c00b
new file mode 100644
index 00000000..1c6edb1f
--- /dev/null
+++ b/root/package/modems/src/data/0b3c-c00b
@@ -0,0 +1,4 @@
+{
+	"desc": "Olivetti Olicard 500",
+	"type": "qmi"
+}
diff --git a/root/package/modems/src/data/0bdb-1900 b/root/package/modems/src/data/0bdb-1900
new file mode 100644
index 00000000..84a9a9b7
--- /dev/null
+++ b/root/package/modems/src/data/0bdb-1900
@@ -0,0 +1,6 @@
+{
+	"desc": "Ericsson F3507g",
+	"control": 4,
+	"data": 1
+}	"acm": 1
+}
diff --git a/root/package/modems/src/data/0bdb-1902 b/root/package/modems/src/data/0bdb-1902
new file mode 100644
index 00000000..84a9a9b7
--- /dev/null
+++ b/root/package/modems/src/data/0bdb-1902
@@ -0,0 +1,6 @@
+{
+	"desc": "Ericsson F3507g",
+	"control": 4,
+	"data": 1
+}	"acm": 1
+}
diff --git a/root/package/modems/src/data/0bdb-190a b/root/package/modems/src/data/0bdb-190a
new file mode 100644
index 00000000..2e826130
--- /dev/null
+++ b/root/package/modems/src/data/0bdb-190a
@@ -0,0 +1,6 @@
+{
+	"desc": "Ericsson F3307",
+	"control": 4,
+	"data": 1
+}	"acm": 1
+}
diff --git a/root/package/modems/src/data/0bdb-190d b/root/package/modems/src/data/0bdb-190d
new file mode 100644
index 00000000..2f725eb7
--- /dev/null
+++ b/root/package/modems/src/data/0bdb-190d
@@ -0,0 +1,6 @@
+{
+	"desc": "Ericsson F5521gw",
+	"control": 4,
+	"data": 1
+}	"acm": 1
+}
diff --git a/root/package/modems/src/data/0bdb-1910 b/root/package/modems/src/data/0bdb-1910
new file mode 100644
index 00000000..2f725eb7
--- /dev/null
+++ b/root/package/modems/src/data/0bdb-1910
@@ -0,0 +1,6 @@
+{
+	"desc": "Ericsson F5521gw",
+	"control": 4,
+	"data": 1
+}	"acm": 1
+}
diff --git a/root/package/modems/src/data/0c88-17da b/root/package/modems/src/data/0c88-17da
new file mode 100644
index 00000000..d5ca787a
--- /dev/null
+++ b/root/package/modems/src/data/0c88-17da
@@ -0,0 +1,5 @@
+{
+	"desc": "Kyocera KPC650",
+	"control": 0,
+	"data": 0
+}}
diff --git a/root/package/modems/src/data/0c88-180a b/root/package/modems/src/data/0c88-180a
new file mode 100644
index 00000000..a2bee34e
--- /dev/null
+++ b/root/package/modems/src/data/0c88-180a
@@ -0,0 +1,5 @@
+{
+	"desc": "Kyocera KPC680",
+	"control": 0,
+	"data": 0
+}}
diff --git a/root/package/modems/src/data/0f3d-68a2 b/root/package/modems/src/data/0f3d-68a2
new file mode 100644
index 00000000..f85a049c
--- /dev/null
+++ b/root/package/modems/src/data/0f3d-68a2
@@ -0,0 +1,4 @@
+{
+	"desc": "Sierra MC7700",
+	"type": "qmi"
+}
diff --git a/root/package/modems/src/data/0f3d-68aa b/root/package/modems/src/data/0f3d-68aa
new file mode 100644
index 00000000..3a68c206
--- /dev/null
+++ b/root/package/modems/src/data/0f3d-68aa
@@ -0,0 +1,5 @@
+{
+	"desc": "Sierra Wireless AC313U/320U/330U Direct IP",
+	"control": 3,
+	"data": 3
+}}
diff --git a/root/package/modems/src/data/1004-6124 b/root/package/modems/src/data/1004-6124
new file mode 100644
index 00000000..471d8a5c
--- /dev/null
+++ b/root/package/modems/src/data/1004-6124
@@ -0,0 +1,6 @@
+{
+	"desc": "LG L-05A",
+	"control": 0,
+	"data": 2
+}	"acm": 1
+}
diff --git a/root/package/modems/src/data/1004-6141 b/root/package/modems/src/data/1004-6141
new file mode 100644
index 00000000..840dc64c
--- /dev/null
+++ b/root/package/modems/src/data/1004-6141
@@ -0,0 +1,6 @@
+{
+	"desc": "LG LUU-2100TI",
+	"control": 0,
+	"data": 2
+}	"acm": 1
+}
diff --git a/root/package/modems/src/data/1004-6157 b/root/package/modems/src/data/1004-6157
new file mode 100644
index 00000000..ec949566
--- /dev/null
+++ b/root/package/modems/src/data/1004-6157
@@ -0,0 +1,6 @@
+{
+	"desc": "LG LUU-2110TI",
+	"control": 0,
+	"data": 2
+}	"acm": 1
+}
diff --git a/root/package/modems/src/data/1004-618f b/root/package/modems/src/data/1004-618f
new file mode 100644
index 00000000..df98b66b
--- /dev/null
+++ b/root/package/modems/src/data/1004-618f
@@ -0,0 +1,5 @@
+{
+	"desc": "LG L-02C",
+	"control": 0,
+	"data": 2
+}}
diff --git a/root/package/modems/src/data/106c-3711 b/root/package/modems/src/data/106c-3711
new file mode 100644
index 00000000..4d22d4da
--- /dev/null
+++ b/root/package/modems/src/data/106c-3711
@@ -0,0 +1,6 @@
+{
+	"desc": "PANTECH UM-150",
+	"control": 0,
+	"data": 0
+}	"acm": 1
+}
diff --git a/root/package/modems/src/data/106c-3714 b/root/package/modems/src/data/106c-3714
new file mode 100644
index 00000000..5fa2a3a6
--- /dev/null
+++ b/root/package/modems/src/data/106c-3714
@@ -0,0 +1,6 @@
+{
+	"desc": "PANTECH UM-175",
+	"control": 0,
+	"data": 0
+}	"acm": 1
+}
diff --git a/root/package/modems/src/data/106c-3715 b/root/package/modems/src/data/106c-3715
new file mode 100644
index 00000000..8cbe23da
--- /dev/null
+++ b/root/package/modems/src/data/106c-3715
@@ -0,0 +1,6 @@
+{
+	"desc": "PANTECH UM-175AL",
+	"control": 0,
+	"data": 0
+}	"acm": 1
+}
diff --git a/root/package/modems/src/data/106c-3716 b/root/package/modems/src/data/106c-3716
new file mode 100644
index 00000000..18bd074f
--- /dev/null
+++ b/root/package/modems/src/data/106c-3716
@@ -0,0 +1,6 @@
+{
+	"desc": "PANTECH UM-190",
+	"control": 0,
+	"data": 0
+}	"acm": 1
+}
diff --git a/root/package/modems/src/data/106c-3717 b/root/package/modems/src/data/106c-3717
new file mode 100644
index 00000000..e028a4b4
--- /dev/null
+++ b/root/package/modems/src/data/106c-3717
@@ -0,0 +1,6 @@
+{
+	"desc": "PANTECH UM-185C/UM185E",
+	"control": 0,
+	"data": 0
+}	"acm": 1
+}
diff --git a/root/package/modems/src/data/106c-3718 b/root/package/modems/src/data/106c-3718
new file mode 100644
index 00000000..362f482b
--- /dev/null
+++ b/root/package/modems/src/data/106c-3718
@@ -0,0 +1,4 @@
+{
+	"desc": "PANTECH UML-290 4G Modem",
+	"type": "qmi"
+}
diff --git a/root/package/modems/src/data/106c-3721 b/root/package/modems/src/data/106c-3721
new file mode 100644
index 00000000..ac61a082
--- /dev/null
+++ b/root/package/modems/src/data/106c-3721
@@ -0,0 +1,4 @@
+{
+	"desc": "PANTECH P4200 4G Modem",
+	"type": "qmi"
+}
diff --git a/root/package/modems/src/data/1199-0017 b/root/package/modems/src/data/1199-0017
new file mode 100644
index 00000000..a50654d7
--- /dev/null
+++ b/root/package/modems/src/data/1199-0017
@@ -0,0 +1,5 @@
+{
+	"desc": "Sierra EM5625",
+	"control": 3,
+	"data": 4
+}}
diff --git a/root/package/modems/src/data/1199-0018 b/root/package/modems/src/data/1199-0018
new file mode 100644
index 00000000..02d7494a
--- /dev/null
+++ b/root/package/modems/src/data/1199-0018
@@ -0,0 +1,5 @@
+{
+	"desc": "Sierra MC5720",
+	"control": 3,
+	"data": 4
+}}
diff --git a/root/package/modems/src/data/1199-0019 b/root/package/modems/src/data/1199-0019
new file mode 100644
index 00000000..4d6d4a9d
--- /dev/null
+++ b/root/package/modems/src/data/1199-0019
@@ -0,0 +1,5 @@
+{
+	"desc": "Sierra AC595U",
+	"control": 3,
+	"data": 4
+}}
diff --git a/root/package/modems/src/data/1199-0020 b/root/package/modems/src/data/1199-0020
new file mode 100644
index 00000000..3482db4d
--- /dev/null
+++ b/root/package/modems/src/data/1199-0020
@@ -0,0 +1,5 @@
+{
+	"desc": "Sierra MC5725",
+	"control": 3,
+	"data": 4
+}}
diff --git a/root/package/modems/src/data/1199-0021 b/root/package/modems/src/data/1199-0021
new file mode 100644
index 00000000..226c1b44
--- /dev/null
+++ b/root/package/modems/src/data/1199-0021
@@ -0,0 +1,5 @@
+{
+	"desc": "Sierra AC597E",
+	"control": 3,
+	"data": 4
+}}
diff --git a/root/package/modems/src/data/1199-0022 b/root/package/modems/src/data/1199-0022
new file mode 100644
index 00000000..dd089a37
--- /dev/null
+++ b/root/package/modems/src/data/1199-0022
@@ -0,0 +1,5 @@
+{
+	"desc": "Sierra EM5725",
+	"control": 3,
+	"data": 4
+}}
diff --git a/root/package/modems/src/data/1199-0023 b/root/package/modems/src/data/1199-0023
new file mode 100644
index 00000000..9c7e72b9
--- /dev/null
+++ b/root/package/modems/src/data/1199-0023
@@ -0,0 +1,5 @@
+{
+	"desc": "Sierra AC597",
+	"control": 3,
+	"data": 4
+}}
diff --git a/root/package/modems/src/data/1199-0024 b/root/package/modems/src/data/1199-0024
new file mode 100644
index 00000000..425d4ccc
--- /dev/null
+++ b/root/package/modems/src/data/1199-0024
@@ -0,0 +1,5 @@
+{
+	"desc": "Sierra MC5727 CDMA",
+	"control": 3,
+	"data": 4
+}}
diff --git a/root/package/modems/src/data/1199-0025 b/root/package/modems/src/data/1199-0025
new file mode 100644
index 00000000..002d6fb1
--- /dev/null
+++ b/root/package/modems/src/data/1199-0025
@@ -0,0 +1,5 @@
+{
+	"desc": "Sierra AC598",
+	"control": 3,
+	"data": 4
+}}
diff --git a/root/package/modems/src/data/1199-0026 b/root/package/modems/src/data/1199-0026
new file mode 100644
index 00000000..13998dee
--- /dev/null
+++ b/root/package/modems/src/data/1199-0026
@@ -0,0 +1,5 @@
+{
+	"desc": "Sierra T11",
+	"control": 3,
+	"data": 4
+}}
diff --git a/root/package/modems/src/data/1199-0027 b/root/package/modems/src/data/1199-0027
new file mode 100644
index 00000000..af4824c9
--- /dev/null
+++ b/root/package/modems/src/data/1199-0027
@@ -0,0 +1,5 @@
+{
+	"desc": "Sierra AC402",
+	"control": 3,
+	"data": 4
+}}
diff --git a/root/package/modems/src/data/1199-0028 b/root/package/modems/src/data/1199-0028
new file mode 100644
index 00000000..34c896e4
--- /dev/null
+++ b/root/package/modems/src/data/1199-0028
@@ -0,0 +1,5 @@
+{
+	"desc": "Sierra MC5728",
+	"control": 3,
+	"data": 4
+}}
diff --git a/root/package/modems/src/data/1199-0112 b/root/package/modems/src/data/1199-0112
new file mode 100644
index 00000000..083baeea
--- /dev/null
+++ b/root/package/modems/src/data/1199-0112
@@ -0,0 +1,5 @@
+{
+	"desc": "Sierra CDMA 1xEVDO PC Card, AC580",
+	"control": 3,
+	"data": 4
+}}
diff --git a/root/package/modems/src/data/1199-0120 b/root/package/modems/src/data/1199-0120
new file mode 100644
index 00000000..4d6d4a9d
--- /dev/null
+++ b/root/package/modems/src/data/1199-0120
@@ -0,0 +1,5 @@
+{
+	"desc": "Sierra AC595U",
+	"control": 3,
+	"data": 4
+}}
diff --git a/root/package/modems/src/data/1199-0218 b/root/package/modems/src/data/1199-0218
new file mode 100644
index 00000000..02d7494a
--- /dev/null
+++ b/root/package/modems/src/data/1199-0218
@@ -0,0 +1,5 @@
+{
+	"desc": "Sierra MC5720",
+	"control": 3,
+	"data": 4
+}}
diff --git a/root/package/modems/src/data/1199-0220 b/root/package/modems/src/data/1199-0220
new file mode 100644
index 00000000..3482db4d
--- /dev/null
+++ b/root/package/modems/src/data/1199-0220
@@ -0,0 +1,5 @@
+{
+	"desc": "Sierra MC5725",
+	"control": 3,
+	"data": 4
+}}
diff --git a/root/package/modems/src/data/1199-0224 b/root/package/modems/src/data/1199-0224
new file mode 100644
index 00000000..a57e54a6
--- /dev/null
+++ b/root/package/modems/src/data/1199-0224
@@ -0,0 +1,5 @@
+{
+	"desc": "Sierra MC5727",
+	"control": 3,
+	"data": 4
+}}
diff --git a/root/package/modems/src/data/1199-0301 b/root/package/modems/src/data/1199-0301
new file mode 100644
index 00000000..13fd7da9
--- /dev/null
+++ b/root/package/modems/src/data/1199-0301
@@ -0,0 +1,5 @@
+{
+	"desc": "Sierra AC250U",
+	"control": 3,
+	"data": 4
+}}
diff --git a/root/package/modems/src/data/1199-6802 b/root/package/modems/src/data/1199-6802
new file mode 100644
index 00000000..d9bd29f9
--- /dev/null
+++ b/root/package/modems/src/data/1199-6802
@@ -0,0 +1,5 @@
+{
+	"desc": "Sierra MC8755",
+	"control": 0,
+	"data": 2
+}}
diff --git a/root/package/modems/src/data/1199-6803 b/root/package/modems/src/data/1199-6803
new file mode 100644
index 00000000..c694fa3e
--- /dev/null
+++ b/root/package/modems/src/data/1199-6803
@@ -0,0 +1,5 @@
+{
+	"desc": "Sierra MC8765",
+	"control": 0,
+	"data": 2
+}}
diff --git a/root/package/modems/src/data/1199-6804 b/root/package/modems/src/data/1199-6804
new file mode 100644
index 00000000..d9bd29f9
--- /dev/null
+++ b/root/package/modems/src/data/1199-6804
@@ -0,0 +1,5 @@
+{
+	"desc": "Sierra MC8755",
+	"control": 0,
+	"data": 2
+}}
diff --git a/root/package/modems/src/data/1199-6805 b/root/package/modems/src/data/1199-6805
new file mode 100644
index 00000000..c694fa3e
--- /dev/null
+++ b/root/package/modems/src/data/1199-6805
@@ -0,0 +1,5 @@
+{
+	"desc": "Sierra MC8765",
+	"control": 0,
+	"data": 2
+}}
diff --git a/root/package/modems/src/data/1199-6808 b/root/package/modems/src/data/1199-6808
new file mode 100644
index 00000000..d9bd29f9
--- /dev/null
+++ b/root/package/modems/src/data/1199-6808
@@ -0,0 +1,5 @@
+{
+	"desc": "Sierra MC8755",
+	"control": 0,
+	"data": 2
+}}
diff --git a/root/package/modems/src/data/1199-6809 b/root/package/modems/src/data/1199-6809
new file mode 100644
index 00000000..d9bd29f9
--- /dev/null
+++ b/root/package/modems/src/data/1199-6809
@@ -0,0 +1,5 @@
+{
+	"desc": "Sierra MC8755",
+	"control": 0,
+	"data": 2
+}}
diff --git a/root/package/modems/src/data/1199-6813 b/root/package/modems/src/data/1199-6813
new file mode 100644
index 00000000..f10c1044
--- /dev/null
+++ b/root/package/modems/src/data/1199-6813
@@ -0,0 +1,5 @@
+{
+	"desc": "Sierra MC8775",
+	"control": 0,
+	"data": 2
+}}
diff --git a/root/package/modems/src/data/1199-6815 b/root/package/modems/src/data/1199-6815
new file mode 100644
index 00000000..f10c1044
--- /dev/null
+++ b/root/package/modems/src/data/1199-6815
@@ -0,0 +1,5 @@
+{
+	"desc": "Sierra MC8775",
+	"control": 0,
+	"data": 2
+}}
diff --git a/root/package/modems/src/data/1199-6816 b/root/package/modems/src/data/1199-6816
new file mode 100644
index 00000000..f10c1044
--- /dev/null
+++ b/root/package/modems/src/data/1199-6816
@@ -0,0 +1,5 @@
+{
+	"desc": "Sierra MC8775",
+	"control": 0,
+	"data": 2
+}}
diff --git a/root/package/modems/src/data/1199-6820 b/root/package/modems/src/data/1199-6820
new file mode 100644
index 00000000..ce52c8f2
--- /dev/null
+++ b/root/package/modems/src/data/1199-6820
@@ -0,0 +1,5 @@
+{
+	"desc": "Sierra AC875",
+	"control": 0,
+	"data": 2
+}}
diff --git a/root/package/modems/src/data/1199-6821 b/root/package/modems/src/data/1199-6821
new file mode 100644
index 00000000..3ebd0be1
--- /dev/null
+++ b/root/package/modems/src/data/1199-6821
@@ -0,0 +1,5 @@
+{
+	"desc": "Sierra AC875U",
+	"control": 2,
+	"data": 0
+}}
diff --git a/root/package/modems/src/data/1199-6822 b/root/package/modems/src/data/1199-6822
new file mode 100644
index 00000000..35ee919c
--- /dev/null
+++ b/root/package/modems/src/data/1199-6822
@@ -0,0 +1,5 @@
+{
+	"desc": "Sierra AC875E",
+	"control": 3,
+	"data": 4
+}}
diff --git a/root/package/modems/src/data/1199-6833 b/root/package/modems/src/data/1199-6833
new file mode 100644
index 00000000..0fcd10e9
--- /dev/null
+++ b/root/package/modems/src/data/1199-6833
@@ -0,0 +1,5 @@
+{
+	"desc": "Sierra MC8781",
+	"control": 3,
+	"data": 4
+}}
diff --git a/root/package/modems/src/data/1199-6834 b/root/package/modems/src/data/1199-6834
new file mode 100644
index 00000000..0b9eadf7
--- /dev/null
+++ b/root/package/modems/src/data/1199-6834
@@ -0,0 +1,5 @@
+{
+	"desc": "Sierra MC8780",
+	"control": 3,
+	"data": 4
+}}
diff --git a/root/package/modems/src/data/1199-6835 b/root/package/modems/src/data/1199-6835
new file mode 100644
index 00000000..0fcd10e9
--- /dev/null
+++ b/root/package/modems/src/data/1199-6835
@@ -0,0 +1,5 @@
+{
+	"desc": "Sierra MC8781",
+	"control": 3,
+	"data": 4
+}}
diff --git a/root/package/modems/src/data/1199-6838 b/root/package/modems/src/data/1199-6838
new file mode 100644
index 00000000..0b9eadf7
--- /dev/null
+++ b/root/package/modems/src/data/1199-6838
@@ -0,0 +1,5 @@
+{
+	"desc": "Sierra MC8780",
+	"control": 3,
+	"data": 4
+}}
diff --git a/root/package/modems/src/data/1199-6839 b/root/package/modems/src/data/1199-6839
new file mode 100644
index 00000000..0fcd10e9
--- /dev/null
+++ b/root/package/modems/src/data/1199-6839
@@ -0,0 +1,5 @@
+{
+	"desc": "Sierra MC8781",
+	"control": 3,
+	"data": 4
+}}
diff --git a/root/package/modems/src/data/1199-683a b/root/package/modems/src/data/1199-683a
new file mode 100644
index 00000000..02da610c
--- /dev/null
+++ b/root/package/modems/src/data/1199-683a
@@ -0,0 +1,5 @@
+{
+	"desc": "Sierra MC8785",
+	"control": 3,
+	"data": 4
+}}
diff --git a/root/package/modems/src/data/1199-683b b/root/package/modems/src/data/1199-683b
new file mode 100644
index 00000000..0f2a133c
--- /dev/null
+++ b/root/package/modems/src/data/1199-683b
@@ -0,0 +1,5 @@
+{
+	"desc": "Sierra MC8785 Composite",
+	"control": 3,
+	"data": 4
+}}
diff --git a/root/package/modems/src/data/1199-6850 b/root/package/modems/src/data/1199-6850
new file mode 100644
index 00000000..1989d0ab
--- /dev/null
+++ b/root/package/modems/src/data/1199-6850
@@ -0,0 +1,5 @@
+{
+	"desc": "Sierra AC880",
+	"control": 2,
+	"data": 0
+}}
diff --git a/root/package/modems/src/data/1199-6851 b/root/package/modems/src/data/1199-6851
new file mode 100644
index 00000000..16d8ab46
--- /dev/null
+++ b/root/package/modems/src/data/1199-6851
@@ -0,0 +1,5 @@
+{
+	"desc": "Sierra AC 881",
+	"control": 2,
+	"data": 0
+}}
diff --git a/root/package/modems/src/data/1199-6852 b/root/package/modems/src/data/1199-6852
new file mode 100644
index 00000000..65be37b7
--- /dev/null
+++ b/root/package/modems/src/data/1199-6852
@@ -0,0 +1,5 @@
+{
+	"desc": "Sierra AC880E",
+	"control": 2,
+	"data": 0
+}}
diff --git a/root/package/modems/src/data/1199-6853 b/root/package/modems/src/data/1199-6853
new file mode 100644
index 00000000..a8aee6d9
--- /dev/null
+++ b/root/package/modems/src/data/1199-6853
@@ -0,0 +1,5 @@
+{
+	"desc": "Sierra AC881E",
+	"control": 2,
+	"data": 0
+}}
diff --git a/root/package/modems/src/data/1199-6855 b/root/package/modems/src/data/1199-6855
new file mode 100644
index 00000000..24eddc6f
--- /dev/null
+++ b/root/package/modems/src/data/1199-6855
@@ -0,0 +1,5 @@
+{
+	"desc": "Sierra AC880U",
+	"control": 2,
+	"data": 0
+}}
diff --git a/root/package/modems/src/data/1199-6856 b/root/package/modems/src/data/1199-6856
new file mode 100644
index 00000000..415a80a1
--- /dev/null
+++ b/root/package/modems/src/data/1199-6856
@@ -0,0 +1,5 @@
+{
+	"desc": "Sierra ATT USB Connect 881",
+	"control": 2,
+	"data": 0
+}}
diff --git a/root/package/modems/src/data/1199-6859 b/root/package/modems/src/data/1199-6859
new file mode 100644
index 00000000..075cc6bc
--- /dev/null
+++ b/root/package/modems/src/data/1199-6859
@@ -0,0 +1,5 @@
+{
+	"desc": "Sierra AC885E",
+	"control": 2,
+	"data": 0
+}}
diff --git a/root/package/modems/src/data/1199-685a b/root/package/modems/src/data/1199-685a
new file mode 100644
index 00000000..075cc6bc
--- /dev/null
+++ b/root/package/modems/src/data/1199-685a
@@ -0,0 +1,5 @@
+{
+	"desc": "Sierra AC885E",
+	"control": 2,
+	"data": 0
+}}
diff --git a/root/package/modems/src/data/1199-6880 b/root/package/modems/src/data/1199-6880
new file mode 100644
index 00000000..e188c037
--- /dev/null
+++ b/root/package/modems/src/data/1199-6880
@@ -0,0 +1,5 @@
+{
+	"desc": "Sierra C885",
+	"control": 3,
+	"data": 3
+}}
diff --git a/root/package/modems/src/data/1199-6890 b/root/package/modems/src/data/1199-6890
new file mode 100644
index 00000000..6d2f892a
--- /dev/null
+++ b/root/package/modems/src/data/1199-6890
@@ -0,0 +1,5 @@
+{
+	"desc": "Sierra C888",
+	"control": 3,
+	"data": 3
+}}
diff --git a/root/package/modems/src/data/1199-6891 b/root/package/modems/src/data/1199-6891
new file mode 100644
index 00000000..fa866e29
--- /dev/null
+++ b/root/package/modems/src/data/1199-6891
@@ -0,0 +1,5 @@
+{
+	"desc": "Sierra C22 and C33",
+	"control": 3,
+	"data": 3
+}}
diff --git a/root/package/modems/src/data/1199-6892 b/root/package/modems/src/data/1199-6892
new file mode 100644
index 00000000..99a2bd2d
--- /dev/null
+++ b/root/package/modems/src/data/1199-6892
@@ -0,0 +1,5 @@
+{
+	"desc": "Sierra Compass HSPA",
+	"control": 3,
+	"data": 3
+}}
diff --git a/root/package/modems/src/data/1199-6893 b/root/package/modems/src/data/1199-6893
new file mode 100644
index 00000000..16f4dfda
--- /dev/null
+++ b/root/package/modems/src/data/1199-6893
@@ -0,0 +1,5 @@
+{
+	"desc": "Sierra C889",
+	"control": 3,
+	"data": 3
+}}
diff --git a/root/package/modems/src/data/1199-68a2 b/root/package/modems/src/data/1199-68a2
new file mode 100644
index 00000000..ac1b1845
--- /dev/null
+++ b/root/package/modems/src/data/1199-68a2
@@ -0,0 +1,4 @@
+{
+	"desc": "Sierra MC7710",
+	"type": "qmi"
+}
diff --git a/root/package/modems/src/data/1199-68aa b/root/package/modems/src/data/1199-68aa
new file mode 100644
index 00000000..7c5a9f2b
--- /dev/null
+++ b/root/package/modems/src/data/1199-68aa
@@ -0,0 +1,5 @@
+{
+	"desc": "Sierra AC320U/AC330U Direct IP",
+	"control": 3,
+	"data": 3
+}}
diff --git a/root/package/modems/src/data/12d1-1035 b/root/package/modems/src/data/12d1-1035
new file mode 100644
index 00000000..ad7025a1
--- /dev/null
+++ b/root/package/modems/src/data/12d1-1035
@@ -0,0 +1,5 @@
+{
+	"desc": "HUAWEI U8110",
+	"control": 0,
+	"data": 0
+}}
diff --git a/root/package/modems/src/data/12d1-1404 b/root/package/modems/src/data/12d1-1404
new file mode 100644
index 00000000..b186ad54
--- /dev/null
+++ b/root/package/modems/src/data/12d1-1404
@@ -0,0 +1,4 @@
+{
+	"desc": "HUAWEI UMG1831",
+	"type": "qmi"
+}
diff --git a/root/package/modems/src/data/12d1-1406 b/root/package/modems/src/data/12d1-1406
new file mode 100644
index 00000000..b1aa3178
--- /dev/null
+++ b/root/package/modems/src/data/12d1-1406
@@ -0,0 +1,5 @@
+{
+	"desc": "HUAWEI/Option newer modems",
+	"control": 1,
+	"data": 0
+}}
diff --git a/root/package/modems/src/data/12d1-140b b/root/package/modems/src/data/12d1-140b
new file mode 100644
index 00000000..cc99898a
--- /dev/null
+++ b/root/package/modems/src/data/12d1-140b
@@ -0,0 +1,5 @@
+{
+	"desc": "HUAWEI/Option EC1260 Wireless Data Modem HSD USB Card",
+	"control": 2,
+	"data": 0
+}}
diff --git a/root/package/modems/src/data/12d1-140c b/root/package/modems/src/data/12d1-140c
new file mode 100644
index 00000000..148d1d1a
--- /dev/null
+++ b/root/package/modems/src/data/12d1-140c
@@ -0,0 +1,4 @@
+{
+	"desc": "HUAWEI/Option newer modems",
+	"type": "qmi"
+}
diff --git a/root/package/modems/src/data/12d1-1412 b/root/package/modems/src/data/12d1-1412
new file mode 100644
index 00000000..e6fb6cc7
--- /dev/null
+++ b/root/package/modems/src/data/12d1-1412
@@ -0,0 +1,5 @@
+{
+	"desc": "HUAWEI/Option EC168",
+	"control": 2,
+	"data": 0
+}}
diff --git a/root/package/modems/src/data/12d1-141b b/root/package/modems/src/data/12d1-141b
new file mode 100644
index 00000000..b1aa3178
--- /dev/null
+++ b/root/package/modems/src/data/12d1-141b
@@ -0,0 +1,5 @@
+{
+	"desc": "HUAWEI/Option newer modems",
+	"control": 1,
+	"data": 0
+}}
diff --git a/root/package/modems/src/data/12d1-1433 b/root/package/modems/src/data/12d1-1433
new file mode 100644
index 00000000..c5d86cb1
--- /dev/null
+++ b/root/package/modems/src/data/12d1-1433
@@ -0,0 +1,5 @@
+{
+	"desc": "HUAWEI/Option E1756C",
+	"control": 2,
+	"data": 0
+}}
diff --git a/root/package/modems/src/data/12d1-1436 b/root/package/modems/src/data/12d1-1436
new file mode 100644
index 00000000..7db8644b
--- /dev/null
+++ b/root/package/modems/src/data/12d1-1436
@@ -0,0 +1,5 @@
+{
+	"desc": "HUAWEI/Option E1800",
+	"control": 2,
+	"data": 0
+}}
diff --git a/root/package/modems/src/data/12d1-1444 b/root/package/modems/src/data/12d1-1444
new file mode 100644
index 00000000..500d7751
--- /dev/null
+++ b/root/package/modems/src/data/12d1-1444
@@ -0,0 +1,5 @@
+{
+	"desc": "HUAWEI/Option E352-R1",
+	"control": 0,
+	"data": 0
+}}
diff --git a/root/package/modems/src/data/12d1-144e b/root/package/modems/src/data/12d1-144e
new file mode 100644
index 00000000..a704946a
--- /dev/null
+++ b/root/package/modems/src/data/12d1-144e
@@ -0,0 +1,5 @@
+{
+	"desc": "Huawei K3806",
+	"control": 0,
+	"data": 2
+}}
diff --git a/root/package/modems/src/data/12d1-1464 b/root/package/modems/src/data/12d1-1464
new file mode 100644
index 00000000..1b5397cd
--- /dev/null
+++ b/root/package/modems/src/data/12d1-1464
@@ -0,0 +1,5 @@
+{
+	"desc": "Huawei K4505",
+	"control": 2,
+	"data": 0
+}}
diff --git a/root/package/modems/src/data/12d1-1465 b/root/package/modems/src/data/12d1-1465
new file mode 100644
index 00000000..dbb20f7c
--- /dev/null
+++ b/root/package/modems/src/data/12d1-1465
@@ -0,0 +1,5 @@
+{
+	"desc": "Huawei K3765",
+	"control": 2,
+	"data": 0
+}}
diff --git a/root/package/modems/src/data/12d1-1491 b/root/package/modems/src/data/12d1-1491
new file mode 100644
index 00000000..c1ae9a56
--- /dev/null
+++ b/root/package/modems/src/data/12d1-1491
@@ -0,0 +1,5 @@
+{
+	"desc": "Huawei R201",
+	"control": 2,
+	"data": 0
+}}
diff --git a/root/package/modems/src/data/12d1-14a5 b/root/package/modems/src/data/12d1-14a5
new file mode 100644
index 00000000..50ea0795
--- /dev/null
+++ b/root/package/modems/src/data/12d1-14a5
@@ -0,0 +1,5 @@
+{
+	"desc": "Huawei E173",
+	"control": 2,
+	"data": 0
+}}
diff --git a/root/package/modems/src/data/12d1-14a8 b/root/package/modems/src/data/12d1-14a8
new file mode 100644
index 00000000..50ea0795
--- /dev/null
+++ b/root/package/modems/src/data/12d1-14a8
@@ -0,0 +1,5 @@
+{
+	"desc": "Huawei E173",
+	"control": 2,
+	"data": 0
+}}
diff --git a/root/package/modems/src/data/12d1-14ac b/root/package/modems/src/data/12d1-14ac
new file mode 100644
index 00000000..148d1d1a
--- /dev/null
+++ b/root/package/modems/src/data/12d1-14ac
@@ -0,0 +1,4 @@
+{
+	"desc": "HUAWEI/Option newer modems",
+	"type": "qmi"
+}
diff --git a/root/package/modems/src/data/12d1-14ae b/root/package/modems/src/data/12d1-14ae
new file mode 100644
index 00000000..e27a798f
--- /dev/null
+++ b/root/package/modems/src/data/12d1-14ae
@@ -0,0 +1,5 @@
+{
+	"desc": "Huawei K3806",
+	"control": 1,
+	"data": 2
+}}
diff --git a/root/package/modems/src/data/12d1-14c6 b/root/package/modems/src/data/12d1-14c6
new file mode 100644
index 00000000..0cb4d8c1
--- /dev/null
+++ b/root/package/modems/src/data/12d1-14c6
@@ -0,0 +1,4 @@
+{
+	"desc": "Huawei K4605",
+	"type": "qmi"
+}
diff --git a/root/package/modems/src/data/12d1-14c8 b/root/package/modems/src/data/12d1-14c8
new file mode 100644
index 00000000..958b1188
--- /dev/null
+++ b/root/package/modems/src/data/12d1-14c8
@@ -0,0 +1,4 @@
+{
+	"desc": "Huawei K5005",
+	"type": "qmi"
+}
diff --git a/root/package/modems/src/data/12d1-14c9 b/root/package/modems/src/data/12d1-14c9
new file mode 100644
index 00000000..bc757918
--- /dev/null
+++ b/root/package/modems/src/data/12d1-14c9
@@ -0,0 +1,4 @@
+{
+	"desc": "Huawei K3770",
+	"type": "qmi"
+}
diff --git a/root/package/modems/src/data/12d1-14ca b/root/package/modems/src/data/12d1-14ca
new file mode 100644
index 00000000..8155b4bf
--- /dev/null
+++ b/root/package/modems/src/data/12d1-14ca
@@ -0,0 +1,4 @@
+{
+	"desc": "Huawei K3771",
+	"type": "qmi"
+}
diff --git a/root/package/modems/src/data/12d1-14cb b/root/package/modems/src/data/12d1-14cb
new file mode 100644
index 00000000..b496a60b
--- /dev/null
+++ b/root/package/modems/src/data/12d1-14cb
@@ -0,0 +1,5 @@
+{
+	"desc": "Huawei K4510",
+	"control": 2,
+	"data": 0
+}}
diff --git a/root/package/modems/src/data/12d1-14cc b/root/package/modems/src/data/12d1-14cc
new file mode 100644
index 00000000..98488bd2
--- /dev/null
+++ b/root/package/modems/src/data/12d1-14cc
@@ -0,0 +1,4 @@
+{
+	"desc": "Huawei K4511",
+	"type": "qmi"
+}
diff --git a/root/package/modems/src/data/12d1-14cf b/root/package/modems/src/data/12d1-14cf
new file mode 100644
index 00000000..18e1e1e3
--- /dev/null
+++ b/root/package/modems/src/data/12d1-14cf
@@ -0,0 +1,5 @@
+{
+	"desc": "Huawei K3772",
+	"control": 2,
+	"data": 0
+}}
diff --git a/root/package/modems/src/data/12d1-14d2 b/root/package/modems/src/data/12d1-14d2
new file mode 100644
index 00000000..414b8467
--- /dev/null
+++ b/root/package/modems/src/data/12d1-14d2
@@ -0,0 +1,4 @@
+{
+	"desc": "Huawei E173/E177",
+	"type": "qmi"
+}
diff --git a/root/package/modems/src/data/12d1-1506 b/root/package/modems/src/data/12d1-1506
new file mode 100644
index 00000000..65760e8f
--- /dev/null
+++ b/root/package/modems/src/data/12d1-1506
@@ -0,0 +1,5 @@
+{
+	"desc": "Huawei E367/E398",
+	"control": 2,
+	"data": 0
+}}
diff --git a/root/package/modems/src/data/12d1-150a b/root/package/modems/src/data/12d1-150a
new file mode 100644
index 00000000..45f191a3
--- /dev/null
+++ b/root/package/modems/src/data/12d1-150a
@@ -0,0 +1,4 @@
+{
+	"desc": "Huawei E398",
+	"type": "qmi"
+}
diff --git a/root/package/modems/src/data/12d1-150c b/root/package/modems/src/data/12d1-150c
new file mode 100644
index 00000000..7ab4c499
--- /dev/null
+++ b/root/package/modems/src/data/12d1-150c
@@ -0,0 +1,4 @@
+{
+	"desc": "Huawei E367",
+	"type": "qmi"
+}
diff --git a/root/package/modems/src/data/12d1-150f b/root/package/modems/src/data/12d1-150f
new file mode 100644
index 00000000..7ab4c499
--- /dev/null
+++ b/root/package/modems/src/data/12d1-150f
@@ -0,0 +1,4 @@
+{
+	"desc": "Huawei E367",
+	"type": "qmi"
+}
diff --git a/root/package/modems/src/data/12d1-151b b/root/package/modems/src/data/12d1-151b
new file mode 100644
index 00000000..28e561c8
--- /dev/null
+++ b/root/package/modems/src/data/12d1-151b
@@ -0,0 +1,4 @@
+{
+	"desc": "Huawei E392u-12",
+	"type": "qmi"
+}
diff --git a/root/package/modems/src/data/12d1-151d b/root/package/modems/src/data/12d1-151d
new file mode 100644
index 00000000..e5eae2a8
--- /dev/null
+++ b/root/package/modems/src/data/12d1-151d
@@ -0,0 +1,5 @@
+{
+	"desc": "Huawei E3131",
+	"control": 3,
+	"data": 0
+}}
diff --git a/root/package/modems/src/data/12d1-156c b/root/package/modems/src/data/12d1-156c
new file mode 100644
index 00000000..3fc6b1b1
--- /dev/null
+++ b/root/package/modems/src/data/12d1-156c
@@ -0,0 +1,5 @@
+{
+	"desc": "Huawei E3276",
+	"control": 1,
+	"data": 0
+}}
diff --git a/root/package/modems/src/data/12d1-1576 b/root/package/modems/src/data/12d1-1576
new file mode 100644
index 00000000..1aeb021c
--- /dev/null
+++ b/root/package/modems/src/data/12d1-1576
@@ -0,0 +1,4 @@
+{
+	"desc": "Huawei K4201 composite",
+	"type": "mbim"
+}
diff --git a/root/package/modems/src/data/12d1-1577 b/root/package/modems/src/data/12d1-1577
new file mode 100644
index 00000000..46a12daf
--- /dev/null
+++ b/root/package/modems/src/data/12d1-1577
@@ -0,0 +1,4 @@
+{
+	"desc": "Huawei K4202 composite",
+	"type": "mbim"
+}
diff --git a/root/package/modems/src/data/12d1-1578 b/root/package/modems/src/data/12d1-1578
new file mode 100644
index 00000000..6710d159
--- /dev/null
+++ b/root/package/modems/src/data/12d1-1578
@@ -0,0 +1,4 @@
+{
+	"desc": "Huawei K4606 composite",
+	"type": "mbim"
+}
diff --git a/root/package/modems/src/data/12d1-1589 b/root/package/modems/src/data/12d1-1589
new file mode 100644
index 00000000..e2d35275
--- /dev/null
+++ b/root/package/modems/src/data/12d1-1589
@@ -0,0 +1,4 @@
+{
+	"desc": "Huawei E8278",
+	"type": "ncm"
+}
diff --git a/root/package/modems/src/data/12d1-1c05 b/root/package/modems/src/data/12d1-1c05
new file mode 100644
index 00000000..c5612241
--- /dev/null
+++ b/root/package/modems/src/data/12d1-1c05
@@ -0,0 +1,5 @@
+{
+	"desc": "Huawei E173s",
+	"control": 2,
+	"data": 0
+}}
diff --git a/root/package/modems/src/data/12d1-1c07 b/root/package/modems/src/data/12d1-1c07
new file mode 100644
index 00000000..cee72768
--- /dev/null
+++ b/root/package/modems/src/data/12d1-1c07
@@ -0,0 +1,5 @@
+{
+	"desc": "Huawei E188",
+	"control": 2,
+	"data": 0
+}}
diff --git a/root/package/modems/src/data/12d1-1c08 b/root/package/modems/src/data/12d1-1c08
new file mode 100644
index 00000000..4f6fb21f
--- /dev/null
+++ b/root/package/modems/src/data/12d1-1c08
@@ -0,0 +1,5 @@
+{
+	"desc": "Huawei E173s",
+	"control": 1,
+	"data": 0
+}}
diff --git a/root/package/modems/src/data/12d1-1c10 b/root/package/modems/src/data/12d1-1c10
new file mode 100644
index 00000000..50ea0795
--- /dev/null
+++ b/root/package/modems/src/data/12d1-1c10
@@ -0,0 +1,5 @@
+{
+	"desc": "Huawei E173",
+	"control": 2,
+	"data": 0
+}}
diff --git a/root/package/modems/src/data/12d1-1c12 b/root/package/modems/src/data/12d1-1c12
new file mode 100644
index 00000000..50ea0795
--- /dev/null
+++ b/root/package/modems/src/data/12d1-1c12
@@ -0,0 +1,5 @@
+{
+	"desc": "Huawei E173",
+	"control": 2,
+	"data": 0
+}}
diff --git a/root/package/modems/src/data/12d1-1c1e b/root/package/modems/src/data/12d1-1c1e
new file mode 100644
index 00000000..4622965a
--- /dev/null
+++ b/root/package/modems/src/data/12d1-1c1e
@@ -0,0 +1,4 @@
+{
+	"desc": "Huawei E586",
+	"type": "ncm"
+}
diff --git a/root/package/modems/src/data/12d1-1c1f b/root/package/modems/src/data/12d1-1c1f
new file mode 100644
index 00000000..13cb40ff
--- /dev/null
+++ b/root/package/modems/src/data/12d1-1c1f
@@ -0,0 +1,4 @@
+{
+	"desc": "Huawei E587",
+	"type": "ncm"
+}
diff --git a/root/package/modems/src/data/12d1-1c23 b/root/package/modems/src/data/12d1-1c23
new file mode 100644
index 00000000..d1043471
--- /dev/null
+++ b/root/package/modems/src/data/12d1-1c23
@@ -0,0 +1,5 @@
+{
+	"desc": "Huawei E173",
+	"control": 0,
+	"data": 2
+}}
diff --git a/root/package/modems/src/data/12d1-1f16 b/root/package/modems/src/data/12d1-1f16
new file mode 100644
index 00000000..10d27cf5
--- /dev/null
+++ b/root/package/modems/src/data/12d1-1f16
@@ -0,0 +1,4 @@
+{
+	"desc": "Huawei K5150 composite",
+	"mode": "mbim"
+}
diff --git a/root/package/modems/src/data/1410-1400 b/root/package/modems/src/data/1410-1400
new file mode 100644
index 00000000..e2bda967
--- /dev/null
+++ b/root/package/modems/src/data/1410-1400
@@ -0,0 +1,5 @@
+{
+	"desc": "Novatel U730",
+	"control": 1,
+	"data": 0
+}}
diff --git a/root/package/modems/src/data/1410-1410 b/root/package/modems/src/data/1410-1410
new file mode 100644
index 00000000..ba48aea9
--- /dev/null
+++ b/root/package/modems/src/data/1410-1410
@@ -0,0 +1,5 @@
+{
+	"desc": "Novatel U740",
+	"control": 1,
+	"data": 0
+}}
diff --git a/root/package/modems/src/data/1410-1420 b/root/package/modems/src/data/1410-1420
new file mode 100644
index 00000000..5cc96b69
--- /dev/null
+++ b/root/package/modems/src/data/1410-1420
@@ -0,0 +1,5 @@
+{
+	"desc": "Novatel U870",
+	"control": 1,
+	"data": 0
+}}
diff --git a/root/package/modems/src/data/1410-1430 b/root/package/modems/src/data/1410-1430
new file mode 100644
index 00000000..012f3ad9
--- /dev/null
+++ b/root/package/modems/src/data/1410-1430
@@ -0,0 +1,5 @@
+{
+	"desc": "Novatel XU870",
+	"control": 1,
+	"data": 0
+}}
diff --git a/root/package/modems/src/data/1410-1450 b/root/package/modems/src/data/1410-1450
new file mode 100644
index 00000000..d1016773
--- /dev/null
+++ b/root/package/modems/src/data/1410-1450
@@ -0,0 +1,5 @@
+{
+	"desc": "Novatel X950D",
+	"control": 1,
+	"data": 0
+}}
diff --git a/root/package/modems/src/data/1410-2100 b/root/package/modems/src/data/1410-2100
new file mode 100644
index 00000000..a0328cf9
--- /dev/null
+++ b/root/package/modems/src/data/1410-2100
@@ -0,0 +1,5 @@
+{
+	"desc": "Novatel EV620",
+	"control": 1,
+	"data": 0
+}}
diff --git a/root/package/modems/src/data/1410-2110 b/root/package/modems/src/data/1410-2110
new file mode 100644
index 00000000..701bf424
--- /dev/null
+++ b/root/package/modems/src/data/1410-2110
@@ -0,0 +1,5 @@
+{
+	"desc": "Novatel ES720",
+	"control": 1,
+	"data": 0
+}}
diff --git a/root/package/modems/src/data/1410-2120 b/root/package/modems/src/data/1410-2120
new file mode 100644
index 00000000..7ab3c9d7
--- /dev/null
+++ b/root/package/modems/src/data/1410-2120
@@ -0,0 +1,5 @@
+{
+	"desc": "Novatel E725",
+	"control": 1,
+	"data": 0
+}}
diff --git a/root/package/modems/src/data/1410-2130 b/root/package/modems/src/data/1410-2130
new file mode 100644
index 00000000..98006e20
--- /dev/null
+++ b/root/package/modems/src/data/1410-2130
@@ -0,0 +1,5 @@
+{
+	"desc": "Novatel ES620",
+	"control": 1,
+	"data": 0
+}}
diff --git a/root/package/modems/src/data/1410-2400 b/root/package/modems/src/data/1410-2400
new file mode 100644
index 00000000..cd9f2906
--- /dev/null
+++ b/root/package/modems/src/data/1410-2400
@@ -0,0 +1,5 @@
+{
+	"desc": "Novatel EU730",
+	"control": 1,
+	"data": 0
+}}
diff --git a/root/package/modems/src/data/1410-2410 b/root/package/modems/src/data/1410-2410
new file mode 100644
index 00000000..4635063b
--- /dev/null
+++ b/root/package/modems/src/data/1410-2410
@@ -0,0 +1,5 @@
+{
+	"desc": "Novatel EU740",
+	"control": 1,
+	"data": 0
+}}
diff --git a/root/package/modems/src/data/1410-2420 b/root/package/modems/src/data/1410-2420
new file mode 100644
index 00000000..340666c7
--- /dev/null
+++ b/root/package/modems/src/data/1410-2420
@@ -0,0 +1,5 @@
+{
+	"desc": "Novatel EU870D",
+	"control": 1,
+	"data": 0
+}}
diff --git a/root/package/modems/src/data/1410-4100 b/root/package/modems/src/data/1410-4100
new file mode 100644
index 00000000..260a2891
--- /dev/null
+++ b/root/package/modems/src/data/1410-4100
@@ -0,0 +1,5 @@
+{
+	"desc": "Novatel MC727/U727",
+	"control": 1,
+	"data": 0
+}}
diff --git a/root/package/modems/src/data/1410-4400 b/root/package/modems/src/data/1410-4400
new file mode 100644
index 00000000..838a7fbf
--- /dev/null
+++ b/root/package/modems/src/data/1410-4400
@@ -0,0 +1,5 @@
+{
+	"desc": "Novatel Ovation MC930D/MC950D",
+	"control": 1,
+	"data": 0
+}}
diff --git a/root/package/modems/src/data/1410-6000 b/root/package/modems/src/data/1410-6000
new file mode 100644
index 00000000..a12716e4
--- /dev/null
+++ b/root/package/modems/src/data/1410-6000
@@ -0,0 +1,5 @@
+{
+	"desc": "Novatel USB760",
+	"control": 1,
+	"data": 0
+}}
diff --git a/root/package/modems/src/data/1410-6001 b/root/package/modems/src/data/1410-6001
new file mode 100644
index 00000000..a12716e4
--- /dev/null
+++ b/root/package/modems/src/data/1410-6001
@@ -0,0 +1,5 @@
+{
+	"desc": "Novatel USB760",
+	"control": 1,
+	"data": 0
+}}
diff --git a/root/package/modems/src/data/1410-6002 b/root/package/modems/src/data/1410-6002
new file mode 100644
index 00000000..fce8e9bf
--- /dev/null
+++ b/root/package/modems/src/data/1410-6002
@@ -0,0 +1,5 @@
+{
+	"desc": "Novatel USB760 3G",
+	"control": 1,
+	"data": 0
+}}
diff --git a/root/package/modems/src/data/1410-6010 b/root/package/modems/src/data/1410-6010
new file mode 100644
index 00000000..d08c399a
--- /dev/null
+++ b/root/package/modems/src/data/1410-6010
@@ -0,0 +1,5 @@
+{
+	"desc": "Novatel MC780",
+	"control": 1,
+	"data": 0
+}}
diff --git a/root/package/modems/src/data/1410-7001 b/root/package/modems/src/data/1410-7001
new file mode 100644
index 00000000..079c7d52
--- /dev/null
+++ b/root/package/modems/src/data/1410-7001
@@ -0,0 +1,5 @@
+{
+	"desc": "Novatel MiFi 2372",
+	"control": 1,
+	"data": 0
+}}
diff --git a/root/package/modems/src/data/1410-7003 b/root/package/modems/src/data/1410-7003
new file mode 100644
index 00000000..079c7d52
--- /dev/null
+++ b/root/package/modems/src/data/1410-7003
@@ -0,0 +1,5 @@
+{
+	"desc": "Novatel MiFi 2372",
+	"control": 1,
+	"data": 0
+}}
diff --git a/root/package/modems/src/data/1410-7030 b/root/package/modems/src/data/1410-7030
new file mode 100644
index 00000000..0fc40290
--- /dev/null
+++ b/root/package/modems/src/data/1410-7030
@@ -0,0 +1,5 @@
+{
+	"desc": "Novatel USB998",
+	"control": 0,
+	"data": 0
+}}
diff --git a/root/package/modems/src/data/1410-7031 b/root/package/modems/src/data/1410-7031
new file mode 100644
index 00000000..e1ba049c
--- /dev/null
+++ b/root/package/modems/src/data/1410-7031
@@ -0,0 +1,6 @@
+{
+	"desc": "Novatel USB679",
+	"control": 0,
+	"data": 0
+}	"generic": 1
+}
diff --git a/root/package/modems/src/data/1410-7041 b/root/package/modems/src/data/1410-7041
new file mode 100644
index 00000000..03e8fcd5
--- /dev/null
+++ b/root/package/modems/src/data/1410-7041
@@ -0,0 +1,5 @@
+{
+	"desc": "Novatel MF3470",
+	"control": 0,
+	"data": 0
+}}
diff --git a/root/package/modems/src/data/1410-7042 b/root/package/modems/src/data/1410-7042
new file mode 100644
index 00000000..0bb9cdbd
--- /dev/null
+++ b/root/package/modems/src/data/1410-7042
@@ -0,0 +1,5 @@
+{
+	"desc": "Novatel Ovation MC545/MC547",
+	"control": 0,
+	"data": 0
+}}
diff --git a/root/package/modems/src/data/1410-9011 b/root/package/modems/src/data/1410-9011
new file mode 100644
index 00000000..8247a97c
--- /dev/null
+++ b/root/package/modems/src/data/1410-9011
@@ -0,0 +1,4 @@
+{
+	"desc": "Novatel E371",
+	"type": "qmi"
+}
diff --git a/root/package/modems/src/data/1410-b001 b/root/package/modems/src/data/1410-b001
new file mode 100644
index 00000000..3c13539a
--- /dev/null
+++ b/root/package/modems/src/data/1410-b001
@@ -0,0 +1,4 @@
+{
+	"desc": "Novatel MC551/USB551L",
+	"type": "qmi"
+}
diff --git a/root/package/modems/src/data/1529-3100 b/root/package/modems/src/data/1529-3100
new file mode 100644
index 00000000..5e4fe34b
--- /dev/null
+++ b/root/package/modems/src/data/1529-3100
@@ -0,0 +1,6 @@
+{
+	"desc": "UBIQUAM U-100/105/200/300/520",
+	"control": 0,
+	"data": 0
+}	"acm": 1
+}
diff --git a/root/package/modems/src/data/16d5-6202 b/root/package/modems/src/data/16d5-6202
new file mode 100644
index 00000000..1ba8a502
--- /dev/null
+++ b/root/package/modems/src/data/16d5-6202
@@ -0,0 +1,5 @@
+{
+	"desc": "AnyData ADU-620UW",
+	"control": 2,
+	"data": 0
+}}
diff --git a/root/package/modems/src/data/16d5-6501 b/root/package/modems/src/data/16d5-6501
new file mode 100644
index 00000000..09207df3
--- /dev/null
+++ b/root/package/modems/src/data/16d5-6501
@@ -0,0 +1,5 @@
+{
+	"desc": "AnyData ADU-300A",
+	"control": 1,
+	"data": 0
+}}
diff --git a/root/package/modems/src/data/16d5-6502 b/root/package/modems/src/data/16d5-6502
new file mode 100644
index 00000000..4bdbf899
--- /dev/null
+++ b/root/package/modems/src/data/16d5-6502
@@ -0,0 +1,5 @@
+{
+	"desc": "AnyData ADU-500A",
+	"control": 2,
+	"data": 0
+}}
diff --git a/root/package/modems/src/data/16d5-6603 b/root/package/modems/src/data/16d5-6603
new file mode 100644
index 00000000..5c108a2d
--- /dev/null
+++ b/root/package/modems/src/data/16d5-6603
@@ -0,0 +1,6 @@
+{
+	"desc": "AnyData ADU-890WH",
+	"control": 0,
+	"data": 0
+}	"generic": 1
+}
diff --git a/root/package/modems/src/data/16d5-900d b/root/package/modems/src/data/16d5-900d
new file mode 100644
index 00000000..b1c48698
--- /dev/null
+++ b/root/package/modems/src/data/16d5-900d
@@ -0,0 +1,6 @@
+{
+	"desc": "AnyData ADU-890WH",
+	"control": 0,
+	"data": 0
+}	"acm": 1
+}
diff --git a/root/package/modems/src/data/16d8-5141 b/root/package/modems/src/data/16d8-5141
new file mode 100644
index 00000000..bda356fd
--- /dev/null
+++ b/root/package/modems/src/data/16d8-5141
@@ -0,0 +1,6 @@
+{
+	"desc": "Cmotech CNU-510",
+	"control": 0,
+	"data": 0
+}	"acm": 1
+}
diff --git a/root/package/modems/src/data/16d8-5533 b/root/package/modems/src/data/16d8-5533
new file mode 100644
index 00000000..185d257d
--- /dev/null
+++ b/root/package/modems/src/data/16d8-5533
@@ -0,0 +1,6 @@
+{
+	"desc": "Cmotech CNU-550",
+	"control": 0,
+	"data": 0
+}	"acm": 1
+}
diff --git a/root/package/modems/src/data/16d8-5543 b/root/package/modems/src/data/16d8-5543
new file mode 100644
index 00000000..185d257d
--- /dev/null
+++ b/root/package/modems/src/data/16d8-5543
@@ -0,0 +1,6 @@
+{
+	"desc": "Cmotech CNU-550",
+	"control": 0,
+	"data": 0
+}	"acm": 1
+}
diff --git a/root/package/modems/src/data/16d8-5553 b/root/package/modems/src/data/16d8-5553
new file mode 100644
index 00000000..2403381d
--- /dev/null
+++ b/root/package/modems/src/data/16d8-5553
@@ -0,0 +1,6 @@
+{
+	"desc": "Cmotech CDU-550",
+	"control": 0,
+	"data": 0
+}	"acm": 1
+}
diff --git a/root/package/modems/src/data/16d8-6002 b/root/package/modems/src/data/16d8-6002
new file mode 100644
index 00000000..715878c4
--- /dev/null
+++ b/root/package/modems/src/data/16d8-6002
@@ -0,0 +1,5 @@
+{
+	"desc": "Franklin U300",
+	"control": 1,
+	"data": 0
+}}
diff --git a/root/package/modems/src/data/16d8-6006 b/root/package/modems/src/data/16d8-6006
new file mode 100644
index 00000000..bb8f87e0
--- /dev/null
+++ b/root/package/modems/src/data/16d8-6006
@@ -0,0 +1,5 @@
+{
+	"desc": "Cmotech CGU-628",
+	"control": 0,
+	"data": 0
+}}
diff --git a/root/package/modems/src/data/16d8-6007 b/root/package/modems/src/data/16d8-6007
new file mode 100644
index 00000000..a0ed8bce
--- /dev/null
+++ b/root/package/modems/src/data/16d8-6007
@@ -0,0 +1,4 @@
+{
+	"desc": "Cmotech CHE-628S",
+	"type": "qmi"
+}
diff --git a/root/package/modems/src/data/16d8-6008 b/root/package/modems/src/data/16d8-6008
new file mode 100644
index 00000000..1afeb99d
--- /dev/null
+++ b/root/package/modems/src/data/16d8-6008
@@ -0,0 +1,4 @@
+{
+	"desc": "Franklin U301",
+	"type": "qmi"
+}
diff --git a/root/package/modems/src/data/16d8-6522 b/root/package/modems/src/data/16d8-6522
new file mode 100644
index 00000000..44343d00
--- /dev/null
+++ b/root/package/modems/src/data/16d8-6522
@@ -0,0 +1,6 @@
+{
+	"desc": "Cmotech CDU-650",
+	"control": 2,
+	"data": 0
+}	"acm": 1
+}
diff --git a/root/package/modems/src/data/16d8-6523 b/root/package/modems/src/data/16d8-6523
new file mode 100644
index 00000000..406566b9
--- /dev/null
+++ b/root/package/modems/src/data/16d8-6523
@@ -0,0 +1,6 @@
+{
+	"desc": "Cmotech CCU-650U",
+	"control": 2,
+	"data": 0
+}	"acm": 1
+}
diff --git a/root/package/modems/src/data/16d8-6532 b/root/package/modems/src/data/16d8-6532
new file mode 100644
index 00000000..5b6a147f
--- /dev/null
+++ b/root/package/modems/src/data/16d8-6532
@@ -0,0 +1,6 @@
+{
+	"desc": "Cmotech CCU-650",
+	"control": 2,
+	"data": 0
+}	"acm": 1
+}
diff --git a/root/package/modems/src/data/16d8-6533 b/root/package/modems/src/data/16d8-6533
new file mode 100644
index 00000000..07175f31
--- /dev/null
+++ b/root/package/modems/src/data/16d8-6533
@@ -0,0 +1,6 @@
+{
+	"desc": "Cmotech CNM-650",
+	"control": 0,
+	"data": 0
+}	"acm": 1
+}
diff --git a/root/package/modems/src/data/16d8-6543 b/root/package/modems/src/data/16d8-6543
new file mode 100644
index 00000000..c518ca72
--- /dev/null
+++ b/root/package/modems/src/data/16d8-6543
@@ -0,0 +1,6 @@
+{
+	"desc": "Cmotech CNU-650",
+	"control": 0,
+	"data": 0
+}	"acm": 1
+}
diff --git a/root/package/modems/src/data/16d8-680a b/root/package/modems/src/data/16d8-680a
new file mode 100644
index 00000000..9b1c85fe
--- /dev/null
+++ b/root/package/modems/src/data/16d8-680a
@@ -0,0 +1,6 @@
+{
+	"desc": "Cmotech CDU-680",
+	"control": 0,
+	"data": 0
+}	"acm": 1
+}
diff --git a/root/package/modems/src/data/19d2-0001 b/root/package/modems/src/data/19d2-0001
new file mode 100644
index 00000000..31ee3fd3
--- /dev/null
+++ b/root/package/modems/src/data/19d2-0001
@@ -0,0 +1,5 @@
+{
+	"desc": "ONDA MT505UP/ZTE",
+	"control": 2,
+	"data": 0
+}}
diff --git a/root/package/modems/src/data/19d2-0002 b/root/package/modems/src/data/19d2-0002
new file mode 100644
index 00000000..ee80af5f
--- /dev/null
+++ b/root/package/modems/src/data/19d2-0002
@@ -0,0 +1,4 @@
+{
+	"desc": "ZTE ET502HS/MT505UP/MF632",
+	"type": "qmi"
+}
diff --git a/root/package/modems/src/data/19d2-0015 b/root/package/modems/src/data/19d2-0015
new file mode 100644
index 00000000..31ee3fd3
--- /dev/null
+++ b/root/package/modems/src/data/19d2-0015
@@ -0,0 +1,5 @@
+{
+	"desc": "ONDA MT505UP/ZTE",
+	"control": 2,
+	"data": 0
+}}
diff --git a/root/package/modems/src/data/19d2-0016 b/root/package/modems/src/data/19d2-0016
new file mode 100644
index 00000000..48c5fefd
--- /dev/null
+++ b/root/package/modems/src/data/19d2-0016
@@ -0,0 +1,5 @@
+{
+	"desc": "ONDA MF110/ZTE",
+	"control": 1,
+	"data": 2
+}}
diff --git a/root/package/modems/src/data/19d2-0017 b/root/package/modems/src/data/19d2-0017
new file mode 100644
index 00000000..87178fba
--- /dev/null
+++ b/root/package/modems/src/data/19d2-0017
@@ -0,0 +1,4 @@
+{
+	"desc": "ONDA MT505UP/ZTE",
+	"type": "qmi"
+}
diff --git a/root/package/modems/src/data/19d2-0018 b/root/package/modems/src/data/19d2-0018
new file mode 100644
index 00000000..76120d48
--- /dev/null
+++ b/root/package/modems/src/data/19d2-0018
@@ -0,0 +1,5 @@
+{
+	"desc": "ONDA MSA110UP/ZTE",
+	"control": 1,
+	"data": 2
+}}
diff --git a/root/package/modems/src/data/19d2-0019 b/root/package/modems/src/data/19d2-0019
new file mode 100644
index 00000000..8d31ed76
--- /dev/null
+++ b/root/package/modems/src/data/19d2-0019
@@ -0,0 +1,4 @@
+{
+	"desc": "ONDA MT689DC/ZTE",
+	"type": "qmi"
+}
diff --git a/root/package/modems/src/data/19d2-0022 b/root/package/modems/src/data/19d2-0022
new file mode 100644
index 00000000..7ed8ed1c
--- /dev/null
+++ b/root/package/modems/src/data/19d2-0022
@@ -0,0 +1,5 @@
+{
+	"desc": "ZTE K2525",
+	"control": 1,
+	"data": 0
+}}
diff --git a/root/package/modems/src/data/19d2-0024 b/root/package/modems/src/data/19d2-0024
new file mode 100644
index 00000000..5ae34af2
--- /dev/null
+++ b/root/package/modems/src/data/19d2-0024
@@ -0,0 +1,5 @@
+{
+	"desc": "ONDA MT503HSA",
+	"control": 2,
+	"data": 0
+}}
diff --git a/root/package/modems/src/data/19d2-0025 b/root/package/modems/src/data/19d2-0025
new file mode 100644
index 00000000..68baeb77
--- /dev/null
+++ b/root/package/modems/src/data/19d2-0025
@@ -0,0 +1,4 @@
+{
+	"desc": "ZTE MF628",
+	"type": "qmi"
+}
diff --git a/root/package/modems/src/data/19d2-0031 b/root/package/modems/src/data/19d2-0031
new file mode 100644
index 00000000..7aa8aa4b
--- /dev/null
+++ b/root/package/modems/src/data/19d2-0031
@@ -0,0 +1,4 @@
+{
+	"desc": "ZTE MF110/MF112/MF626",
+	"type": "qmi"
+}
diff --git a/root/package/modems/src/data/19d2-0033 b/root/package/modems/src/data/19d2-0033
new file mode 100644
index 00000000..e99314e3
--- /dev/null
+++ b/root/package/modems/src/data/19d2-0033
@@ -0,0 +1,5 @@
+{
+	"desc": "ZTE MF636",
+	"control": 1,
+	"data": 4
+}}
diff --git a/root/package/modems/src/data/19d2-0037 b/root/package/modems/src/data/19d2-0037
new file mode 100644
index 00000000..8ee565d4
--- /dev/null
+++ b/root/package/modems/src/data/19d2-0037
@@ -0,0 +1,5 @@
+{
+	"desc": "ONDA MT505UP/ZTE",
+	"control": 2,
+	"data": 2
+}}
diff --git a/root/package/modems/src/data/19d2-0039 b/root/package/modems/src/data/19d2-0039
new file mode 100644
index 00000000..c80a51ae
--- /dev/null
+++ b/root/package/modems/src/data/19d2-0039
@@ -0,0 +1,5 @@
+{
+	"desc": "ZTE MF100",
+	"control": 1,
+	"data": 2
+}}
diff --git a/root/package/modems/src/data/19d2-0042 b/root/package/modems/src/data/19d2-0042
new file mode 100644
index 00000000..c08014c5
--- /dev/null
+++ b/root/package/modems/src/data/19d2-0042
@@ -0,0 +1,4 @@
+{
+	"desc": "ZTE MF190",
+	"type": "qmi"
+}
diff --git a/root/package/modems/src/data/19d2-0052 b/root/package/modems/src/data/19d2-0052
new file mode 100644
index 00000000..87178fba
--- /dev/null
+++ b/root/package/modems/src/data/19d2-0052
@@ -0,0 +1,4 @@
+{
+	"desc": "ONDA MT505UP/ZTE",
+	"type": "qmi"
+}
diff --git a/root/package/modems/src/data/19d2-0055 b/root/package/modems/src/data/19d2-0055
new file mode 100644
index 00000000..87178fba
--- /dev/null
+++ b/root/package/modems/src/data/19d2-0055
@@ -0,0 +1,4 @@
+{
+	"desc": "ONDA MT505UP/ZTE",
+	"type": "qmi"
+}
diff --git a/root/package/modems/src/data/19d2-0057 b/root/package/modems/src/data/19d2-0057
new file mode 100644
index 00000000..78007461
--- /dev/null
+++ b/root/package/modems/src/data/19d2-0057
@@ -0,0 +1,5 @@
+{
+	"desc": "AIKO 83D",
+	"control": 0,
+	"data": 2
+}}
diff --git a/root/package/modems/src/data/19d2-0063 b/root/package/modems/src/data/19d2-0063
new file mode 100644
index 00000000..f45825d0
--- /dev/null
+++ b/root/package/modems/src/data/19d2-0063
@@ -0,0 +1,4 @@
+{
+	"desc": "ZTE K3565-Z",
+	"type": "qmi"
+}
diff --git a/root/package/modems/src/data/19d2-0064 b/root/package/modems/src/data/19d2-0064
new file mode 100644
index 00000000..edb0efef
--- /dev/null
+++ b/root/package/modems/src/data/19d2-0064
@@ -0,0 +1,5 @@
+{
+	"desc": "ZTE MF627",
+	"control": 0,
+	"data": 2
+}}
diff --git a/root/package/modems/src/data/19d2-0066 b/root/package/modems/src/data/19d2-0066
new file mode 100644
index 00000000..c57d7aec
--- /dev/null
+++ b/root/package/modems/src/data/19d2-0066
@@ -0,0 +1,5 @@
+{
+	"desc": "ZTE MF626",
+	"control": 1,
+	"data": 3
+}}
diff --git a/root/package/modems/src/data/19d2-0073 b/root/package/modems/src/data/19d2-0073
new file mode 100644
index 00000000..0f9502f1
--- /dev/null
+++ b/root/package/modems/src/data/19d2-0073
@@ -0,0 +1,5 @@
+{
+	"desc": "ZTE A580",
+	"control": 1,
+	"data": 0
+}}
diff --git a/root/package/modems/src/data/19d2-0079 b/root/package/modems/src/data/19d2-0079
new file mode 100644
index 00000000..569a9996
--- /dev/null
+++ b/root/package/modems/src/data/19d2-0079
@@ -0,0 +1,5 @@
+{
+	"desc": "ZTE A353",
+	"control": 1,
+	"data": 2
+}}
diff --git a/root/package/modems/src/data/19d2-0082 b/root/package/modems/src/data/19d2-0082
new file mode 100644
index 00000000..ea4fcd94
--- /dev/null
+++ b/root/package/modems/src/data/19d2-0082
@@ -0,0 +1,5 @@
+{
+	"desc": "ZTE MF668/MF190",
+	"control": 1,
+	"data": 2
+}}
diff --git a/root/package/modems/src/data/19d2-0086 b/root/package/modems/src/data/19d2-0086
new file mode 100644
index 00000000..f25d77a6
--- /dev/null
+++ b/root/package/modems/src/data/19d2-0086
@@ -0,0 +1,5 @@
+{
+	"desc": "ZTE MF645",
+	"control": 1,
+	"data": 2
+}}
diff --git a/root/package/modems/src/data/19d2-0091 b/root/package/modems/src/data/19d2-0091
new file mode 100644
index 00000000..4e429a63
--- /dev/null
+++ b/root/package/modems/src/data/19d2-0091
@@ -0,0 +1,5 @@
+{
+	"desc": "ZTE MF636",
+	"control": 1,
+	"data": 3
+}}
diff --git a/root/package/modems/src/data/19d2-0094 b/root/package/modems/src/data/19d2-0094
new file mode 100644
index 00000000..34a976eb
--- /dev/null
+++ b/root/package/modems/src/data/19d2-0094
@@ -0,0 +1,5 @@
+{
+	"desc": "ZTE AC581",
+	"control": 3,
+	"data": 0
+}}
diff --git a/root/package/modems/src/data/19d2-0104 b/root/package/modems/src/data/19d2-0104
new file mode 100644
index 00000000..0646b8d1
--- /dev/null
+++ b/root/package/modems/src/data/19d2-0104
@@ -0,0 +1,4 @@
+{
+	"desc": "ZTE K4505-Z",
+	"type": "qmi"
+}
diff --git a/root/package/modems/src/data/19d2-0108 b/root/package/modems/src/data/19d2-0108
new file mode 100644
index 00000000..369d70f0
--- /dev/null
+++ b/root/package/modems/src/data/19d2-0108
@@ -0,0 +1,5 @@
+{
+	"desc": "ONDA MT505UP/ZTE",
+	"control": 1,
+	"data": 3
+}}
diff --git a/root/package/modems/src/data/19d2-0116 b/root/package/modems/src/data/19d2-0116
new file mode 100644
index 00000000..bfe9b5d4
--- /dev/null
+++ b/root/package/modems/src/data/19d2-0116
@@ -0,0 +1,6 @@
+{
+	"desc": "ZTE MF651",
+	"control": 1,
+	"data": 0
+}	"acm": 1
+}
diff --git a/root/package/modems/src/data/19d2-0117 b/root/package/modems/src/data/19d2-0117
new file mode 100644
index 00000000..8610bbf4
--- /dev/null
+++ b/root/package/modems/src/data/19d2-0117
@@ -0,0 +1,5 @@
+{
+	"desc": "ZTE MF112",
+	"control": 1,
+	"data": 2
+}}
diff --git a/root/package/modems/src/data/19d2-0121 b/root/package/modems/src/data/19d2-0121
new file mode 100644
index 00000000..da5b96c0
--- /dev/null
+++ b/root/package/modems/src/data/19d2-0121
@@ -0,0 +1,4 @@
+{
+	"desc": "ZTE MF637",
+	"type": "qmi"
+}
diff --git a/root/package/modems/src/data/19d2-0124 b/root/package/modems/src/data/19d2-0124
new file mode 100644
index 00000000..74b4f6fb
--- /dev/null
+++ b/root/package/modems/src/data/19d2-0124
@@ -0,0 +1,4 @@
+{
+	"desc": "ZTE MF110",
+	"type": "qmi"
+}
diff --git a/root/package/modems/src/data/19d2-0128 b/root/package/modems/src/data/19d2-0128
new file mode 100644
index 00000000..620eb90f
--- /dev/null
+++ b/root/package/modems/src/data/19d2-0128
@@ -0,0 +1,5 @@
+{
+	"desc": "ZTE MF651",
+	"control": 1,
+	"data": 3
+}}
diff --git a/root/package/modems/src/data/19d2-0142 b/root/package/modems/src/data/19d2-0142
new file mode 100644
index 00000000..6d19e3e8
--- /dev/null
+++ b/root/package/modems/src/data/19d2-0142
@@ -0,0 +1,6 @@
+{
+	"desc": "ZTE MF665C",
+	"control": 0,
+	"data": 0
+}	"acm": 1
+}
diff --git a/root/package/modems/src/data/19d2-0143 b/root/package/modems/src/data/19d2-0143
new file mode 100644
index 00000000..6885a9b2
--- /dev/null
+++ b/root/package/modems/src/data/19d2-0143
@@ -0,0 +1,6 @@
+{
+	"desc": "ZTE MF190B",
+	"control": 0,
+	"data": 0
+}	"acm": 1
+}
diff --git a/root/package/modems/src/data/19d2-0152 b/root/package/modems/src/data/19d2-0152
new file mode 100644
index 00000000..20047be7
--- /dev/null
+++ b/root/package/modems/src/data/19d2-0152
@@ -0,0 +1,5 @@
+{
+	"desc": "ZTE AC583",
+	"control": 2,
+	"data": 0
+}}
diff --git a/root/package/modems/src/data/19d2-0157 b/root/package/modems/src/data/19d2-0157
new file mode 100644
index 00000000..d7be7c4d
--- /dev/null
+++ b/root/package/modems/src/data/19d2-0157
@@ -0,0 +1,4 @@
+{
+	"desc": "ZTE MF683",
+	"type": "qmi"
+}
diff --git a/root/package/modems/src/data/19d2-0167 b/root/package/modems/src/data/19d2-0167
new file mode 100644
index 00000000..0eefdc12
--- /dev/null
+++ b/root/package/modems/src/data/19d2-0167
@@ -0,0 +1,4 @@
+{
+	"desc": "ZTE MF820D",
+	"type": "qmi"
+}
diff --git a/root/package/modems/src/data/19d2-0170 b/root/package/modems/src/data/19d2-0170
new file mode 100644
index 00000000..d7d6f97a
--- /dev/null
+++ b/root/package/modems/src/data/19d2-0170
@@ -0,0 +1,6 @@
+{
+	"desc": "ZTE A371",
+	"control": 0,
+	"data": 1
+}	"generic": 1
+}
diff --git a/root/package/modems/src/data/19d2-0199 b/root/package/modems/src/data/19d2-0199
new file mode 100644
index 00000000..565afcf6
--- /dev/null
+++ b/root/package/modems/src/data/19d2-0199
@@ -0,0 +1,4 @@
+{
+	"desc": "ZTE MF820S",
+	"type": "qmi"
+}
diff --git a/root/package/modems/src/data/19d2-0257 b/root/package/modems/src/data/19d2-0257
new file mode 100644
index 00000000..6e943169
--- /dev/null
+++ b/root/package/modems/src/data/19d2-0257
@@ -0,0 +1,4 @@
+{
+	"desc": "ZTE MF821",
+	"type": "qmi"
+}
diff --git a/root/package/modems/src/data/19d2-0265 b/root/package/modems/src/data/19d2-0265
new file mode 100644
index 00000000..284c6ed9
--- /dev/null
+++ b/root/package/modems/src/data/19d2-0265
@@ -0,0 +1,4 @@
+{
+	"desc": "Onda MT8205/ZTE",
+	"type": "qmi"
+}
diff --git a/root/package/modems/src/data/19d2-0284 b/root/package/modems/src/data/19d2-0284
new file mode 100644
index 00000000..4fc3bbbc
--- /dev/null
+++ b/root/package/modems/src/data/19d2-0284
@@ -0,0 +1,4 @@
+{
+	"desc": "ZTE MF880",
+	"type": "qmi"
+}
diff --git a/root/package/modems/src/data/19d2-0326 b/root/package/modems/src/data/19d2-0326
new file mode 100644
index 00000000..c854f2a6
--- /dev/null
+++ b/root/package/modems/src/data/19d2-0326
@@ -0,0 +1,4 @@
+{
+	"desc": "ZTE MF821D",
+	"type": "qmi"
+}
diff --git a/root/package/modems/src/data/19d2-1003 b/root/package/modems/src/data/19d2-1003
new file mode 100644
index 00000000..a7d0eb5a
--- /dev/null
+++ b/root/package/modems/src/data/19d2-1003
@@ -0,0 +1,6 @@
+{
+	"desc": "ZTE K3805-Z",
+	"control": 1,
+	"data": 0
+}	"acm": 1
+}
diff --git a/root/package/modems/src/data/19d2-1008 b/root/package/modems/src/data/19d2-1008
new file mode 100644
index 00000000..d0b329ce
--- /dev/null
+++ b/root/package/modems/src/data/19d2-1008
@@ -0,0 +1,4 @@
+{
+	"desc": "ZTE K3570-Z",
+	"type": "qmi"
+}
diff --git a/root/package/modems/src/data/19d2-1010 b/root/package/modems/src/data/19d2-1010
new file mode 100644
index 00000000..fe294f0f
--- /dev/null
+++ b/root/package/modems/src/data/19d2-1010
@@ -0,0 +1,4 @@
+{
+	"desc": "ZTE K3571-Z",
+	"type": "qmi"
+}
diff --git a/root/package/modems/src/data/19d2-1015 b/root/package/modems/src/data/19d2-1015
new file mode 100644
index 00000000..a5eab00e
--- /dev/null
+++ b/root/package/modems/src/data/19d2-1015
@@ -0,0 +1,6 @@
+{
+	"desc": "ZTE K3806-Z",
+	"control": 1,
+	"data": 0
+}	"acm": 1
+}
diff --git a/root/package/modems/src/data/19d2-1018 b/root/package/modems/src/data/19d2-1018
new file mode 100644
index 00000000..48add8f4
--- /dev/null
+++ b/root/package/modems/src/data/19d2-1018
@@ -0,0 +1,4 @@
+{
+	"desc": "ZTE K5006-Z",
+	"type": "qmi"
+}
diff --git a/root/package/modems/src/data/19d2-1172 b/root/package/modems/src/data/19d2-1172
new file mode 100644
index 00000000..1b4c728f
--- /dev/null
+++ b/root/package/modems/src/data/19d2-1172
@@ -0,0 +1,6 @@
+{
+	"desc": "ZTE K4510-Z",
+	"control": 0,
+	"data": 0
+}	"acm": 1
+}
diff --git a/root/package/modems/src/data/19d2-1173 b/root/package/modems/src/data/19d2-1173
new file mode 100644
index 00000000..1b4c728f
--- /dev/null
+++ b/root/package/modems/src/data/19d2-1173
@@ -0,0 +1,6 @@
+{
+	"desc": "ZTE K4510-Z",
+	"control": 0,
+	"data": 0
+}	"acm": 1
+}
diff --git a/root/package/modems/src/data/19d2-1176 b/root/package/modems/src/data/19d2-1176
new file mode 100644
index 00000000..4bbd5b74
--- /dev/null
+++ b/root/package/modems/src/data/19d2-1176
@@ -0,0 +1,4 @@
+{
+	"desc": "ZTE K3770-Z",
+	"type": "qmi"
+}
diff --git a/root/package/modems/src/data/19d2-1177 b/root/package/modems/src/data/19d2-1177
new file mode 100644
index 00000000..3d196af4
--- /dev/null
+++ b/root/package/modems/src/data/19d2-1177
@@ -0,0 +1,6 @@
+{
+	"desc": "ZTE K3770-Z",
+	"control": 0,
+	"data": 0
+}	"acm": 1
+}
diff --git a/root/package/modems/src/data/19d2-1181 b/root/package/modems/src/data/19d2-1181
new file mode 100644
index 00000000..5ee7b2f2
--- /dev/null
+++ b/root/package/modems/src/data/19d2-1181
@@ -0,0 +1,6 @@
+{
+	"desc": "ZTE K3772-Z",
+	"control": 0,
+	"data": 0
+}	"acm": 1
+}
diff --git a/root/package/modems/src/data/19d2-1203 b/root/package/modems/src/data/19d2-1203
new file mode 100644
index 00000000..45025312
--- /dev/null
+++ b/root/package/modems/src/data/19d2-1203
@@ -0,0 +1,6 @@
+{
+	"desc": "ZTE MF691",
+	"control": 0,
+	"data": 0
+}	"acm": 1
+}
diff --git a/root/package/modems/src/data/19d2-1208 b/root/package/modems/src/data/19d2-1208
new file mode 100644
index 00000000..d8bc573a
--- /dev/null
+++ b/root/package/modems/src/data/19d2-1208
@@ -0,0 +1,6 @@
+{
+	"desc": "ZTE MF192",
+	"control": 0,
+	"data": 0
+}	"acm": 1
+}
diff --git a/root/package/modems/src/data/19d2-1211 b/root/package/modems/src/data/19d2-1211
new file mode 100644
index 00000000..0df58f0a
--- /dev/null
+++ b/root/package/modems/src/data/19d2-1211
@@ -0,0 +1,6 @@
+{
+	"desc": "ZTE MF195",
+	"control": 0,
+	"data": 0
+}	"acm": 1
+}
diff --git a/root/package/modems/src/data/19d2-1212 b/root/package/modems/src/data/19d2-1212
new file mode 100644
index 00000000..0df58f0a
--- /dev/null
+++ b/root/package/modems/src/data/19d2-1212
@@ -0,0 +1,6 @@
+{
+	"desc": "ZTE MF195",
+	"control": 0,
+	"data": 0
+}	"acm": 1
+}
diff --git a/root/package/modems/src/data/19d2-1217 b/root/package/modems/src/data/19d2-1217
new file mode 100644
index 00000000..d8bc573a
--- /dev/null
+++ b/root/package/modems/src/data/19d2-1217
@@ -0,0 +1,6 @@
+{
+	"desc": "ZTE MF192",
+	"control": 0,
+	"data": 0
+}	"acm": 1
+}
diff --git a/root/package/modems/src/data/19d2-1218 b/root/package/modems/src/data/19d2-1218
new file mode 100644
index 00000000..d8bc573a
--- /dev/null
+++ b/root/package/modems/src/data/19d2-1218
@@ -0,0 +1,6 @@
+{
+	"desc": "ZTE MF192",
+	"control": 0,
+	"data": 0
+}	"acm": 1
+}
diff --git a/root/package/modems/src/data/19d2-1220 b/root/package/modems/src/data/19d2-1220
new file mode 100644
index 00000000..d8bc573a
--- /dev/null
+++ b/root/package/modems/src/data/19d2-1220
@@ -0,0 +1,6 @@
+{
+	"desc": "ZTE MF192",
+	"control": 0,
+	"data": 0
+}	"acm": 1
+}
diff --git a/root/package/modems/src/data/19d2-1222 b/root/package/modems/src/data/19d2-1222
new file mode 100644
index 00000000..d8bc573a
--- /dev/null
+++ b/root/package/modems/src/data/19d2-1222
@@ -0,0 +1,6 @@
+{
+	"desc": "ZTE MF192",
+	"control": 0,
+	"data": 0
+}	"acm": 1
+}
diff --git a/root/package/modems/src/data/19d2-1245 b/root/package/modems/src/data/19d2-1245
new file mode 100644
index 00000000..c08014c5
--- /dev/null
+++ b/root/package/modems/src/data/19d2-1245
@@ -0,0 +1,4 @@
+{
+	"desc": "ZTE MF190",
+	"type": "qmi"
+}
diff --git a/root/package/modems/src/data/19d2-1252 b/root/package/modems/src/data/19d2-1252
new file mode 100644
index 00000000..768a4333
--- /dev/null
+++ b/root/package/modems/src/data/19d2-1252
@@ -0,0 +1,4 @@
+{
+	"desc": "ZTE MF669",
+	"type": "qmi"
+}
diff --git a/root/package/modems/src/data/19d2-1254 b/root/package/modems/src/data/19d2-1254
new file mode 100644
index 00000000..c08014c5
--- /dev/null
+++ b/root/package/modems/src/data/19d2-1254
@@ -0,0 +1,4 @@
+{
+	"desc": "ZTE MF190",
+	"type": "qmi"
+}
diff --git a/root/package/modems/src/data/19d2-1256 b/root/package/modems/src/data/19d2-1256
new file mode 100644
index 00000000..c08014c5
--- /dev/null
+++ b/root/package/modems/src/data/19d2-1256
@@ -0,0 +1,4 @@
+{
+	"desc": "ZTE MF190",
+	"type": "qmi"
+}
diff --git a/root/package/modems/src/data/19d2-1270 b/root/package/modems/src/data/19d2-1270
new file mode 100644
index 00000000..7ad57f02
--- /dev/null
+++ b/root/package/modems/src/data/19d2-1270
@@ -0,0 +1,4 @@
+{
+	"desc": "ZTE MF667",
+	"type": "qmi"
+}
diff --git a/root/package/modems/src/data/19d2-1401 b/root/package/modems/src/data/19d2-1401
new file mode 100644
index 00000000..730b6349
--- /dev/null
+++ b/root/package/modems/src/data/19d2-1401
@@ -0,0 +1,4 @@
+{
+	"desc": "ZTE MF60",
+	"type": "qmi"
+}
diff --git a/root/package/modems/src/data/19d2-1402 b/root/package/modems/src/data/19d2-1402
new file mode 100644
index 00000000..730b6349
--- /dev/null
+++ b/root/package/modems/src/data/19d2-1402
@@ -0,0 +1,4 @@
+{
+	"desc": "ZTE MF60",
+	"type": "qmi"
+}
diff --git a/root/package/modems/src/data/19d2-1426 b/root/package/modems/src/data/19d2-1426
new file mode 100644
index 00000000..cb9337b4
--- /dev/null
+++ b/root/package/modems/src/data/19d2-1426
@@ -0,0 +1,4 @@
+{
+	"desc": "ZTE MF91D",
+	"type": "qmi"
+}
diff --git a/root/package/modems/src/data/19d2-1512 b/root/package/modems/src/data/19d2-1512
new file mode 100644
index 00000000..7e4bbf75
--- /dev/null
+++ b/root/package/modems/src/data/19d2-1512
@@ -0,0 +1,6 @@
+{
+	"desc": "ZTE MFxxx",
+	"control": 0,
+	"data": 0
+}	"acm": 1
+}
diff --git a/root/package/modems/src/data/19d2-1515 b/root/package/modems/src/data/19d2-1515
new file mode 100644
index 00000000..d8bc573a
--- /dev/null
+++ b/root/package/modems/src/data/19d2-1515
@@ -0,0 +1,6 @@
+{
+	"desc": "ZTE MF192",
+	"control": 0,
+	"data": 0
+}	"acm": 1
+}
diff --git a/root/package/modems/src/data/19d2-1518 b/root/package/modems/src/data/19d2-1518
new file mode 100644
index 00000000..d8bc573a
--- /dev/null
+++ b/root/package/modems/src/data/19d2-1518
@@ -0,0 +1,6 @@
+{
+	"desc": "ZTE MF192",
+	"control": 0,
+	"data": 0
+}	"acm": 1
+}
diff --git a/root/package/modems/src/data/19d2-1519 b/root/package/modems/src/data/19d2-1519
new file mode 100644
index 00000000..d8bc573a
--- /dev/null
+++ b/root/package/modems/src/data/19d2-1519
@@ -0,0 +1,6 @@
+{
+	"desc": "ZTE MF192",
+	"control": 0,
+	"data": 0
+}	"acm": 1
+}
diff --git a/root/package/modems/src/data/19d2-1522 b/root/package/modems/src/data/19d2-1522
new file mode 100644
index 00000000..4c926f01
--- /dev/null
+++ b/root/package/modems/src/data/19d2-1522
@@ -0,0 +1,6 @@
+{
+	"desc": "ZTE MF652",
+	"control": 0,
+	"data": 0
+}	"acm": 1
+}
diff --git a/root/package/modems/src/data/19d2-1525 b/root/package/modems/src/data/19d2-1525
new file mode 100644
index 00000000..7a37c432
--- /dev/null
+++ b/root/package/modems/src/data/19d2-1525
@@ -0,0 +1,6 @@
+{
+	"desc": "ZTE MF591",
+	"control": 0,
+	"data": 0
+}	"acm": 1
+}
diff --git a/root/package/modems/src/data/19d2-1527 b/root/package/modems/src/data/19d2-1527
new file mode 100644
index 00000000..6b46c73d
--- /dev/null
+++ b/root/package/modems/src/data/19d2-1527
@@ -0,0 +1,6 @@
+{
+	"desc": "ZTE MF196",
+	"control": 0,
+	"data": 0
+}	"acm": 1
+}
diff --git a/root/package/modems/src/data/19d2-1537 b/root/package/modems/src/data/19d2-1537
new file mode 100644
index 00000000..a6251640
--- /dev/null
+++ b/root/package/modems/src/data/19d2-1537
@@ -0,0 +1,6 @@
+{
+	"desc": "ZTE MF190J",
+	"control": 0,
+	"data": 0
+}	"acm": 1
+}
diff --git a/root/package/modems/src/data/19d2-1538 b/root/package/modems/src/data/19d2-1538
new file mode 100644
index 00000000..a6251640
--- /dev/null
+++ b/root/package/modems/src/data/19d2-1538
@@ -0,0 +1,6 @@
+{
+	"desc": "ZTE MF190J",
+	"control": 0,
+	"data": 0
+}	"acm": 1
+}
diff --git a/root/package/modems/src/data/19d2-1544 b/root/package/modems/src/data/19d2-1544
new file mode 100644
index 00000000..a6251640
--- /dev/null
+++ b/root/package/modems/src/data/19d2-1544
@@ -0,0 +1,6 @@
+{
+	"desc": "ZTE MF190J",
+	"control": 0,
+	"data": 0
+}	"acm": 1
+}
diff --git a/root/package/modems/src/data/19d2-2002 b/root/package/modems/src/data/19d2-2002
new file mode 100644
index 00000000..a049f196
--- /dev/null
+++ b/root/package/modems/src/data/19d2-2002
@@ -0,0 +1,4 @@
+{
+	"desc": "ZTE K3765-Z",
+	"type": "qmi"
+}
diff --git a/root/package/modems/src/data/19d2-2003 b/root/package/modems/src/data/19d2-2003
new file mode 100644
index 00000000..a2a08808
--- /dev/null
+++ b/root/package/modems/src/data/19d2-2003
@@ -0,0 +1,5 @@
+{
+	"desc": "ZTE MF180",
+	"control": 1,
+	"data": 3
+}}
diff --git a/root/package/modems/src/data/19d2-ffdd b/root/package/modems/src/data/19d2-ffdd
new file mode 100644
index 00000000..71d1050a
--- /dev/null
+++ b/root/package/modems/src/data/19d2-ffdd
@@ -0,0 +1,5 @@
+{
+	"desc": "ZTE AC682",
+	"control": 1,
+	"data": 0
+}}
diff --git a/root/package/modems/src/data/19d2-ffe4 b/root/package/modems/src/data/19d2-ffe4
new file mode 100644
index 00000000..03a16bff
--- /dev/null
+++ b/root/package/modems/src/data/19d2-ffe4
@@ -0,0 +1,6 @@
+{
+	"desc": "ZTE AC3781",
+	"control": 1,
+	"data": 0
+}	"generic": 1
+}
diff --git a/root/package/modems/src/data/19d2-ffe9 b/root/package/modems/src/data/19d2-ffe9
new file mode 100644
index 00000000..57531e26
--- /dev/null
+++ b/root/package/modems/src/data/19d2-ffe9
@@ -0,0 +1,5 @@
+{
+	"desc": "ZTE AC2738",
+	"control": 1,
+	"data": 0
+}}
diff --git a/root/package/modems/src/data/19d2-fff1 b/root/package/modems/src/data/19d2-fff1
new file mode 100644
index 00000000..4347f288
--- /dev/null
+++ b/root/package/modems/src/data/19d2-fff1
@@ -0,0 +1,5 @@
+{
+	"desc": "ZTE generic",
+	"control": 1,
+	"data": 0
+}}
diff --git a/root/package/modems/src/data/19d2-fffb b/root/package/modems/src/data/19d2-fffb
new file mode 100644
index 00000000..4ff616a0
--- /dev/null
+++ b/root/package/modems/src/data/19d2-fffb
@@ -0,0 +1,5 @@
+{
+	"desc": "ZTE MG880",
+	"control": 1,
+	"data": 0
+}}
diff --git a/root/package/modems/src/data/19d2-fffc b/root/package/modems/src/data/19d2-fffc
new file mode 100644
index 00000000..4ff616a0
--- /dev/null
+++ b/root/package/modems/src/data/19d2-fffc
@@ -0,0 +1,5 @@
+{
+	"desc": "ZTE MG880",
+	"control": 1,
+	"data": 0
+}}
diff --git a/root/package/modems/src/data/19d2-fffd b/root/package/modems/src/data/19d2-fffd
new file mode 100644
index 00000000..4ff616a0
--- /dev/null
+++ b/root/package/modems/src/data/19d2-fffd
@@ -0,0 +1,5 @@
+{
+	"desc": "ZTE MG880",
+	"control": 1,
+	"data": 0
+}}
diff --git a/root/package/modems/src/data/19d2-fffe b/root/package/modems/src/data/19d2-fffe
new file mode 100644
index 00000000..4e600498
--- /dev/null
+++ b/root/package/modems/src/data/19d2-fffe
@@ -0,0 +1,5 @@
+{
+	"desc": "ZTE AC8700",
+	"control": 1,
+	"data": 0
+}}
diff --git a/root/package/modems/src/data/19d2-ffff b/root/package/modems/src/data/19d2-ffff
new file mode 100644
index 00000000..747fa238
--- /dev/null
+++ b/root/package/modems/src/data/19d2-ffff
@@ -0,0 +1,5 @@
+{
+	"desc": "ZTE AC8710",
+	"control": 1,
+	"data": 0
+}}
diff --git a/root/package/modems/src/data/1a8d-1002 b/root/package/modems/src/data/1a8d-1002
new file mode 100644
index 00000000..93388be2
--- /dev/null
+++ b/root/package/modems/src/data/1a8d-1002
@@ -0,0 +1,5 @@
+{
+	"desc": "Bandrich C-100/C-120",
+	"control": 1,
+	"data": 0
+}}
diff --git a/root/package/modems/src/data/1a8d-1003 b/root/package/modems/src/data/1a8d-1003
new file mode 100644
index 00000000..93388be2
--- /dev/null
+++ b/root/package/modems/src/data/1a8d-1003
@@ -0,0 +1,5 @@
+{
+	"desc": "Bandrich C-100/C-120",
+	"control": 1,
+	"data": 0
+}}
diff --git a/root/package/modems/src/data/1a8d-1007 b/root/package/modems/src/data/1a8d-1007
new file mode 100644
index 00000000..f013968f
--- /dev/null
+++ b/root/package/modems/src/data/1a8d-1007
@@ -0,0 +1,5 @@
+{
+	"desc": "Bandrich C-270",
+	"control": 2,
+	"data": 0
+}}
diff --git a/root/package/modems/src/data/1a8d-1009 b/root/package/modems/src/data/1a8d-1009
new file mode 100644
index 00000000..82e4bf03
--- /dev/null
+++ b/root/package/modems/src/data/1a8d-1009
@@ -0,0 +1,5 @@
+{
+	"desc": "Bandrich C-170/C-180",
+	"control": 2,
+	"data": 0
+}}
diff --git a/root/package/modems/src/data/1a8d-100c b/root/package/modems/src/data/1a8d-100c
new file mode 100644
index 00000000..1acb9eec
--- /dev/null
+++ b/root/package/modems/src/data/1a8d-100c
@@ -0,0 +1,5 @@
+{
+	"desc": "Bandrich C-320",
+	"control": 2,
+	"data": 0
+}}
diff --git a/root/package/modems/src/data/1a8d-100d b/root/package/modems/src/data/1a8d-100d
new file mode 100644
index 00000000..67db2b46
--- /dev/null
+++ b/root/package/modems/src/data/1a8d-100d
@@ -0,0 +1,5 @@
+{
+	"desc": "Bandrich C-508",
+	"control": 2,
+	"data": 0
+}}
diff --git a/root/package/modems/src/data/1a8d-2006 b/root/package/modems/src/data/1a8d-2006
new file mode 100644
index 00000000..78f36cef
--- /dev/null
+++ b/root/package/modems/src/data/1a8d-2006
@@ -0,0 +1,6 @@
+{
+	"desc": "Bandrich C-33x",
+	"control": 0,
+	"data": 1
+}	"acm": 1
+}
diff --git a/root/package/modems/src/data/1bbb-0000 b/root/package/modems/src/data/1bbb-0000
new file mode 100644
index 00000000..0be73afa
--- /dev/null
+++ b/root/package/modems/src/data/1bbb-0000
@@ -0,0 +1,5 @@
+{
+	"desc": "Alcatel X060S/X070S/X080S/X200",
+	"control": 2,
+	"data": 2
+}}
diff --git a/root/package/modems/src/data/1bbb-0012 b/root/package/modems/src/data/1bbb-0012
new file mode 100644
index 00000000..3eecac0e
--- /dev/null
+++ b/root/package/modems/src/data/1bbb-0012
@@ -0,0 +1,6 @@
+{
+	"desc": "Alcatel X085C",
+	"control": 2,
+	"data": 2
+}	"generic": 1
+}
diff --git a/root/package/modems/src/data/1bbb-0017 b/root/package/modems/src/data/1bbb-0017
new file mode 100644
index 00000000..853c05c0
--- /dev/null
+++ b/root/package/modems/src/data/1bbb-0017
@@ -0,0 +1,5 @@
+{
+	"desc": "Alcatel X220L",
+	"control": 4,
+	"data": 4
+}}
diff --git a/root/package/modems/src/data/1bbb-0052 b/root/package/modems/src/data/1bbb-0052
new file mode 100644
index 00000000..853c05c0
--- /dev/null
+++ b/root/package/modems/src/data/1bbb-0052
@@ -0,0 +1,5 @@
+{
+	"desc": "Alcatel X220L",
+	"control": 4,
+	"data": 4
+}}
diff --git a/root/package/modems/src/data/1bbb-00b7 b/root/package/modems/src/data/1bbb-00b7
new file mode 100644
index 00000000..9eaffe66
--- /dev/null
+++ b/root/package/modems/src/data/1bbb-00b7
@@ -0,0 +1,5 @@
+{
+	"desc": "Alcatel X600",
+	"control": 0,
+	"data": 4
+}}
diff --git a/root/package/modems/src/data/1bbb-00ca b/root/package/modems/src/data/1bbb-00ca
new file mode 100644
index 00000000..80d71fad
--- /dev/null
+++ b/root/package/modems/src/data/1bbb-00ca
@@ -0,0 +1,6 @@
+{
+	"desc": "Alcatel X080C",
+	"control": 0,
+	"data": 0
+}	"generic": 1
+}
diff --git a/root/package/modems/src/data/1bbb-011e b/root/package/modems/src/data/1bbb-011e
new file mode 100644
index 00000000..160221dd
--- /dev/null
+++ b/root/package/modems/src/data/1bbb-011e
@@ -0,0 +1,4 @@
+{
+	"desc": "Alcatel L100V,",
+	"type": "qmi"
+}
diff --git a/root/package/modems/src/data/1bbb-0203 b/root/package/modems/src/data/1bbb-0203
new file mode 100644
index 00000000..2632a632
--- /dev/null
+++ b/root/package/modems/src/data/1bbb-0203
@@ -0,0 +1,4 @@
+{
+	"desc": "Alcatel L800Z,",
+	"type": "qmi"
+}
diff --git a/root/package/modems/src/data/1c9e-6060 b/root/package/modems/src/data/1c9e-6060
new file mode 100644
index 00000000..6f77bb4b
--- /dev/null
+++ b/root/package/modems/src/data/1c9e-6060
@@ -0,0 +1,6 @@
+{
+	"desc": "Alcatel X020 & X030",
+	"control": 2,
+	"data": 0
+}	"generic": 1
+}
diff --git a/root/package/modems/src/data/1c9e-6061 b/root/package/modems/src/data/1c9e-6061
new file mode 100644
index 00000000..6f77bb4b
--- /dev/null
+++ b/root/package/modems/src/data/1c9e-6061
@@ -0,0 +1,6 @@
+{
+	"desc": "Alcatel X020 & X030",
+	"control": 2,
+	"data": 0
+}	"generic": 1
+}
diff --git a/root/package/modems/src/data/1c9e-9000 b/root/package/modems/src/data/1c9e-9000
new file mode 100644
index 00000000..39dcd776
--- /dev/null
+++ b/root/package/modems/src/data/1c9e-9000
@@ -0,0 +1,6 @@
+{
+	"desc": "4G Systems XS Stick W14",
+	"control": 0,
+	"data": 0
+}	"generic": 1
+}
diff --git a/root/package/modems/src/data/1c9e-9603 b/root/package/modems/src/data/1c9e-9603
new file mode 100644
index 00000000..fd3f099d
--- /dev/null
+++ b/root/package/modems/src/data/1c9e-9603
@@ -0,0 +1,5 @@
+{
+	"desc": "4G Systems XS Stick W14",
+	"control": 1,
+	"data": 2
+}}
diff --git a/root/package/modems/src/data/1c9e-9605 b/root/package/modems/src/data/1c9e-9605
new file mode 100644
index 00000000..c2992c16
--- /dev/null
+++ b/root/package/modems/src/data/1c9e-9605
@@ -0,0 +1,5 @@
+{
+	"desc": "4G Systems XS Stick W14",
+	"control": 1,
+	"data": 3
+}}
diff --git a/root/package/modems/src/data/1c9e-9607 b/root/package/modems/src/data/1c9e-9607
new file mode 100644
index 00000000..c2992c16
--- /dev/null
+++ b/root/package/modems/src/data/1c9e-9607
@@ -0,0 +1,5 @@
+{
+	"desc": "4G Systems XS Stick W14",
+	"control": 1,
+	"data": 3
+}}
diff --git a/root/package/modems/src/data/1c9e-9801 b/root/package/modems/src/data/1c9e-9801
new file mode 100644
index 00000000..40dcc760
--- /dev/null
+++ b/root/package/modems/src/data/1c9e-9801
@@ -0,0 +1,6 @@
+{
+	"desc": "4G Systems XS Stick W21",
+	"control": 2,
+	"data": 1
+}	"generic": 1
+}
diff --git a/root/package/modems/src/data/1c9e-9900 b/root/package/modems/src/data/1c9e-9900
new file mode 100644
index 00000000..42da3aba
--- /dev/null
+++ b/root/package/modems/src/data/1c9e-9900
@@ -0,0 +1,6 @@
+{
+	"desc": "Softbank C02LC",
+	"control": 1,
+	"data": 2
+}	"generic": 1
+}
diff --git a/root/package/modems/src/data/1e0e-9000 b/root/package/modems/src/data/1e0e-9000
new file mode 100644
index 00000000..bdb159da
--- /dev/null
+++ b/root/package/modems/src/data/1e0e-9000
@@ -0,0 +1,5 @@
+{
+	"desc": "PROLink PHS100, Hyundai MB-810, A-Link 3GU",
+	"control": 1,
+	"data": 2
+}}
diff --git a/root/package/modems/src/data/1e0e-9100 b/root/package/modems/src/data/1e0e-9100
new file mode 100644
index 00000000..d1b2dda7
--- /dev/null
+++ b/root/package/modems/src/data/1e0e-9100
@@ -0,0 +1,5 @@
+{
+	"desc": "PROLink PHS300, A-Link 3GU",
+	"control": 1,
+	"data": 2
+}}
diff --git a/root/package/modems/src/data/1e0e-9200 b/root/package/modems/src/data/1e0e-9200
new file mode 100644
index 00000000..bdb159da
--- /dev/null
+++ b/root/package/modems/src/data/1e0e-9200
@@ -0,0 +1,5 @@
+{
+	"desc": "PROLink PHS100, Hyundai MB-810, A-Link 3GU",
+	"control": 1,
+	"data": 2
+}}
diff --git a/root/package/modems/src/data/1e0e-ce16 b/root/package/modems/src/data/1e0e-ce16
new file mode 100644
index 00000000..93e0c3fa
--- /dev/null
+++ b/root/package/modems/src/data/1e0e-ce16
@@ -0,0 +1,5 @@
+{
+	"desc": "D-Link DWM-162-U5, Micromax MMX 300c",
+	"control": 1,
+	"data": 0
+}}
diff --git a/root/package/modems/src/data/1e0e-cefe b/root/package/modems/src/data/1e0e-cefe
new file mode 100644
index 00000000..ebc941df
--- /dev/null
+++ b/root/package/modems/src/data/1e0e-cefe
@@ -0,0 +1,6 @@
+{
+	"desc": "D-Link DWM-162-U5, Micromax MMX 300c",
+	"control": 1,
+	"data": 2
+}	"generic": 1
+}
diff --git a/root/package/modems/src/data/2001-7d00 b/root/package/modems/src/data/2001-7d00
new file mode 100644
index 00000000..b0cc4791
--- /dev/null
+++ b/root/package/modems/src/data/2001-7d00
@@ -0,0 +1,6 @@
+{
+	"desc": "D-Link DWM-156 A6",
+	"control": 1,
+	"data": 0
+}	"generic": 1
+}
diff --git a/root/package/modems/src/data/2001-7d01 b/root/package/modems/src/data/2001-7d01
new file mode 100644
index 00000000..ab8fd9de
--- /dev/null
+++ b/root/package/modems/src/data/2001-7d01
@@ -0,0 +1,5 @@
+{
+	"desc": "D-Link DWM-156 A7",
+	"control": 1,
+	"data": 0
+}}
diff --git a/root/package/modems/src/data/2001-7d02 b/root/package/modems/src/data/2001-7d02
new file mode 100644
index 00000000..ab8fd9de
--- /dev/null
+++ b/root/package/modems/src/data/2001-7d02
@@ -0,0 +1,5 @@
+{
+	"desc": "D-Link DWM-156 A7",
+	"control": 1,
+	"data": 0
+}}
diff --git a/root/package/modems/src/data/2001-7d03 b/root/package/modems/src/data/2001-7d03
new file mode 100644
index 00000000..ab8fd9de
--- /dev/null
+++ b/root/package/modems/src/data/2001-7d03
@@ -0,0 +1,5 @@
+{
+	"desc": "D-Link DWM-156 A7",
+	"control": 1,
+	"data": 0
+}}
diff --git a/root/package/modems/src/data/211f-6801 b/root/package/modems/src/data/211f-6801
new file mode 100644
index 00000000..06cdddca
--- /dev/null
+++ b/root/package/modems/src/data/211f-6801
@@ -0,0 +1,5 @@
+{
+	"desc": "Celot K-3000/CT-650/CT-680",
+	"control": 2,
+	"data": 0
+}}
diff --git a/root/package/modems/src/data/2357-0201 b/root/package/modems/src/data/2357-0201
new file mode 100644
index 00000000..7ad8690e
--- /dev/null
+++ b/root/package/modems/src/data/2357-0201
@@ -0,0 +1,4 @@
+{
+	"desc": "TP-Link MA180",
+	"type": "qmi"
+}
diff --git a/root/package/modems/src/data/2357-0202 b/root/package/modems/src/data/2357-0202
new file mode 100644
index 00000000..7ad8690e
--- /dev/null
+++ b/root/package/modems/src/data/2357-0202
@@ -0,0 +1,4 @@
+{
+	"desc": "TP-Link MA180",
+	"type": "qmi"
+}
diff --git a/root/package/modems/src/data/2357-0203 b/root/package/modems/src/data/2357-0203
new file mode 100644
index 00000000..7ad8690e
--- /dev/null
+++ b/root/package/modems/src/data/2357-0203
@@ -0,0 +1,4 @@
+{
+	"desc": "TP-Link MA180",
+	"type": "qmi"
+}
diff --git a/root/package/modems/src/data/2357-9000 b/root/package/modems/src/data/2357-9000
new file mode 100644
index 00000000..0ddb804a
--- /dev/null
+++ b/root/package/modems/src/data/2357-9000
@@ -0,0 +1,4 @@
+{
+	"desc": "TP-Link MA260",
+	"type": "qmi"
+}
diff --git a/root/package/modems/src/data/2c7c-0121 b/root/package/modems/src/data/2c7c-0121
new file mode 100644
index 00000000..771731f0
--- /dev/null
+++ b/root/package/modems/src/data/2c7c-0121
@@ -0,0 +1,11 @@
+{
+	"desc": "Quectel EC21",
+	"type": "gobinet",
+	"control": 2,
+	"boudrate": 115200,
+	"stop_bits": 8,
+	"gps": 1,
+	"ep_iface": 4,
+	"dl_max_size": 4096,
+	"dl_max_datagrams": 16
+}
diff --git a/root/package/modems/src/data/2c7c-0125 b/root/package/modems/src/data/2c7c-0125
new file mode 100644
index 00000000..71a158a3
--- /dev/null
+++ b/root/package/modems/src/data/2c7c-0125
@@ -0,0 +1,11 @@
+{
+	"desc": "Quectel EC25",
+	"type": "gobinet",
+	"control": 2,
+	"boudrate": 115200,
+	"stop_bits": 8,
+	"gps": 1,
+	"ep_iface": 4,
+	"dl_max_size": 4096,
+	"dl_max_datagrams": 16
+}
diff --git a/root/package/modems/src/data/2c7c-0296 b/root/package/modems/src/data/2c7c-0296
new file mode 100644
index 00000000..b1a62448
--- /dev/null
+++ b/root/package/modems/src/data/2c7c-0296
@@ -0,0 +1,11 @@
+{
+	"desc": "Quectel BG96",
+	"type": "gobinet",
+	"control": 3,
+	"boudrate": 115200,
+	"stop_bits": 8,
+	"gps": 1,
+        "ep_iface": 4,
+        "dl_max_size": 2048,
+        "dl_max_datagrams": 8
+}
diff --git a/root/package/modems/src/data/2c7c-0306 b/root/package/modems/src/data/2c7c-0306
new file mode 100644
index 00000000..e271dc4a
--- /dev/null
+++ b/root/package/modems/src/data/2c7c-0306
@@ -0,0 +1,11 @@
+{
+	"desc": "Quectel EG06",
+	"type": "gobinet",
+	"control": 2,
+	"boudrate": 115200,
+	"stop_bits": 8,
+	"gps": 1,
+	"ep_iface": 4,
+	"dl_max_size": 16384,
+	"dl_max_datagrams": 32
+}
diff --git a/root/package/modems/src/data/2c7c-0512 b/root/package/modems/src/data/2c7c-0512
new file mode 100644
index 00000000..977b8c3d
--- /dev/null
+++ b/root/package/modems/src/data/2c7c-0512
@@ -0,0 +1,11 @@
+{
+	"desc": "Quectel EG12/EG18",
+	"type": "gobinet",
+	"control": 2,
+	"boudrate": 115200,
+	"stop_bits": 8,
+	"gps": 1,
+	"ep_iface": 4,
+	"dl_max_size": 16384,
+	"dl_max_datagrams": 32
+}
diff --git a/root/package/modems/src/data/413c-8114 b/root/package/modems/src/data/413c-8114
new file mode 100644
index 00000000..a3cb2cd7
--- /dev/null
+++ b/root/package/modems/src/data/413c-8114
@@ -0,0 +1,5 @@
+{
+	"desc": "Dell 5700",
+	"control": 1,
+	"data": 0
+}}
diff --git a/root/package/modems/src/data/413c-8115 b/root/package/modems/src/data/413c-8115
new file mode 100644
index 00000000..af27cbe0
--- /dev/null
+++ b/root/package/modems/src/data/413c-8115
@@ -0,0 +1,5 @@
+{
+	"desc": "Dell 5500",
+	"control": 1,
+	"data": 0
+}}
diff --git a/root/package/modems/src/data/413c-8116 b/root/package/modems/src/data/413c-8116
new file mode 100644
index 00000000..31b79bf9
--- /dev/null
+++ b/root/package/modems/src/data/413c-8116
@@ -0,0 +1,5 @@
+{
+	"desc": "Dell 5505",
+	"control": 1,
+	"data": 0
+}}
diff --git a/root/package/modems/src/data/413c-8117 b/root/package/modems/src/data/413c-8117
new file mode 100644
index 00000000..a3cb2cd7
--- /dev/null
+++ b/root/package/modems/src/data/413c-8117
@@ -0,0 +1,5 @@
+{
+	"desc": "Dell 5700",
+	"control": 1,
+	"data": 0
+}}
diff --git a/root/package/modems/src/data/413c-8118 b/root/package/modems/src/data/413c-8118
new file mode 100644
index 00000000..b92d4151
--- /dev/null
+++ b/root/package/modems/src/data/413c-8118
@@ -0,0 +1,5 @@
+{
+	"desc": "Dell 5510",
+	"control": 1,
+	"data": 0
+}}
diff --git a/root/package/modems/src/data/413c-8128 b/root/package/modems/src/data/413c-8128
new file mode 100644
index 00000000..a3cb2cd7
--- /dev/null
+++ b/root/package/modems/src/data/413c-8128
@@ -0,0 +1,5 @@
+{
+	"desc": "Dell 5700",
+	"control": 1,
+	"data": 0
+}}
diff --git a/root/package/modems/src/data/413c-8129 b/root/package/modems/src/data/413c-8129
new file mode 100644
index 00000000..a3cb2cd7
--- /dev/null
+++ b/root/package/modems/src/data/413c-8129
@@ -0,0 +1,5 @@
+{
+	"desc": "Dell 5700",
+	"control": 1,
+	"data": 0
+}}
diff --git a/root/package/modems/src/data/413c-8133 b/root/package/modems/src/data/413c-8133
new file mode 100644
index 00000000..4ae84020
--- /dev/null
+++ b/root/package/modems/src/data/413c-8133
@@ -0,0 +1,5 @@
+{
+	"desc": "Dell 5720",
+	"control": 1,
+	"data": 0
+}}
diff --git a/root/package/modems/src/data/413c-8134 b/root/package/modems/src/data/413c-8134
new file mode 100644
index 00000000..4ae84020
--- /dev/null
+++ b/root/package/modems/src/data/413c-8134
@@ -0,0 +1,5 @@
+{
+	"desc": "Dell 5720",
+	"control": 1,
+	"data": 0
+}}
diff --git a/root/package/modems/src/data/413c-8135 b/root/package/modems/src/data/413c-8135
new file mode 100644
index 00000000..4ae84020
--- /dev/null
+++ b/root/package/modems/src/data/413c-8135
@@ -0,0 +1,5 @@
+{
+	"desc": "Dell 5720",
+	"control": 1,
+	"data": 0
+}}
diff --git a/root/package/modems/src/data/413c-8136 b/root/package/modems/src/data/413c-8136
new file mode 100644
index 00000000..d2bf508f
--- /dev/null
+++ b/root/package/modems/src/data/413c-8136
@@ -0,0 +1,5 @@
+{
+	"desc": "Dell 5520",
+	"control": 1,
+	"data": 0
+}}
diff --git a/root/package/modems/src/data/413c-8137 b/root/package/modems/src/data/413c-8137
new file mode 100644
index 00000000..d2bf508f
--- /dev/null
+++ b/root/package/modems/src/data/413c-8137
@@ -0,0 +1,5 @@
+{
+	"desc": "Dell 5520",
+	"control": 1,
+	"data": 0
+}}
diff --git a/root/package/modems/src/data/413c-8138 b/root/package/modems/src/data/413c-8138
new file mode 100644
index 00000000..d2bf508f
--- /dev/null
+++ b/root/package/modems/src/data/413c-8138
@@ -0,0 +1,5 @@
+{
+	"desc": "Dell 5520",
+	"control": 1,
+	"data": 0
+}}
diff --git a/root/package/modems/src/data/413c-8147 b/root/package/modems/src/data/413c-8147
new file mode 100644
index 00000000..f0b0638f
--- /dev/null
+++ b/root/package/modems/src/data/413c-8147
@@ -0,0 +1,6 @@
+{
+	"desc": "Dell 5530",
+	"control": 0,
+	"data": 1
+}	"acm": 1
+}
diff --git a/root/package/modems/src/data/413c-8180 b/root/package/modems/src/data/413c-8180
new file mode 100644
index 00000000..1ae44053
--- /dev/null
+++ b/root/package/modems/src/data/413c-8180
@@ -0,0 +1,5 @@
+{
+	"desc": "Dell 5730",
+	"control": 1,
+	"data": 0
+}}
diff --git a/root/package/modems/src/data/413c-8181 b/root/package/modems/src/data/413c-8181
new file mode 100644
index 00000000..1ae44053
--- /dev/null
+++ b/root/package/modems/src/data/413c-8181
@@ -0,0 +1,5 @@
+{
+	"desc": "Dell 5730",
+	"control": 1,
+	"data": 0
+}}
diff --git a/root/package/modems/src/data/413c-8182 b/root/package/modems/src/data/413c-8182
new file mode 100644
index 00000000..1ae44053
--- /dev/null
+++ b/root/package/modems/src/data/413c-8182
@@ -0,0 +1,5 @@
+{
+	"desc": "Dell 5730",
+	"control": 1,
+	"data": 0
+}}
diff --git a/root/package/modems/src/data/413c-8186 b/root/package/modems/src/data/413c-8186
new file mode 100644
index 00000000..fa240998
--- /dev/null
+++ b/root/package/modems/src/data/413c-8186
@@ -0,0 +1,4 @@
+{
+	"desc": "Dell 5620",
+	"type": "qmi"
+}
diff --git a/root/package/modems/src/data/413c-8194 b/root/package/modems/src/data/413c-8194
new file mode 100644
index 00000000..b361f54d
--- /dev/null
+++ b/root/package/modems/src/data/413c-8194
@@ -0,0 +1,4 @@
+{
+	"desc": "Dell 5630",
+	"type": "qmi"
+}
diff --git a/root/package/modems/src/data/413c-8195 b/root/package/modems/src/data/413c-8195
new file mode 100644
index 00000000..45b78768
--- /dev/null
+++ b/root/package/modems/src/data/413c-8195
@@ -0,0 +1,4 @@
+{
+	"desc": "Dell 5800",
+	"type": "qmi"
+}
diff --git a/root/package/modems/src/data/413c-8196 b/root/package/modems/src/data/413c-8196
new file mode 100644
index 00000000..cd247303
--- /dev/null
+++ b/root/package/modems/src/data/413c-8196
@@ -0,0 +1,4 @@
+{
+	"desc": "Dell 5800v2",
+	"type": "qmi"
+}
diff --git a/root/package/modems/src/data/413c-819b b/root/package/modems/src/data/413c-819b
new file mode 100644
index 00000000..e66c3fc4
--- /dev/null
+++ b/root/package/modems/src/data/413c-819b
@@ -0,0 +1,5 @@
+{
+	"desc": "Dell 5804",
+	"control": 1,
+	"data": 0
+}}
diff --git a/root/target/linux/generic/config-5.4 b/root/target/linux/generic/config-5.4
index 2658cfcd..f6991753 100755
--- a/root/target/linux/generic/config-5.4
+++ b/root/target/linux/generic/config-5.4
@@ -663,6 +663,7 @@ CONFIG_BPF_JIT=y
 # CONFIG_BPF_JIT_ALWAYS_ON is not set
 # CONFIG_BPF_STREAM_PARSER is not set
 CONFIG_BPF_SYSCALL=y
+# CONFIG_BPF_UNPRIV_DEFAULT_OFF is not set
 # CONFIG_BPQETHER is not set
 CONFIG_BQL=y
 CONFIG_BRANCH_PROFILE_NONE=y
diff --git a/root/target/linux/ipq40xx/base-files/bin/board_track b/root/target/linux/ipq40xx/base-files/bin/board_track
index 651be120..dede6ab7 100755
--- a/root/target/linux/ipq40xx/base-files/bin/board_track
+++ b/root/target/linux/ipq40xx/base-files/bin/board_track
@@ -24,6 +24,8 @@ check_modem() {
 			mctl -s -m ${label}
 			sleep 1
 			mctl -p -m ${label}
+			ip link set up dev wwan0 2>&1 >/dev/null
+			ip link set up dev wwan1 2>&1 >/dev/null
 		done
 		json_select ..
 		return 1
diff --git a/root/target/linux/ipq40xx/base-files/lib/preinit/82_modem_power b/root/target/linux/ipq40xx/base-files/lib/preinit/82_modem_power
new file mode 100644
index 00000000..7db2ecf2
--- /dev/null
+++ b/root/target/linux/ipq40xx/base-files/lib/preinit/82_modem_power
@@ -0,0 +1,20 @@
+set_state() {
+	local label="$1"
+	local disable
+
+	[ -e "/sys/class/gpio/${label}_power/value" ] || return
+
+	config_get disable ${label} disable
+	[ "${disable}" -eq 1 ] && \
+		/sbin/mctl -s -m "${label}" || \
+		/sbin/mctl -p -m "${label}"
+}
+
+do_power_modem() {
+	[ -z "$(uci -q get system.modem.disable)" ] && /sbin/mctl -p || {
+		config_load system
+		config_foreach set_state mctl
+	}
+}
+
+boot_hook_add preinit_main do_power_modem
diff --git a/root/target/linux/ipq40xx/base-files/sbin/mctl b/root/target/linux/ipq40xx/base-files/sbin/mctl
new file mode 100755
index 00000000..f501cc2e
--- /dev/null
+++ b/root/target/linux/ipq40xx/base-files/sbin/mctl
@@ -0,0 +1,120 @@
+#!/bin/sh
+
+. /usr/share/libubox/jshn.sh
+
+PS_ON=1
+PS_OFF=2
+
+MPS=0
+MLBL="modem"
+
+modem_reset() {
+	local label="$1"
+
+	[ -e "/sys/class/gpio/${label}_reset/value" ] || return
+
+	echo 1 > "/sys/class/gpio/${label}_reset/value"
+	sleep 1
+	echo 0 > "/sys/class/gpio/${label}_reset/value"
+}
+
+modem_off() {
+	local label="$1"
+
+	[ -e "/sys/class/gpio/${label}_reset/value" ] || return
+
+	echo 1 > "/sys/class/gpio/${label}_reset/value"
+}
+
+modem_power() {
+	local label="$1"
+
+	[ -e "/sys/class/gpio/${label}_power/value" ] || return
+
+	# simulate power press
+	echo 1 > "/sys/class/gpio/${label}_power/value"
+	sleep 1
+	echo 0 > "/sys/class/gpio/${label}_power/value"
+}
+
+modem_list() {
+	local list="modem"
+	local label
+
+	[ "$(modem_fetch_primary)" -eq 0 ] && {
+		echo "${list}"
+		return
+	}
+
+	for m in /sys/class/gpio/modem*_power; do
+	        label="$(basename $m | awk -F_ '{print $1}')"
+	        [ "${label}" != "modem" ] && list="${list},${label}"
+	done
+
+	echo "${list}"
+}
+
+modem_fetch_primary() {
+	local modem modems primary
+
+	json_init
+	json_load_file "/etc/board.json"
+
+	json_get_keys modems modems
+	json_select modems
+
+	for modem in $modems; do
+		json_select "$modem"
+		json_get_vars primary
+
+		[ -n "$primary" ] && {
+			echo 1
+			return
+		}
+
+		json_select ..
+	done
+	echo 0
+}
+
+modem_is_available() {
+	local label="$1"
+	[ -e "/sys/class/gpio/${label}_power/value" ]
+}
+
+usage() {
+	cat <<EOF
+Usage $0 <option>
+Control modem power state.
+
+Options:
+ -p, --power-on                power on modem
+ -s, --shutdown                shutdown modem
+ -r, --reboot                  reboot modem
+ -m, --modem <label>           use specified modem instead of default one
+
+Available modem labels:
+ $(modem_list)
+EOF
+	exit 1
+}
+
+while [ -n "$1" ]; do
+	case "$1" in
+	-p | --power-on) MPS="${PS_ON}";;
+	-s | --shutdown) MPS="${PS_OFF}";;
+	-r | --reboot) MPS="${PS_ON}";;
+	-m | --modem) MLBL="$2"; shift;;
+	-*) echo "Invalid option: $1"; usage;;
+	*) break;;
+	esac
+	shift
+done
+
+[ "${MPS}" -eq 0 ] && usage
+modem_is_available "${MLBL}" || usage
+
+case "${MPS}" in
+"${PS_ON}") modem_reset "${MLBL}"; sleep 1; modem_power "${MLBL}";;
+"${PS_OFF}") modem_off "${MLBL}";;
+esac
\ No newline at end of file
diff --git a/root/target/linux/ipq40xx/dts/qcom-ipq4018-rutx-08_10.dts b/root/target/linux/ipq40xx/dts/qcom-ipq4018-rutx-08_10.dts
index 0404ede3..22984ac2 100644
--- a/root/target/linux/ipq40xx/dts/qcom-ipq4018-rutx-08_10.dts
+++ b/root/target/linux/ipq40xx/dts/qcom-ipq4018-rutx-08_10.dts
@@ -2,7 +2,7 @@
 #include "qcom-ipq4018-rutx-shiftreg.dtsi"
 
 / {
-	model = "RUTX08/10";
+	model = "Teltonika RUTX08/10";
 
 	soc {
 		gpio-export {
diff --git a/root/target/linux/ipq40xx/dts/qcom-ipq4018-rutx-09_11.dts b/root/target/linux/ipq40xx/dts/qcom-ipq4018-rutx-09_11.dts
index 707011a4..6bf9ec40 100644
--- a/root/target/linux/ipq40xx/dts/qcom-ipq4018-rutx-09_11.dts
+++ b/root/target/linux/ipq40xx/dts/qcom-ipq4018-rutx-09_11.dts
@@ -2,7 +2,7 @@
 #include "qcom-ipq4018-rutx-shiftreg.dtsi"
 
 / {
-	model = "RUTX09/11";
+	model = "Teltonika RUTX09/11";
 
 	soc {
 		gpio-export {
diff --git a/root/target/linux/ipq40xx/dts/qcom-ipq4018-rutx-12.dts b/root/target/linux/ipq40xx/dts/qcom-ipq4018-rutx-12.dts
index d39f64e9..8b02bf9a 100644
--- a/root/target/linux/ipq40xx/dts/qcom-ipq4018-rutx-12.dts
+++ b/root/target/linux/ipq40xx/dts/qcom-ipq4018-rutx-12.dts
@@ -2,7 +2,7 @@
 #include "qcom-ipq4018-rutx-shiftreg.dtsi"
 
 / {
-	model = "RUTX12";
+	model = "Teltonika RUTX12";
 
 	soc {
 		gpio-export {
diff --git a/root/target/linux/ipq40xx/dts/qcom-ipq4018-rutx-R1.dts b/root/target/linux/ipq40xx/dts/qcom-ipq4018-rutx-R1.dts
index 5f30195b..3742fc27 100644
--- a/root/target/linux/ipq40xx/dts/qcom-ipq4018-rutx-R1.dts
+++ b/root/target/linux/ipq40xx/dts/qcom-ipq4018-rutx-R1.dts
@@ -3,7 +3,7 @@
 #include "qcom-ipq4018-rutx-i2c.dtsi" // SFP
 
 / {
-	model = "RUTXR1";
+	model = "Teltonika RUTXR1";
 
 	soc {
 		gpio-export {
diff --git a/root/target/linux/ipq40xx/dts/qcom-ipq4018-rutx-STM32.dts b/root/target/linux/ipq40xx/dts/qcom-ipq4018-rutx-STM32.dts
index c6e53f02..ddb8b72c 100644
--- a/root/target/linux/ipq40xx/dts/qcom-ipq4018-rutx-STM32.dts
+++ b/root/target/linux/ipq40xx/dts/qcom-ipq4018-rutx-STM32.dts
@@ -2,7 +2,7 @@
 #include "qcom-ipq4018-rutx-i2c.dtsi"
 
 / {
-	model = "RUTX STM32";
+	model = "Teltonika RUTX STM32";
 	io_expander = "stm32";
 
 	soc {
diff --git a/root/target/linux/ipq40xx/files/drivers/net/phy/qca807x.c b/root/target/linux/ipq40xx/files/drivers/net/phy/qca807x.c
new file mode 100644
index 00000000..8d523548
--- /dev/null
+++ b/root/target/linux/ipq40xx/files/drivers/net/phy/qca807x.c
@@ -0,0 +1,865 @@
+// SPDX-License-Identifier: GPL-2.0-or-later
+/*
+ * Copyright (c) 2020 Sartura Ltd.
+ *
+ * Author: Robert Marko <robert.marko@sartura.hr>
+ *
+ * Qualcomm QCA8072 and QCA8075 PHY driver
+ */
+
+#include <linux/version.h>
+#include <linux/module.h>
+#include <linux/of.h>
+#include <linux/phy.h>
+#include <linux/bitfield.h>
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(5,8,0)
+#include <linux/ethtool_netlink.h>
+#endif
+#include <linux/gpio.h>
+#include <linux/sfp.h>
+
+#include <dt-bindings/net/qcom-qca807x.h>
+
+#define PHY_ID_QCA8072		0x004dd0b2
+#define PHY_ID_QCA8075		0x004dd0b1
+#define PHY_ID_QCA807X_PSGMII	0x06820805
+
+/* Downshift */
+#define QCA807X_SMARTSPEED_EN			BIT(5)
+#define QCA807X_SMARTSPEED_RETRY_LIMIT_MASK	GENMASK(4, 2)
+#define QCA807X_SMARTSPEED_RETRY_LIMIT_DEFAULT	5
+#define QCA807X_SMARTSPEED_RETRY_LIMIT_MIN	2
+#define QCA807X_SMARTSPEED_RETRY_LIMIT_MAX	9
+
+/* Cable diagnostic test (CDT) */
+#define QCA807X_CDT						0x16
+#define QCA807X_CDT_ENABLE					BIT(15)
+#define QCA807X_CDT_ENABLE_INTER_PAIR_SHORT			BIT(13)
+#define QCA807X_CDT_STATUS					BIT(11)
+#define QCA807X_CDT_MMD3_STATUS					0x8064
+#define QCA807X_CDT_MDI0_STATUS_MASK				GENMASK(15, 12)
+#define QCA807X_CDT_MDI1_STATUS_MASK				GENMASK(11, 8)
+#define QCA807X_CDT_MDI2_STATUS_MASK				GENMASK(7, 4)
+#define QCA807X_CDT_MDI3_STATUS_MASK				GENMASK(3, 0)
+#define QCA807X_CDT_RESULTS_INVALID				0x0
+#define QCA807X_CDT_RESULTS_OK					0x1
+#define QCA807X_CDT_RESULTS_OPEN				0x2
+#define QCA807X_CDT_RESULTS_SAME_SHORT				0x3
+#define QCA807X_CDT_RESULTS_CROSS_SHORT_WITH_MDI1_SAME_OK	0x4
+#define QCA807X_CDT_RESULTS_CROSS_SHORT_WITH_MDI2_SAME_OK	0x8
+#define QCA807X_CDT_RESULTS_CROSS_SHORT_WITH_MDI3_SAME_OK	0xc
+#define QCA807X_CDT_RESULTS_CROSS_SHORT_WITH_MDI1_SAME_OPEN	0x6
+#define QCA807X_CDT_RESULTS_CROSS_SHORT_WITH_MDI2_SAME_OPEN	0xa
+#define QCA807X_CDT_RESULTS_CROSS_SHORT_WITH_MDI3_SAME_OPEN	0xe
+#define QCA807X_CDT_RESULTS_CROSS_SHORT_WITH_MDI1_SAME_SHORT	0x7
+#define QCA807X_CDT_RESULTS_CROSS_SHORT_WITH_MDI2_SAME_SHORT	0xb
+#define QCA807X_CDT_RESULTS_CROSS_SHORT_WITH_MDI3_SAME_SHORT	0xf
+#define QCA807X_CDT_RESULTS_BUSY				0x9
+#define QCA807X_CDT_MMD3_MDI0_LENGTH				0x8065
+#define QCA807X_CDT_MMD3_MDI1_LENGTH				0x8066
+#define QCA807X_CDT_MMD3_MDI2_LENGTH				0x8067
+#define QCA807X_CDT_MMD3_MDI3_LENGTH				0x8068
+#define QCA807X_CDT_SAME_SHORT_LENGTH_MASK			GENMASK(15, 8)
+#define QCA807X_CDT_CROSS_SHORT_LENGTH_MASK			GENMASK(7, 0)
+
+#define QCA807X_CHIP_CONFIGURATION				0x1f
+#define QCA807X_BT_BX_REG_SEL					BIT(15)
+#define QCA807X_CHIP_CONFIGURATION_MODE_CFG_MASK		GENMASK(3, 0)
+#define QCA807X_CHIP_CONFIGURATION_MODE_QSGMII_SGMII		4
+#define QCA807X_CHIP_CONFIGURATION_MODE_PSGMII_FIBER		3
+#define QCA807X_CHIP_CONFIGURATION_MODE_PSGMII_ALL_COPPER	0
+
+#define QCA807X_MEDIA_SELECT_STATUS				0x1a
+#define QCA807X_MEDIA_DETECTED_COPPER				BIT(5)
+#define QCA807X_MEDIA_DETECTED_1000_BASE_X			BIT(4)
+#define QCA807X_MEDIA_DETECTED_100_BASE_FX			BIT(3)
+
+#define QCA807X_MMD7_FIBER_MODE_AUTO_DETECTION			0x807e
+#define QCA807X_MMD7_FIBER_MODE_AUTO_DETECTION_EN		BIT(0)
+
+#define QCA807X_MMD7_1000BASE_T_POWER_SAVE_PER_CABLE_LENGTH	0x801a
+#define QCA807X_CONTROL_DAC_MASK				GENMASK(2, 0)
+
+#define QCA807X_MMD7_LED_100N_1				0x8074
+#define QCA807X_MMD7_LED_100N_2				0x8075
+#define QCA807X_MMD7_LED_1000N_1			0x8076
+#define QCA807X_MMD7_LED_1000N_2			0x8077
+#define QCA807X_LED_TXACT_BLK_EN_2			BIT(10)
+#define QCA807X_LED_RXACT_BLK_EN_2			BIT(9)
+#define QCA807X_LED_GT_ON_EN_2				BIT(6)
+#define QCA807X_LED_HT_ON_EN_2				BIT(5)
+#define QCA807X_LED_BT_ON_EN_2				BIT(4)
+#define QCA807X_GPIO_FORCE_EN				BIT(15)
+#define QCA807X_GPIO_FORCE_MODE_MASK			GENMASK(14, 13)
+
+#define QCA807X_INTR_ENABLE				0x12
+#define QCA807X_INTR_STATUS				0x13
+#define QCA807X_INTR_ENABLE_AUTONEG_ERR			BIT(15)
+#define QCA807X_INTR_ENABLE_SPEED_CHANGED		BIT(14)
+#define QCA807X_INTR_ENABLE_DUPLEX_CHANGED		BIT(13)
+#define QCA807X_INTR_ENABLE_LINK_FAIL			BIT(11)
+#define QCA807X_INTR_ENABLE_LINK_SUCCESS		BIT(10)
+
+#define QCA807X_FUNCTION_CONTROL			0x10
+#define QCA807X_FC_MDI_CROSSOVER_MODE_MASK		GENMASK(6, 5)
+#define QCA807X_FC_MDI_CROSSOVER_AUTO			3
+#define QCA807X_FC_MDI_CROSSOVER_MANUAL_MDIX		1
+#define QCA807X_FC_MDI_CROSSOVER_MANUAL_MDI		0
+
+#define QCA807X_PHY_SPECIFIC_STATUS			0x11
+#define QCA807X_SS_SPEED_AND_DUPLEX_RESOLVED		BIT(11)
+#define QCA807X_SS_SPEED_MASK				GENMASK(15, 14)
+#define QCA807X_SS_SPEED_1000				2
+#define QCA807X_SS_SPEED_100				1
+#define QCA807X_SS_SPEED_10				0
+#define QCA807X_SS_DUPLEX				BIT(13)
+#define QCA807X_SS_MDIX					BIT(6)
+
+/* PSGMII PHY specific */
+#define PSGMII_QSGMII_DRIVE_CONTROL_1			0xb
+#define PSGMII_QSGMII_TX_DRIVER_MASK			GENMASK(7, 4)
+#define PSGMII_MODE_CTRL				0x6d
+#define PSGMII_MODE_CTRL_AZ_WORKAROUND_MASK		GENMASK(3, 0)
+#define PSGMII_MMD3_SERDES_CONTROL			0x805a
+
+struct qca807x_gpio_priv {
+	struct phy_device *phy;
+};
+
+static int qca807x_get_downshift(struct phy_device *phydev, u8 *data)
+{
+	int val, cnt, enable;
+
+	val = phy_read(phydev, MII_NWAYTEST);
+	if (val < 0)
+		return val;
+
+	enable = FIELD_GET(QCA807X_SMARTSPEED_EN, val);
+	cnt = FIELD_GET(QCA807X_SMARTSPEED_RETRY_LIMIT_MASK, val) + 2;
+
+	*data = enable ? cnt : DOWNSHIFT_DEV_DISABLE;
+
+	return 0;
+}
+
+static int qca807x_set_downshift(struct phy_device *phydev, u8 cnt)
+{
+	int ret, val;
+
+	if (cnt > QCA807X_SMARTSPEED_RETRY_LIMIT_MAX ||
+	    (cnt < QCA807X_SMARTSPEED_RETRY_LIMIT_MIN && cnt != DOWNSHIFT_DEV_DISABLE))
+		return -EINVAL;
+
+	if (!cnt) {
+		ret = phy_clear_bits(phydev, MII_NWAYTEST, QCA807X_SMARTSPEED_EN);
+	} else {
+		val = QCA807X_SMARTSPEED_EN;
+		val |= FIELD_PREP(QCA807X_SMARTSPEED_RETRY_LIMIT_MASK, cnt - 2);
+
+		phy_modify(phydev, MII_NWAYTEST,
+			   QCA807X_SMARTSPEED_EN |
+			   QCA807X_SMARTSPEED_RETRY_LIMIT_MASK,
+			   val);
+	}
+
+	ret = genphy_soft_reset(phydev);
+
+	return ret;
+}
+
+static int qca807x_get_tunable(struct phy_device *phydev,
+			       struct ethtool_tunable *tuna, void *data)
+{
+	switch (tuna->id) {
+	case ETHTOOL_PHY_DOWNSHIFT:
+		return qca807x_get_downshift(phydev, data);
+	default:
+		return -EOPNOTSUPP;
+	}
+}
+
+static int qca807x_set_tunable(struct phy_device *phydev,
+			       struct ethtool_tunable *tuna, const void *data)
+{
+	switch (tuna->id) {
+	case ETHTOOL_PHY_DOWNSHIFT:
+		return qca807x_set_downshift(phydev, *(const u8 *)data);
+	default:
+		return -EOPNOTSUPP;
+	}
+}
+
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(5,8,0)
+static bool qca807x_distance_valid(int result)
+{
+	switch (result) {
+	case QCA807X_CDT_RESULTS_OPEN:
+	case QCA807X_CDT_RESULTS_SAME_SHORT:
+	case QCA807X_CDT_RESULTS_CROSS_SHORT_WITH_MDI1_SAME_OK:
+	case QCA807X_CDT_RESULTS_CROSS_SHORT_WITH_MDI2_SAME_OK:
+	case QCA807X_CDT_RESULTS_CROSS_SHORT_WITH_MDI3_SAME_OK:
+	case QCA807X_CDT_RESULTS_CROSS_SHORT_WITH_MDI1_SAME_OPEN:
+	case QCA807X_CDT_RESULTS_CROSS_SHORT_WITH_MDI2_SAME_OPEN:
+	case QCA807X_CDT_RESULTS_CROSS_SHORT_WITH_MDI3_SAME_OPEN:
+	case QCA807X_CDT_RESULTS_CROSS_SHORT_WITH_MDI1_SAME_SHORT:
+	case QCA807X_CDT_RESULTS_CROSS_SHORT_WITH_MDI2_SAME_SHORT:
+	case QCA807X_CDT_RESULTS_CROSS_SHORT_WITH_MDI3_SAME_SHORT:
+		return true;
+	}
+	return false;
+}
+
+static int qca807x_report_length(struct phy_device *phydev,
+				 int pair, int result)
+{
+	int length;
+	int ret;
+
+	ret = phy_read_mmd(phydev, MDIO_MMD_PCS, QCA807X_CDT_MMD3_MDI0_LENGTH + pair);
+	if (ret < 0)
+		return ret;
+
+	switch (result) {
+	case ETHTOOL_A_CABLE_RESULT_CODE_SAME_SHORT:
+		length = (FIELD_GET(QCA807X_CDT_SAME_SHORT_LENGTH_MASK, ret) * 800) / 10;
+		break;
+	case ETHTOOL_A_CABLE_RESULT_CODE_OPEN:
+	case ETHTOOL_A_CABLE_RESULT_CODE_CROSS_SHORT:
+		length = (FIELD_GET(QCA807X_CDT_CROSS_SHORT_LENGTH_MASK, ret) * 800) / 10;
+		break;
+	}
+
+	ethnl_cable_test_fault_length(phydev, pair, length);
+
+	return 0;
+}
+
+static int qca807x_cable_test_report_trans(int result)
+{
+	switch (result) {
+	case QCA807X_CDT_RESULTS_OK:
+		return ETHTOOL_A_CABLE_RESULT_CODE_OK;
+	case QCA807X_CDT_RESULTS_OPEN:
+		return ETHTOOL_A_CABLE_RESULT_CODE_OPEN;
+	case QCA807X_CDT_RESULTS_SAME_SHORT:
+		return ETHTOOL_A_CABLE_RESULT_CODE_SAME_SHORT;
+	case QCA807X_CDT_RESULTS_CROSS_SHORT_WITH_MDI1_SAME_OK:
+	case QCA807X_CDT_RESULTS_CROSS_SHORT_WITH_MDI2_SAME_OK:
+	case QCA807X_CDT_RESULTS_CROSS_SHORT_WITH_MDI3_SAME_OK:
+	case QCA807X_CDT_RESULTS_CROSS_SHORT_WITH_MDI1_SAME_OPEN:
+	case QCA807X_CDT_RESULTS_CROSS_SHORT_WITH_MDI2_SAME_OPEN:
+	case QCA807X_CDT_RESULTS_CROSS_SHORT_WITH_MDI3_SAME_OPEN:
+	case QCA807X_CDT_RESULTS_CROSS_SHORT_WITH_MDI1_SAME_SHORT:
+	case QCA807X_CDT_RESULTS_CROSS_SHORT_WITH_MDI2_SAME_SHORT:
+	case QCA807X_CDT_RESULTS_CROSS_SHORT_WITH_MDI3_SAME_SHORT:
+		return ETHTOOL_A_CABLE_RESULT_CODE_CROSS_SHORT;
+	default:
+		return ETHTOOL_A_CABLE_RESULT_CODE_UNSPEC;
+	}
+}
+
+static int qca807x_cable_test_report(struct phy_device *phydev)
+{
+	int pair0, pair1, pair2, pair3;
+	int ret;
+
+	ret = phy_read_mmd(phydev, MDIO_MMD_PCS, QCA807X_CDT_MMD3_STATUS);
+	if (ret < 0)
+		return ret;
+
+	pair0 = FIELD_GET(QCA807X_CDT_MDI0_STATUS_MASK, ret);
+	pair1 = FIELD_GET(QCA807X_CDT_MDI1_STATUS_MASK, ret);
+	pair2 = FIELD_GET(QCA807X_CDT_MDI2_STATUS_MASK, ret);
+	pair3 = FIELD_GET(QCA807X_CDT_MDI3_STATUS_MASK, ret);
+
+	ethnl_cable_test_result(phydev, ETHTOOL_A_CABLE_PAIR_A,
+				qca807x_cable_test_report_trans(pair0));
+	ethnl_cable_test_result(phydev, ETHTOOL_A_CABLE_PAIR_B,
+				qca807x_cable_test_report_trans(pair1));
+	ethnl_cable_test_result(phydev, ETHTOOL_A_CABLE_PAIR_C,
+				qca807x_cable_test_report_trans(pair2));
+	ethnl_cable_test_result(phydev, ETHTOOL_A_CABLE_PAIR_D,
+				qca807x_cable_test_report_trans(pair3));
+
+	if (qca807x_distance_valid(pair0))
+		qca807x_report_length(phydev, 0, qca807x_cable_test_report_trans(pair0));
+	if (qca807x_distance_valid(pair1))
+		qca807x_report_length(phydev, 1, qca807x_cable_test_report_trans(pair1));
+	if (qca807x_distance_valid(pair2))
+		qca807x_report_length(phydev, 2, qca807x_cable_test_report_trans(pair2));
+	if (qca807x_distance_valid(pair3))
+		qca807x_report_length(phydev, 3, qca807x_cable_test_report_trans(pair3));
+
+	return 0;
+}
+
+static int qca807x_cable_test_get_status(struct phy_device *phydev,
+					 bool *finished)
+{
+	int val;
+
+	*finished = false;
+
+	val = phy_read(phydev, QCA807X_CDT);
+	if (!((val & QCA807X_CDT_ENABLE) && (val & QCA807X_CDT_STATUS))) {
+		*finished = true;
+
+		return qca807x_cable_test_report(phydev);
+	}
+
+	return 0;
+}
+
+static int qca807x_cable_test_start(struct phy_device *phydev)
+{
+	int val, ret;
+
+	val = phy_read(phydev, QCA807X_CDT);
+	/* Enable inter-pair short check as well */
+	val &= ~QCA807X_CDT_ENABLE_INTER_PAIR_SHORT;
+	val |= QCA807X_CDT_ENABLE;
+	ret = phy_write(phydev, QCA807X_CDT, val);
+
+	return ret;
+}
+#endif
+
+#ifdef CONFIG_GPIOLIB
+static int qca807x_gpio_get_direction(struct gpio_chip *gc, unsigned int offset)
+{
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(5,5,0)
+	return GPIO_LINE_DIRECTION_OUT;
+#else
+	return GPIOF_DIR_OUT;
+#endif
+}
+
+static int qca807x_gpio_get_reg(unsigned int offset)
+{
+	return QCA807X_MMD7_LED_100N_2 + (offset % 2) * 2;
+}
+
+static int qca807x_gpio_get(struct gpio_chip *gc, unsigned int offset)
+{
+	struct qca807x_gpio_priv *priv = gpiochip_get_data(gc);
+	int val;
+
+	val = phy_read_mmd(priv->phy, MDIO_MMD_AN, qca807x_gpio_get_reg(offset));
+
+	return FIELD_GET(QCA807X_GPIO_FORCE_MODE_MASK, val);
+}
+
+static void qca807x_gpio_set(struct gpio_chip *gc, unsigned int offset, int value)
+{
+	struct qca807x_gpio_priv *priv = gpiochip_get_data(gc);
+	int val;
+
+	val = phy_read_mmd(priv->phy, MDIO_MMD_AN, qca807x_gpio_get_reg(offset));
+	val &= ~QCA807X_GPIO_FORCE_MODE_MASK;
+	val |= QCA807X_GPIO_FORCE_EN;
+	val |= FIELD_PREP(QCA807X_GPIO_FORCE_MODE_MASK, value);
+
+	phy_write_mmd(priv->phy, MDIO_MMD_AN, qca807x_gpio_get_reg(offset), val);
+}
+
+static int qca807x_gpio_dir_out(struct gpio_chip *gc, unsigned int offset, int value)
+{
+	qca807x_gpio_set(gc, offset, value);
+
+	return 0;
+}
+
+static int qca807x_gpio(struct phy_device *phydev)
+{
+	struct device *dev = &phydev->mdio.dev;
+	struct qca807x_gpio_priv *priv;
+	struct gpio_chip *gc;
+
+	priv = devm_kzalloc(dev, sizeof(*priv), GFP_KERNEL);
+	if (!priv)
+		return -ENOMEM;
+
+	priv->phy = phydev;
+
+	gc = devm_kzalloc(dev, sizeof(*gc), GFP_KERNEL);
+	if (!gc)
+		return -ENOMEM;
+
+	gc->label = dev_name(dev);
+	gc->base = -1;
+	gc->ngpio = 2;
+	gc->parent = dev;
+	gc->owner = THIS_MODULE;
+	gc->can_sleep = true;
+	gc->get_direction = qca807x_gpio_get_direction;
+	gc->direction_output = qca807x_gpio_dir_out;
+	gc->get = qca807x_gpio_get;
+	gc->set = qca807x_gpio_set;
+
+	return devm_gpiochip_add_data(dev, gc, priv);
+}
+#endif
+
+static int qca807x_read_copper_status(struct phy_device *phydev, bool combo_port)
+{
+	int ss, err, page, old_link = phydev->link;
+
+	/* Only combo port has dual pages */
+	if (combo_port) {
+		/* Check whether copper page is set and set if needed */
+		page = phy_read(phydev, QCA807X_CHIP_CONFIGURATION);
+		if (!(page & QCA807X_BT_BX_REG_SEL)) {
+			page |= QCA807X_BT_BX_REG_SEL;
+			phy_write(phydev, QCA807X_CHIP_CONFIGURATION, page);
+		}
+	}
+
+	/* Update the link, but return if there was an error */
+	err = genphy_update_link(phydev);
+	if (err)
+		return err;
+
+	/* why bother the PHY if nothing can have changed */
+	if (phydev->autoneg == AUTONEG_ENABLE && old_link && phydev->link)
+		return 0;
+
+	phydev->speed = SPEED_UNKNOWN;
+	phydev->duplex = DUPLEX_UNKNOWN;
+	phydev->pause = 0;
+	phydev->asym_pause = 0;
+
+	err = genphy_read_lpa(phydev);
+	if (err < 0)
+		return err;
+
+	/* Read the QCA807x PHY-Specific Status register copper page,
+	 * which indicates the speed and duplex that the PHY is actually
+	 * using, irrespective of whether we are in autoneg mode or not.
+	 */
+	ss = phy_read(phydev, QCA807X_PHY_SPECIFIC_STATUS);
+	if (ss < 0)
+		return ss;
+
+	if (ss & QCA807X_SS_SPEED_AND_DUPLEX_RESOLVED) {
+		int sfc;
+
+		sfc = phy_read(phydev, QCA807X_FUNCTION_CONTROL);
+		if (sfc < 0)
+			return sfc;
+
+		switch (FIELD_GET(QCA807X_SS_SPEED_MASK, ss)) {
+		case QCA807X_SS_SPEED_10:
+			phydev->speed = SPEED_10;
+			break;
+		case QCA807X_SS_SPEED_100:
+			phydev->speed = SPEED_100;
+			break;
+		case QCA807X_SS_SPEED_1000:
+			phydev->speed = SPEED_1000;
+			break;
+		}
+		if (ss & QCA807X_SS_DUPLEX)
+			phydev->duplex = DUPLEX_FULL;
+		else
+			phydev->duplex = DUPLEX_HALF;
+
+		if (ss & QCA807X_SS_MDIX)
+			phydev->mdix = ETH_TP_MDI_X;
+		else
+			phydev->mdix = ETH_TP_MDI;
+
+		switch (FIELD_GET(QCA807X_FC_MDI_CROSSOVER_MODE_MASK, sfc)) {
+		case QCA807X_FC_MDI_CROSSOVER_MANUAL_MDI:
+			phydev->mdix_ctrl = ETH_TP_MDI;
+			break;
+		case QCA807X_FC_MDI_CROSSOVER_MANUAL_MDIX:
+			phydev->mdix_ctrl = ETH_TP_MDI_X;
+			break;
+		case QCA807X_FC_MDI_CROSSOVER_AUTO:
+			phydev->mdix_ctrl = ETH_TP_MDI_AUTO;
+			break;
+		}
+	}
+
+	if (phydev->autoneg == AUTONEG_ENABLE && phydev->autoneg_complete)
+		phy_resolve_aneg_pause(phydev);
+
+	return 0;
+}
+
+static int qca807x_read_fiber_status(struct phy_device *phydev, bool combo_port)
+{
+	int ss, err, page, lpa, old_link = phydev->link;
+
+	/* Check whether fiber page is set and set if needed */
+	page = phy_read(phydev, QCA807X_CHIP_CONFIGURATION);
+	if (page & QCA807X_BT_BX_REG_SEL) {
+		page &= ~QCA807X_BT_BX_REG_SEL;
+		phy_write(phydev, QCA807X_CHIP_CONFIGURATION, page);
+	}
+
+	/* Update the link, but return if there was an error */
+	err = genphy_update_link(phydev);
+	if (err)
+		return err;
+
+	/* why bother the PHY if nothing can have changed */
+	if (phydev->autoneg == AUTONEG_ENABLE && old_link && phydev->link)
+		return 0;
+
+	phydev->speed = SPEED_UNKNOWN;
+	phydev->duplex = DUPLEX_UNKNOWN;
+	phydev->pause = 0;
+	phydev->asym_pause = 0;
+
+	if (phydev->autoneg == AUTONEG_ENABLE && phydev->autoneg_complete) {
+		lpa = phy_read(phydev, MII_LPA);
+		if (lpa < 0)
+			return lpa;
+
+		linkmode_mod_bit(ETHTOOL_LINK_MODE_Autoneg_BIT,
+				 phydev->lp_advertising, lpa & LPA_LPACK);
+		linkmode_mod_bit(ETHTOOL_LINK_MODE_1000baseX_Full_BIT,
+				 phydev->lp_advertising, lpa & LPA_1000XFULL);
+		linkmode_mod_bit(ETHTOOL_LINK_MODE_Pause_BIT,
+				 phydev->lp_advertising, lpa & LPA_1000XPAUSE);
+		linkmode_mod_bit(ETHTOOL_LINK_MODE_Asym_Pause_BIT,
+				 phydev->lp_advertising,
+				 lpa & LPA_1000XPAUSE_ASYM);
+
+		phy_resolve_aneg_linkmode(phydev);
+	}
+
+	/* Read the QCA807x PHY-Specific Status register fiber page,
+	 * which indicates the speed and duplex that the PHY is actually
+	 * using, irrespective of whether we are in autoneg mode or not.
+	 */
+	ss = phy_read(phydev, QCA807X_PHY_SPECIFIC_STATUS);
+	if (ss < 0)
+		return ss;
+
+	if (ss & QCA807X_SS_SPEED_AND_DUPLEX_RESOLVED) {
+		switch (FIELD_GET(QCA807X_SS_SPEED_MASK, ss)) {
+		case QCA807X_SS_SPEED_100:
+			phydev->speed = SPEED_100;
+			break;
+		case QCA807X_SS_SPEED_1000:
+			phydev->speed = SPEED_1000;
+			break;
+		}
+
+		if (ss & QCA807X_SS_DUPLEX)
+			phydev->duplex = DUPLEX_FULL;
+		else
+			phydev->duplex = DUPLEX_HALF;
+	}
+
+	return 0;
+}
+
+static int qca807x_read_status(struct phy_device *phydev)
+{
+	int val;
+
+	/* Check for Combo port */
+	if (phy_read(phydev, QCA807X_CHIP_CONFIGURATION)) {
+		/* Check for fiber mode first */
+		if (linkmode_test_bit(ETHTOOL_LINK_MODE_FIBRE_BIT, phydev->supported)) {
+			/* Check for actual detected media */
+			val = phy_read(phydev, QCA807X_MEDIA_SELECT_STATUS);
+			if (val & QCA807X_MEDIA_DETECTED_COPPER) {
+				qca807x_read_copper_status(phydev, true);
+			} else if ((val & QCA807X_MEDIA_DETECTED_1000_BASE_X) ||
+				   (val & QCA807X_MEDIA_DETECTED_100_BASE_FX)) {
+				qca807x_read_fiber_status(phydev, true);
+			}
+		} else {
+			qca807x_read_copper_status(phydev, true);
+		}
+	} else {
+		qca807x_read_copper_status(phydev, false);
+	}
+
+	return 0;
+}
+
+static int qca807x_config_intr(struct phy_device *phydev)
+{
+	int ret, val;
+
+	val = phy_read(phydev, QCA807X_INTR_ENABLE);
+
+	if (phydev->interrupts == PHY_INTERRUPT_ENABLED) {
+		/* Check for combo port as it has fewer interrupts */
+		if (phy_read(phydev, QCA807X_CHIP_CONFIGURATION)) {
+			val |= QCA807X_INTR_ENABLE_SPEED_CHANGED;
+			val |= QCA807X_INTR_ENABLE_LINK_FAIL;
+			val |= QCA807X_INTR_ENABLE_LINK_SUCCESS;
+		} else {
+			val |= QCA807X_INTR_ENABLE_AUTONEG_ERR;
+			val |= QCA807X_INTR_ENABLE_SPEED_CHANGED;
+			val |= QCA807X_INTR_ENABLE_DUPLEX_CHANGED;
+			val |= QCA807X_INTR_ENABLE_LINK_FAIL;
+			val |= QCA807X_INTR_ENABLE_LINK_SUCCESS;
+		}
+		ret = phy_write(phydev, QCA807X_INTR_ENABLE, val);
+	} else {
+		ret = phy_write(phydev, QCA807X_INTR_ENABLE, 0);
+	}
+
+	return ret;
+}
+
+#if LINUX_VERSION_CODE < KERNEL_VERSION(5,12,0)
+static int qca807x_ack_intr(struct phy_device *phydev)
+{
+	int ret;
+
+	ret = phy_read(phydev, QCA807X_INTR_STATUS);
+
+	return (ret < 0) ? ret : 0;
+}
+#else
+static irqreturn_t qca807x_handle_interrupt(struct phy_device *phydev)
+{
+	int irq_status, int_enabled;
+
+	irq_status = phy_read(phydev, QCA807X_INTR_STATUS);
+	if (irq_status < 0) {
+		phy_error(phydev);
+		return IRQ_NONE;
+	}
+
+	/* Read the current enabled interrupts */
+	int_enabled = phy_read(phydev, QCA807X_INTR_ENABLE);
+	if (int_enabled < 0) {
+		phy_error(phydev);
+		return IRQ_NONE;
+	}
+
+	/* See if this was one of our enabled interrupts */
+	if (!(irq_status & int_enabled))
+		return IRQ_NONE;
+
+	phy_trigger_machine(phydev);
+
+	return IRQ_HANDLED;
+}
+#endif
+
+static int qca807x_led_config(struct phy_device *phydev)
+{
+	struct device_node *node = phydev->mdio.dev.of_node;
+	bool led_config = false;
+	int val;
+
+	val = phy_read_mmd(phydev, MDIO_MMD_AN, QCA807X_MMD7_LED_1000N_1);
+	if (val < 0)
+		return val;
+
+	if (of_property_read_bool(node, "qcom,single-led-1000")) {
+		val |= QCA807X_LED_TXACT_BLK_EN_2;
+		val |= QCA807X_LED_RXACT_BLK_EN_2;
+		val |= QCA807X_LED_GT_ON_EN_2;
+
+		led_config = true;
+	}
+
+	if (of_property_read_bool(node, "qcom,single-led-100")) {
+		val |= QCA807X_LED_HT_ON_EN_2;
+
+		led_config = true;
+	}
+
+	if (of_property_read_bool(node, "qcom,single-led-10")) {
+		val |= QCA807X_LED_BT_ON_EN_2;
+
+		led_config = true;
+	}
+
+	if (led_config)
+		return phy_write_mmd(phydev, MDIO_MMD_AN, QCA807X_MMD7_LED_1000N_1, val);
+	else
+		return 0;
+}
+
+static const struct sfp_upstream_ops qca807x_sfp_ops = {
+	.attach = phy_sfp_attach,
+	.detach = phy_sfp_detach,
+};
+
+static int qca807x_config(struct phy_device *phydev)
+{
+	struct device_node *node = phydev->mdio.dev.of_node;
+	int control_dac, ret = 0;
+	u32 of_control_dac;
+
+	/* Check for Combo port */
+	if (phy_read(phydev, QCA807X_CHIP_CONFIGURATION)) {
+		int fiber_mode_autodect;
+		int psgmii_serdes;
+		int chip_config;
+
+		if (of_property_read_bool(node, "qcom,fiber-enable")) {
+			/* Enable fiber mode autodection (1000Base-X or 100Base-FX) */
+			fiber_mode_autodect = phy_read_mmd(phydev, MDIO_MMD_AN,
+							   QCA807X_MMD7_FIBER_MODE_AUTO_DETECTION);
+			fiber_mode_autodect |= QCA807X_MMD7_FIBER_MODE_AUTO_DETECTION_EN;
+			phy_write_mmd(phydev, MDIO_MMD_AN, QCA807X_MMD7_FIBER_MODE_AUTO_DETECTION,
+				      fiber_mode_autodect);
+
+			/* Enable 4 copper + combo port mode */
+			chip_config = phy_read(phydev, QCA807X_CHIP_CONFIGURATION);
+			chip_config &= ~QCA807X_CHIP_CONFIGURATION_MODE_CFG_MASK;
+			chip_config |= FIELD_PREP(QCA807X_CHIP_CONFIGURATION_MODE_CFG_MASK,
+						  QCA807X_CHIP_CONFIGURATION_MODE_PSGMII_FIBER);
+			phy_write(phydev, QCA807X_CHIP_CONFIGURATION, chip_config);
+
+			linkmode_set_bit(ETHTOOL_LINK_MODE_FIBRE_BIT, phydev->supported);
+			linkmode_set_bit(ETHTOOL_LINK_MODE_FIBRE_BIT, phydev->advertising);
+		}
+
+		/* Prevent PSGMII going into hibernation via PSGMII self test */
+		psgmii_serdes = phy_read_mmd(phydev, MDIO_MMD_PCS, PSGMII_MMD3_SERDES_CONTROL);
+		psgmii_serdes &= ~BIT(1);
+		ret = phy_write_mmd(phydev, MDIO_MMD_PCS,
+				    PSGMII_MMD3_SERDES_CONTROL,
+				    psgmii_serdes);
+	}
+
+	if (!of_property_read_u32(node, "qcom,control-dac", &of_control_dac)) {
+		control_dac = phy_read_mmd(phydev, MDIO_MMD_AN,
+					   QCA807X_MMD7_1000BASE_T_POWER_SAVE_PER_CABLE_LENGTH);
+		control_dac &= ~QCA807X_CONTROL_DAC_MASK;
+		control_dac |= FIELD_PREP(QCA807X_CONTROL_DAC_MASK, of_control_dac);
+		ret = phy_write_mmd(phydev, MDIO_MMD_AN,
+				    QCA807X_MMD7_1000BASE_T_POWER_SAVE_PER_CABLE_LENGTH,
+				    control_dac);
+	}
+
+	/* Optionally configure LED-s */
+	if (IS_ENABLED(CONFIG_GPIOLIB)) {
+		/* Check whether PHY-s pins are used as GPIO-s */
+		if (!of_property_read_bool(node, "gpio-controller"))
+			ret = qca807x_led_config(phydev);
+	} else {
+		ret = qca807x_led_config(phydev);
+	}
+
+	return ret;
+}
+
+static int qca807x_probe(struct phy_device *phydev)
+{
+	struct device_node *node = phydev->mdio.dev.of_node;
+	int ret = 0;
+
+	if (IS_ENABLED(CONFIG_GPIOLIB)) {
+		/* Do not register a GPIO controller unless flagged for it */
+		if (of_property_read_bool(node, "gpio-controller"))
+			ret = qca807x_gpio(phydev);
+	}
+
+	/* Attach SFP bus on combo port*/
+	if (of_property_read_bool(node, "qcom,fiber-enable")) {
+		if (phy_read(phydev, QCA807X_CHIP_CONFIGURATION))
+			ret = phy_sfp_probe(phydev, &qca807x_sfp_ops);
+	}
+
+	return ret;
+}
+
+static int qca807x_psgmii_config(struct phy_device *phydev)
+{
+	struct device_node *node = phydev->mdio.dev.of_node;
+	int psgmii_az, tx_amp, ret = 0;
+	u32 tx_driver_strength;
+
+	/* Workaround to enable AZ transmitting ability */
+	if (of_property_read_bool(node, "qcom,psgmii-az")) {
+		psgmii_az = phy_read_mmd(phydev, MDIO_MMD_PMAPMD, PSGMII_MODE_CTRL);
+		psgmii_az &= ~PSGMII_MODE_CTRL_AZ_WORKAROUND_MASK;
+		psgmii_az |= FIELD_PREP(PSGMII_MODE_CTRL_AZ_WORKAROUND_MASK, 0xc);
+		ret = phy_write_mmd(phydev, MDIO_MMD_PMAPMD, PSGMII_MODE_CTRL, psgmii_az);
+		psgmii_az = phy_read_mmd(phydev, MDIO_MMD_PMAPMD, PSGMII_MODE_CTRL);
+	}
+
+	/* PSGMII/QSGMII TX amp set to DT defined value instead of default 600mV */
+	if (!of_property_read_u32(node, "qcom,tx-driver-strength", &tx_driver_strength)) {
+		tx_amp = phy_read(phydev, PSGMII_QSGMII_DRIVE_CONTROL_1);
+		tx_amp &= ~PSGMII_QSGMII_TX_DRIVER_MASK;
+		tx_amp |= FIELD_PREP(PSGMII_QSGMII_TX_DRIVER_MASK, tx_driver_strength);
+		ret = phy_write(phydev, PSGMII_QSGMII_DRIVE_CONTROL_1, tx_amp);
+	}
+
+	return ret;
+}
+
+static struct phy_driver qca807x_drivers[] = {
+	{
+		PHY_ID_MATCH_EXACT(PHY_ID_QCA8072),
+		.name           = "Qualcomm QCA8072",
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(5,8,0)
+		.flags		= PHY_POLL_CABLE_TEST,
+#endif
+		/* PHY_GBIT_FEATURES */
+		.probe		= qca807x_probe,
+		.config_init	= qca807x_config,
+		.read_status	= qca807x_read_status,
+		.config_intr	= qca807x_config_intr,
+#if LINUX_VERSION_CODE < KERNEL_VERSION(5,12,0)
+		.ack_interrupt	= qca807x_ack_intr,
+#else
+		.handle_interrupt = qca807x_handle_interrupt,
+#endif
+		.soft_reset	= genphy_soft_reset,
+		.get_tunable	= qca807x_get_tunable,
+		.set_tunable	= qca807x_set_tunable,
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(5,8,0)
+		.cable_test_start	= qca807x_cable_test_start,
+		.cable_test_get_status	= qca807x_cable_test_get_status,
+#endif
+	},
+	{
+		PHY_ID_MATCH_EXACT(PHY_ID_QCA8075),
+		.name           = "Qualcomm QCA8075",
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(5,8,0)
+		.flags		= PHY_POLL_CABLE_TEST,
+#endif
+		/* PHY_GBIT_FEATURES */
+		.probe		= qca807x_probe,
+		.config_init	= qca807x_config,
+		.read_status	= qca807x_read_status,
+		.config_intr	= qca807x_config_intr,
+#if LINUX_VERSION_CODE < KERNEL_VERSION(5,12,0)
+		.ack_interrupt	= qca807x_ack_intr,
+#else
+		.handle_interrupt = qca807x_handle_interrupt,
+#endif
+		.soft_reset	= genphy_soft_reset,
+		.get_tunable	= qca807x_get_tunable,
+		.set_tunable	= qca807x_set_tunable,
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(5,8,0)
+		.cable_test_start	= qca807x_cable_test_start,
+		.cable_test_get_status	= qca807x_cable_test_get_status,
+#endif
+	},
+	{
+		PHY_ID_MATCH_EXACT(PHY_ID_QCA807X_PSGMII),
+		.name           = "Qualcomm QCA807x PSGMII",
+		.probe		= qca807x_psgmii_config,
+	},
+};
+module_phy_driver(qca807x_drivers);
+
+static struct mdio_device_id __maybe_unused qca807x_tbl[] = {
+	{ PHY_ID_MATCH_EXACT(PHY_ID_QCA8072) },
+	{ PHY_ID_MATCH_EXACT(PHY_ID_QCA8075) },
+	{ PHY_ID_MATCH_MODEL(PHY_ID_QCA807X_PSGMII) },
+	{ }
+};
+
+MODULE_AUTHOR("Robert Marko");
+MODULE_DESCRIPTION("Qualcomm QCA807x PHY driver");
+MODULE_DEVICE_TABLE(mdio, qca807x_tbl);
+MODULE_LICENSE("GPL");
diff --git a/root/target/linux/ipq40xx/image/generic.mk b/root/target/linux/ipq40xx/image/generic.mk
index b5ac9f1b..ee1e6046 100644
--- a/root/target/linux/ipq40xx/image/generic.mk
+++ b/root/target/linux/ipq40xx/image/generic.mk
@@ -842,7 +842,8 @@ define Device/teltonika_rutx
 	IMAGE/factory.bin := append-ubi | qsdk-ipq-factory-nand | append-rutx-metadata
 	IMAGES += sysupgrade.bin
 	IMAGE/sysupgrade.bin := append-ubi | qsdk-ipq-factory-nand | append-metadata
-	DEVICE_PACKAGES := ipq-wifi-teltonika_rutx kmod-bluetooth kmod-r2ec
+	#DEVICE_PACKAGES := ipq-wifi-teltonika_rutx kmod-bluetooth kmod-r2ec
+	DEVICE_PACKAGES := ipq-wifi-teltonika_rutx kmod-bluetooth
 	HW_SUPPORT := io_expander%stm32:shiftreg_1
 endef
 TARGET_DEVICES += teltonika_rutx
diff --git a/root/target/linux/ipq40xx/patches-5.15/085-ipq40xx-fix-sleep-clock.patch b/root/target/linux/ipq40xx/patches-5.15/085-ipq40xx-fix-sleep-clock.patch
new file mode 100644
index 00000000..af07d57b
--- /dev/null
+++ b/root/target/linux/ipq40xx/patches-5.15/085-ipq40xx-fix-sleep-clock.patch
@@ -0,0 +1,16 @@
+Index: linux-5.4.124/arch/arm/boot/dts/qcom-ipq4019.dtsi
+===================================================================
+--- linux-5.4.124.orig/arch/arm/boot/dts/qcom-ipq4019.dtsi
++++ linux-5.4.124/arch/arm/boot/dts/qcom-ipq4019.dtsi
+@@ -140,9 +140,9 @@
+ 	};
+ 
+ 	clocks {
+-		sleep_clk: sleep_clk {
++		sleep_clk: gcc_sleep_clk_src {
+ 			compatible = "fixed-clock";
+-			clock-frequency = <32768>;
++			clock-frequency = <32000>;
+ 			#clock-cells = <0>;
+ 		};
+ 
diff --git a/root/target/linux/ipq40xx/patches-5.15/500-jffs2-Dont-add-summary-entry-when-MTD-write-fails.patch b/root/target/linux/ipq40xx/patches-5.15/500-jffs2-Dont-add-summary-entry-when-MTD-write-fails.patch
new file mode 100644
index 00000000..6f9d9b87
--- /dev/null
+++ b/root/target/linux/ipq40xx/patches-5.15/500-jffs2-Dont-add-summary-entry-when-MTD-write-fails.patch
@@ -0,0 +1,53 @@
+--- a/fs/jffs2/writev.c
++++ b/fs/jffs2/writev.c
+@@ -16,9 +16,18 @@
+ int jffs2_flash_direct_writev(struct jffs2_sb_info *c, const struct kvec *vecs,
+ 			      unsigned long count, loff_t to, size_t *retlen)
+ {
++	int ret;
++
++	ret = mtd_writev(c->mtd, vecs, count, to, retlen);
++
+ 	if (!jffs2_is_writebuffered(c)) {
+ 		if (jffs2_sum_active()) {
+ 			int res;
++
++			if (ret ||
++			    *retlen != iov_length((struct iovec *) vecs, count))
++				return ret;
++
+ 			res = jffs2_sum_add_kvec(c, vecs, count, (uint32_t) to);
+ 			if (res) {
+ 				return res;
+@@ -26,18 +35,22 @@
+ 		}
+ 	}
+ 
+-	return mtd_writev(c->mtd, vecs, count, to, retlen);
++	return ret;
+ }
+ 
+ int jffs2_flash_direct_write(struct jffs2_sb_info *c, loff_t ofs, size_t len,
+ 			size_t *retlen, const u_char *buf)
+ {
+ 	int ret;
++
+ 	ret = mtd_write(c->mtd, ofs, len, retlen, buf);
+ 
+ 	if (jffs2_sum_active()) {
+ 		struct kvec vecs[1];
+ 		int res;
++
++		if (ret || *retlen != len)
++			return ret;
+ 
+ 		vecs[0].iov_base = (unsigned char *) buf;
+ 		vecs[0].iov_len = len;
+@@ -47,5 +60,6 @@
+ 			return res;
+ 		}
+ 	}
++
+ 	return ret;
+ }
+
diff --git a/root/target/linux/ipq40xx/patches-5.15/714-qca8075-report-combo-link-state-to-netdev.patch b/root/target/linux/ipq40xx/patches-5.15/714-qca8075-report-combo-link-state-to-netdev.patch
new file mode 100644
index 00000000..915ee115
--- /dev/null
+++ b/root/target/linux/ipq40xx/patches-5.15/714-qca8075-report-combo-link-state-to-netdev.patch
@@ -0,0 +1,210 @@
+--- a/drivers/net/phy/qca807x.c
++++ b/drivers/net/phy/qca807x.c
+@@ -122,9 +122,24 @@
+ #define PSGMII_MODE_CTRL_AZ_WORKAROUND_MASK		GENMASK(3, 0)
+ #define PSGMII_MMD3_SERDES_CONTROL			0x805a
+ 
++#define QCA8075_PHY4_PREFER_FIBER	0x400
++
+ struct qca807x_gpio_priv {
+ 	struct phy_device *phy;
+ };
++
++/* Phy medium type */
++typedef enum {
++	QCA8075_PHY_MEDIUM_COPPER = 0,
++	QCA8075_PHY_MEDIUM_FIBER = 1, /**< Fiber */
++	QCA8075_PHY_MEDIUM_NULL = 2 /**< NULL */
++} qca8075_phy_medium_t;
++
++static qca8075_phy_medium_t last_phy_medium = QCA8075_PHY_MEDIUM_NULL;
++static int last_phydev_link_state = -1;
++static int copper_link = 0;
++static int fiber_link = 0;
++static int report_last_status = 0;
+ 
+ static int qca807x_get_downshift(struct phy_device *phydev, u8 *data)
+ {
+@@ -400,6 +415,142 @@
+ }
+ #endif
+ 
++static qca8075_phy_medium_t phy_prefer_medium_get(struct phy_device *phydev)
++{
++	int val;
++	val = phy_read(phydev, QCA807X_CHIP_CONFIGURATION);
++
++	return ((val & QCA8075_PHY4_PREFER_FIBER) ?
++		QCA8075_PHY_MEDIUM_FIBER : QCA8075_PHY_MEDIUM_COPPER);
++}
++
++static qca8075_phy_medium_t phy_active_medium_get(struct phy_device *phydev) {
++	int val;
++	val = phy_read(phydev, QCA807X_MEDIA_SELECT_STATUS);
++
++	if (val & QCA807X_MEDIA_DETECTED_COPPER) {
++		return QCA8075_PHY_MEDIUM_COPPER;
++	} else if ((val & QCA807X_MEDIA_DETECTED_1000_BASE_X) ||
++			   (val & QCA807X_MEDIA_DETECTED_100_BASE_FX)) {
++		return QCA8075_PHY_MEDIUM_FIBER;
++	} else {
++		return phy_prefer_medium_get(phydev);
++	}
++}
++
++static int ar40xx_update_link(struct phy_device *phydev)
++{
++	int status = 0, bmcr;
++	qca8075_phy_medium_t phy_medium;
++
++	phy_medium = phy_active_medium_get(phydev);
++
++	/* Do a fake read */
++	bmcr = phy_read(phydev, MII_BMSR);
++	if (bmcr < 0)
++		return bmcr;
++
++	/* Autoneg is being started, therefore disregard BMSR value and
++	 * report link as down.
++	 */
++	if (bmcr & BMCR_ANRESTART)
++		goto done;
++
++	/* The link state is latched low so that momentary link
++	 * drops can be detected. Do not double-read the status
++	 * in polling mode to detect such short link drops except
++	 * the link was already down.
++	 */
++	if (!phy_polling_mode(phydev) || !phydev->link) {
++		status = phy_read(phydev, MII_BMSR);
++		if (status < 0)
++			return status;
++		else if (status & BMSR_LSTATUS)
++			goto done;
++	}
++
++	/* Read link and autonegotiation status */
++	status = phy_read(phydev, MII_BMSR);
++	if (status < 0)
++		return status;
++done:
++	if ( report_last_status > 0 ) {
++		report_last_status = 0;
++		phydev->link = last_phydev_link_state;
++		return 0;
++	}
++	/* reporting copper/fiber link state to netdev */
++	if ((status & BMSR_LSTATUS) == 0) {
++		phydev->link = 0;
++		if (last_phy_medium == phy_medium) { /* medium not changed */
++			if(phydev->link != last_phydev_link_state)
++				report_last_status++;
++			if (phy_medium == QCA8075_PHY_MEDIUM_FIBER)
++				fiber_link = 0;
++			else
++				copper_link = 0;
++		} else { /* medium changed, check current medium*/
++			if (phy_medium == QCA8075_PHY_MEDIUM_FIBER) { /* fiber active*/
++				if (copper_link == 1) { /* copper active, but not preferred*/
++					if(phydev->link == last_phydev_link_state) {
++						phydev->link = !phydev->link; /* toggle link state */
++						report_last_status++;
++					}
++				}
++				fiber_link = 0;
++			} else { /* copper active*/
++				if (fiber_link == 1) { /* fiber active, preferred*/
++					if(phydev->link == last_phydev_link_state) {
++						phydev->link = !phydev->link; /* toggle link state */
++						report_last_status++;
++					}
++				}
++				copper_link = 0;
++			}
++		}
++	} else {
++		phydev->link = 1;
++		if (last_phy_medium == phy_medium){
++			if (phy_medium == QCA8075_PHY_MEDIUM_FIBER)
++				fiber_link = 1;
++			else
++				copper_link = 1;
++		}
++		else {
++			if (phy_medium == QCA8075_PHY_MEDIUM_FIBER) { /* fiber active*/
++				if (copper_link == 1) { /* copper active, but not preferred*/
++					if(phydev->link == last_phydev_link_state) {
++						phydev->link = !phydev->link;
++						report_last_status++;
++					}
++				}
++				fiber_link = 1;
++			} else { /* copper active*/
++				if (fiber_link == 1) { /* fiber active, preferred*/
++					if(phydev->link == last_phydev_link_state) {
++						phydev->link = !phydev->link;
++						report_last_status++;
++					}
++				}
++				copper_link = 1;
++			}
++		}
++	}
++
++	phydev->autoneg_complete = status & BMSR_ANEGCOMPLETE ? 1 : 0;
++
++	/* Consider the case that autoneg was started and "aneg complete"
++	 * bit has been reset, but "link up" bit not yet.
++	 */
++	if (phydev->autoneg == AUTONEG_ENABLE && !phydev->autoneg_complete)
++		phydev->link = 0;
++
++	last_phy_medium = phy_medium;
++	last_phydev_link_state = phydev->link;
++
++	return 0;
++}
++
+ static int qca807x_read_copper_status(struct phy_device *phydev, bool combo_port)
+ {
+ 	int ss, err, page, old_link = phydev->link;
+@@ -415,7 +566,7 @@
+ 	}
+ 
+ 	/* Update the link, but return if there was an error */
+-	err = genphy_update_link(phydev);
++	err = ar40xx_update_link(phydev);
+ 	if (err)
+ 		return err;
+ 
+@@ -499,7 +650,7 @@
+ 	}
+ 
+ 	/* Update the link, but return if there was an error */
+-	err = genphy_update_link(phydev);
++	err = ar40xx_update_link(phydev);
+ 	if (err)
+ 		return err;
+ 
+@@ -559,7 +710,7 @@
+ 
+ static int qca807x_read_status(struct phy_device *phydev)
+ {
+-	int val;
++	int val, err;
+ 
+ 	/* Check for Combo port */
+ 	if (phy_read(phydev, QCA807X_CHIP_CONFIGURATION)) {
+@@ -572,6 +723,11 @@
+ 			} else if ((val & QCA807X_MEDIA_DETECTED_1000_BASE_X) ||
+ 				   (val & QCA807X_MEDIA_DETECTED_100_BASE_FX)) {
+ 				qca807x_read_fiber_status(phydev, true);
++			} else {
++				/* Update the link, but return if there was an error */
++				err = ar40xx_update_link(phydev);
++				if (err)
++					return err;
+ 			}
+ 		} else {
+ 			qca807x_read_copper_status(phydev, true);
+
diff --git a/root/target/linux/ipq40xx/patches-5.15/719-meiglink_slm750_support.patch b/root/target/linux/ipq40xx/patches-5.15/719-meiglink_slm750_support.patch
new file mode 100644
index 00000000..9fa02a68
--- /dev/null
+++ b/root/target/linux/ipq40xx/patches-5.15/719-meiglink_slm750_support.patch
@@ -0,0 +1,35 @@
+Index: linux-5.4.137/drivers/usb/serial/option.c
+===================================================================
+--- linux-5.4.137.orig/drivers/usb/serial/option.c
++++ linux-5.4.137/drivers/usb/serial/option.c
+@@ -241,6 +241,8 @@ static void option_instat_callback(struc
+ #define UBLOX_PRODUCT_R6XX			0x90fa
+ /* These Yuga products use Qualcomm's vendor ID */
+ #define YUGA_PRODUCT_CLM920_NC5			0x9625
++/* These Meiglink products use Qualcomm's vendor ID */
++#define MEIGLINK_PRODUCT_SLM750			0xf601
+ 
+ #define QUECTEL_VENDOR_ID			0x2c7c
+ /* These Quectel products use Quectel's vendor ID */
+@@ -1102,6 +1104,9 @@ static const struct usb_device_id option
+ 	/* u-blox products using Qualcomm vendor ID */
+ 	{ USB_DEVICE(QUALCOMM_VENDOR_ID, UBLOX_PRODUCT_R410M),
+ 	  .driver_info = RSVD(1) | RSVD(3) },
++	/* Meiglink products using Qualcomm vendor ID */
++	// Works OK in case of some issues check macros that are used by Quectel Products
++	{ USB_DEVICE(QUALCOMM_VENDOR_ID, MEIGLINK_PRODUCT_SLM750)},
+ 	{ USB_DEVICE(QUALCOMM_VENDOR_ID, UBLOX_PRODUCT_R6XX),
+ 	  .driver_info = RSVD(3) },
+ 	/* Quectel products using Quectel vendor ID */
+Index: linux-5.4.137/drivers/net/usb/qmi_wwan.c
+===================================================================
+--- linux-5.4.137.orig/drivers/net/usb/qmi_wwan.c
++++ linux-5.4.137/drivers/net/usb/qmi_wwan.c
+@@ -1171,6 +1171,7 @@ static const struct usb_device_id produc
+ 	{QMI_FIXED_INTF(0x05c6, 0x9079, 6)},
+ 	{QMI_FIXED_INTF(0x05c6, 0x9079, 7)},
+ 	{QMI_FIXED_INTF(0x05c6, 0x9079, 8)},
++	{QMI_MATCH_FF_FF_FF(0x05c6, 0xf601)}, 	/* Meiglink SLM750 (in case of issues check if DTR flag setting is enough) */
+ 	{QMI_FIXED_INTF(0x05c6, 0x9080, 5)},
+ 	{QMI_FIXED_INTF(0x05c6, 0x9080, 6)},
+ 	{QMI_FIXED_INTF(0x05c6, 0x9080, 7)},
diff --git a/root/target/linux/ipq40xx/patches-5.15/851-spi-qup-revert-fix-PIO-DMA-transfers.patch b/root/target/linux/ipq40xx/patches-5.15/851-spi-qup-revert-fix-PIO-DMA-transfers.patch
new file mode 100644
index 00000000..00ccf928
--- /dev/null
+++ b/root/target/linux/ipq40xx/patches-5.15/851-spi-qup-revert-fix-PIO-DMA-transfers.patch
@@ -0,0 +1,105 @@
+--- a/drivers/spi/spi-qup.c
++++ b/drivers/spi/spi-qup.c
+@@ -273,9 +273,6 @@
+ 		writel_relaxed(QUP_OP_IN_SERVICE_FLAG,
+ 			       controller->base + QUP_OPERATIONAL);
+ 
+-		if (!remainder)
+-			goto exit;
+-
+ 		if (is_block_mode) {
+ 			num_words = (remainder > words_per_block) ?
+ 					words_per_block : remainder;
+@@ -305,13 +302,11 @@
+ 	 * to refresh opflags value because MAX_INPUT_DONE_FLAG may now be
+ 	 * present and this is used to determine if transaction is complete
+ 	 */
+-exit:
+-	if (!remainder) {
+-		*opflags = readl_relaxed(controller->base + QUP_OPERATIONAL);
+-		if (is_block_mode && *opflags & QUP_OP_MAX_INPUT_DONE_FLAG)
+-			writel_relaxed(QUP_OP_IN_SERVICE_FLAG,
+-				       controller->base + QUP_OPERATIONAL);
+-	}
++	*opflags = readl_relaxed(controller->base + QUP_OPERATIONAL);
++	if (is_block_mode && *opflags & QUP_OP_MAX_INPUT_DONE_FLAG)
++		writel_relaxed(QUP_OP_IN_SERVICE_FLAG,
++			       controller->base + QUP_OPERATIONAL);
++
+ }
+ 
+ static void spi_qup_write_to_fifo(struct spi_qup *controller, u32 num_words)
+@@ -358,10 +353,6 @@
+ 		/* ACK by clearing service flag */
+ 		writel_relaxed(QUP_OP_OUT_SERVICE_FLAG,
+ 			       controller->base + QUP_OPERATIONAL);
+-
+-		/* make sure the interrupt is valid */
+-		if (!remainder)
+-			return;
+ 
+ 		if (is_block_mode) {
+ 			num_words = (remainder > words_per_block) ?
+@@ -576,24 +567,10 @@
+ 	return 0;
+ }
+ 
+-static bool spi_qup_data_pending(struct spi_qup *controller)
+-{
+-	unsigned int remainder_tx, remainder_rx;
+-
+-	remainder_tx = DIV_ROUND_UP(spi_qup_len(controller) -
+-				    controller->tx_bytes, controller->w_size);
+-
+-	remainder_rx = DIV_ROUND_UP(spi_qup_len(controller) -
+-				    controller->rx_bytes, controller->w_size);
+-
+-	return remainder_tx || remainder_rx;
+-}
+-
+ static irqreturn_t spi_qup_qup_irq(int irq, void *dev_id)
+ {
+ 	struct spi_qup *controller = dev_id;
+ 	u32 opflags, qup_err, spi_err;
+-	unsigned long flags;
+ 	int error = 0;
+ 
+ 	qup_err = readl_relaxed(controller->base + QUP_ERROR_FLAGS);
+@@ -625,11 +602,6 @@
+ 		error = -EIO;
+ 	}
+ 
+-	spin_lock_irqsave(&controller->lock, flags);
+-	if (!controller->error)
+-		controller->error = error;
+-	spin_unlock_irqrestore(&controller->lock, flags);
+-
+ 	if (spi_qup_is_dma_xfer(controller->mode)) {
+ 		writel_relaxed(opflags, controller->base + QUP_OPERATIONAL);
+ 	} else {
+@@ -638,21 +610,10 @@
+ 
+ 		if (opflags & QUP_OP_OUT_SERVICE_FLAG)
+ 			spi_qup_write(controller);
+-
+-		if (!spi_qup_data_pending(controller))
+-			complete(&controller->done);
+-	}
+-
+-	if (error)
++	}
++
++	if ((opflags & QUP_OP_MAX_INPUT_DONE_FLAG) || error)
+ 		complete(&controller->done);
+-
+-	if (opflags & QUP_OP_MAX_INPUT_DONE_FLAG) {
+-		if (!spi_qup_is_dma_xfer(controller->mode)) {
+-			if (spi_qup_data_pending(controller))
+-				return IRQ_HANDLED;
+-		}
+-		complete(&controller->done);
+-	}
+ 
+ 	return IRQ_HANDLED;
+ }
+