brcm47xx: update bcma and ssb to master-2011-07-21

[openwrt.git] / package / madwifi / patches / 354-ifxmips_eeprom.patch

diff --git a/package/madwifi/patches/354-ifxmips_eeprom.patch b/package/madwifi/patches/354-ifxmips_eeprom.patch
index f4c8f73..59036b1 100644 (file)
--- a/package/madwifi/patches/354-ifxmips_eeprom.patch
+++ b/package/madwifi/patches/354-ifxmips_eeprom.patch
@@ -1,15 +1,13 @@
-Index: madwifi-trunk-r3314/ath_hal/ah_os.c
-===================================================================
---- madwifi-trunk-r3314.orig/ath_hal/ah_os.c   2008-07-06 02:42:52.000000000 +0200
-+++ madwifi-trunk-r3314/ath_hal/ah_os.c        2008-07-06 02:51:53.000000000 +0200
-@@ -343,6 +343,46 @@
+--- a/ath_hal/ah_os.c
++++ b/ath_hal/ah_os.c
+@@ -343,6 +343,46 @@ EXPORT_SYMBOL(ath_hal_func);
   * NB: see the comments in ah_osdep.h about byte-swapping register
   *     reads and writes to understand what's going on below.
   */
 +
-+#ifdef CONFIG_IFXMIPS
-+extern int ifxmips_has_brn_block(void);
-+static int ifxmips_emulate = 0;
++#ifdef CONFIG_LANTIQ
++extern int lantiq_emulate_madwifi_eep;
++extern unsigned long long lantiq_madwifi_eep_addr;
 +#define EEPROM_EMULATION 1
 +#endif
 +
@@ -34,7 +32,7 @@ Index: madwifi-trunk-r3314/ath_hal/ah_os.c
 +                              val = 0x00000002;
 +                      break;
 +              case 0x6004:
-+                      val = cpu_to_le16(__raw_readw((u16 *) KSEG1ADDR(0xb07f0400 + addrsel)));
++                      val = cpu_to_le16(__raw_readw((u16 *) KSEG1ADDR(lantiq_madwifi_eep_addr + addrsel)));
 +                      /* this forces the regdomain to 0x00 (worldwide), as the original setting
 +                       * causes issues with the HAL */
 +                      if (addrsel == 0x17e)
@@ -49,13 +47,13 @@ Index: madwifi-trunk-r3314/ath_hal/ah_os.c
  void __ahdecl
  ath_hal_reg_write(struct ath_hal *ah, u_int reg, u_int32_t val)
  {
-@@ -351,20 +391,33 @@
+@@ -351,20 +391,33 @@ ath_hal_reg_write(struct ath_hal *ah, u_
                ath_hal_printf(ah, "%s: WRITE 0x%x <= 0x%x\n", 
                                (ath_hal_func ?: "unknown"), reg, val);
  #endif
 -      _OS_REG_WRITE(ah, reg, val);
 +#ifdef EEPROM_EMULATION
-+      if((reg >= 0x6000) && (reg <= 0x6010) && ifxmips_emulate)
++      if((reg >= 0x6000) && (reg <= 0x6010) && lantiq_emulate_madwifi_eep)
 +      {
 +              val = ath_hal_eeprom(ah, reg, val, 1);
 +      } else
@@ -72,7 +70,7 @@ Index: madwifi-trunk-r3314/ath_hal/ah_os.c
 -      u_int32_t val;
 +      u_int32_t val;
 +#ifdef EEPROM_EMULATION
-+      if((reg >= 0x6000) && (reg <= 0x6010) && ifxmips_emulate)
++      if((reg >= 0x6000) && (reg <= 0x6010) && lantiq_emulate_madwifi_eep)
 +      {
 +              val = ath_hal_eeprom(ah, reg, 0, 0);
 +      } else
@@ -87,14 +85,11 @@ Index: madwifi-trunk-r3314/ath_hal/ah_os.c
                                (ath_hal_func ?: "unknown"), reg, val);
  #endif
        return val;
-@@ -581,7 +634,9 @@
+@@ -581,7 +634,6 @@ init_ath_hal(void)
  {
        const char *sep;
        int i;
 -
-+#ifdef CONFIG_IFXMIPS
-+      ifxmips_emulate = ifxmips_has_brn_block();
-+#endif
        printk(KERN_INFO "%s: %s (", dev_info, ath_hal_version);
        sep = "";
        for (i = 0; ath_hal_buildopts[i] != NULL; i++) {