aboutsummaryrefslogtreecommitdiffstats
path: root/package
diff options
context:
space:
mode:
authorJohn Crispin <john@openwrt.org>2011-11-12 18:41:15 +0000
committerJohn Crispin <john@openwrt.org>2011-11-12 18:41:15 +0000
commiteb20ab87e6ed3f9481318ae4dcea3d357f530cf3 (patch)
tree75625757f5714ec7c110d4e7743fa406a0989c80 /package
parentbbfaaeffd6f02f87a02bab2d5e874873cd1788ca (diff)
downloadupstream-eb20ab87e6ed3f9481318ae4dcea3d357f530cf3.tar.gz
upstream-eb20ab87e6ed3f9481318ae4dcea3d357f530cf3.tar.bz2
upstream-eb20ab87e6ed3f9481318ae4dcea3d357f530cf3.zip
lantiq: w303v has its rt2860 eep on the nor flash. tell compat-wireless how to use it
SVN-Revision: 28994
Diffstat (limited to 'package')
-rw-r--r--package/mac80211/patches/605-rt2x00-pci-eeprom.patch50
1 files changed, 50 insertions, 0 deletions
diff --git a/package/mac80211/patches/605-rt2x00-pci-eeprom.patch b/package/mac80211/patches/605-rt2x00-pci-eeprom.patch
new file mode 100644
index 0000000000..c2e574d058
--- /dev/null
+++ b/package/mac80211/patches/605-rt2x00-pci-eeprom.patch
@@ -0,0 +1,50 @@
+Index: compat-wireless-2011-11-04/drivers/net/wireless/rt2x00/rt2800pci.c
+===================================================================
+--- compat-wireless-2011-11-04.orig/drivers/net/wireless/rt2x00/rt2800pci.c 2011-11-12 19:34:24.760314206 +0100
++++ compat-wireless-2011-11-04/drivers/net/wireless/rt2x00/rt2800pci.c 2011-11-12 19:34:24.956314211 +0100
+@@ -84,7 +84,7 @@
+ rt2x00pci_register_write(rt2x00dev, H2M_MAILBOX_CID, ~0);
+ }
+
+-static void rt2800pci_read_eeprom_soc(struct rt2x00_dev *rt2x00dev)
++static void rt2800pci_read_eeprom_file(struct rt2x00_dev *rt2x00dev)
+ {
+ memcpy(rt2x00dev->eeprom, rt2x00dev->eeprom_file->data, EEPROM_SIZE);
+ }
+@@ -938,8 +938,9 @@
+ /*
+ * Read EEPROM into buffer
+ */
+- if (rt2x00_is_soc(rt2x00dev))
+- rt2800pci_read_eeprom_soc(rt2x00dev);
++ if (rt2x00_is_soc(rt2x00dev) ||
++ test_bit(REQUIRE_EEPROM_FILE, &rt2x00dev->cap_flags))
++ rt2800pci_read_eeprom_file(rt2x00dev);
+ else if (rt2800pci_efuse_detect(rt2x00dev))
+ rt2800pci_read_eeprom_efuse(rt2x00dev);
+ else
+Index: compat-wireless-2011-11-04/drivers/net/wireless/rt2x00/rt2x00pci.c
+===================================================================
+--- compat-wireless-2011-11-04.orig/drivers/net/wireless/rt2x00/rt2x00pci.c 2011-11-12 19:34:24.704314204 +0100
++++ compat-wireless-2011-11-04/drivers/net/wireless/rt2x00/rt2x00pci.c 2011-11-12 19:34:24.956314211 +0100
+@@ -255,6 +255,7 @@
+ int rt2x00pci_probe(struct pci_dev *pci_dev, const struct rt2x00_ops *ops)
+ {
+ struct ieee80211_hw *hw;
++ struct rt2x00_platform_data *pdata;
+ struct rt2x00_dev *rt2x00dev;
+ int retval;
+
+@@ -299,6 +300,12 @@
+ rt2x00dev->irq = pci_dev->irq;
+ rt2x00dev->name = pci_name(pci_dev);
+
++ /* if we get passed the name of a eeprom_file_name, then use this in
++ favour of the eeprom */
++ pdata = rt2x00dev->dev->platform_data;
++ if (pdata && pdata->eeprom_file_name)
++ set_bit(REQUIRE_EEPROM_FILE, &rt2x00dev->cap_flags);
++
+ if (pci_is_pcie(pci_dev))
+ rt2x00_set_chip_intf(rt2x00dev, RT2X00_CHIP_INTF_PCIE);
+ else