 @@ -1,156 +1,156 @@
-/* $Id: ar5312_board.c,v 1.1 2006/09/26 06:37:32 gdamore Exp $ */
+/* $Id: ar5312_board.c,v 1.1.72.1 2009/08/07 06:50:47 snj Exp $ */
 /*
  * Copyright (c) 2006 Urbana-Champaign Independent Media Center.
  * Copyright (c) 2006 Garrett D'Amore.
  * All rights reserved.
+ *
  * This code was written by Garrett D'Amore for the Champaign-Urbana
  * Community Wireless Network Project.
+ *
  * Redistribution and use in source and binary forms, with or
  * without modification, are permitted provided that the following
  * conditions are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above
  *    copyright notice, this list of conditions and the following
  *    disclaimer in the documentation and/or other materials provided
  *    with the distribution.
  * 3. All advertising materials mentioning features or use of this
  *    software must display the following acknowledgements:
  *      This product includes software developed by the Urbana-Champaign
  *      Independent Media Center.
  *	This product includes software developed by Garrett D'Amore.
  * 4. Urbana-Champaign Independent Media Center's name and Garrett
  *    D'Amore's name may not be used to endorse or promote products
  *    derived from this software without specific prior written permission.
+ *
  * THIS SOFTWARE IS PROVIDED BY THE URBANA-CHAMPAIGN INDEPENDENT
  * MEDIA CENTER AND GARRETT D'AMORE ``AS IS'' AND ANY EXPRESS OR
  * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
  * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
  * ARE DISCLAIMED.  IN NO EVENT SHALL THE URBANA-CHAMPAIGN INDEPENDENT
  * MEDIA CENTER OR GARRETT D'AMORE BE LIABLE FOR ANY DIRECT, INDIRECT,
  * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
  * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
  * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
  * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
  * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
  * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ar5312_board.c,v 1.1 2006/09/26 06:37:32 gdamore Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ar5312_board.c,v 1.1.72.1 2009/08/07 06:50:47 snj Exp $");
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/device.h>
 #include <machine/bus.h>
 #include <mips/atheros/include/ar5312reg.h>
 #include <mips/atheros/include/ar531xvar.h>
-#include <contrib/dev/ath/ah_soc.h>
+#include <ah_soc.h>
 extern const char *ether_sprintf(const uint8_t *);
 /*
  * Locate the Board Configuration data using heuristics.
  * Search backward from the (aliased) end of flash looking
  * for the signature string that marks the start of the data.
  * We search at most 500KB.
  */
 const struct ar531x_boarddata *
 ar531x_board_info(void)
+{
 	static const struct ar531x_boarddata *board = NULL;
 	const uint8_t *ptr, *end;
 	uint32_t fctl;
 	if (board == NULL) {
 		/* configure flash bank 0 */
 		fctl = REGVAL(AR5312_FLASHCTL_BASE + AR5312_FLASHCTL_0) &
 		    AR5312_FLASHCTL_MW_MASK;
 		fctl |=
 		    AR5312_FLASHCTL_E |
 		    AR5312_FLASHCTL_RBLE |
 		    AR5312_FLASHCTL_AC_8M |
 		    (1 << AR5312_FLASHCTL_IDCY_SHIFT) |
 		    (7 << AR5312_FLASHCTL_WST1_SHIFT) |
 		    (7 << AR5312_FLASHCTL_WST2_SHIFT);
 		REGVAL(AR5312_FLASHCTL_BASE + AR5312_FLASHCTL_0) = fctl;
 		REGVAL(AR5312_FLASHCTL_BASE + AR5312_FLASHCTL_1) &=
 		    ~(AR5312_FLASHCTL_E | AR5312_FLASHCTL_AC_MASK);
 		REGVAL(AR5312_FLASHCTL_BASE + AR5312_FLASHCTL_2) &=
 		    ~(AR5312_FLASHCTL_E | AR5312_FLASHCTL_AC_MASK);
 		/* search backward in the flash looking for the signature */
 		ptr = (const uint8_t *) MIPS_PHYS_TO_KSEG1(AR5312_FLASH_END - 0x1000);
 		end = ptr - (500 * 1024);	/* NB: max 500KB window */
 		/* XXX validate end */
 		for (; ptr > end; ptr -= 0x1000)
 			if (*(const uint32_t *)ptr == AR531X_BD_MAGIC) {
 				board = (const struct ar531x_boarddata *) ptr;
 				break;
+			}
+	}
 	return board;
+}
 /*
  * Locate the radio configuration data; it is located relative
  * to the board configuration data.
  */
 const void *
 ar531x_radio_info(void)
+{
 	static const void *radio = NULL;
 	const struct ar531x_boarddata *board;
 	const uint8_t *baddr, *ptr, *end;
 	if (radio == NULL) {
 		board = ar531x_board_info();
 		if (board == NULL)
 			return NULL;
 		baddr = (const uint8_t *) board;
 		ptr = baddr + 0x1000;
 		end = (const uint8_t *)
 		    MIPS_PHYS_TO_KSEG1(AR5312_FLASH_END-0x1000);
 	again:
 		for (; ptr < end; ptr += 0x1000)
 			if (*(const uint32_t *)ptr != 0xffffffff) {
 				radio = ptr;
 				goto done;
+			}
 		/* sort of an Algol-style for loop ... */
 		if (end == (uint8_t *) MIPS_PHYS_TO_KSEG1(AR5312_FLASH_END)) {
 			/* NB: AR2316 has radio data in a different location */
 			ptr = baddr + 0xf8;
 			end = (const uint8_t *)
 			    MIPS_PHYS_TO_KSEG1(AR5312_FLASH_END-0x1000 + 0xf8);
 			goto again;
+		}
+	}
 done:
 	return radio;
+}
 /*
  * Locate board and radio configuration data in flash.
  */
 int
 ar531x_board_config(struct ar531x_config *config)
