X-Git-Url: https://git.rohieb.name/openwrt.git/blobdiff_plain/cf521fcca87ee5330d41200c3470ca78e6519eb3..1fe43c4a68da43f9b18c150af08388bb6cb8325e:/target/linux/atheros/patches-2.6.37/100-board.patch

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 97d51f479..778502d48 100644
--- a/target/linux/atheros/patches-2.6.37/100-board.patch
+++ b/target/linux/atheros/patches-2.6.37/100-board.patch
@@ -85,7 +85,7 @@
 +obj-$(CONFIG_ATHEROS_AR2315) += ar2315.o
 --- /dev/null
 +++ b/arch/mips/ar231x/board.c
-@@ -0,0 +1,251 @@
+@@ -0,0 +1,258 @@
 +/*
 + * 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
@@ -225,6 +225,7 @@
 +	u8 *bcfg, *rcfg;
 +	u8 *board_data;
 +	u8 *radio_data;
++	u8 *mac_addr;
 +	u32 offset;
 +
 +	ar231x_board.config = NULL;
@@ -282,6 +283,12 @@
 +	rcfg_size = BOARD_CONFIG_BUFSZ - offset;
 +	memcpy(radio_data, rcfg, rcfg_size);
 +
++	mac_addr = &radio_data[0x1d * 2];
++	if (is_broadcast_ether_addr(mac_addr)) {
++		printk(KERN_INFO "Radio MAC is blank; using board-data\n");
++		memcpy(mac_addr, ar231x_board.config->wlan0_mac, ETH_ALEN);
++	}
++
 +	return 0;
 +}
 +
@@ -1338,7 +1345,7 @@
 +#endif /* __AR2315_REG_H */
 --- /dev/null
 +++ b/arch/mips/include/asm/mach-ar231x/ar5312_regs.h
-@@ -0,0 +1,236 @@
+@@ -0,0 +1,232 @@
 +/*
 + * 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
@@ -1391,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 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\
@@ -1577,7 +1580,7 @@
 +
 --- /dev/null
 +++ b/arch/mips/ar231x/ar5312.c
-@@ -0,0 +1,549 @@
+@@ -0,0 +1,529 @@
 +/*
 + * 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
@@ -1878,7 +1881,6 @@
 +{
 +	struct ar231x_boarddata *config;
 +	u32 fctl = 0;
-+	const u8 *radio;
 +	u8 *c;
 +
 +	if (!is_5312())
@@ -1888,22 +1890,6 @@
 +	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;
@@ -1960,11 +1946,10 @@
 +		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
@@ -1985,10 +1970,8 @@
 +		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;
 +}