From: RISCi_ATOM <bob@bobcall.me>
Date: Wed, 18 Dec 2019 23:10:44 +0000 (-0500)
Subject: Fix wndr3800 wifi issues and add back kmod-owl-loader
X-Git-Tag: v1.5.0~27
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=210e3f07c8942916bf1d91aae5b14710cfb5fe4f;p=librecmc%2Flibrecmc.git

Fix wndr3800 wifi issues and add back kmod-owl-loader
---

diff --git a/package/kernel/linux/modules/wireless.mk b/package/kernel/linux/modules/wireless.mk
new file mode 100644
index 0000000000..16f5dcbf90
--- /dev/null
+++ b/package/kernel/linux/modules/wireless.mk
@@ -0,0 +1,28 @@
+#
+# Copyright (C) 2006-2008 OpenWrt.org
+#
+# This is free software, licensed under the GNU General Public License v2.
+# See /LICENSE for more information.
+#
+
+WIRELESS_MENU:=Wireless Drivers
+
+define KernelPackage/owl-loader
+  SUBMENU:=$(WIRELESS_MENU)
+  TITLE:=Owl loader for initializing Atheros PCI(e) Wifi chips
+  DEPENDS:=@PCI_SUPPORT
+  KCONFIG:=CONFIG_OWL_LOADER
+  FILES:=$(LINUX_DIR)/drivers/misc/owl-loader.ko
+  AUTOLOAD:=$(call AutoProbe,owl-loader)
+endef
+
+define KernelPackage/owl-loader/description
+  Kernel module that helps to initialize certain Qualcomm
+  Atheros' PCI(e) Wifi chips, which have the init data
+  (which contains the PCI device ID for example) stored
+  together with the calibration data in the file system.
+
+  This is necessary for devices like the Cisco Meraki Z1.
+endef
+
+$(eval $(call KernelPackage,owl-loader))
diff --git a/target/linux/ath79/Makefile b/target/linux/ath79/Makefile
index 82f6317ac6..5653733794 100644
--- a/target/linux/ath79/Makefile
+++ b/target/linux/ath79/Makefile
@@ -14,6 +14,6 @@ include $(INCLUDE_DIR)/target.mk
 
 DEFAULT_PACKAGES += \
 	kmod-gpio-button-hotplug swconfig \
-	kmod-ath9k uboot-envtools
+	kmod-ath9k uboot-envtools kmod-owl-loader
 
 $(eval $(call BuildTarget))
diff --git a/target/linux/ath79/dts/ar7161_netgear_wndr3700.dtsi b/target/linux/ath79/dts/ar7161_netgear_wndr3700.dtsi
index 89e9b2fbb7..779584e342 100644
--- a/target/linux/ath79/dts/ar7161_netgear_wndr3700.dtsi
+++ b/target/linux/ath79/dts/ar7161_netgear_wndr3700.dtsi
@@ -153,7 +153,7 @@
 
 	ath9k0: wifi@0,11 {
 		compatible = "pci168c,0029";
-		reg = <0x8800 0 0 0 0x10000>;
+		reg = <0x8800 0 0 0 0>;
 		mtd-mac-address = <&art 0x0>;
 		qca,no-eeprom;
 		#gpio-cells = <2>;
@@ -162,7 +162,7 @@
 
 	ath9k1: wifi@0,12 {
 		compatible = "pci168c,0029";
-		reg = <0x9000 0 0 0 0x10000>;
+		reg = <0x9000 0 0 0 0>;
 		mtd-mac-address = <&art 0xc>;
 		qca,no-eeprom;
 		#gpio-cells = <2>;