+{
 	config->board = ar531x_board_info();
 	if (config->board == NULL)
 		return ENOENT;
 	config->radio = ar531x_radio_info();
 	if (config->radio == NULL)
 		return ENOENT;		/* XXX distinct code */
 	return 0;
+}

 @@ -1,159 +1,159 @@
-/* $NetBSD: ar5315_board.c,v 1.1 2006/09/26 06:37:32 gdamore Exp $ */
+/* $NetBSD: ar5315_board.c,v 1.1.72.1 2009/08/07 06:50:48 snj Exp $ */
 /*
  * Copyright (c) 2006 Urbana-Champaign Independent Media Center.
  * Copyright (c) 2006 Garrett D'Amore.
  * All rights reserved.
+ *
  * Portions of this code were written by Garrett D'Amore for the
  * Champaign-Urbana Community Wireless Network Project.
+ *
  * Redistribution and use in source and binary forms, with or
  * without modification, are permitted provided that the following
  * conditions are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above
  *    copyright notice, this list of conditions and the following
  *    disclaimer in the documentation and/or other materials provided
  *    with the distribution.
  * 3. All advertising materials mentioning features or use of this
  *    software must display the following acknowledgements:
  *      This product includes software developed by the Urbana-Champaign
  *      Independent Media Center.
  *	This product includes software developed by Garrett D'Amore.
  * 4. Urbana-Champaign Independent Media Center's name and Garrett
  *    D'Amore's name may not be used to endorse or promote products
  *    derived from this software without specific prior written permission.
+ *
  * THIS SOFTWARE IS PROVIDED BY THE URBANA-CHAMPAIGN INDEPENDENT
  * MEDIA CENTER AND GARRETT D'AMORE ``AS IS'' AND ANY EXPRESS OR
  * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
  * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
  * ARE DISCLAIMED.  IN NO EVENT SHALL THE URBANA-CHAMPAIGN INDEPENDENT
  * MEDIA CENTER OR GARRETT D'AMORE BE LIABLE FOR ANY DIRECT, INDIRECT,
  * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
  * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
  * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
  * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
  * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
  * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 /*
  * This file provides code to locate board-specific configuration and radio
  * information data in flash for the AR5315.
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ar5315_board.c,v 1.1 2006/09/26 06:37:32 gdamore Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ar5315_board.c,v 1.1.72.1 2009/08/07 06:50:48 snj Exp $");
 #include "opt_ddb.h"
 #include "opt_kgdb.h"
 #include "opt_memsize.h"
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/kernel.h>
 #include <sys/buf.h>
 #include <dev/cons.h>
 #include <mips/cache.h>
 #include <mips/locore.h>
 #include <mips/cpuregs.h>
 #include <net/if.h>
 #include <net/if_ether.h>
-#include <contrib/dev/ath/ah_soc.h>	/* XXX really doesn't belong in hal */
+#include <ah_soc.h>	/* XXX really doesn't belong in hal */
 #include <mips/atheros/include/ar5315reg.h>
 #include <mips/atheros/include/ar531xvar.h>
 #include <mips/atheros/include/arbusvar.h>
 #include <machine/locore.h>
 #include "com.h"
 /*
  * Locate the Board Configuration data using heuristics.
  * Search backward from the (aliased) end of flash looking
  * for the signature string that marks the start of the data.
  * We search at most 500KB.
  */
 const struct ar531x_boarddata *
 ar531x_board_info(void)
+{
 	static const struct ar531x_boarddata *board = NULL;
 	const uint8_t *ptr, *end;
 	if (board == NULL) {
 		/* search backward in the flash looking for the signature */
 		ptr = (const uint8_t *) MIPS_PHYS_TO_KSEG1(AR5315_CONFIG_END
 		    - 0x1000);
 		end = (const uint8_t *)AR5315_CONFIG_BASE;
 		/* XXX validate end */
 		for (; ptr > end; ptr -= 0x1000)
 			if (*(const uint32_t *)ptr == AR531X_BD_MAGIC) {
 				board = (const struct ar531x_boarddata *) ptr;
 				break;
+			}
+	}
 	return board;
+}
 /*
  * Locate the radio configuration data; it is located relative to the
  * board configuration data.
  */
 const void *
 ar531x_radio_info(void)
+{
 	static const void *radio = NULL;
 	const struct ar531x_boarddata *board;
 	const uint8_t *baddr, *ptr, *end;
 	if (radio)
 		goto done;
 	board = ar531x_board_info();
 	if (board == NULL)
 		return NULL;
 	baddr = (const uint8_t *) board;
 	end = (const uint8_t *)MIPS_PHYS_TO_KSEG1(AR5315_RADIO_END);
 	for (ptr = baddr + 0x1000; ptr < end; ptr += 0x1000)
 		if (*(const uint32_t *)ptr != 0xffffffffU) {
 			radio = ptr;
 			goto done;
+		}
 	/* AR2316 moves radio data */
 	for (ptr = baddr + 0xf8; ptr < end; ptr += 0x1000)
 		if (*(const uint32_t *)ptr != 0xffffffffU) {
 			radio = ptr;
 			goto done;
+		}
 done:
 	return radio;
+}
 /*
  * Locate board and radio configuration data in flash.
  */
 int
 ar531x_board_config(struct ar531x_config *config)
+{
 	config->board = ar531x_board_info();
 	if (config->board == NULL)
 		return ENOENT;
 	config->radio = ar531x_radio_info();
 	if (config->radio == NULL)
 		return ENOENT;		/* XXX distinct code */
 	return 0;
+}

 @@ -1,386 +1,386 @@
