projects
/
openwrt
/
svn-archive
/
archive.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (from parent 1:
b3abbfd
)
atheros: remove bogus wlan device mask checks
author
Felix Fietkau
<nbd@openwrt.org>
Mon, 11 Apr 2011 03:25:59 +0000
(
03:25
+0000)
committer
Felix Fietkau
<nbd@openwrt.org>
Mon, 11 Apr 2011 03:25:59 +0000
(
03:25
+0000)
SVN-Revision: 26585
target/linux/atheros/patches-2.6.37/100-board.patch
patch
|
blob
|
history
diff --git
a/target/linux/atheros/patches-2.6.37/100-board.patch
b/target/linux/atheros/patches-2.6.37/100-board.patch
index b72d32109ceaeda18fba5425224748e4e1272c5f..778502d480c7706e5589a635397d02f63374c8b2 100644
(file)
--- a/
target/linux/atheros/patches-2.6.37/100-board.patch
+++ b/
target/linux/atheros/patches-2.6.37/100-board.patch
@@
-1345,7
+1345,7
@@
+#endif /* __AR2315_REG_H */
--- /dev/null
+++ b/arch/mips/include/asm/mach-ar231x/ar5312_regs.h
+#endif /* __AR2315_REG_H */
--- /dev/null
+++ b/arch/mips/include/asm/mach-ar231x/ar5312_regs.h
-@@ -0,0 +1,23
6
@@
+@@ -0,0 +1,23
2
@@
+/*
+ * This file is subject to the terms and conditions of the GNU General Public
+ * License. See the file "COPYING" in the main directory of this archive
+/*
+ * This file is subject to the terms and conditions of the GNU General Public
+ * License. See the file "COPYING" in the main directory of this archive
@@
-1398,10
+1398,6
@@
+#define AR5212_AR5312_REV2 0x0052 /* AR5312 WMAC (AP31) */
+#define AR5212_AR5312_REV7 0x0057 /* AR5312 WMAC (AP30-040) */
+#define AR5212_AR2313_REV8 0x0058 /* AR2313 WMAC (AP43-030) */
+#define AR5212_AR5312_REV2 0x0052 /* AR5312 WMAC (AP31) */
+#define AR5212_AR5312_REV7 0x0057 /* AR5312 WMAC (AP30-040) */
+#define AR5212_AR2313_REV8 0x0058 /* AR2313 WMAC (AP43-030) */
-+#define AR531X_RADIO_MASK_OFF 0xc8
-+#define AR531X_RADIO0_MASK 0x0003
-+#define AR531X_RADIO1_MASK 0x000c
-+#define AR531X_RADIO1_S 2
+
+/*
+ * AR531X_NUM_WMAC defines the number of Wireless MACs that\
+
+/*
+ * AR531X_NUM_WMAC defines the number of Wireless MACs that\
@@
-1584,7
+1580,7
@@
+
--- /dev/null
+++ b/arch/mips/ar231x/ar5312.c
+
--- /dev/null
+++ b/arch/mips/ar231x/ar5312.c
-@@ -0,0 +1,5
4
9 @@
+@@ -0,0 +1,5
2
9 @@
+/*
+ * This file is subject to the terms and conditions of the GNU General Public
+ * License. See the file "COPYING" in the main directory of this archive
+/*
+ * This file is subject to the terms and conditions of the GNU General Public
+ * License. See the file "COPYING" in the main directory of this archive
@@
-1885,7
+1881,6
@@
+{
+ struct ar231x_boarddata *config;
+ u32 fctl = 0;
+{
+ struct ar231x_boarddata *config;
+ u32 fctl = 0;
-+ const u8 *radio;
+ u8 *c;
+
+ if (!is_5312())
+ u8 *c;
+
+ if (!is_5312())
@@
-1895,22
+1890,6
@@
+ ar231x_find_config(ar5312_flash_limit());
+ config = ar231x_board.config;
+
+ ar231x_find_config(ar5312_flash_limit());
+ config = ar231x_board.config;
+
-+
-+ /*
-+ * Chip IDs and hardware detection for some Atheros
-+ * models are really broken!
-+ *
-+ * Atheros uses a disabled WMAC0 and Silicon ID of AR5312
-+ * as indication for AR2312, which is otherwise
-+ * indistinguishable from the real AR5312.
-+ */
-+ if (ar231x_board.radio) {
-+ radio = ar231x_board.radio + AR531X_RADIO_MASK_OFF;
-+ if ((*((const u32 *) radio) & AR531X_RADIO0_MASK) == 0)
-+ config->flags |= BD_ISCASPER;
-+ } else
-+ radio = NULL;
-+
+ /* AR2313 has CPU minor rev. 10 */
+ if ((current_cpu_data.processor_id & 0xff) == 0x0a)
+ ar231x_devtype = DEV_TYPE_AR2313;
+ /* AR2313 has CPU minor rev. 10 */
+ if ((current_cpu_data.processor_id & 0xff) == 0x0a)
+ ar231x_devtype = DEV_TYPE_AR2313;
@@
-1967,11
+1946,10
@@
+ if (!ar231x_board.radio)
+ return 0;
+
+ if (!ar231x_board.radio)
+ return 0;
+
-+ if ((*((u32 *) radio) & AR531X_RADIO0_MASK) &&
-+ (config->flags & BD_WLAN0))
-+ ar231x_add_wmac(0, AR531X_WLAN0,
-+ AR5312_IRQ_WLAN0_INTRS);
++ if (!(config->flags & BD_WLAN0))
++ break;
+
+
++ ar231x_add_wmac(0, AR531X_WLAN0, AR5312_IRQ_WLAN0_INTRS);
+ break;
+ /*
+ * AR2312/3 ethernet uses the PHY of ENET0, but the MAC
+ break;
+ /*
+ * AR2312/3 ethernet uses the PHY of ENET0, but the MAC
@@
-1992,10
+1970,8
@@
+ break;
+ }
+
+ break;
+ }
+
-+ if ((*((u32 *) radio) & AR531X_RADIO1_MASK) &&
-+ (config->flags & BD_WLAN1))
-+ ar231x_add_wmac(1, AR531X_WLAN1,
-+ AR5312_IRQ_WLAN1_INTRS);
++ if (config->flags & BD_WLAN1)
++ ar231x_add_wmac(1, AR531X_WLAN1, AR5312_IRQ_WLAN1_INTRS);
+
+ return 0;
+}
+
+ return 0;
+}