From: Gabor Juhos <juhosg@openwrt.org>
Date: Tue, 20 Apr 2010 13:19:25 +0000 (+0000)
Subject: atheros: register wmac device only if it is enabled in the board config
X-Git-Tag: reboot~20149
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=f1eeb9b19909084a58483ed10530011043305a2e;p=openwrt%2Fopenwrt.git

atheros: register wmac device only if it is enabled in the board config

SVN-Revision: 21038
---

diff --git a/target/linux/atheros/patches-2.6.30/100-board.patch b/target/linux/atheros/patches-2.6.30/100-board.patch
index 5f51293714..8183fb8aa2 100644
--- a/target/linux/atheros/patches-2.6.30/100-board.patch
+++ b/target/linux/atheros/patches-2.6.30/100-board.patch
@@ -1555,7 +1555,7 @@
 +
 --- /dev/null
 +++ b/arch/mips/ar231x/ar5312.c
-@@ -0,0 +1,547 @@
+@@ -0,0 +1,549 @@
 +/*
 + * 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
@@ -1938,7 +1938,8 @@
 +		if (!ar231x_board.radio)
 +			return 0;
 +
-+		if (*((u32 *) radio) & AR531X_RADIO0_MASK)
++		if ((*((u32 *) radio) & AR531X_RADIO0_MASK) &&
++		    (config->flags & BD_WLAN0))
 +			ar231x_add_wmac(0, AR531X_WLAN0,
 +				AR5312_IRQ_WLAN0_INTRS);
 +
@@ -1962,7 +1963,8 @@
 +		break;
 +	}
 +
-+	if (*((u32 *) radio) & AR531X_RADIO1_MASK)
++	if ((*((u32 *) radio) & AR531X_RADIO1_MASK) &&
++	    (config->flags & BD_WLAN1))
 +		ar231x_add_wmac(1, AR531X_WLAN1,
 +			AR5312_IRQ_WLAN1_INTRS);
 +
diff --git a/target/linux/atheros/patches-2.6.32/100-board.patch b/target/linux/atheros/patches-2.6.32/100-board.patch
index cfa78cdf9e..c798975953 100644
--- a/target/linux/atheros/patches-2.6.32/100-board.patch
+++ b/target/linux/atheros/patches-2.6.32/100-board.patch
@@ -1557,7 +1557,7 @@
 +
 --- /dev/null
 +++ b/arch/mips/ar231x/ar5312.c
-@@ -0,0 +1,547 @@
+@@ -0,0 +1,549 @@
 +/*
 + * 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
@@ -1940,7 +1940,8 @@
 +		if (!ar231x_board.radio)
 +			return 0;
 +
-+		if (*((u32 *) radio) & AR531X_RADIO0_MASK)
++		if ((*((u32 *) radio) & AR531X_RADIO0_MASK) &&
++		    (config->flags & BD_WLAN0))
 +			ar231x_add_wmac(0, AR531X_WLAN0,
 +				AR5312_IRQ_WLAN0_INTRS);
 +
@@ -1964,7 +1965,8 @@
 +		break;
 +	}
 +
-+	if (*((u32 *) radio) & AR531X_RADIO1_MASK)
++	if ((*((u32 *) radio) & AR531X_RADIO1_MASK) &&
++	    (config->flags & BD_WLAN1))
 +		ar231x_add_wmac(1, AR531X_WLAN1,
 +			AR5312_IRQ_WLAN1_INTRS);
 +
diff --git a/target/linux/atheros/patches-2.6.33/100-board.patch b/target/linux/atheros/patches-2.6.33/100-board.patch
index 8ecce331b5..6cf6ddbfbf 100644
--- a/target/linux/atheros/patches-2.6.33/100-board.patch
+++ b/target/linux/atheros/patches-2.6.33/100-board.patch
@@ -1557,7 +1557,7 @@
 +
 --- /dev/null
 +++ b/arch/mips/ar231x/ar5312.c
-@@ -0,0 +1,547 @@
+@@ -0,0 +1,549 @@
 +/*
 + * 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
@@ -1940,7 +1940,8 @@
 +		if (!ar231x_board.radio)
 +			return 0;
 +
-+		if (*((u32 *) radio) & AR531X_RADIO0_MASK)
++		if ((*((u32 *) radio) & AR531X_RADIO0_MASK) &&
++		    (config->flags & BD_WLAN0))
 +			ar231x_add_wmac(0, AR531X_WLAN0,
 +				AR5312_IRQ_WLAN0_INTRS);
 +
@@ -1964,7 +1965,8 @@
 +		break;
 +	}
 +
-+	if (*((u32 *) radio) & AR531X_RADIO1_MASK)
++	if ((*((u32 *) radio) & AR531X_RADIO1_MASK) &&
++	    (config->flags & BD_WLAN1))
 +		ar231x_add_wmac(1, AR531X_WLAN1,
 +			AR5312_IRQ_WLAN1_INTRS);
 +