-/* $NetBSD: ar5315.c,v 1.5 2008/01/23 05:23:59 dyoung Exp $ */
+/* $NetBSD: ar5315.c,v 1.5.20.1 2009/08/07 06:50:48 snj Exp $ */
 /*
  * Copyright (c) 2006 Urbana-Champaign Independent Media Center.
  * Copyright (c) 2006 Garrett D'Amore.
  * All rights reserved.
+ *
  * Portions of this code were written by Garrett D'Amore for the
  * Champaign-Urbana Community Wireless Network Project.
+ *
  * Redistribution and use in source and binary forms, with or
  * without modification, are permitted provided that the following
  * conditions are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above
  *    copyright notice, this list of conditions and the following
  *    disclaimer in the documentation and/or other materials provided
  *    with the distribution.
  * 3. All advertising materials mentioning features or use of this
  *    software must display the following acknowledgements:
  *      This product includes software developed by the Urbana-Champaign
  *      Independent Media Center.
  *	This product includes software developed by Garrett D'Amore.
  * 4. Urbana-Champaign Independent Media Center's name and Garrett
  *    D'Amore's name may not be used to endorse or promote products
  *    derived from this software without specific prior written permission.
+ *
  * THIS SOFTWARE IS PROVIDED BY THE URBANA-CHAMPAIGN INDEPENDENT
  * MEDIA CENTER AND GARRETT D'AMORE ``AS IS'' AND ANY EXPRESS OR
  * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
  * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
  * ARE DISCLAIMED.  IN NO EVENT SHALL THE URBANA-CHAMPAIGN INDEPENDENT
  * MEDIA CENTER OR GARRETT D'AMORE BE LIABLE FOR ANY DIRECT, INDIRECT,
  * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
  * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
  * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
  * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
  * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
  * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 /*
  * This file includes a bunch of implementation specific bits for
  * AR5315, which differs these from other members of the AR531X
  * family.
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ar5315.c,v 1.5 2008/01/23 05:23:59 dyoung Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ar5315.c,v 1.5.20.1 2009/08/07 06:50:48 snj Exp $");
 #include "opt_ddb.h"
 #include "opt_kgdb.h"
 #include "opt_memsize.h"
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/kernel.h>
 #include <sys/buf.h>
 #include <sys/device.h>
 #include <mips/cache.h>
 #include <mips/locore.h>
 #include <mips/cpuregs.h>
 #include <net/if.h>
 #include <net/if_ether.h>
 #include <prop/proplib.h>
-#include <contrib/dev/ath/ah_soc.h>	/* XXX really doesn't belong in hal */
+#include <ah_soc.h>	/* XXX really doesn't belong in hal */
 #include <mips/atheros/include/ar5315reg.h>
 #include <mips/atheros/include/ar531xvar.h>
 #include <mips/atheros/include/arbusvar.h>
 #include <machine/locore.h>
 /* helper macro for accessing system registers without bus space */
 #define	REGVAL(x)	*((volatile uint32_t *)(MIPS_PHYS_TO_KSEG1((x))))
 #define	GETSYSREG(x)	REGVAL((x) + AR5315_SYSREG_BASE)
 #define	PUTSYSREG(x,v)	(REGVAL((x) + AR5315_SYSREG_BASE)) = (v)
 #define	GETPCIREG(x)	REGVAL((x) + AR5315_PCI_BASE)
 #define	PUTPCIREG(x,v)	(REGVAL((x) + AR5315_PCI_BASE)) = (v)
 #define	GETSDRAMREG(x)	REGVAL((x) + AR5315_SDRAMCTL_BASE)
 uint32_t
 ar531x_memsize(void)
+{
 #ifndef	MEMSIZE
 	uint32_t	memsize = 0;
 	uint32_t	memcfg, cw, rw, dw;
 	/*
 	 * Determine the memory size.  We query the board info.
 	 */
 	memcfg = GETSDRAMREG(AR5315_SDRAMCTL_MEM_CFG);
 	cw = (memcfg & AR5315_MEM_CFG_COL_WIDTH_MASK) >>
 	    AR5315_MEM_CFG_COL_WIDTH_SHIFT;
 	cw += 1;
 	rw = (memcfg & AR5315_MEM_CFG_ROW_WIDTH_MASK) >>
 	    AR5315_MEM_CFG_ROW_WIDTH_SHIFT;
 	rw += 1;
 	/* XXX: according to redboot, this could be wrong if DDR SDRAM */
 	dw = (memcfg & AR5315_MEM_CFG_DATA_WIDTH_MASK) >>
 	    AR5315_MEM_CFG_DATA_WIDTH_SHIFT;
 	dw += 1;
 	dw *= 8;	/* bits */
 	/* not too sure about this math, but it _seems_ to add up */
 	memsize = (1 << cw) * (1 << rw) * dw;
 #if 0
 	printf("SDRAM_MEM_CFG =%x, cw=%d rw=%d dw=%d xmemsize=%d\n", memcfg,
 	    cw, rw, dw, memsize);
 #endif
 	return (memsize);
 #else
 	/* compile time value forced */
 	return MEMSIZE;
 #endif
+}
 const char *
 ar531x_cpuname(void)
+{
 	uint16_t	rev = GETSYSREG(AR5315_SYSREG_SREV);
 	switch (rev) {
 	case 0x52:	/* AP30 */
 	case 0x57:	/* AP31 */
 		return "Atheros AR5312";
 	case 0x58:	/* AP43 */
 		return "Atheros AR2313";
 	case 0x86:	/* AP51-Light */
 	case 0x87:	/* AP51-Full */
 		return "Atheros AR2315";
 	case 0x91:	/* AP61 */
 		return "Atheros AR2317";
+	}
 	return ("Atheros AR531X");
+}
 void
 ar531x_wdog(uint32_t period)
