X-Git-Url: https://git.rohieb.name/openwrt.git/blobdiff_plain/4d1dc2d13a24c1a8fab6d25e6cf7acf161a154c1..5913e5b125adcf07d7450634860e9d37dc26e8c1:/package/madwifi/patches/354-ifxmips_eeprom.patch?ds=sidebyside diff --git a/package/madwifi/patches/354-ifxmips_eeprom.patch b/package/madwifi/patches/354-ifxmips_eeprom.patch index e96bf8654..59036b1b4 100644 --- a/package/madwifi/patches/354-ifxmips_eeprom.patch +++ b/package/madwifi/patches/354-ifxmips_eeprom.patch @@ -1,13 +1,13 @@ --- a/ath_hal/ah_os.c +++ b/ath_hal/ah_os.c -@@ -343,6 +343,46 @@ +@@ -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 + @@ -32,7 +32,7 @@ + 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) @@ -47,13 +47,13 @@ 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 @@ -70,7 +70,7 @@ - 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 @@ -85,14 +85,11 @@ (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++) {