mac80211: rt2x00: add mtd-eeprom swab function

[openwrt/staging/chunkeey.git] / package / kernel / mac80211 / patches / 605-rt2x00-load-eeprom-on-SoC-from-a-mtd-device-defines-.patch

diff --git a/package/kernel/mac80211/patches/605-rt2x00-load-eeprom-on-SoC-from-a-mtd-device-defines-.patch b/package/kernel/mac80211/patches/605-rt2x00-load-eeprom-on-SoC-from-a-mtd-device-defines-.patch
index 75f0415b73f71e35f9b9b4ac0891e9c1e03412df..a98b49c541f5f76e73751c2fd2e5b85559854b87 100644 (file)
--- a/package/kernel/mac80211/patches/605-rt2x00-load-eeprom-on-SoC-from-a-mtd-device-defines-.patch
+++ b/package/kernel/mac80211/patches/605-rt2x00-load-eeprom-on-SoC-from-a-mtd-device-defines-.patch
@@ -6,12 +6,12 @@ Subject: [PATCH] rt2x00: load eeprom on SoC from a mtd device defines inside
 
 Signed-off-by: John Crispin <blogic@openwrt.org>
 ---
- drivers/net/wireless/rt2x00/Kconfig     |    1 +
- drivers/net/wireless/rt2x00/rt2800pci.c |   44 ++++++++++++++++++++++++++-----
- 2 files changed, 39 insertions(+), 6 deletions(-)
+ drivers/net/wireless/ralink/rt2x00/Kconfig        |  1 +
+ drivers/net/wireless/ralink/rt2x00/rt2x00eeprom.c | 65 +++++++++++++++++++++++
+ 2 files changed, 66 insertions(+)
 
---- a/drivers/net/wireless/rt2x00/Kconfig
-+++ b/drivers/net/wireless/rt2x00/Kconfig
+--- a/drivers/net/wireless/ralink/rt2x00/Kconfig
++++ b/drivers/net/wireless/ralink/rt2x00/Kconfig
 @@ -219,6 +219,7 @@ config RT2800SOC
        select RT2X00_LIB_EEPROM
        select RT2800_LIB
@@ -20,9 +20,9 @@ Signed-off-by: John Crispin <blogic@openwrt.org>
        ---help---
          This adds support for Ralink WiSoC devices.
          Supported chips: RT2880, RT3050, RT3052, RT3350, RT3352.
---- a/drivers/net/wireless/rt2x00/rt2x00eeprom.c
-+++ b/drivers/net/wireless/rt2x00/rt2x00eeprom.c
-@@ -26,11 +26,66 @@
+--- a/drivers/net/wireless/ralink/rt2x00/rt2x00eeprom.c
++++ b/drivers/net/wireless/ralink/rt2x00/rt2x00eeprom.c
+@@ -26,11 +26,73 @@
  
  #include <linux/kernel.h>
  #include <linux/module.h>
@@ -40,17 +40,15 @@ Signed-off-by: John Crispin <blogic@openwrt.org>
 +      static struct firmware mtd_fw;
 +      struct device_node *np = rt2x00dev->dev->of_node, *mtd_np = NULL;
 +      size_t retlen, len = rt2x00dev->ops->eeprom_size;
-+      int size, offset = 0;
++      int i, size, offset = 0;
 +      struct mtd_info *mtd;
 +      const char *part;
 +      const __be32 *list;
 +      phandle phandle;
 +
 +      list = of_get_property(np, "ralink,mtd-eeprom", &size);
-+      if (!list) {
-+              dev_err(rt2x00dev->dev, "failed to load eeprom property\n");
++      if (!list)
 +              return -ENOENT;
-+      }
 +
 +      phandle = be32_to_cpup(list++);
 +      if (phandle)
@@ -76,11 +74,20 @@ Signed-off-by: John Crispin <blogic@openwrt.org>
 +      ret = mtd_read(mtd, offset, len, &retlen, (u_char *) rt2x00dev->eeprom);
 +      put_mtd_device(mtd);
 +
-+      if (!ret) {
-+              rt2x00dev->eeprom_file = &mtd_fw;
-+              mtd_fw.size = len;
-+              mtd_fw.data = rt2x00dev->eeprom;
++      if ((retlen != rt2x00dev->ops->eeprom_size) || ret) {
++              dev_err(rt2x00dev->dev, "failed to load eeprom from device \"%s\"\n", part);
++              return ret;
 +      }
++
++      if (of_find_property(np, "ralink,mtd-eeprom-swap", NULL))
++              for (i = 0; i < len/sizeof(u16); i++)
++                      rt2x00dev->eeprom[i] = swab16(rt2x00dev->eeprom[i]);
++
++      rt2x00dev->eeprom_file = &mtd_fw;
++      mtd_fw.size = len;
++      mtd_fw.data = (const u8 *) rt2x00dev->eeprom;
++
++      dev_info(rt2x00dev->dev, "loaded eeprom from mtd device \"%s\"\n", part);
 +#endif
 +
 +      return ret;
@@ -89,7 +96,7 @@ Signed-off-by: John Crispin <blogic@openwrt.org>
  static const char *
  rt2x00lib_get_eeprom_file_name(struct rt2x00_dev *rt2x00dev)
  {
-@@ -58,6 +113,9 @@ static int rt2x00lib_request_eeprom_file
+@@ -58,6 +120,9 @@ static int rt2x00lib_request_eeprom_file
        const char *ee_name;
        int retval;
  
@@ -97,5 +104,5 @@ Signed-off-by: John Crispin <blogic@openwrt.org>
 +              return 0;
 +
        ee_name = rt2x00lib_get_eeprom_file_name(rt2x00dev);
-       if (!ee_name) {
-               rt2x00_err(rt2x00dev,
+       if (!ee_name && test_bit(REQUIRE_EEPROM_FILE, &rt2x00dev->cap_flags)) {
+               rt2x00_err(rt2x00dev, "Required EEPROM name is missing.");