+{
 	if (period == 0) {
 		PUTSYSREG(AR5315_SYSREG_WDOG_CTL, AR5315_WDOG_CTL_IGNORE);
 		PUTSYSREG(AR5315_SYSREG_WDOG_TIMER, 0);
 	} else {
 		PUTSYSREG(AR5315_SYSREG_WDOG_TIMER, period);
 		PUTSYSREG(AR5315_SYSREG_WDOG_CTL, AR5315_WDOG_CTL_RESET);
+	}
+}
 void
 ar531x_businit(void)
+{
 	/*
 	 * XXX: clear COP0 config bits 0 and 1 -- Linux sets KSEG0 to either
 	 * 0 or 4.  Why does it do this?  It is implementation defined...
 	 */
 	mips3_cp0_config_write(mips3_cp0_config_read() & ~0x3);
 	PUTSYSREG(AR5315_SYSREG_AHB_ERR0, AR5315_AHB_ERROR_DET);
 	GETSYSREG(AR5315_SYSREG_AHB_ERR1);
+}
 static uint32_t
 get_freq(uint32_t clkreg)
+{
 	uint32_t	freq = 0;
 	uint32_t	clkctl, pllc, pllout, refdiv, fbdiv, div2, cpudiv;
 	static const int pll_divide_table[] = {
 , 3, 4, 6, 3,
 		/*
 		 * these entries are bogus, but it avoids a possible
 		 * bad table dereference
 		 */
 , 1, 1
 	};
 	static const int pre_divide_table[] = {
 , 2, 4, 5
 	};
 	if (freq)
 		return freq;
 	pllc = GETSYSREG(AR5315_SYSREG_PLLC_CTL);
 	clkctl = GETSYSREG(clkreg);
 	refdiv = pre_divide_table[AR5315_PLLC_REF_DIV(pllc)];
 	fbdiv = AR5315_PLLC_FB_DIV(pllc);
 	div2 = (AR5315_PLLC_DIV_2(pllc) + 1) * 2;	/* results in 2 or 4 */
 	cpudiv = AR5315_CLOCKCTL_DIV(clkctl);
 	cpudiv = cpudiv ? (cpudiv * 2) : 1;
 	/* 40MHz reference clk, reference and feedback dividers */
 	pllout = (40000000 / refdiv) * div2 * fbdiv;
 	switch (AR5315_CLOCKCTL_SELECT(clkctl)) {
 	case 0:
 	case 1:
 		/* CLKM select */
 		pllout /= pll_divide_table[AR5315_PLLC_CLKM(pllc)];
 		break;
 	case 2:
 		/* CLKC select */
 		pllout /= pll_divide_table[AR5315_PLLC_CLKC(pllc)];
 		break;
 	default:
 		/* ref_clk select */
 		pllout = 40000000;	/* use original reference clock */
 		break;
+	}
 	freq = pllout/(cpudiv);
 	return (freq);
+}
 uint32_t
 ar531x_cpu_freq(void)
+{
 	static uint32_t	freq = 0;
 	if (freq == 0)
 		freq = get_freq(AR5315_SYSREG_CPUCLK);
 	return (freq);
+}
 uint32_t
 ar531x_bus_freq(void)
+{
 	static uint32_t	freq = 0;
 	if (freq == 0)
 		freq = get_freq(AR5315_SYSREG_AMBACLK);
 	return (freq);
+}
 static void
 addprop_data(struct device *dev, const char *name, const uint8_t *data,
     int len)
+{
 	prop_data_t	pd;
 	pd = prop_data_create_data(data, len);
 	KASSERT(pd != NULL);
 	if (prop_dictionary_set(device_properties(dev), name, pd) == false) {
 		printf("WARNING: unable to set %s property for %s\n",
 		    name, device_xname(dev));
+	}
 	prop_object_release(pd);
+}
 static void
 addprop_integer(struct device *dev, const char *name, uint32_t val)
+{
 	prop_number_t	pn;
 	pn = prop_number_create_integer(val);
 	KASSERT(pn != NULL);
 	if (prop_dictionary_set(device_properties(dev), name, pn) == false) {
 		printf("WARNING: unable to set %s property for %s",
 		    name, device_xname(dev));
+	}
 	prop_object_release(pn);
+}
 void
 ar531x_device_register(struct device *dev, void *aux)
+{
 	struct arbus_attach_args *aa = aux;
 	const struct ar531x_boarddata *info;
 	info = ar531x_board_info();
 	if (info == NULL) {
 		/* nothing known about this board! */
 		return;
+	}
 	/*
 	 * We don't ever know the boot device.  But that's because the
 	 * firmware only loads from the network.
 	 */
 	/* Fetch the MAC addresses. */
 	if (device_is_a(dev, "ae")) {
 		const uint8_t *enet;
 		if (aa->aa_addr == AR5315_ENET_BASE)
 			enet = info->enet0Mac;
 		else
 			return;
 		addprop_data(dev, "mac-addr", enet, ETHER_ADDR_LEN);
+	}
 	if (device_is_a(dev, "ath")) {
 		const uint8_t *enet;
 		if (aa->aa_addr == AR5315_WLAN_BASE)
 			enet = info->wlan0Mac;
 		else
 			return;
 		addprop_data(dev, "mac-addr", enet, ETHER_ADDR_LEN);
 		addprop_integer(dev, "wmac-rev",
 		    GETSYSREG(AR5315_SYSREG_SREV));
+	}
 	if (device_is_a(dev, "com")) {
 		addprop_integer(dev, "frequency", ar531x_bus_freq());
+	}
 	if (device_is_a(dev, "argpio")) {
 		if (info->config & BD_RSTFACTORY) {
 			addprop_integer(dev, "reset-pin",
 			    info->resetConfigGpio);
+		}
 		if (info->config & BD_SYSLED) {
 			addprop_integer(dev, "sysled-pin",
 			    info->sysLedGpio);
+		}
+	}
+}
 const struct ar531x_device *
 ar531x_get_devices(void)
