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 (file)
index 0000000..16f5dcb
--- /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 82f6317ac669e742054bb2b8ad276533a5fdbedf..565373379410df6a009930cdd0f3e0aa8856553c 100644 (file)
--- 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 89e9b2fbb7a535c1d05a0a891a2eb3e511cfa19a..779584e342e276eded79c9542a700efeed0aa572 100644 (file)
--- 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>;