+{
 	const static struct ar531x_device devices[] = {
+		{
 			"com",
 			AR5315_UART_BASE, 0x1000,
 			AR5315_CPU_IRQ_MISC, AR5315_MISC_IRQ_UART,
 , 0, 0
 		},
+		{
 			"ae",
 			AR5315_ENET_BASE, 0x100000,
 			AR5315_CPU_IRQ_ENET, -1,
 , 0, 0
 		},
+		{
 			"ath",
 			AR5315_WLAN_BASE, 0x100000,
 			AR5315_CPU_IRQ_WLAN, -1,
 , 0, 0
 		},
+		{
 			"arspi",
 			AR5315_SPI_BASE, 0x10,
 			AR5315_CPU_IRQ_MISC, AR5315_MISC_IRQ_SPI,
 , 0, 0
 		},
 		{ NULL }
 	};
 	return devices;
+}
 int
 ar531x_enable_device(const struct ar531x_device *dev)
+{
 	if (dev->addr == AR5315_WLAN_BASE) {
 		/* enable arbitration for wlan */
 		PUTSYSREG(AR5315_SYSREG_AHB_ARB_CTL,
 		    GETSYSREG(AR5315_SYSREG_AHB_ARB_CTL) | AR5315_ARB_WLAN);
 		/* set WLAN for big endian */
 		PUTSYSREG(AR5315_SYSREG_ENDIAN,
 		    GETSYSREG(AR5315_SYSREG_ENDIAN) | AR5315_ENDIAN_WLAN);
 		/* wake up the mac */
 		PUTPCIREG(AR5315_PCI_MAC_SCR,
 		    (GETPCIREG(AR5315_PCI_MAC_SCR) & ~PCI_MAC_SCR_SLM_MASK) |
 		    PCI_MAC_SCR_SLM_FWAKE);
 		/* wait for it to wake up */
 		while (GETPCIREG(AR5315_PCI_MAC_PCICFG) &
 		    PCI_MAC_PCICFG_SPWR_DN);
+	}
 	return 0;
+}

 @@ -1,193 +1,194 @@
-/* $NetBSD: if_ath_arbus.c,v 1.15 2008/07/09 19:47:23 joerg Exp $ */
+/* $NetBSD: if_ath_arbus.c,v 1.15.4.1 2009/08/07 06:50:48 snj Exp $ */
 /*-
  * Copyright (c) 2006 Jared D. McNeill <jmcneill@invisible.ca>
  * All rights reserved.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
  * 3. All advertising materials mentioning features or use of this software
  *    must display the following acknowledgement:
  *        This product includes software developed by the NetBSD
  *        Foundation, Inc. and its contributors.
  * 4. Neither the name of The NetBSD Foundation nor the names of its
  *    contributors may be used to endorse or promote products derived
  *    from this software without specific prior written permission.
+ *
  * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
  * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
  * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
  * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
  * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
  * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
  * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
  * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
  * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_ath_arbus.c,v 1.15 2008/07/09 19:47:23 joerg Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_ath_arbus.c,v 1.15.4.1 2009/08/07 06:50:48 snj Exp $");
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/device.h>
 #include <sys/mbuf.h>
 #include <sys/malloc.h>
 #include <sys/kernel.h>
 #include <sys/errno.h>
 #include <machine/bus.h>
 #include <machine/intr.h>
 #include <net/if.h>
 #include <net/if_media.h>
 #include <net/if_ether.h>
 #include <net/if_llc.h>
 #include <net/if_arp.h>
 #include <netinet/in.h>
 #include <net80211/ieee80211_netbsd.h>
 #include <net80211/ieee80211_var.h>
 #include <mips/atheros/include/ar531xvar.h>
 #include <mips/atheros/include/arbusvar.h>
 #include <dev/pci/pcidevs.h>
 #include <dev/ic/ath_netbsd.h>
 #include <dev/ic/athvar.h>
 #include <contrib/dev/ath/ah.h>
-#include <contrib/dev/ath/ah_soc.h>	/* XXX really doesn't belong in hal */
+#include <ah.h>
 #include <ah_soc.h>	/* XXX really doesn't belong in hal */
 struct ath_arbus_softc {
 	struct ath_softc	sc_ath;
 	bus_space_tag_t		sc_iot;
 	bus_space_handle_t	sc_ioh;
 	void			*sc_ih;
 	struct ar531x_config	sc_config;
 };
 static int	ath_arbus_match(device_t, cfdata_t, void *);
 static void	ath_arbus_attach(device_t, device_t, void *);
 static int	ath_arbus_detach(device_t, int);
 CFATTACH_DECL_NEW(ath_arbus, sizeof(struct ath_arbus_softc),
     ath_arbus_match, ath_arbus_attach, ath_arbus_detach, NULL);
 static int
 ath_arbus_match(device_t parent, cfdata_t cf, void *opaque)
+{
 	struct arbus_attach_args *aa;
 	aa = (struct arbus_attach_args *)opaque;
 	if (strcmp(aa->aa_name, "ath") == 0)
 		return 1;
 	return 0;
+}
 static bool
 ath_arbus_resume(device_t dv PMF_FN_ARGS)
+{
 	struct ath_arbus_softc *asc = device_private(dv);
 	ath_resume(&asc->sc_ath);
 	return true;
+}
 static void
 ath_arbus_attach(device_t parent, device_t self, void *opaque)
+{
 	struct ath_arbus_softc *asc;
 	struct ath_softc *sc;
 	struct arbus_attach_args *aa;
 	const char *name;
 	prop_number_t prop;
 	int rv;
 	uint16_t devid;
 	asc = device_private(self);
 	sc = &asc->sc_ath;
 	sc->sc_dev = self;
 	aa = (struct arbus_attach_args *)opaque;
 	prop = prop_dictionary_get(device_properties(sc->sc_dev),
 	    "wmac-rev");
 	if (prop == NULL) {
 		printf(": unable to get wmac-rev property\n");
 		return;
+	}
 	KDASSERT(prop_object_type(prop) == PROP_TYPE_NUMBER);
 	devid = (uint16_t)prop_number_integer_value(prop);
 	name = ath_hal_probe(PCI_VENDOR_ATHEROS, devid);
 	printf(": %s\n", name ? name : "Unknown AR531X WLAN");
 	asc->sc_iot = aa->aa_bst;
 	rv = bus_space_map(asc->sc_iot, aa->aa_addr, aa->aa_size, 0,
 	    &asc->sc_ioh);
 	if (rv) {
 		aprint_error_dev(self, "unable to map registers\n");
 		return;
+	}
 	/*
 	 * Setup HAL configuration state for use by the driver.
 	 */
 	rv = ar531x_board_config(&asc->sc_config);
 	if (rv) {
 		aprint_error_dev(self, "unable to locate board configuration\n");
 		return;
+	}
 	asc->sc_config.unit = device_unit(sc->sc_dev);
 	asc->sc_config.tag = asc->sc_iot;
 	/* NB: the HAL expects the config state passed as the tag */
 	sc->sc_st = (HAL_BUS_TAG) &asc->sc_config;
 	sc->sc_sh = (HAL_BUS_HANDLE) asc->sc_ioh;
 	sc->sc_dmat = aa->aa_dmat;
 	asc->sc_ih = arbus_intr_establish(aa->aa_cirq, aa->aa_mirq, ath_intr,
 	    sc);
 	if (asc->sc_ih == NULL) {
 		aprint_error_dev(self, "couldn't establish interrupt\n");
 		return;
+	}
 	ATH_LOCK_INIT(sc);
 	if (!pmf_device_register(self, NULL, ath_arbus_resume))
 		aprint_error_dev(self, "couldn't establish power handler\n");
 	else
 		pmf_class_network_register(self, &sc->sc_if);
 	if (ath_attach(devid, sc) != 0) {
 		aprint_error_dev(self, "ath_attach failed\n");
 		goto err;
+	}
 	return;
 err:
 	arbus_intr_disestablish(asc->sc_ih);
+}
 static int
 ath_arbus_detach(device_t self, int flags)
+{
 	struct ath_arbus_softc *asc = device_private(self);
 	ath_detach(&asc->sc_ath);
 	arbus_intr_disestablish(asc->sc_ih);
 	return (0);
+}

 @@ -1,229 +1,230 @@
-/* $Id: ar5312reg.h,v 1.2 2006/09/04 05:17:26 gdamore Exp $ */
+/* $Id: ar5312reg.h,v 1.2.74.1 2009/08/07 06:50:48 snj Exp $ */
 /*
  * Copyright (c) 2006 Urbana-Champaign Independent Media Center.
  * Copyright (c) 2006 Garrett D'Amore.
  * All rights reserved.
+ *
  * This code was written by Garrett D'Amore for the Champaign-Urbana
  * Community Wireless Network Project.
+ *
  * Redistribution and use in source and binary forms, with or
  * without modification, are permitted provided that the following
  * conditions are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above
  *    copyright notice, this list of conditions and the following
  *    disclaimer in the documentation and/or other materials provided
  *    with the distribution.
  * 3. All advertising materials mentioning features or use of this
  *    software must display the following acknowledgements:
  *      This product includes software developed by the Urbana-Champaign
  *      Independent Media Center.
  *	This product includes software developed by Garrett D'Amore.
  * 4. Urbana-Champaign Independent Media Center's name and Garrett
  *    D'Amore's name may not be used to endorse or promote products
  *    derived from this software without specific prior written permission.
+ *
  * THIS SOFTWARE IS PROVIDED BY THE URBANA-CHAMPAIGN INDEPENDENT
  * MEDIA CENTER AND GARRETT D'AMORE ``AS IS'' AND ANY EXPRESS OR
  * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
  * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
  * ARE DISCLAIMED.  IN NO EVENT SHALL THE URBANA-CHAMPAIGN INDEPENDENT
  * MEDIA CENTER OR GARRETT D'AMORE BE LIABLE FOR ANY DIRECT, INDIRECT,
  * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
  * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
  * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
  * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
  * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
  * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 #ifndef	_MIPS_ATHEROS_AR5312REG_H_
 #define	_MIPS_ATHEROS_AR5312REG_H_
 #define	AR5312_MEM0_BASE		0x00000000	/* sdram */
 #define	AR5312_MEM1_BASE		0x08000000	/* sdram/flash */
 #define	AR5312_MEM3_BASE		0x10000000	/* flash */
 #define	AR5312_WLAN0_BASE		0x18000000
 #define	AR5312_ENET0_BASE		0x18100000
 #define	AR5312_ENET1_BASE		0x18200000
 #define	AR5312_SDRAMCTL_BASE		0x18300000
 #define	AR5312_FLASHCTL_BASE		0x18400000
 #define	AR5312_WLAN1_BASE		0x18500000
 #define	AR5312_UART0_BASE		0x1C000000	/* high speed */
 #define	AR5312_UART1_BASE		0x1C001000
 #define	AR5312_GPIO_BASE		0x1C002000
 #define	AR5312_SYSREG_BASE		0x1C003000
 #define	AR5312_UARTDMA_BASE		0x1C004000
 #define	AR5312_FLASH_BASE		0x1E000000
 #define	AR5312_FLASH_END		0x20000000	/* possibly aliased */
 /*
  * FLASHCTL registers  -- offset relative to AR531X_FLASHCTL_BASE
  */
 #define	AR5312_FLASHCTL_0			0x00
 #define	AR5312_FLASHCTL_1			0x04
 #define	AR5312_FLASHCTL_2			0x08
 #define	AR5312_FLASHCTL_IDCY_MASK		0xf	/* idle cycle turn */
 #define	AR5312_FLASHCTL_IDCY_SHIFT		0
 #define	AR5312_FLASHCTL_WST1_MASK		0x3e0	/* wait state 1 */
 #define	AR5312_FLASHCTL_WST1_SHIFT		5
 #define	AR5312_FLASHCTL_WST2_MASK		0xf800	/* wait state 1 */
 #define	AR5312_FLASHCTL_WST2_SHIFT		11
 #define AR5312_FLASHCTL_RBLE			0x00000400 /* rd byte enable */
 #define	AR5312_FLASHCTL_AC_MASK			0x00070000	/* addr chk */
 #define	AR5312_FLASHCTL_AC_SHIFT		16
 #define	AR5312_FLASHCTL_AC_128K			0x00000000
 #define	AR5312_FLASHCTL_AC_256K			0x00010000
 #define	AR5312_FLASHCTL_AC_512K			0x00020000
 #define	AR5312_FLASHCTL_AC_1M			0x00030000
 #define	AR5312_FLASHCTL_AC_2M			0x00040000
 #define	AR5312_FLASHCTL_AC_4M			0x00050000
 #define	AR5312_FLASHCTL_AC_8M			0x00060000
 #define	AR5312_FLASHCTL_AC_16M			0x00070000
 #define AR5312_FLASHCTL_E			0x00080000 /* enable */
 #define AR5312_FLASHCTL_MW_MASK			0x30000000 /* mem width */
 /*
  * SYSREG registers  -- offset relative to AR531X_SYSREG_BASE
  */
 #define	AR5312_SYSREG_TIMER		0x0000
 #define	AR5312_SYSREG_TIMER_RELOAD	0x0004
 #define	AR5312_SYSREG_WDOG_CTL		0x0008
 #define	AR5312_SYSREG_WDOG_TIMER	0x000c
 #define	AR5312_SYSREG_MISC_INTSTAT	0x0010
 #define	AR5312_SYSREG_MISC_INTMASK	0x0014
 #define	AR5312_SYSREG_INTSTAT		0x0018
 #define	AR5312_SYSREG_RESETCTL		0x0020
 #define	AR5312_SYSREG_CLOCKCTL		0x0064
 #define	AR5312_SYSREG_SCRATCH		0x006c
 #define	AR5312_SYSREG_AHBPERR		0x0070
 #define	AR5312_SYSREG_AHBDMAE		0x0078
 #define	AR5312_SYSREG_ENABLE		0x0080
 #define	AR5312_SYSREG_REVISION		0x0090
 /* WDOG_CTL watchdog control bits */
 #define	AR5312_WDOG_CTL_IGNORE			0x0000
 #define	AR5312_WDOG_CTL_NMI			0x0001
 #define	AR5312_WDOG_CTL_RESET			0x0002
 /* Resets */
 #define	AR5312_RESET_SYSTEM			0x00000001
 #define	AR5312_RESET_CPU			0x00000002
 #define	AR5312_RESET_WLAN0			0x00000004	/* mac & bb */
 #define	AR5312_RESET_PHY0			0x00000008	/* enet phy */
 #define	AR5312_RESET_PHY1			0x00000010	/* enet phy */
 #define	AR5312_RESET_ENET0			0x00000020	/* mac */
 #define	AR5312_RESET_ENET1			0x00000040	/* mac */
 #define	AR5312_RESET_UART0			0x00000100	/* mac */
 #define	AR5312_RESET_WLAN1			0x00000200	/* mac & bb */
 #define	AR5312_RESET_APB			0x00000400	/* bridge */
 #define	AR5312_RESET_WARM_CPU			0x00001000
 #define	AR5312_RESET_WARM_WLAN0_MAC		0x00002000
 #define	AR5312_RESET_WARM_WLAN0_BB		0x00004000
 #define	AR5312_RESET_NMI			0x00010000
 #define	AR5312_RESET_WARM_WLAN1_MAC		0x00020000
 #define	AR5312_RESET_WARM_WLAN1_BB		0x00040000
 #define	AR5312_RESET_LOCAL_BUS			0x00080000
 #define	AR5312_RESET_WDOG			0x00100000
 /* AR5312/2312 clockctl bits */
 #define	AR5312_CLOCKCTL_PREDIVIDE_MASK		0x00000030
 #define	AR5312_CLOCKCTL_PREDIVIDE_SHIFT			 4
 #define	AR5312_CLOCKCTL_MULTIPLIER_MASK		0x00001f00
 #define	AR5312_CLOCKCTL_MULTIPLIER_SHIFT		 8
 #define	AR5312_CLOCKCTL_DOUBLER_MASK		0x00010000
 /* AR2313 clockctl */
 #define	AR2313_CLOCKCTL_PREDIVIDE_MASK		0x00003000
 #define	AR2313_CLOCKCTL_PREDIVIDE_SHIFT			12
 #define	AR2313_CLOCKCTL_MULTIPLIER_MASK		0x001f0000
 #define	AR2313_CLOCKCTL_MULTIPLIER_SHIFT		16
 #define	AR2313_CLOCKCTL_DOUBLER_MASK		0x00000000
 /* Enables */
 #define	AR5312_ENABLE_WLAN0			0x0001
 #define	AR5312_ENABLE_ENET0			0x0002
 #define	AR5312_ENABLE_ENET1			0x0004
 #define	AR5312_ENABLE_WLAN1			0x0018	/* both DMA and PIO */
 /* Revision ids */
 #define	AR5312_REVISION_WMAC_MAJOR(x)		(((x) >> 12) & 0xf)
 #define	AR5312_REVISION_WMAC_MINOR(x)		(((x) >> 8) & 0xf)
 #define	AR5312_REVISION_WMAC(x)			(((x) >> 8) & 0xff)
 #define	AR5312_REVISION_MAJOR(x)		(((x) >> 4) & 0xf)
 #define	AR5312_REVISION_MINOR(x)		(((x) >> 0) & 0xf)
 #define	AR5312_REVISION_MAJ_AR5311		0x1
 #define	AR5312_REVISION_MAJ_AR5312		0x4
 #define	AR5312_REVISION_MAJ_AR2313		0x5
 #define	AR5312_REVISION_MAJ_AR5315		0xB
 /*
  * SDRAMCTL registers  -- offset relative to SDRAMCTL
  */
 #define	AR5312_SDRAMCTL_MEM_CFG0	0x0000
 #define	AR5312_SDRAMCTL_MEM_CFG1	0x0004
 /* memory config 1 bits */
 #define	AR5312_MEM_CFG1_BANK0_MASK		0x00000700
 #define	AR5312_MEM_CFG1_BANK0_SHIFT		8
 #define	AR5312_MEM_CFG1_BANK1_MASK		0x00007000
 #define	AR5312_MEM_CFG1_BANK1_SHIFT		12
 /* helper macro for accessing system registers without bus space */
 #define	REGVAL(x)	*((volatile uint32_t *)(MIPS_PHYS_TO_KSEG1((x))))
 #define	GETSYSREG(x)	REGVAL((x) + AR5312_SYSREG_BASE)
 #define	PUTSYSREG(x,v)	(REGVAL((x) + AR5312_SYSREG_BASE)) = (v)
 #define	GETSDRAMREG(x)	REGVAL((x) + AR5312_SDRAMCTL_BASE)
 #define	PUTSDRAMREG(x,v)	(REGVAL((x) + AR5312_SDRAMCTL_BASE)) = (v)
 /*
  * Interrupts.
  */
 #define	AR5312_IRQ_WLAN0		0
 #define	AR5312_IRQ_ENET0		1
 #define	AR5312_IRQ_ENET1		2
 #define	AR5312_IRQ_WLAN1		3
 #define	AR5312_IRQ_MISC			4
 #define	AR5312_MISC_IRQ_TIMER		0
 #define	AR5312_MISC_IRQ_AHBPERR		1
 #define	AR5312_MISC_IRQ_AHBDMAE		2
 #define	AR5312_MISC_IRQ_GPIO		3
 #define	AR5312_MISC_IRQ_UART0		4
 #define	AR5312_MISC_IRQ_UART0_DMA	5
 #define	AR5312_MISC_IRQ_WDOG		6
 /*
  * Board data.  This is located in flash somewhere, ar531x_board_info
  * locates it.
  */
-#include <contrib/dev/ath/ah_soc.h>	/* XXX really doesn't belong in hal */
+#include <ah_soc.h>	/* XXX really doesn't belong in hal */
 /* XXX write-around for now */
 #define	AR5312_BOARD_MAGIC		AR531X_BD_MAGIC
 /* config bits */
 #define	AR5312_BOARD_CONFIG_ENET0	BD_ENET0
 #define	AR5312_BOARD_CONFIG_ENET1	BD_ENET1
 #define	AR5312_BOARD_CONFIG_UART1	BD_UART1
 #define	AR5312_BOARD_CONFIG_UART0	BD_UART0
 #define	AR5312_BOARD_CONFIG_RSTFACTORY	BD_RSTFACTORY
 #define	AR5312_BOARD_CONFIG_SYSLED	BD_SYSLED
 #define	AR5312_BOARD_CONFIG_EXTUARTCLK	BD_EXTUARTCLK
 #define	AR5312_BOARD_CONFIG_CPUFREQ	BD_CPUFREQ
 #define	AR5312_BOARD_CONFIG_SYSFREQ	BD_SYSFREQ
 #define	AR5312_BOARD_CONFIG_WLAN0	BD_WLAN0
 #define	AR5312_BOARD_CONFIG_MEMCAP	BD_MEMCAP
 #define	AR5312_BOARD_CONFIG_DISWDOG	BD_DISWATCHDOG
 #define	AR5312_BOARD_CONFIG_WLAN1	BD_WLAN1
 #define	AR5312_BOARD_CONFIG_AR2312	BD_ISCASPER
 #define	AR5312_BOARD_CONFIG_WLAN0_2G	BD_WLAN0_2G_EN
 #define	AR5312_BOARD_CONFIG_WLAN0_5G	BD_WLAN0_5G_EN
 #define	AR5312_BOARD_CONFIG_WLAN1_2G	BD_WLAN1_2G_EN
 #define	AR5312_BOARD_CONFIG_WLAN1_5G	BD_WLAN1_5G_EN
 #endif	/* _MIPS_ATHEROS_AR531XREG_H_ */