added libjson-c. added driver, webinterface and userspace daemon for the fonera mp3-hack

SVN-Revision: 8509

5 files changed, 1919 insertions, 0 deletions

diff --git a/package/fonera-mp3-drv/src/Makefile b/package/fonera-mp3-drv/src/Makefile
new file mode 100644
index 0000000..fda632e
--- /dev/null
+++ b/package/fonera-mp3-drv/src/Makefile
@@ -0,0 +1,19 @@
+# $Id$
+#
+# Makefile for mp3 - vs1011b driver
+#
+# Copyright (C) 2007 John '2B|!2B' Crispin  john@phrozen.org
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License
+# as published by the Free Software Foundation; either version
+# 2 of the License, or (at your option) any later version.
+#
+
+obj-m	:= mp3_drv.o
+
+ifeq ($(MAKING_MODULES),1)
+#export-objs := mp3_drv.o
+
+-include $(TOPDIR)/Rules.make
+endif
diff --git a/package/fonera-mp3-drv/src/ar531x.h b/package/fonera-mp3-drv/src/ar531x.h
new file mode 100644
index 0000000..9176c15
--- /dev/null
+++ b/package/fonera-mp3-drv/src/ar531x.h
@@ -0,0 +1,1124 @@
+/*
+ * 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
+ * for more details.
+ *
+ * Copyright © 2003 Atheros Communications, Inc.,  All Rights Reserved.
+ */
+
+#ifndef AR531X_H
+#define AR531X_H 1
+
+
+#ifndef CONFIG_AR531X_COBRA
+
+#include <asm/addrspace.h>
+
+/* Address Map */
+#define AR531X_WLAN0            0x18000000
+#define AR531X_WLAN1            0x18500000
+#define AR531X_ENET0            0x18100000
+#define AR531X_ENET1            0x18200000
+#define AR531X_SDRAMCTL         0x18300000
+#define AR531X_FLASHCTL         0x18400000
+#define AR531X_APBBASE		0x1c000000
+#define AR531X_FLASH            0x1e000000
+
+/*
+ * AR531X_NUM_ENET_MAC defines the number of ethernet MACs that
+ * should be considered available.  The AR5312 supports 2 enet MACS,
+ * even though many reference boards only actually use 1 of them
+ * (i.e. Only MAC 0 is actually connected to an enet PHY or PHY switch.
+ * The AR2312 supports 1 enet MAC.
+ */
+#define AR531X_NUM_ENET_MAC             2
+
+/*
+ * Need these defines to determine true number of ethernet MACs
+ */
+#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\
+ * should be considered available.
+ */
+#define AR531X_NUM_WMAC                 2
+
+/* Reset/Timer Block Address Map */
+#define AR531X_RESETTMR		(AR531X_APBBASE  + 0x3000)
+#define AR531X_TIMER		(AR531X_RESETTMR + 0x0000) /* countdown timer */
+#define AR531X_WD_CTRL          (AR531X_RESETTMR + 0x0008) /* watchdog cntrl */
+#define AR531X_WD_TIMER         (AR531X_RESETTMR + 0x000c) /* watchdog timer */
+#define AR531X_ISR		(AR531X_RESETTMR + 0x0010) /* Intr Status Reg */
+#define AR531X_IMR		(AR531X_RESETTMR + 0x0014) /* Intr Mask Reg */
+#define AR531X_RESET		(AR531X_RESETTMR + 0x0020)
+#define AR5312_CLOCKCTL1	(AR531X_RESETTMR + 0x0064)
+#define AR5312_SCRATCH   	(AR531X_RESETTMR + 0x006c)
+#define AR531X_PROCADDR		(AR531X_RESETTMR + 0x0070)
+#define AR531X_PROC1		(AR531X_RESETTMR + 0x0074)
+#define AR531X_DMAADDR		(AR531X_RESETTMR + 0x0078)
+#define AR531X_DMA1		(AR531X_RESETTMR + 0x007c)
+#define AR531X_ENABLE           (AR531X_RESETTMR + 0x0080) /* interface enb */
+#define AR531X_REV		(AR531X_RESETTMR + 0x0090) /* revision */
+
+/* AR531X_WD_CTRL register bit field definitions */
+#define AR531X_WD_CTRL_IGNORE_EXPIRATION 0x0000
+#define AR531X_WD_CTRL_NMI               0x0001
+#define AR531X_WD_CTRL_RESET             0x0002
+
+/* AR531X_ISR register bit field definitions */
+#define AR531X_ISR_NONE		0x0000
+#define AR531X_ISR_TIMER	0x0001
+#define AR531X_ISR_AHBPROC	0x0002
+#define AR531X_ISR_AHBDMA	0x0004
+#define AR531X_ISR_GPIO		0x0008
+#define AR531X_ISR_UART0	0x0010
+#define AR531X_ISR_UART0DMA	0x0020
+#define AR531X_ISR_WD		0x0040
+#define AR531X_ISR_LOCAL	0x0080
+
+/* AR531X_RESET register bit field definitions */
+#define AR531X_RESET_SYSTEM     0x00000001  /* cold reset full system */
+#define AR531X_RESET_PROC       0x00000002  /* cold reset MIPS core */
+#define AR531X_RESET_WLAN0      0x00000004  /* cold reset WLAN MAC and BB */
+#define AR531X_RESET_EPHY0      0x00000008  /* cold reset ENET0 phy */
+#define AR531X_RESET_EPHY1      0x00000010  /* cold reset ENET1 phy */
+#define AR531X_RESET_ENET0      0x00000020  /* cold reset ENET0 mac */
+#define AR531X_RESET_ENET1      0x00000040  /* cold reset ENET1 mac */
+#define AR531X_RESET_UART0      0x00000100  /* cold reset UART0 (high speed) */
+#define AR531X_RESET_WLAN1      0x00000200  /* cold reset WLAN MAC/BB */
+#define AR531X_RESET_APB        0x00000400  /* cold reset APB (ar5312) */
+#define AR531X_RESET_WARM_PROC  0x00001000  /* warm reset MIPS core */
+#define AR531X_RESET_WARM_WLAN0_MAC 0x00002000  /* warm reset WLAN0 MAC */
+#define AR531X_RESET_WARM_WLAN0_BB  0x00004000  /* warm reset WLAN0 BaseBand */
+#define AR531X_RESET_NMI        0x00010000  /* send an NMI to the processor */
+#define AR531X_RESET_WARM_WLAN1_MAC 0x00020000  /* warm reset WLAN1 mac */
+#define AR531X_RESET_WARM_WLAN1_BB  0x00040000  /* warm reset WLAN1 baseband */
+#define AR531X_RESET_LOCAL_BUS  0x00080000  /* reset local bus */
+#define AR531X_RESET_WDOG       0x00100000  /* last reset was a watchdog */
+
+#define AR531X_RESET_WMAC0_BITS \
+        AR531X_RESET_WLAN0 |\
+        AR531X_RESET_WARM_WLAN0_MAC |\
+        AR531X_RESET_WARM_WLAN0_BB
+
+#define AR531X_RESERT_WMAC1_BITS \
+        AR531X_RESET_WLAN1 |\
+        AR531X_RESET_WARM_WLAN1_MAC |\
+        AR531X_RESET_WARM_WLAN1_BB
+
+/* AR5312_CLOCKCTL1 register bit field definitions */
+#define AR5312_CLOCKCTL1_PREDIVIDE_MASK    0x00000030
+#define AR5312_CLOCKCTL1_PREDIVIDE_SHIFT            4
+#define AR5312_CLOCKCTL1_MULTIPLIER_MASK   0x00001f00
+#define AR5312_CLOCKCTL1_MULTIPLIER_SHIFT           8
+#define AR5312_CLOCKCTL1_DOUBLER_MASK      0x00010000
+
+/* Valid for AR5312 and AR2312 */
+#define AR5312_CLOCKCTL1_PREDIVIDE_MASK    0x00000030
+#define AR5312_CLOCKCTL1_PREDIVIDE_SHIFT            4
+#define AR5312_CLOCKCTL1_MULTIPLIER_MASK   0x00001f00
+#define AR5312_CLOCKCTL1_MULTIPLIER_SHIFT           8
+#define AR5312_CLOCKCTL1_DOUBLER_MASK      0x00010000
+
+/* Valid for AR2313 */
+#define AR2313_CLOCKCTL1_PREDIVIDE_MASK    0x00003000
+#define AR2313_CLOCKCTL1_PREDIVIDE_SHIFT           12
+#define AR2313_CLOCKCTL1_MULTIPLIER_MASK   0x001f0000
+#define AR2313_CLOCKCTL1_MULTIPLIER_SHIFT          16
+#define AR2313_CLOCKCTL1_DOUBLER_MASK      0x00000000
+
+
+/* AR531X_ENABLE register bit field definitions */
+#define AR531X_ENABLE_WLAN0              0x0001
+#define AR531X_ENABLE_ENET0              0x0002
+#define AR531X_ENABLE_ENET1              0x0004
+#define AR531X_ENABLE_UART_AND_WLAN1_PIO 0x0008   /* UART, and WLAN1 PIOs */
+#define AR531X_ENABLE_WLAN1_DMA          0x0010   /* WLAN1 DMAs */
+#define AR531X_ENABLE_WLAN1 \
+            (AR531X_ENABLE_UART_AND_WLAN1_PIO | AR531X_ENABLE_WLAN1_DMA)
+
+/* AR531X_REV register bit field definitions */
+#define AR531X_REV_WMAC_MAJ    0xf000
+#define AR531X_REV_WMAC_MAJ_S  12
+#define AR531X_REV_WMAC_MIN    0x0f00
+#define AR531X_REV_WMAC_MIN_S  8
+#define AR531X_REV_MAJ         0x00f0
+#define AR531X_REV_MAJ_S       4
+#define AR531X_REV_MIN         0x000f
+#define AR531X_REV_MIN_S       0
+#define AR531X_REV_CHIP        (REV_MAJ|REV_MIN)
+
+/* Major revision numbers, bits 7..4 of Revision ID register */
+#define AR531X_REV_MAJ_AR5312          0x4
+#define AR531X_REV_MAJ_AR2313          0x5
+
+/* Minor revision numbers, bits 3..0 of Revision ID register */
+#define AR5312_REV_MIN_DUAL     0x0     /* Dual WLAN version */
+#define AR5312_REV_MIN_SINGLE   0x1     /* Single WLAN version */
+
+/* AR531X_FLASHCTL register bit field definitions */
+#define FLASHCTL_IDCY   0x0000000f      /* Idle cycle turn around time */
+#define FLASHCTL_IDCY_S 0
+#define FLASHCTL_WST1   0x000003e0      /* Wait state 1 */
+#define FLASHCTL_WST1_S 5
+#define FLASHCTL_RBLE   0x00000400      /* Read byte lane enable */
+#define FLASHCTL_WST2   0x0000f800      /* Wait state 2 */
+#define FLASHCTL_WST2_S 11
+#define FLASHCTL_AC     0x00070000      /* Flash address check (added) */
+#define FLASHCTL_AC_S   16
+#define FLASHCTL_AC_128K 0x00000000
+#define FLASHCTL_AC_256K 0x00010000
+#define FLASHCTL_AC_512K 0x00020000
+#define FLASHCTL_AC_1M   0x00030000
+#define FLASHCTL_AC_2M   0x00040000
+#define FLASHCTL_AC_4M   0x00050000
+#define FLASHCTL_AC_8M   0x00060000
+#define FLASHCTL_AC_RES  0x00070000     /* 16MB is not supported */
+#define FLASHCTL_E      0x00080000      /* Flash bank enable (added) */
+#define FLASHCTL_BUSERR 0x01000000      /* Bus transfer error status flag */
+#define FLASHCTL_WPERR  0x02000000      /* Write protect error status flag */
+#define FLASHCTL_WP     0x04000000      /* Write protect */
+#define FLASHCTL_BM     0x08000000      /* Burst mode */
+#define FLASHCTL_MW     0x30000000      /* Memory width */
+#define FLASHCTL_MWx8   0x00000000      /* Memory width x8 */
+#define FLASHCTL_MWx16  0x10000000      /* Memory width x16 */
+#define FLASHCTL_MWx32  0x20000000      /* Memory width x32 (not supported) */
+#define FLASHCTL_ATNR   0x00000000      /* Access type == no retry */
+#define FLASHCTL_ATR    0x80000000      /* Access type == retry every */
+#define FLASHCTL_ATR4   0xc0000000      /* Access type == retry every 4 */
+
+/* ARM Flash Controller -- 3 flash banks with either x8 or x16 devices.  */
+#define AR531X_FLASHCTL0        (AR531X_FLASHCTL + 0x00)
+#define AR531X_FLASHCTL1        (AR531X_FLASHCTL + 0x04)
+#define AR531X_FLASHCTL2        (AR531X_FLASHCTL + 0x08)
+
+/* ARM SDRAM Controller -- just enough to determine memory size */
+#define AR531X_MEM_CFG1 (AR531X_SDRAMCTL + 0x04)
+#define MEM_CFG1_AC0    0x00000700      /* bank 0: SDRAM addr check (added) */
+#define MEM_CFG1_AC0_S  8
+#define MEM_CFG1_AC1    0x00007000      /* bank 1: SDRAM addr check (added) */
+#define MEM_CFG1_AC1_S  12
+
+/* GPIO Address Map */
+#define AR531X_GPIO         (AR531X_APBBASE  + 0x2000)
+#define AR531X_GPIO_DO      (AR531X_GPIO + 0x00)        /* output register */
+#define AR531X_GPIO_DI      (AR531X_GPIO + 0x04)        /* intput register */
+#define AR531X_GPIO_CR      (AR531X_GPIO + 0x08)        /* control register */
+
+/* GPIO Control Register bit field definitions */
+#define GPIO_CR_M(x)    (1 << (x))                      /* mask for i/o */
+#define GPIO_CR_O(x)    (0 << (x))                      /* mask for output */
+#define GPIO_CR_I(x)    (1 << (x))                      /* mask for input */
+#define GPIO_CR_INT(x)  (1 << ((x)+8))                  /* mask for interrupt */
+#define GPIO_CR_UART(x) (1 << ((x)+16))                 /* uart multiplex */
+
+
+typedef unsigned int AR531X_REG;
+
+#define sysRegRead(phys)	\
+	(*(volatile AR531X_REG *)PHYS_TO_K1(phys))
+
+#define sysRegWrite(phys, val)	\
+	((*(volatile AR531X_REG *)PHYS_TO_K1(phys)) = (val))
+
+
+/*
+ * This is board-specific data that is stored in a "fixed" location in flash.
+ * It is shared across operating systems, so it should not be changed lightly.
+ * The main reason we need it is in order to extract the ethernet MAC
+ * address(es).
+ */
+struct ar531x_boarddata {
+    u32 magic;                       /* board data is valid */
+#define AR531X_BD_MAGIC 0x35333131   /* "5311", for all 531x platforms */
+    u16 cksum;                       /* checksum (starting with BD_REV 2) */
+    u16 rev;                         /* revision of this struct */
+#define BD_REV  4
+    char   boardName[64];            /* Name of board */
+    u16 major;                       /* Board major number */
+    u16 minor;                       /* Board minor number */
+    u32 config;                      /* Board configuration */
+#define BD_ENET0        0x00000001   /* ENET0 is stuffed */
+#define BD_ENET1        0x00000002   /* ENET1 is stuffed */
+#define BD_UART1        0x00000004   /* UART1 is stuffed */
+#define BD_UART0        0x00000008   /* UART0 is stuffed (dma) */
+#define BD_RSTFACTORY   0x00000010   /* Reset factory defaults stuffed */
+#define BD_SYSLED       0x00000020   /* System LED stuffed */
+#define BD_EXTUARTCLK   0x00000040   /* External UART clock */
+#define BD_CPUFREQ      0x00000080   /* cpu freq is valid in nvram */
+#define BD_SYSFREQ      0x00000100   /* sys freq is set in nvram */
+#define BD_WLAN0        0x00000200   /* Enable WLAN0 */
+#define BD_MEMCAP       0x00000400   /* CAP SDRAM @ memCap for testing */
+#define BD_DISWATCHDOG  0x00000800   /* disable system watchdog */
+#define BD_WLAN1        0x00001000   /* Enable WLAN1 (ar5212) */
+#define BD_ISCASPER     0x00002000   /* FLAG for AR2312 */
+#define BD_WLAN0_2G_EN  0x00004000   /* FLAG for radio0_2G */
+#define BD_WLAN0_5G_EN  0x00008000   /* FLAG for radio0_2G */
+#define BD_WLAN1_2G_EN  0x00020000   /* FLAG for radio0_2G */
+#define BD_WLAN1_5G_EN  0x00040000   /* FLAG for radio0_2G */
+    u16 resetConfigGpio;             /* Reset factory GPIO pin */
+    u16 sysLedGpio;                  /* System LED GPIO pin */
+
+    u32 cpuFreq;                     /* CPU core frequency in Hz */
+    u32 sysFreq;                     /* System frequency in Hz */
+    u32 cntFreq;                     /* Calculated C0_COUNT frequency */
+
+    u8  wlan0Mac[6];
+    u8  enet0Mac[6];
+    u8  enet1Mac[6];
+
+    u16 pciId;                       /* Pseudo PCIID for common code */
+    u16 memCap;                      /* cap bank1 in MB */
+
+    /* version 3 */
+    u8  wlan1Mac[6];                 /* (ar5212) */
+};
+
+#else
+
+/*
+ * Add support for Cobra
+ *
+ * AR531XPLUSreg.h Register definitions for Atheros AR5311 and AR5312 chipsets.
+ *   - WLAN registers are listed in
+ *         hal/ar5211/ar5211Reg.h
+ *         hal/ar5212/ar5212Reg.h
+ *   - Ethernet registers are listed in ar531xenet.h
+ *   - Standard UART is 16550 compatible.
+ */
+
+
+/*
+ * Address map
+ */
+#define AR531XPLUS_SDRAM0           0x00000000      /* DRAM */
+#define AR531XPLUS_SPI_READ         0x08000000      /* SPI FLASH */
+#define AR531XPLUS_WLAN0            0xB0000000      /* Wireless MMR */
+#define AR531XPLUS_PCI              0xB0100000      /* PCI MMR */
+#define AR531XPLUS_SDRAMCTL         0xB0300000      /* SDRAM MMR */
+#define AR531XPLUS_LOCAL            0xB0400000      /* LOCAL BUS MMR */
+#define AR531XPLUS_ENET0            0xB0500000      /* ETHERNET MMR */
+#define AR531XPLUS_DSLBASE          0xB1000000      /* RESET CONTROL MMR */
+#define AR531XPLUS_UART0            0xB1100003      /* UART MMR */
+#define AR531XPLUS_SPI              0xB1300000      /* SPI FLASH MMR */
+#define AR531XPLUS_FLASHBT          0xBfc00000      /* ro boot alias to FLASH */
+#define AR531XPLUS_RAM1             0x40000000      /* ram alias */
+#define AR531XPLUS_PCIEXT           0x80000000      /* pci external */
+#define AR531XPLUS_RAM2             0xc0000000      /* ram alias */
+#define AR531XPLUS_RAM3             0xe0000000      /* ram alias */
+
+#define AR531X_ENET0  AR531XPLUS_ENET0       
+#define AR531X_ENET1  0 
+/*
+ * Reset Register
+ */
+#define AR531XPLUS_COLD_RESET       (AR531XPLUS_DSLBASE + 0x0000)
+
+/* Cold Reset */
+#define RESET_COLD_AHB              0x00000001
+#define RESET_COLD_APB              0x00000002
+#define RESET_COLD_CPU              0x00000004
+#define RESET_COLD_CPUWARM          0x00000008
+#define RESET_SYSTEM                (RESET_COLD_CPU | RESET_COLD_APB | RESET_COLD_AHB)      /* full system */
+
+/* Warm Reset */
+
+#define AR531XPLUS_RESET            (AR531XPLUS_DSLBASE + 0x0004)
+#define AR531X_RESET AR531XPLUS_RESET
+
+#define RESET_WARM_WLAN0_MAC        0x00000001      /* warm reset WLAN0 MAC */
+#define RESET_WARM_WLAN0_BB         0x00000002      /* warm reset WLAN0 BaseBand */
+#define RESET_MPEGTS_RSVD           0x00000004      /* warm reset MPEG-TS */
+#define RESET_PCIDMA                0x00000008      /* warm reset PCI ahb/dma */
+#define RESET_MEMCTL                0x00000010      /* warm reset memory controller */
+#define RESET_LOCAL                 0x00000020      /* warm reset local bus */
+#define RESET_I2C_RSVD              0x00000040      /* warm reset I2C bus */
+#define RESET_SPI                   0x00000080      /* warm reset SPI interface */
+#define RESET_UART0                 0x00000100      /* warm reset UART0 */
+#define RESET_IR_RSVD               0x00000200      /* warm reset IR interface */
+#define RESET_EPHY0                 0x00000400      /* cold reset ENET0 phy */
+#define RESET_ENET0                 0x00000800      /* cold reset ENET0 mac */
+
+#define AR531X_RESET_ENET0 RESET_ENET0
+#define AR531X_RESET_EPHY0 RESET_EPHY0
+#define AR531X_RESET_ENET1 0
+#define AR531X_RESET_EPHY1 0
+
+/*
+ * AHB master arbitration control
+ */
+#define AR531XPLUS_AHB_ARB_CTL      (AR531XPLUS_DSLBASE + 0x0008)
+
+#define ARB_CPU                     0x00000001      /* CPU, default */
+#define ARB_WLAN                    0x00000002      /* WLAN */
+#define ARB_MPEGTS_RSVD             0x00000004      /* MPEG-TS */
+#define ARB_LOCAL                   0x00000008      /* LOCAL */
+#define ARB_PCI                     0x00000010      /* PCI */
+#define ARB_ETHERNET                0x00000020      /* Ethernet */
+#define ARB_RETRY                   0x00000100      /* retry policy, debug only */
+
+/*
+ * Config Register
+ */
+#define AR531XPLUS_ENDIAN_CTL       (AR531XPLUS_DSLBASE + 0x000c)
+
+#define CONFIG_AHB                  0x00000001      /* EC - AHB bridge endianess */
+#define CONFIG_WLAN                 0x00000002      /* WLAN byteswap */
+#define CONFIG_MPEGTS_RSVD          0x00000004      /* MPEG-TS byteswap */
+#define CONFIG_PCI                  0x00000008      /* PCI byteswap */
+#define CONFIG_MEMCTL               0x00000010      /* Memory controller endianess */
+#define CONFIG_LOCAL                0x00000020      /* Local bus byteswap */
+#define CONFIG_ETHERNET             0x00000040      /* Ethernet byteswap */
+
+#define CONFIG_MERGE                0x00000200      /* CPU write buffer merge */
+#define CONFIG_CPU                  0x00000400      /* CPU big endian */
+#define CONFIG_PCIAHB               0x00000800
+#define CONFIG_PCIAHB_BRIDGE        0x00001000
+#define CONFIG_SPI                  0x00008000      /* SPI byteswap */
+#define CONFIG_CPU_DRAM             0x00010000
+#define CONFIG_CPU_PCI              0x00020000
+#define CONFIG_CPU_MMR              0x00040000
+#define CONFIG_BIG                  0x00000400      
+
+
+/*
+ * NMI control
+ */
+#define AR531XPLUS_NMI_CTL          (AR531XPLUS_DSLBASE + 0x0010)
+
+#define NMI_EN  1
+
+/*
+ * Revision Register - Initial value is 0x3010 (WMAC 3.0, AR531X 1.0).
+ */
+#define AR531XPLUS_SREV             (AR531XPLUS_DSLBASE + 0x0014)
+
+#define AR531X_REV  AR531XPLUS_SREV
+
+#define REV_MAJ                     0x00f0
+#define REV_MAJ_S                   4
+#define REV_MIN                     0x000f
+#define REV_MIN_S                   0
+#define REV_CHIP                    (REV_MAJ|REV_MIN)
+
+#define AR531X_REV_MAJ REV_MAJ
+#define AR531X_REV_MAJ_S REV_MAJ_S
+#define AR531X_REV_MIN REV_MIN 
+#define AR531X_REV_MIN_S REV_MIN_S 
+#define REV_CHIP                    (REV_MAJ|REV_MIN)
+/*
+ * Need these defines to determine true number of ethernet MACs
+ */
+#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 
+
+/* Major revision numbers, bits 7..4 of Revision ID register */
+#define AR531X_REV_MAJ_AR5312          0x4
+#define AR531X_REV_MAJ_AR2313          0x5
+
+/*
+ * AR531X_NUM_ENET_MAC defines the number of ethernet MACs that
+ * should be considered available.  The AR5312 supports 2 enet MACS,
+ * even though many reference boards only actually use 1 of them
+ * (i.e. Only MAC 0 is actually connected to an enet PHY or PHY switch.
+ * The AR2312 supports 1 enet MAC.
+ */
+#define AR531X_NUM_ENET_MAC             1
+
+/*
+ * Interface Enable
+ */
+#define AR531XPLUS_IF_CTL           (AR531XPLUS_DSLBASE + 0x0018)
+
+#define IF_MASK                     0x00000007
+#define IF_DISABLED                 0
+#define IF_PCI                      1
+#define IF_TS_LOCAL                 2
+#define IF_ALL                      3   /* only for emulation with separate pins */
+#define IF_LOCAL_HOST               0x00000008
+#define IF_PCI_HOST                 0x00000010
+#define IF_PCI_INTR                 0x00000020
+#define IF_PCI_CLK_MASK             0x00030000
+#define IF_PCI_CLK_INPUT            0 
+#define IF_PCI_CLK_OUTPUT_LOW       1
+#define IF_PCI_CLK_OUTPUT_CLK       2
+#define IF_PCI_CLK_OUTPUT_HIGH      3
+#define IF_PCI_CLK_SHIFT            16 
+ 
+                
+/* Major revision numbers, bits 7..4 of Revision ID register */
+#define REV_MAJ_AR5311              0x01
+#define REV_MAJ_AR5312              0x04
+#define REV_MAJ_AR5315              0x0B
+
+/*
+ * APB Interrupt control
+ */
+
+#define AR531XPLUS_ISR              (AR531XPLUS_DSLBASE + 0x0020)
+#define AR531XPLUS_IMR              (AR531XPLUS_DSLBASE + 0x0024)
+#define AR531XPLUS_GISR             (AR531XPLUS_DSLBASE + 0x0028)
+
+#define ISR_UART0                   0x0001           /* high speed UART */
+#define ISR_I2C_RSVD                0x0002           /* I2C bus */
+#define ISR_SPI                     0x0004           /* SPI bus */
+#define ISR_AHB                     0x0008           /* AHB error */
+#define ISR_APB                     0x0010           /* APB error */
+#define ISR_TIMER                   0x0020           /* timer */
+#define ISR_GPIO                    0x0040           /* GPIO */
+#define ISR_WD                      0x0080           /* watchdog */
+#define ISR_IR_RSVD                 0x0100           /* IR */
+                                
+#define IMR_UART0                   ISR_UART0
+#define IMR_I2C_RSVD                ISR_I2C_RSVD
+#define IMR_SPI                     ISR_SPI
+#define IMR_AHB                     ISR_AHB
+#define IMR_APB                     ISR_APB
+#define IMR_TIMER                   ISR_TIMER
+#define IMR_GPIO                    ISR_GPIO
+#define IMR_WD                      ISR_WD
+#define IMR_IR_RSVD                 ISR_IR_RSVD
+
+#define GISR_MISC                   0x0001
+#define GISR_WLAN0                  0x0002
+#define GISR_MPEGTS_RSVD            0x0004
+#define GISR_LOCALPCI               0x0008
+#define GISR_WMACPOLL               0x0010
+#define GISR_TIMER                  0x0020
+#define GISR_ETHERNET               0x0040
+
+/*
+ * Interrupt routing from IO to the processor IP bits
+ * Define our inter mask and level
+ */
+#define AR531XPLUS_INTR_MISCIO      SR_IBIT3
+#define AR531XPLUS_INTR_WLAN0       SR_IBIT4
+#define AR531XPLUS_INTR_ENET0       SR_IBIT5
+#define AR531XPLUS_INTR_LOCALPCI    SR_IBIT6
+#define AR531XPLUS_INTR_WMACPOLL    SR_IBIT7
+#define AR531XPLUS_INTR_COMPARE     SR_IBIT8
+
+/*
+ * Timers
+ */
+#define AR531XPLUS_TIMER            (AR531XPLUS_DSLBASE + 0x0030)
+#define AR531XPLUS_RELOAD           (AR531XPLUS_DSLBASE + 0x0034)
+#define AR531XPLUS_WD               (AR531XPLUS_DSLBASE + 0x0038)
+#define AR531XPLUS_WDC              (AR531XPLUS_DSLBASE + 0x003c)
+
+#define WDC_RESET                   0x00000002               /* reset on watchdog */
+#define WDC_NMI                     0x00000001               /* NMI on watchdog */
+#define WDC_IGNORE_EXPIRATION       0x00000000
+
+/*
+ * Interface Debug
+ */
+#define AR531X_FLASHDBG             (AR531X_RESETTMR + 0x0040)
+#define AR531X_MIIDBG               (AR531X_RESETTMR + 0x0044)
+
+
+/*
+ * CPU Performance Counters
+ */
+#define AR531XPLUS_PERFCNT0         (AR531XPLUS_DSLBASE + 0x0048)
+#define AR531XPLUS_PERFCNT1         (AR531XPLUS_DSLBASE + 0x004c)
+
+#define PERF_DATAHIT                0x0001  /* Count Data Cache Hits */
+#define PERF_DATAMISS               0x0002  /* Count Data Cache Misses */
+#define PERF_INSTHIT                0x0004  /* Count Instruction Cache Hits */
+#define PERF_INSTMISS               0x0008  /* Count Instruction Cache Misses */
+#define PERF_ACTIVE                 0x0010  /* Count Active Processor Cycles */
+#define PERF_WBHIT                  0x0020  /* Count CPU Write Buffer Hits */
+#define PERF_WBMISS                 0x0040  /* Count CPU Write Buffer Misses */
+                                
+#define PERF_EB_ARDY                0x0001  /* Count EB_ARdy signal */
+#define PERF_EB_AVALID              0x0002  /* Count EB_AValid signal */
+#define PERF_EB_WDRDY               0x0004  /* Count EB_WDRdy signal */
+#define PERF_EB_RDVAL               0x0008  /* Count EB_RdVal signal */
+#define PERF_VRADDR                 0x0010  /* Count valid read address cycles */
+#define PERF_VWADDR                 0x0020  /* Count valid write address cycles */
+#define PERF_VWDATA                 0x0040  /* Count valid write data cycles */
+
+/*
+ * AHB Error Reporting.
+ */
+#define AR531XPLUS_AHB_ERR0         (AR531XPLUS_DSLBASE + 0x0050)  /* error  */
+#define AR531XPLUS_AHB_ERR1         (AR531XPLUS_DSLBASE + 0x0054)  /* haddr  */
+#define AR531XPLUS_AHB_ERR2         (AR531XPLUS_DSLBASE + 0x0058)  /* hwdata */
+#define AR531XPLUS_AHB_ERR3         (AR531XPLUS_DSLBASE + 0x005c)  /* hrdata */
+#define AR531XPLUS_AHB_ERR4         (AR531XPLUS_DSLBASE + 0x0060)  /* status */
+
+#define AHB_ERROR_DET               1   /* AHB Error has been detected,          */
+                                        /* write 1 to clear all bits in ERR0     */
+#define AHB_ERROR_OVR               2   /* AHB Error overflow has been detected  */
+#define AHB_ERROR_WDT               4   /* AHB Error due to wdt instead of hresp */
+
+#define PROCERR_HMAST               0x0000000f
+#define PROCERR_HMAST_DFLT          0
+#define PROCERR_HMAST_WMAC          1
+#define PROCERR_HMAST_ENET          2
+#define PROCERR_HMAST_PCIENDPT      3
+#define PROCERR_HMAST_LOCAL         4
+#define PROCERR_HMAST_CPU           5
+#define PROCERR_HMAST_PCITGT        6
+                                    
+#define PROCERR_HMAST_S             0
+#define PROCERR_HWRITE              0x00000010
+#define PROCERR_HSIZE               0x00000060
+#define PROCERR_HSIZE_S             5
+#define PROCERR_HTRANS              0x00000180
+#define PROCERR_HTRANS_S            7
+#define PROCERR_HBURST              0x00000e00
+#define PROCERR_HBURST_S            9
+
+
+
+/*
+ * Clock Control
+ */
+#define AR531XPLUS_PLLC_CTL         (AR531XPLUS_DSLBASE + 0x0064)
+#define AR531XPLUS_PLLV_CTL         (AR531XPLUS_DSLBASE + 0x0068)
+#define AR531XPLUS_CPUCLK           (AR531XPLUS_DSLBASE + 0x006c)
+#define AR531XPLUS_AMBACLK          (AR531XPLUS_DSLBASE + 0x0070)
+#define AR531XPLUS_SYNCCLK          (AR531XPLUS_DSLBASE + 0x0074)
+#define AR531XPLUS_DSL_SLEEP_CTL    (AR531XPLUS_DSLBASE + 0x0080)
+#define AR531XPLUS_DSL_SLEEP_DUR    (AR531XPLUS_DSLBASE + 0x0084)
+
+/* PLLc Control fields */
+#define PLLC_REF_DIV_M              0x00000003
+#define PLLC_REF_DIV_S              0
+#define PLLC_FDBACK_DIV_M           0x0000007C
+#define PLLC_FDBACK_DIV_S           2
+#define PLLC_ADD_FDBACK_DIV_M       0x00000080
+#define PLLC_ADD_FDBACK_DIV_S       7
+#define PLLC_CLKC_DIV_M             0x0001c000
+#define PLLC_CLKC_DIV_S             14
+#define PLLC_CLKM_DIV_M             0x00700000
+#define PLLC_CLKM_DIV_S             20
+
+/* CPU CLK Control fields */
+#define CPUCLK_CLK_SEL_M            0x00000003
+#define CPUCLK_CLK_SEL_S            0
+#define CPUCLK_CLK_DIV_M            0x0000000c
+#define CPUCLK_CLK_DIV_S            2
+
+/* AMBA CLK Control fields */
+#define AMBACLK_CLK_SEL_M           0x00000003
+#define AMBACLK_CLK_SEL_S           0
+#define AMBACLK_CLK_DIV_M           0x0000000c
+#define AMBACLK_CLK_DIV_S           2
+
+#if defined(COBRA_EMUL)
+#define AR531XPLUS_AMBA_CLOCK_RATE  20000000
+#define AR531XPLUS_CPU_CLOCK_RATE   40000000
+#else
+#if defined(DEFAULT_PLL)
+#define AR531XPLUS_AMBA_CLOCK_RATE  40000000
+#define AR531XPLUS_CPU_CLOCK_RATE   40000000
+#else
+#define AR531XPLUS_AMBA_CLOCK_RATE  92000000
+#define AR531XPLUS_CPU_CLOCK_RATE   184000000
+#endif /* ! DEFAULT_PLL */
+#endif /* ! COBRA_EMUL */
+
+#define AR531XPLUS_UART_CLOCK_RATE  AR531XPLUS_AMBA_CLOCK_RATE
+#define AR531XPLUS_SDRAM_CLOCK_RATE AR531XPLUS_AMBA_CLOCK_RATE
+
+/*
+ * The UART computes baud rate as:
+ *   baud = clock / (16 * divisor)
+ * where divisor is specified as a High Byte (DLM) and a Low Byte (DLL).
+ */
+#define DESIRED_BAUD_RATE           38400
+
+/*
+ * The WATCHDOG value is computed as
+ *  10 seconds * AR531X_WATCHDOG_CLOCK_RATE
+ */
+#define DESIRED_WATCHDOG_SECONDS    10
+#define AR531X_WATCHDOG_TIME \
+        (DESIRED_WATCHDOG_SECONDS * AR531X_WATCHDOG_CLOCK_RATE)
+
+
+#define CLOCKCTL_UART0  0x0010  /* enable UART0 external clock */
+
+
+ /*
+ * Applicable "PCICFG" bits for WLAN(s).  Assoc status and LED mode.
+ */
+#define AR531X_PCICFG               (AR531X_RESETTMR + 0x00b0)
+#define ASSOC_STATUS_M              0x00000003
+#define ASSOC_STATUS_NONE           0
+#define ASSOC_STATUS_PENDING        1   
+#define ASSOC_STATUS_ASSOCIATED     2
+#define LED_MODE_M                  0x0000001c
+#define LED_BLINK_THRESHOLD_M       0x000000e0
+#define LED_SLOW_BLINK_MODE         0x00000100
+
+/*
+ * GPIO
+ */
+
+#define AR531XPLUS_GPIO_DI          (AR531XPLUS_DSLBASE + 0x0088)
+#define AR531XPLUS_GPIO_DO          (AR531XPLUS_DSLBASE + 0x0090)
+#define AR531XPLUS_GPIO_CR          (AR531XPLUS_DSLBASE + 0x0098)
+#define AR531XPLUS_GPIO_INT         (AR531XPLUS_DSLBASE + 0x00a0)
+
+#define GPIO_CR_M(x)                (1 << (x))                  /* mask for i/o */
+#define GPIO_CR_O(x)                (1 << (x))                  /* output */
+#define GPIO_CR_I(x)                (0 << (x))                  /* input */
+
+#define GPIO_INT(x,Y)               ((x) << (8 * (Y)))          /* interrupt enable */
+#define GPIO_INT_M(Y)               ((0x3F) << (8 * (Y)))       /* mask for int */
+#define GPIO_INT_LVL(x,Y)           ((x) << (8 * (Y) + 6))      /* interrupt level */
+#define GPIO_INT_LVL_M(Y)           ((0x3) << (8 * (Y) + 6))    /* mask for int level */
+
+#define AR531XPLUS_RESET_GPIO       5
+#define AR531XPLUS_NUM_GPIO         22
+
+    
+/* 
+ *  PCI Clock Control
+ */     
+ 
+#define AR531XPLUS_PCICLK           (AR531XPLUS_DSLBASE + 0x00a4)
+
+#define PCICLK_INPUT_M              0x3
+#define PCICLK_INPUT_S              0
+                         
+#define PCICLK_PLLC_CLKM            0
+#define PCICLK_PLLC_CLKM1           1
+#define PCICLK_PLLC_CLKC            2
+#define PCICLK_REF_CLK              3 
+
+#define PCICLK_DIV_M                0xc
+#define PCICLK_DIV_S                2
+                         
+#define PCICLK_IN_FREQ              0
+#define PCICLK_IN_FREQ_DIV_6        1
+#define PCICLK_IN_FREQ_DIV_8        2
+#define PCICLK_IN_FREQ_DIV_10       3 
+
+/*
+ * Observation Control Register
+ */
+#define AR531XPLUS_OCR              (AR531XPLUS_DSLBASE + 0x00b0)
+#define OCR_GPIO0_IRIN              0x0040
+#define OCR_GPIO1_IROUT             0x0080
+#define OCR_GPIO3_RXCLR             0x0200
+
+/* 
+ *  General Clock Control
+ */     
+ 
+#define AR531XPLUS_MISCCLK          (AR531XPLUS_DSLBASE + 0x00b4)
+#define MISCCLK_PLLBYPASS_EN        0x00000001
+#define MISCCLK_PROCREFCLK          0x00000002
+
+/*
+ * SDRAM Controller
+ *   - No read or write buffers are included.
+ */
+#define AR531XPLUS_MEM_CFG          (AR531XPLUS_SDRAMCTL + 0x00)
+#define AR531XPLUS_MEM_CTRL         (AR531XPLUS_SDRAMCTL + 0x0c)
+#define AR531XPLUS_MEM_REF          (AR531XPLUS_SDRAMCTL + 0x10)
+
+#define SDRAM_DATA_WIDTH_M          0x00006000
+#define SDRAM_DATA_WIDTH_S          13
+
+#define SDRAM_COL_WIDTH_M           0x00001E00
+#define SDRAM_COL_WIDTH_S           9
+
+#define SDRAM_ROW_WIDTH_M           0x000001E0
+#define SDRAM_ROW_WIDTH_S           5
+
+#define SDRAM_BANKADDR_BITS_M       0x00000018
+#define SDRAM_BANKADDR_BITS_S       3
+
+
+/*
+ * SDRAM Memory Refresh (MEM_REF) value is computed as:
+ * MEMCTL_SREFR = (Tr * hclk_freq) / R
+ * where Tr is max. time of refresh of any single row
+ * R is number of rows in the DRAM
+ * For most 133MHz SDRAM parts, Tr=64ms, R=4096 or 8192
+ */
+#if defined(COBRA_EMUL)
+#define AR531XPLUS_SDRAM_MEMORY_REFRESH_VALUE  0x96
+#else 
+#if defined(DEFAULT_PLL)
+#define AR531XPLUS_SDRAM_MEMORY_REFRESH_VALUE  0x200
+#else
+#define AR531XPLUS_SDRAM_MEMORY_REFRESH_VALUE  0x61a
+#endif /* ! DEFAULT_PLL */
+#endif 
+
+#if defined(AR531XPLUS)
+
+#define AR531XPLUS_SDRAM_DDR_SDRAM      0   /* Not DDR SDRAM */
+#define AR531XPLUS_SDRAM_DATA_WIDTH     16  /* bits */   
+#define AR531XPLUS_SDRAM_COL_WIDTH      8
+#define AR531XPLUS_SDRAM_ROW_WIDTH      12
+
+#else
+
+#define AR531XPLUS_SDRAM_DDR_SDRAM      0   /* Not DDR SDRAM */
+#define AR531XPLUS_SDRAM_DATA_WIDTH     16
+#define AR531XPLUS_SDRAM_COL_WIDTH      8
+#define AR531XPLUS_SDRAM_ROW_WIDTH      12
+
+#endif /* ! AR531XPLUS */
+
+/*
+ * SPI Flash Interface Registers
+ */
+
+#define AR531XPLUS_SPI_CTL      (AR531XPLUS_SPI + 0x00)
+#define AR531XPLUS_SPI_OPCODE   (AR531XPLUS_SPI + 0x04)
+#define AR531XPLUS_SPI_DATA     (AR531XPLUS_SPI + 0x08)
+
+#define SPI_CTL_START           0x00000100
+#define SPI_CTL_BUSY            0x00010000
+#define SPI_CTL_TXCNT_MASK      0x0000000f
+#define SPI_CTL_RXCNT_MASK      0x000000f0
+#define SPI_CTL_TX_RX_CNT_MASK  0x000000ff
+#define SPI_CTL_SIZE_MASK       0x00060000
+
+#define SPI_CTL_CLK_SEL_MASK    0x03000000
+#define SPI_OPCODE_MASK         0x000000ff
+
+/* 
+ * PCI-MAC Configuration registers 
+ */
+#define PCI_MAC_RC              (AR531XPLUS_PCI + 0x4000) 
+#define PCI_MAC_SCR             (AR531XPLUS_PCI + 0x4004)
+#define PCI_MAC_INTPEND         (AR531XPLUS_PCI + 0x4008)
+#define PCI_MAC_SFR             (AR531XPLUS_PCI + 0x400C)
+#define PCI_MAC_PCICFG          (AR531XPLUS_PCI + 0x4010)
+#define PCI_MAC_SREV            (AR531XPLUS_PCI + 0x4020)
+
+#define PCI_MAC_RC_MAC          0x00000001
+#define PCI_MAC_RC_BB           0x00000002
+
+#define PCI_MAC_SCR_SLMODE_M    0x00030000
+#define PCI_MAC_SCR_SLMODE_S    16        
+#define PCI_MAC_SCR_SLM_FWAKE   0         
+#define PCI_MAC_SCR_SLM_FSLEEP  1         
+#define PCI_MAC_SCR_SLM_NORMAL  2         
+
+#define PCI_MAC_SFR_SLEEP       0x00000001
+
+#define PCI_MAC_PCICFG_SPWR_DN  0x00010000
+
+ 
+
+
+/*
+ * PCI Bus Interface Registers
+ */
+#define AR531XPLUS_PCI_1MS_REG      (AR531XPLUS_PCI + 0x0008)
+#define AR531XPLUS_PCI_1MS_MASK     0x3FFFF         /* # of AHB clk cycles in 1ms */
+
+#define AR531XPLUS_PCI_MISC_CONFIG  (AR531XPLUS_PCI + 0x000c)
+#define AR531XPLUS_PCIMISC_TXD_EN   0x00000001      /* Enable TXD for fragments */
+#define AR531XPLUS_PCIMISC_CFG_SEL  0x00000002      /* mem or config cycles */
+#define AR531XPLUS_PCIMISC_GIG_MASK 0x0000000C      /* bits 31-30 for pci req */
+#define AR531XPLUS_PCIMISC_RST_MODE 0x00000030
+#define AR531XPLUS_PCIRST_INPUT     0x00000000      /* 4:5=0 rst is input */
+#define AR531XPLUS_PCIRST_LOW       0x00000010      /* 4:5=1 rst to GND */
+#define AR531XPLUS_PCIRST_HIGH      0x00000020      /* 4:5=2 rst to VDD */
+#define AR531XPLUS_PCIGRANT_EN      0x00000000      /* 6:7=0 early grant en */
+#define AR531XPLUS_PCIGRANT_FRAME   0x00000040      /* 6:7=1 grant waits 4 frame */
+#define AR531XPLUS_PCIGRANT_IDLE    0x00000080      /* 6:7=2 grant waits 4 idle */
+#define AR531XPLUS_PCIGRANT_GAP     0x00000000      /* 6:7=2 grant waits 4 idle */
+#define AR531XPLUS_PCICACHE_DIS     0x00001000      /* PCI external access cache disable */
+
+#define AR531XPLUS_PCI_OUT_TSTAMP   (AR531XPLUS_PCI + 0x0010)
+
+#define AR531XPLUS_PCI_UNCACHE_CFG  (AR531XPLUS_PCI + 0x0014)
+
+#define AR531XPLUS_PCI_IN_EN        (AR531XPLUS_PCI + 0x0100)
+#define AR531XPLUS_PCI_IN_EN0       0x01            /* Enable chain 0 */
+#define AR531XPLUS_PCI_IN_EN1       0x02            /* Enable chain 1 */
+#define AR531XPLUS_PCI_IN_EN2       0x04            /* Enable chain 2 */
+#define AR531XPLUS_PCI_IN_EN3       0x08            /* Enable chain 3 */
+
+#define AR531XPLUS_PCI_IN_DIS       (AR531XPLUS_PCI + 0x0104)
+#define AR531XPLUS_PCI_IN_DIS0      0x01            /* Disable chain 0 */
+#define AR531XPLUS_PCI_IN_DIS1      0x02            /* Disable chain 1 */
+#define AR531XPLUS_PCI_IN_DIS2      0x04            /* Disable chain 2 */
+#define AR531XPLUS_PCI_IN_DIS3      0x08            /* Disable chain 3 */
+
+#define AR531XPLUS_PCI_IN_PTR       (AR531XPLUS_PCI + 0x0200)
+
+#define AR531XPLUS_PCI_OUT_EN       (AR531XPLUS_PCI + 0x0400)
+#define AR531XPLUS_PCI_OUT_EN0      0x01            /* Enable chain 0 */
+
+#define AR531XPLUS_PCI_OUT_DIS      (AR531XPLUS_PCI + 0x0404)
+#define AR531XPLUS_PCI_OUT_DIS0     0x01            /* Disable chain 0 */
+
+#define AR531XPLUS_PCI_OUT_PTR      (AR531XPLUS_PCI + 0x0408)
+
+#define AR531XPLUS_PCI_INT_STATUS   (AR531XPLUS_PCI + 0x0500)   /* write one to clr */
+#define AR531XPLUS_PCI_TXINT        0x00000001      /* Desc In Completed */
+#define AR531XPLUS_PCI_TXOK         0x00000002      /* Desc In OK */
+#define AR531XPLUS_PCI_TXERR        0x00000004      /* Desc In ERR */
+#define AR531XPLUS_PCI_TXEOL        0x00000008      /* Desc In End-of-List */
+#define AR531XPLUS_PCI_RXINT        0x00000010      /* Desc Out Completed */
+#define AR531XPLUS_PCI_RXOK         0x00000020      /* Desc Out OK */
+#define AR531XPLUS_PCI_RXERR        0x00000040      /* Desc Out ERR */
+#define AR531XPLUS_PCI_RXEOL        0x00000080      /* Desc Out EOL */
+#define AR531XPLUS_PCI_TXOOD        0x00000200      /* Desc In Out-of-Desc */
+#define AR531XPLUS_PCI_MASK         0x0000FFFF      /* Desc Mask */
+#define AR531XPLUS_PCI_EXT_INT      0x02000000      
+#define AR531XPLUS_PCI_ABORT_INT    0x04000000      
+
+#define AR531XPLUS_PCI_INT_MASK     (AR531XPLUS_PCI + 0x0504)   /* same as INT_STATUS */
+
+#define AR531XPLUS_PCI_INTEN_REG    (AR531XPLUS_PCI + 0x0508)
+#define AR531XPLUS_PCI_INT_DISABLE  0x00            /* disable pci interrupts */
+#define AR531XPLUS_PCI_INT_ENABLE   0x01            /* enable pci interrupts */
+
+#define AR531XPLUS_PCI_HOST_IN_EN   (AR531XPLUS_PCI + 0x0800)
+#define AR531XPLUS_PCI_HOST_IN_DIS  (AR531XPLUS_PCI + 0x0804)
+#define AR531XPLUS_PCI_HOST_IN_PTR  (AR531XPLUS_PCI + 0x0810)
+#define AR531XPLUS_PCI_HOST_OUT_EN  (AR531XPLUS_PCI + 0x0900)
+#define AR531XPLUS_PCI_HOST_OUT_DIS (AR531XPLUS_PCI + 0x0904)
+#define AR531XPLUS_PCI_HOST_OUT_PTR (AR531XPLUS_PCI + 0x0908)
+
+
+/*
+ * Local Bus Interface Registers
+ */
+#define AR531XPLUS_LB_CONFIG        (AR531XPLUS_LOCAL + 0x0000)
+#define AR531XPLUS_LBCONF_OE        0x00000001      /* =1 OE is low-true */
+#define AR531XPLUS_LBCONF_CS0       0x00000002      /* =1 first CS is low-true */
+#define AR531XPLUS_LBCONF_CS1       0x00000004      /* =1 2nd CS is low-true */
+#define AR531XPLUS_LBCONF_RDY       0x00000008      /* =1 RDY is low-true */
+#define AR531XPLUS_LBCONF_WE        0x00000010      /* =1 Write En is low-true */
+#define AR531XPLUS_LBCONF_WAIT      0x00000020      /* =1 WAIT is low-true */
+#define AR531XPLUS_LBCONF_ADS       0x00000040      /* =1 Adr Strobe is low-true */
+#define AR531XPLUS_LBCONF_MOT       0x00000080      /* =0 Intel, =1 Motorola */
+#define AR531XPLUS_LBCONF_8CS       0x00000100      /* =1 8 bits CS, 0= 16bits */
+#define AR531XPLUS_LBCONF_8DS       0x00000200      /* =1 8 bits Data S, 0=16bits */
+#define AR531XPLUS_LBCONF_ADS_EN    0x00000400      /* =1 Enable ADS */
+#define AR531XPLUS_LBCONF_ADR_OE    0x00000800      /* =1 Adr cap on OE, WE or DS */
+#define AR531XPLUS_LBCONF_ADDT_MUX  0x00001000      /* =1 Adr and Data share bus */
+#define AR531XPLUS_LBCONF_DATA_OE   0x00002000      /* =1 Data cap on OE, WE, DS */
+#define AR531XPLUS_LBCONF_16DATA    0x00004000      /* =1 Data is 16 bits wide */
+#define AR531XPLUS_LBCONF_SWAPDT    0x00008000      /* =1 Byte swap data */
+#define AR531XPLUS_LBCONF_SYNC      0x00010000      /* =1 Bus synchronous to clk */
+#define AR531XPLUS_LBCONF_INT       0x00020000      /* =1 Intr is low true */
+#define AR531XPLUS_LBCONF_INT_CTR0  0x00000000      /* GND high-Z, Vdd is high-Z */
+#define AR531XPLUS_LBCONF_INT_CTR1  0x00040000      /* GND drive, Vdd is high-Z */
+#define AR531XPLUS_LBCONF_INT_CTR2  0x00080000      /* GND high-Z, Vdd drive */
+#define AR531XPLUS_LBCONF_INT_CTR3  0x000C0000      /* GND drive, Vdd drive */
+#define AR531XPLUS_LBCONF_RDY_WAIT  0x00100000      /* =1 RDY is negative of WAIT */
+#define AR531XPLUS_LBCONF_INT_PULSE 0x00200000      /* =1 Interrupt is a pulse */
+#define AR531XPLUS_LBCONF_ENABLE    0x00400000      /* =1 Falcon respond to LB */
+
+#define AR531XPLUS_LB_CLKSEL        (AR531XPLUS_LOCAL + 0x0004)
+#define AR531XPLUS_LBCLK_EXT        0x0001          /* use external clk for lb */
+
+#define AR531XPLUS_LB_1MS           (AR531XPLUS_LOCAL + 0x0008)
+#define AR531XPLUS_LB1MS_MASK       0x3FFFF         /* # of AHB clk cycles in 1ms */
+
+#define AR531XPLUS_LB_MISCCFG       (AR531XPLUS_LOCAL + 0x000C)
+#define AR531XPLUS_LBM_TXD_EN       0x00000001      /* Enable TXD for fragments */
+#define AR531XPLUS_LBM_RX_INTEN     0x00000002      /* Enable LB ints on RX ready */
+#define AR531XPLUS_LBM_MBOXWR_INTEN 0x00000004      /* Enable LB ints on mbox wr */
+#define AR531XPLUS_LBM_MBOXRD_INTEN 0x00000008      /* Enable LB ints on mbox rd */
+#define AR531XPLUS_LMB_DESCSWAP_EN  0x00000010      /* Byte swap desc enable */
+#define AR531XPLUS_LBM_TIMEOUT_MASK 0x00FFFF80
+#define AR531XPLUS_LBM_TIMEOUT_SHFT 7
+#define AR531XPLUS_LBM_PORTMUX      0x07000000
+
+
+#define AR531XPLUS_LB_RXTSOFF       (AR531XPLUS_LOCAL + 0x0010)
+
+#define AR531XPLUS_LB_TX_CHAIN_EN   (AR531XPLUS_LOCAL + 0x0100)
+#define AR531XPLUS_LB_TXEN_0        0x01
+#define AR531XPLUS_LB_TXEN_1        0x02
+#define AR531XPLUS_LB_TXEN_2        0x04
+#define AR531XPLUS_LB_TXEN_3        0x08
+
+#define AR531XPLUS_LB_TX_CHAIN_DIS  (AR531XPLUS_LOCAL + 0x0104)
+#define AR531XPLUS_LB_TX_DESC_PTR   (AR531XPLUS_LOCAL + 0x0200)
+
+#define AR531XPLUS_LB_RX_CHAIN_EN   (AR531XPLUS_LOCAL + 0x0400)
+#define AR531XPLUS_LB_RXEN          0x01
+
+#define AR531XPLUS_LB_RX_CHAIN_DIS  (AR531XPLUS_LOCAL + 0x0404)
+#define AR531XPLUS_LB_RX_DESC_PTR   (AR531XPLUS_LOCAL + 0x0408)
+
+#define AR531XPLUS_LB_INT_STATUS    (AR531XPLUS_LOCAL + 0x0500)
+#define AR531XPLUS_INT_TX_DESC      0x0001
+#define AR531XPLUS_INT_TX_OK        0x0002
+#define AR531XPLUS_INT_TX_ERR       0x0004
+#define AR531XPLUS_INT_TX_EOF       0x0008
+#define AR531XPLUS_INT_RX_DESC      0x0010
+#define AR531XPLUS_INT_RX_OK        0x0020
+#define AR531XPLUS_INT_RX_ERR       0x0040
+#define AR531XPLUS_INT_RX_EOF       0x0080
+#define AR531XPLUS_INT_TX_TRUNC     0x0100
+#define AR531XPLUS_INT_TX_STARVE    0x0200
+#define AR531XPLUS_INT_LB_TIMEOUT   0x0400
+#define AR531XPLUS_INT_LB_ERR       0x0800
+#define AR531XPLUS_INT_MBOX_WR      0x1000
+#define AR531XPLUS_INT_MBOX_RD      0x2000
+
+/* Bit definitions for INT MASK are the same as INT_STATUS */
+#define AR531XPLUS_LB_INT_MASK      (AR531XPLUS_LOCAL + 0x0504)
+
+#define AR531XPLUS_LB_INT_EN        (AR531XPLUS_LOCAL + 0x0508)
+#define AR531XPLUS_LB_MBOX          (AR531XPLUS_LOCAL + 0x0600)
+
+
+
+/*
+ * IR Interface Registers
+ */
+#define AR531XPLUS_IR_PKTDATA                   (AR531XPLUS_IR + 0x0000)
+
+#define AR531XPLUS_IR_PKTLEN                    (AR531XPLUS_IR + 0x07fc) /* 0 - 63 */
+
+#define AR531XPLUS_IR_CONTROL                   (AR531XPLUS_IR + 0x0800)
+#define AR531XPLUS_IRCTL_TX                     0x00000000  /* use as tranmitter */
+#define AR531XPLUS_IRCTL_RX                     0x00000001  /* use as receiver   */
+#define AR531XPLUS_IRCTL_SAMPLECLK_MASK         0x00003ffe  /* Sample clk divisor mask */
+#define AR531XPLUS_IRCTL_SAMPLECLK_SHFT                  1
+#define AR531XPLUS_IRCTL_OUTPUTCLK_MASK         0x03ffc000  /* Output clk divisor mask */
+#define AR531XPLUS_IRCTL_OUTPUTCLK_SHFT                 14
+
+#define AR531XPLUS_IR_STATUS                    (AR531XPLUS_IR + 0x0804)
+#define AR531XPLUS_IRSTS_RX                     0x00000001  /* receive in progress */
+#define AR531XPLUS_IRSTS_TX                     0x00000002  /* transmit in progress */
+
+#define AR531XPLUS_IR_CONFIG                    (AR531XPLUS_IR + 0x0808)
+#define AR531XPLUS_IRCFG_INVIN                  0x00000001  /* invert input polarity */
+#define AR531XPLUS_IRCFG_INVOUT                 0x00000002  /* invert output polarity */
+#define AR531XPLUS_IRCFG_SEQ_START_WIN_SEL      0x00000004  /* 1 => 28, 0 => 7 */
+#define AR531XPLUS_IRCFG_SEQ_START_THRESH       0x000000f0  /*  */
+#define AR531XPLUS_IRCFG_SEQ_END_UNIT_SEL       0x00000100  /*  */
+#define AR531XPLUS_IRCFG_SEQ_END_UNIT_THRESH    0x00007e00  /*  */
+#define AR531XPLUS_IRCFG_SEQ_END_WIN_SEL        0x00008000  /*  */
+#define AR531XPLUS_IRCFG_SEQ_END_WIN_THRESH     0x001f0000  /*  */
+#define AR531XPLUS_IRCFG_NUM_BACKOFF_WORDS      0x01e00000  /*  */
+
+/*
+ * PCI memory constants: Memory area 1 and 2 are the same size -
+ * (twice the PCI_TLB_PAGE_SIZE). The definition of
+ * CPU_TO_PCI_MEM_SIZE is coupled with the TLB setup routine
+ * sysLib.c/sysTlbInit(), in that it assumes that 2 pages of size
+ * PCI_TLB_PAGE_SIZE are set up in the TLB for each PCI memory space.
+ */
+ 
+#define CPU_TO_PCI_MEM_BASE1    0xE0000000
+#define CPU_TO_PCI_MEM_SIZE1    (2*PCI_TLB_PAGE_SIZE)
+ 
+
+/* TLB attributes for PCI transactions */
+
+#define PCI_MMU_PAGEMASK        0x00003FFF
+#define MMU_PAGE_UNCACHED       0x00000010
+#define MMU_PAGE_DIRTY          0x00000004
+#define MMU_PAGE_VALID          0x00000002
+#define MMU_PAGE_GLOBAL         0x00000001
+#define PCI_MMU_PAGEATTRIB      (MMU_PAGE_UNCACHED|MMU_PAGE_DIRTY|\
+                                 MMU_PAGE_VALID|MMU_PAGE_GLOBAL)
+#define PCI_MEMORY_SPACE1_VIRT  0xE0000000      /* Used for non-prefet  mem   */
+#define PCI_MEMORY_SPACE1_PHYS  0x80000000
+#define PCI_TLB_PAGE_SIZE       0x01000000
+#define TLB_HI_MASK             0xFFFFE000
+#define TLB_LO_MASK             0x3FFFFFFF
+#define PAGEMASK_SHIFT          11
+#define TLB_LO_SHIFT            6
+
+#define PCI_MAX_LATENCY         0xFFF           /* Max PCI latency            */
+
+#define HOST_PCI_DEV_ID         3
+#define HOST_PCI_MBAR0          0x10000000
+#define HOST_PCI_MBAR1          0x20000000
+#define HOST_PCI_MBAR2          0x30000000
+
+#define HOST_PCI_SDRAM_BASEADDR HOST_PCI_MBAR1
+#define PCI_DEVICE_MEM_SPACE    0x800000
+
+
+typedef unsigned int AR531X_REG;
+
+#define sysRegRead(phys)	\
+	(*(volatile AR531X_REG *)PHYS_TO_K1(phys))
+
+#define sysRegWrite(phys, val)	\
+	((*(volatile AR531X_REG *)PHYS_TO_K1(phys)) = (val))
+
+
+
+/*
+ * This is board-specific data that is stored in a "fixed" location in flash.
+ * It is shared across operating systems, so it should not be changed lightly.
+ * The main reason we need it is in order to extract the ethernet MAC
+ * address(es).
+ */
+struct ar531x_boarddata {
+    u32 magic;                       /* board data is valid */
+#define AR531X_BD_MAGIC 0x35333131   /* "5311", for all 531x platforms */
+    u16 cksum;                       /* checksum (starting with BD_REV 2) */
+    u16 rev;                         /* revision of this struct */
+#define BD_REV  4
+    char   boardName[64];            /* Name of board */
+    u16 major;                       /* Board major number */
+    u16 minor;                       /* Board minor number */
+    u32 config;                      /* Board configuration */
+#define BD_ENET0        0x00000001   /* ENET0 is stuffed */
+#define BD_ENET1        0x00000002   /* ENET1 is stuffed */
+#define BD_UART1        0x00000004   /* UART1 is stuffed */
+#define BD_UART0        0x00000008   /* UART0 is stuffed (dma) */
+#define BD_RSTFACTORY   0x00000010   /* Reset factory defaults stuffed */
+#define BD_SYSLED       0x00000020   /* System LED stuffed */
+#define BD_EXTUARTCLK   0x00000040   /* External UART clock */
+#define BD_CPUFREQ      0x00000080   /* cpu freq is valid in nvram */
+#define BD_SYSFREQ      0x00000100   /* sys freq is set in nvram */
+#define BD_WLAN0        0x00000200   /* Enable WLAN0 */
+#define BD_MEMCAP       0x00000400   /* CAP SDRAM @ memCap for testing */
+#define BD_DISWATCHDOG  0x00000800   /* disable system watchdog */
+#define BD_WLAN1        0x00001000   /* Enable WLAN1 (ar5212) */
+#define BD_ISCASPER     0x00002000   /* FLAG for AR2312 */
+#define BD_WLAN0_2G_EN  0x00004000   /* FLAG for radio0_2G */
+#define BD_WLAN0_5G_EN  0x00008000   /* FLAG for radio0_2G */
+#define BD_WLAN1_2G_EN  0x00020000   /* FLAG for radio0_2G */
+#define BD_WLAN1_5G_EN  0x00040000   /* FLAG for radio0_2G */
+    u16 resetConfigGpio;             /* Reset factory GPIO pin */
+    u16 sysLedGpio;                  /* System LED GPIO pin */
+
+    u32 cpuFreq;                     /* CPU core frequency in Hz */
+    u32 sysFreq;                     /* System frequency in Hz */
+    u32 cntFreq;                     /* Calculated C0_COUNT frequency */
+
+    u8  wlan0Mac[6];
+    u8  enet0Mac[6];
+    u8  enet1Mac[6];
+
+    u16 pciId;                       /* Pseudo PCIID for common code */
+    u16 memCap;                      /* cap bank1 in MB */
+
+    /* version 3 */
+    u8  wlan1Mac[6];                 /* (ar5212) */
+};
+
+#endif
+
+#endif /* AR531X_H */
diff --git a/package/fonera-mp3-drv/src/ar531xlnx.h b/package/fonera-mp3-drv/src/ar531xlnx.h
new file mode 100644
index 0000000..fe0333f
--- /dev/null
+++ b/package/fonera-mp3-drv/src/ar531xlnx.h
@@ -0,0 +1,140 @@
+/*
+ * 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
+ * for more details.
+ *
+ * Copyright © 2003 Atheros Communications, Inc.,  All Rights Reserved.
+ */
+
+/*
+ * This file contains definitions needed in order to compile
+ * AR531X products for linux.  Definitions that are largely
+ * AR531X-specific and independent of operating system belong
+ * in ar531x.h rather than this file.
+ */
+#ifndef __AR531XLNX_H
+#define __AR531XLNX_H
+#include "ar531x.h"
+
+#define AR531X_HIGH_PRIO                0x10
+#define AR531X_MISC_IRQ_BASE		0x20
+#define AR531X_GPIO_IRQ_BASE            0x30
+
+/* Software's idea of interrupts handled by "CPU Interrupt Controller" */
+#ifndef CONFIG_AR531X_COBRA
+#define CONFIG_AR531X_COBRA 0
+#endif
+
+#if CONFIG_AR531X_COBRA
+#define AR531X_IRQ_NONE		MIPS_CPU_IRQ_BASE+0
+#define AR531X_IRQ_MISC_INTRS	MIPS_CPU_IRQ_BASE+2 /* C0_CAUSE: 0x0400 */
+#define AR531X_IRQ_WLAN0_INTRS	MIPS_CPU_IRQ_BASE+3 /* C0_CAUSE: 0x0800 */
+#define AR531X_IRQ_ENET0_INTRS	MIPS_CPU_IRQ_BASE+4 /* C0_CAUSE: 0x1000 */
+#define AR531X_IRQ_LCBUS_PCI	MIPS_CPU_IRQ_BASE+6 /* C0_CAUSE: 0x4000 */
+#define AR531X_IRQ_WLAN0_POLL	MIPS_CPU_IRQ_BASE+6 /* C0_CAUSE: 0x4000 */
+#define AR531X_IRQ_CPU_CLOCK	MIPS_CPU_IRQ_BASE+7 /* C0_CAUSE: 0x8000 */
+#else
+#define AR531X_IRQ_NONE		MIPS_CPU_IRQ_BASE+0
+#define AR531X_IRQ_WLAN0_INTRS	MIPS_CPU_IRQ_BASE+2 /* C0_CAUSE: 0x0400 */
+#define AR531X_IRQ_ENET0_INTRS	MIPS_CPU_IRQ_BASE+3 /* C0_CAUSE: 0x0800 */
+#define AR531X_IRQ_ENET1_INTRS	MIPS_CPU_IRQ_BASE+4 /* C0_CAUSE: 0x1000 */
+#define AR531X_IRQ_WLAN1_INTRS	MIPS_CPU_IRQ_BASE+5 /* C0_CAUSE: 0x2000 */
+#define AR531X_IRQ_MISC_INTRS	MIPS_CPU_IRQ_BASE+6 /* C0_CAUSE: 0x4000 */
+#define AR531X_IRQ_CPU_CLOCK	MIPS_CPU_IRQ_BASE+7 /* C0_CAUSE: 0x8000 */
+#endif
+
+/* Miscellaneous interrupts, which share IP6 or IP2 */
+#define AR531X_MISC_IRQ_NONE		AR531X_MISC_IRQ_BASE+0
+#define AR531X_MISC_IRQ_TIMER		AR531X_MISC_IRQ_BASE+1
+#define AR531X_MISC_IRQ_AHB_PROC	AR531X_MISC_IRQ_BASE+2
+#define AR531X_MISC_IRQ_AHB_DMA		AR531X_MISC_IRQ_BASE+3
+#define AR531X_MISC_IRQ_GPIO		AR531X_MISC_IRQ_BASE+4
+#define AR531X_MISC_IRQ_UART0		AR531X_MISC_IRQ_BASE+5
+#define AR531X_MISC_IRQ_UART0_DMA	AR531X_MISC_IRQ_BASE+6
+#define AR531X_MISC_IRQ_WATCHDOG	AR531X_MISC_IRQ_BASE+7
+#define AR531X_MISC_IRQ_LOCAL		AR531X_MISC_IRQ_BASE+8
+#define AR531X_MISC_IRQ_COUNT		9
+
+/* GPIO Interrupts [0..7], share AR531X_MISC_IRQ_GPIO */
+#define AR531X_GPIO_IRQ_NONE            AR531X_MISC_IRQ_BASE+0
+#define AR531X_GPIO_IRQ(n)              AR531X_MISC_IRQ_BASE+(n)+1
+#define AR531X_GPIO_IRQ_COUNT           9
+
+#define PHYS_TO_K1(physaddr) KSEG1ADDR(physaddr)
+//#define PHYS_TO_K0(physaddr) KSEG0ADDR(physaddr)
+#define UNMAPPED_TO_PHYS(vaddr)  PHYSADDR(vaddr)
+#define IS_UNMAPPED_VADDR(vaddr) \
+    ((KSEGX(vaddr) == KSEG0) || (KSEGX(vaddr) == KSEG1))
+
+/* IOCTL commands for /proc/ar531x */
+#define AR531X_CTRL_DO_BREAKPOINT       1
+#define AR531X_CTRL_DO_MADWIFI          2
+
+/*
+ * Definitions for operating system portability.
+ * These are vxWorks-->Linux translations.
+ */
+#define LOCAL static
+#define BOOL int
+#define TRUE 1
+#define FALSE 0
+#define UINT8 u8
+#define UINT16 u16
+#define UINT32 u32
+#define PRINTF printk
+#if /* DEBUG */ 1
+#define DEBUG_PRINTF printk
+#define printf printk
+#define INLINE
+#else
+DEBUG_PRINTF while (0) printk
+#define INLINE inline
+#endif
+#define sysUDelay(usecs) udelay(usecs)
+#define sysMsDelay(msecs) mdelay(msecs)
+typedef volatile UINT8 *VIRT_ADDR;
+#define MALLOC(sz) kmalloc(sz, GFP_KERNEL)
+#define MALLOC_NOSLEEP(sz) kmalloc(sz, GFP_ATOMIC)
+#define FREE(ptr) kfree((void *)ptr)
+#define BSP_BUG() do { printk("kernel BSP BUG at %s:%d!\n", __FILE__, __LINE__); *(int *)0=0; } while (0)
+#define BSP_BUG_ON(condition) do { if (unlikely((condition)!=0)) BSP_BUG(); } while(0)
+#define ASSERT(x) BSP_BUG_ON(!(x))
+
+extern struct ar531x_boarddata *ar531x_board_configuration;
+extern char *ar531x_radio_configuration;
+extern char *enet_mac_address_get(int MACUnit);
+
+extern void kgdbInit(void);
+extern int kgdbEnabled(void);
+extern void breakpoint(void);
+extern int kgdbInterrupt(void);
+extern unsigned int ar531x_cpu_frequency(void);
+extern unsigned int ar531x_sys_frequency(void);
+
+/* GPIO support */
+extern struct irqaction spurious_gpio;
+extern unsigned int gpioIntMask;
+extern void ar531x_gpio_intr_init(int irq_base);
+extern void ar531x_gpio_ctrl_output(int gpio);
+extern void ar531x_gpio_ctrl_input(int gpio);
+extern void ar531x_gpio_set(int gpio, int val);
+extern int  ar531x_gpio_get(int gpio);
+extern void ar531x_gpio_intr_enable(unsigned int irq);
+extern void ar531x_gpio_intr_disable(unsigned int irq);
+
+/* Watchdog Timer support */
+extern int watchdog_start(unsigned int milliseconds);
+extern int watchdog_stop(void);
+extern int watchdog_is_enabled(void);
+extern unsigned int watchdog_min_timer_reached(void);
+extern void watchdog_notify_alive(void);
+
+#define A_DATA_CACHE_INVAL(start, length) \
+        dma_cache_inv((UINT32)(start),(length))
+
+#define sysWbFlush() mb()
+
+#define intDisable(x) cli()
+#define intEnable(x) sti()
+
+#endif   /* __AR531XLNX_H */
diff --git a/package/fonera-mp3-drv/src/mp3_drv.c b/package/fonera-mp3-drv/src/mp3_drv.c
new file mode 100644
index 0000000..f2c0dd1
--- /dev/null
+++ b/package/fonera-mp3-drv/src/mp3_drv.c
@@ -0,0 +1,308 @@
+/*
+* a.lp_mp3 - VS1011B driver for Fonera 
+* Copyright (c) 2007 phrozen.org - John Crispin <john@phrozen.org>
+*
+* This program is free software; you can redistribute it and/or modify
+* it under the terms of the GNU General Public License as published by
+* the Free Software Foundation; either version 2 of the License, or
+* (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+* GNU General Public License for more details.
+*
+* You should have received a copy of the GNU General Public License
+* along with this program; if not, write to the Free Software
+* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA02111-1307USA
+*
+* Feedback, Bugs...  john@phrozen.org 
+*
+*/
+
+
+#include <linux/module.h>
+#include <linux/errno.h>
+#include <linux/ioport.h>
+#include <linux/init.h>
+#include <asm/uaccess.h>
+#include <asm/io.h>
+#include <linux/timer.h>
+#include <linux/init.h>
+#include <linux/genhd.h>
+
+// do we want debuging info ?
+#if 0
+#define DBG(x) x
+#else
+#define DBG(x) 
+#endif
+
+#define MP3_CHUNK_SIZE 			4096
+#define MP3_BUFFERING			0
+#define MP3_PLAYING			1
+#define MP3_BUFFER_FINISHED		2
+#define MP3_PLAY_FINISHED		3
+typedef struct _MP3_DATA{
+	unsigned char 	mp3[MP3_CHUNK_SIZE];
+	unsigned char state;
+} MP3_DATA;
+
+#define IOCTL_MP3_INIT			0x01
+#define IOCTL_MP3_RESET			0x02
+#define IOCTL_MP3_SETVOLUME		0x03
+#define IOCTL_MP3_GETVOLUME		0x04
+
+typedef struct _AUDIO_DATA{
+	unsigned int bitrate;
+	unsigned int sample_rate;
+	unsigned char is_stereo;
+}AUDIO_DATA;
+#define IOCTL_MP3_GETAUDIODATA		0x05
+#define IOCTL_MP3_CLEARBUFFER		0x06
+#define IOCTL_MP3_PLAY			0x07
+
+typedef struct _MP3_BEEP{
+	unsigned char 	freq;
+	unsigned int	ms;
+} MP3_BEEP;
+#define IOCTL_MP3_BEEP			0x08			
+#define IOCTL_MP3_END_REACHED		0x09
+#define IOCTL_MP3_BASS			0x10
+
+#define CRYSTAL12288	0x9800
+#define CRYSTAL24576	0x0
+
+#define DEV_NAME 			"mp3"
+#define DEV_MAJOR 			196
+#define MAX_MP3_COUNT 	1
+
+typedef struct _mp3_inf{
+	unsigned char is_open;
+} mp3_inf;
+static mp3_inf mp3_info[MAX_MP3_COUNT];
+
+#define MP3_BUFFER_SIZE		(128 * 1024)
+unsigned char mp3_buffer[MP3_BUFFER_SIZE];
+
+static unsigned long int mp3_buffer_offset_write = 0;
+static unsigned long int mp3_buffer_offset_read = 0;
+static unsigned char mp3_buffering_status = MP3_BUFFERING;
+static unsigned long int mp3_data_in_buffer = 0;
+static int mp3_thread = 0;
+unsigned int crystal_freq;
+
+#include "vs10xx.c"
+
+static wait_queue_head_t wq;
+static DECLARE_COMPLETION(mp3_exit);
+
+static int mp3_playback_thread(void *data){
+	int j;
+	unsigned long timeout;
+	printk("started kthread\n");
+	daemonize("kmp3");
+	while(mp3_buffering_status != MP3_PLAY_FINISHED){
+		if((mp3_buffering_status == MP3_PLAYING) || (mp3_buffering_status == MP3_BUFFER_FINISHED)){
+			while(VS1011_NEEDS_DATA){
+				if(mp3_buffer_offset_read == MP3_BUFFER_SIZE){
+					mp3_buffer_offset_read = 0;
+				}
+				
+				if(mp3_data_in_buffer == 0){
+					if(mp3_buffering_status == MP3_BUFFER_FINISHED){
+						printk("mp3_drv.ko : finished playing\n");
+						mp3_buffering_status = MP3_PLAY_FINISHED;
+					} else {
+						printk("mp3_drv.ko : buffer empty ?\n");
+						if(mp3_buffering_status != MP3_PLAY_FINISHED){
+						}
+					}
+				} else {
+					for(j = 0; j < 32; j++){
+						VS1011_send_SDI(mp3_buffer[mp3_buffer_offset_read + j]);
+					}
+					mp3_buffer_offset_read += 32;
+					mp3_data_in_buffer -= 32;
+				}
+			}
+		}
+		timeout = 1;	
+        	timeout = wait_event_interruptible_timeout(wq, (timeout==0), timeout);	
+	}
+	complete_and_exit(&mp3_exit, 0); 
+}
+
+static ssize_t module_write(struct file * file, const char * buffer, size_t count, loff_t *offset){
+	MP3_DATA mp3_data;
+	
+	copy_from_user((char*) &mp3_data, buffer, sizeof(MP3_DATA));
+	
+	if(mp3_data.state == MP3_BUFFER_FINISHED){
+		mp3_buffering_status = MP3_BUFFER_FINISHED;
+		DBG(printk("mp3_drv.ko : file end reached\n"));
+		return 1;
+	}
+	
+	if(mp3_data.state == MP3_PLAY_FINISHED){
+		mp3_buffering_status = MP3_PLAY_FINISHED;
+		mp3_data_in_buffer = 0;
+		DBG(printk("mp3_drv.ko : stop playing\n"));
+		return 1;
+	}
+	
+	if(mp3_data_in_buffer + MP3_CHUNK_SIZE >= MP3_BUFFER_SIZE){
+		DBG(printk("mp3_drv.ko : buffer is full? %ld\n", mp3_data_in_buffer);)
+		return 0;
+	}
+	
+	if(mp3_buffer_offset_write == MP3_BUFFER_SIZE){
+		mp3_buffer_offset_write = 0;
+	}
+	
+	memcpy(&mp3_buffer[mp3_buffer_offset_write], mp3_data.mp3, MP3_CHUNK_SIZE);
+	mp3_buffer_offset_write += MP3_CHUNK_SIZE;
+	mp3_buffering_status = mp3_data.state;
+	mp3_data_in_buffer += MP3_CHUNK_SIZE;
+	return 1;
+}
+
+static int module_ioctl(struct inode * inode, struct file * file, unsigned int cmd, unsigned long arg){
+	unsigned int 	retval = 0;
+	AUDIO_DATA   	audio_data;
+	MP3_BEEP	mp3_beep;
+	DBG(printk("mp3_drv.ko : Ioctl Called (cmd=%d)\n", cmd );)
+	switch (cmd) {
+		case IOCTL_MP3_INIT:
+			crystal_freq = arg;
+			VS1011_init(crystal_freq, 1);
+			VS1011_print_registers();
+			break;
+
+		case IOCTL_MP3_RESET:
+			DBG(printk("mp3_drv.ko : doing a sw reset\n");)
+			VS1011_init(crystal_freq, 0);
+			VS1011_print_registers();
+			VS1011_send_zeros(0x20);
+			break;
+
+		case IOCTL_MP3_SETVOLUME:
+			DBG(printk("mp3_drv.ko : setting volume to : %lu\n", arg&0xffff);)
+			VS1011_set_volume(arg);
+			break;
+
+		case IOCTL_MP3_GETVOLUME:
+			retval = VS1011_get_volume();
+			DBG(printk("mp3_drv.ko : read volume : %d\n", retval);)
+			break;
+
+		case IOCTL_MP3_GETAUDIODATA:
+			DBG(printk("mp3_drv.ko : read audio data\n");)
+			VS1011_get_audio_data(&audio_data);
+			copy_to_user((char*)arg, (char*)&audio_data, sizeof(AUDIO_DATA));
+			break;
+
+		case IOCTL_MP3_CLEARBUFFER:
+			DBG(printk("mp3_drv.ko : clearing buffer\n");)
+			mp3_buffer_offset_read = 0;
+			mp3_buffer_offset_write = 0;
+			mp3_buffering_status = MP3_PLAY_FINISHED;
+			mp3_data_in_buffer = 0;
+			break;
+
+		case IOCTL_MP3_PLAY:
+			mp3_thread = kernel_thread(mp3_playback_thread, NULL, CLONE_KERNEL);
+			break;
+
+		case IOCTL_MP3_BEEP:
+			copy_from_user((char*)&mp3_beep, (char*)arg, sizeof(MP3_BEEP));
+			VS1011_sine(1,mp3_beep.freq);
+			msDelay(mp3_beep.ms);
+			VS1011_sine(0,0);
+			break;
+
+		case IOCTL_MP3_END_REACHED:
+			if(mp3_buffering_status == MP3_PLAY_FINISHED){
+				retval = 1;
+			}
+			break;
+
+		case IOCTL_MP3_BASS:
+			VS1011_set_bass(arg);
+			break;
+
+		default:
+			printk("mp3_drv.ko : unknown ioctl\n");
+			break;
+
+	}
+	return retval;
+}
+
+static int module_open(struct inode *inode, struct file *file){
+	unsigned int dev_minor = MINOR(inode->i_rdev);
+	if(dev_minor !=  0){
+		printk("mp3_drv.ko : trying to access unknown minor device -> %d\n", dev_minor);
+		return -ENODEV;
+	}
+	if(mp3_info[dev_minor].is_open) {
+		printk("mp3_drv.ko : Device with minor ID %d already in use\n", dev_minor);
+		return -EBUSY;
+	}
+	mp3_info[dev_minor].is_open = 1;
+	
+	mp3_buffering_status = MP3_PLAY_FINISHED;
+	printk("mp3_drv.ko : Minor %d has been opened\n", dev_minor);
+	return 0;
+}
+
+static int module_close(struct inode * inode, struct file * file){
+	unsigned int dev_minor = MINOR(inode->i_rdev);
+	mp3_info[dev_minor].is_open = 0;
+	printk("mp3_drv.ko : Minor %d has been closed\n", dev_minor);
+	mp3_buffering_status = MP3_PLAY_FINISHED;
+	return 0;
+}
+
+struct file_operations modulemp3_fops = {
+        write:         module_write,
+        ioctl:         module_ioctl,
+        open:          module_open,
+        release:       module_close
+};
+
+static int __init mod_init(void){
+	printk("mp3_drv.ko : VS1011b Driver\n");
+	printk("mp3_drv.ko : Made by John '2B|!2B' Crispin (john@phrozen.org)\n");
+	printk("mp3_drv.ko : Starting ...\n");
+	
+	if(register_chrdev(DEV_MAJOR, DEV_NAME, &modulemp3_fops)) {
+		printk( "mp3_drv.ko : Error whilst opening %s (%d)\n", DEV_NAME, DEV_MAJOR);
+		return( -ENODEV );
+	}
+	
+	mp3_info[0].is_open = 0;
+	printk("mp3_drv.ko : Device %s registered for major ID %d\n", DEV_NAME, DEV_MAJOR);
+	crystal_freq = CRYSTAL12288;
+	VS1011_init(crystal_freq, 1);
+	VS1011_print_registers();
+	printk("end of init\n");
+	init_waitqueue_head(&wq);
+	printk("wait queue started\n");
+	return 0;
+}
+
+static void __exit mod_exit(void){
+	printk( "mp3_drv.ko : Cleanup\n" );
+	unregister_chrdev(DEV_MAJOR, DEV_NAME);
+}
+
+module_init (mod_init);
+module_exit (mod_exit);
+
+MODULE_LICENSE("GPL");
+MODULE_AUTHOR("K. John '2B|!2B' Crispin");
+MODULE_DESCRIPTION("vs1011 Driver for Fox Board");
+
+
+
diff --git a/package/fonera-mp3-drv/src/vs10xx.c b/package/fonera-mp3-drv/src/vs10xx.c
new file mode 100644
index 0000000..e7b7f68
--- /dev/null
+++ b/package/fonera-mp3-drv/src/vs10xx.c
@@ -0,0 +1,328 @@
+/*
+ * a.lp_mp3 - VS1011B driver for Fonera 
+ * Copyright (c) 2007 phrozen.org - John Crispin <john@phrozen.org>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA02111-1307USA
+ *
+ * Feedback, Bugs.... mail john@phrozen.org
+ *
+ */ 
+
+#include <linux/module.h>
+#include <linux/sched.h>
+#include <linux/slab.h>
+#include <linux/ioport.h>
+#include <linux/errno.h>
+#include <linux/kernel.h>
+#include <linux/fs.h>
+#include <linux/string.h>
+#include <linux/poll.h>
+#include <linux/init.h>
+#include <linux/interrupt.h>
+#include <linux/delay.h>
+
+#include <asm/io.h>
+#include <asm/system.h>
+#include <asm/irq.h>
+#include "ar531xlnx.h"
+
+#define AR5315_DSLBASE          0xB1000000
+#define AR5315_GPIO_DI          (AR5315_DSLBASE + 0x0088)
+#define AR5315_GPIO_DO          (AR5315_DSLBASE + 0x0090)
+#define AR5315_GPIO_CR          (AR5315_DSLBASE + 0x0098)
+#define AR5315_GPIO_INT         (AR5315_DSLBASE + 0x00a0)
+
+#define GPIO_0			1<<0
+#define GPIO_1			1<<1
+#define GPIO_2			1<<2
+#define GPIO_3			1<<3
+#define GPIO_4			1<<4
+#define GPIO_6			1<<6
+#define GPIO_7			1<<7
+
+#define DREQ				((unsigned int)GPIO_7)
+#define SCK				((unsigned int)GPIO_1)
+#define SI				((unsigned int)GPIO_4)
+#define BSYNC				((unsigned int)GPIO_3)
+#define CS				((unsigned int)GPIO_0)
+#define SO				((unsigned int)GPIO_6)
+#define RES				((unsigned int)GPIO_2)
+
+#define REG_MODE			0x0
+#define REG_STATUS			0x1
+#define REG_BASS			0x2
+#define REG_CLOCKF			0x3
+#define REG_DECODETIME			0x4
+#define REG_AUDATA			0x5
+#define REG_WRAM			0x6
+#define REG_WRAMADDR			0x7
+#define REG_HDAT0			0x8
+#define REG_HDAT1			0x9
+#define REG_A1ADDR			0xa
+#define REG_VOL				0xb
+#define REG_A1CTRL0			0xc
+#define REG_A1CTRL1			0xd
+#define REG_A1CTRL2			0xe
+
+#define VS1011_NEEDS_DATA  		spi_get_bit(DREQ)
+#define VS1011_NEEDS_NO_DATA  		(spi_get_bit(DREQ)== 0x00)
+#define VS1011_WHILE_NEEDS_NO_DATA  	while(spi_get_bit(DREQ)== 0x00){}
+
+#define VS_CS_LO			spi_clear_bit(CS)
+#define VS_CS_HI			spi_set_bit(CS)
+
+#define VS_BSYNC_LO			spi_clear_bit(BSYNC)
+#define VS_BSYNC_HI			spi_set_bit(BSYNC)
+
+#define VS_RESET_LO			spi_clear_bit(RES)
+#define VS_RESET_HI			spi_set_bit(RES)
+
+#define VS1011_READ 			SPI_io_vs1011b(0x03)
+#define VS1011_WRITE 			SPI_io_vs1011b(0x02)
+
+void msDelay(int ms) {
+	int i,a;
+	int delayvar=10;
+
+	for (a=0;a<ms;a++) {
+		for (i=0;i<33084;i++) {
+			delayvar*=2;        
+			delayvar/=2;
+		} 
+	}
+}   
+
+int spi_get_bit(unsigned int pin){
+	return ((sysRegRead(AR5315_GPIO_DI)&pin)?(1):(0));
+}
+
+void spi_set_bit(unsigned int pin){
+	sysRegWrite(AR5315_GPIO_DO, (sysRegRead(AR5315_GPIO_DO) | pin));
+}
+
+void spi_clear_bit(unsigned int pin){
+	sysRegWrite(AR5315_GPIO_DO, (sysRegRead(AR5315_GPIO_DO) & ~pin));
+}
+
+void SPI_clock_vs1011b(void){
+	spi_clear_bit(SCK);
+	spi_set_bit(SCK);
+}
+
+unsigned char SPI_io_vs1011b(unsigned char byte){
+	int i;
+	unsigned char this_bit;
+	unsigned char byte_out = 0;
+	for(i = 7; i>=0; i--){
+		if(byte & (1<<i)){
+			this_bit = 1;
+		} else {
+			this_bit = 0;
+		}
+		if(this_bit){
+			spi_set_bit(SI);
+		} else {
+			spi_clear_bit(SI);
+		}
+		SPI_clock_vs1011b();
+		byte_out += spi_get_bit(SO)<<i;
+	}
+	return byte_out;
+}
+
+void SPI_init_vs1011(void){
+	sysRegWrite(AR5315_GPIO_CR, (sysRegRead(AR5315_GPIO_CR) | SI | SCK | CS | BSYNC | RES) & ~(SO|DREQ));
+	spi_clear_bit(SCK);
+	spi_clear_bit(SI);
+	VS_CS_HI;
+	VS_BSYNC_HI;
+}
+
+void VS1011_send_SCI(unsigned char reg, unsigned int data){
+	VS_CS_LO;
+	VS1011_WRITE;
+	SPI_io_vs1011b(reg);
+	SPI_io_vs1011b((data>>8)&0xff);
+	SPI_io_vs1011b(data&0xff);
+	VS_CS_HI;
+}
+
+unsigned int VS1011_read_SCI(unsigned char reg){
+	unsigned int data;	
+	VS_CS_LO;
+	VS1011_READ;
+	SPI_io_vs1011b(reg);
+	data = 0;
+	data = SPI_io_vs1011b(0x00);
+	data <<= 8;
+	data += SPI_io_vs1011b(0x00);
+	VS_CS_HI;
+	return data;
+}
+
+void VS1011_send_SDI(unsigned char byte){
+	int i;
+	VS_BSYNC_LO;
+	for(i = 7; i>=0; i--){
+		if(byte & (1<<i)){
+			spi_set_bit(SI);
+			
+		} else {
+			spi_clear_bit(SI);
+		}			
+		spi_clear_bit(SCK);
+		spi_set_bit(SCK);
+	}
+	VS_BSYNC_HI;
+}
+
+void VS1011_send_SDI_32(unsigned char* data){
+	int i;
+	VS1011_WHILE_NEEDS_NO_DATA;
+	for(i=0; i<32; i++){
+		VS1011_send_SDI(data[i]);
+	}
+}
+
+void VS1011_send_zeros(unsigned char count){
+	do{
+		VS1011_send_SDI(0x0);
+		count--;
+	}while(count);
+}
+
+void VS1011_set_volume(unsigned int vol){
+	VS1011_send_SCI(REG_VOL, vol);
+}
+
+void VS1011_SW_reset(unsigned int _crystal_freq){
+	unsigned int regval = 0x0804;
+	unsigned long int i = 0;
+	msDelay(100);
+	VS1011_send_zeros(32);
+	VS1011_send_SCI(REG_MODE, regval);
+	msDelay(10);
+	while((VS1011_NEEDS_NO_DATA) && (i++<0xffff)){};
+	VS1011_send_SCI(REG_CLOCKF, _crystal_freq);
+	VS1011_send_zeros(16);
+	VS1011_set_volume(0x00);
+}
+
+void VS1011_HW_reset(void){
+	
+	VS_RESET_LO;
+	msDelay(1);
+	VS_RESET_HI;
+	msDelay(1);
+}
+
+void VS1011_init(unsigned int _crystal_freq, unsigned char hw){
+	if(hw){
+		SPI_init_vs1011();
+	}
+	printk("mp3_drv.ko : Init start\n");
+	if(hw){
+		VS1011_HW_reset();
+	}
+	VS1011_SW_reset(_crystal_freq);
+	printk("mp3_drv.ko : init_ok\n");
+}
+
+void VS1011_sine(unsigned char state, unsigned char freq){
+	VS1011_send_zeros(16);
+	if(state == 0x01){
+		VS1011_send_SDI(0x53);
+		VS1011_send_SDI(0xEF);
+		VS1011_send_SDI(0x6E);
+		VS1011_send_SDI(freq);
+		VS1011_send_zeros(0x04);
+	} else {
+		VS1011_send_SDI(0x45);
+		VS1011_send_SDI(0x78);
+		VS1011_send_SDI(0x69);
+		VS1011_send_SDI(0x74);
+		VS1011_send_zeros(0x04);		
+	}
+}
+
+unsigned int VS1011_get_volume(void){
+	return VS1011_read_SCI(REG_VOL);
+}
+
+unsigned int VS1011_get_decode_time(void){
+	return VS1011_read_SCI(REG_DECODETIME);
+}
+
+const unsigned int sample_rate_values[]  = {0, 44100, 48000, 32000, 22050, 24000, 16000, 11025, 12000, 8000};
+
+void VS1011_get_audio_data(AUDIO_DATA* audio){
+	unsigned int audata = VS1011_read_SCI(REG_AUDATA);
+	audio->sample_rate = sample_rate_values[(audata&0x1E00)>>9];
+	audio->bitrate = audata&0x1FF;
+	audio->is_stereo = (audata&0x8000)>>15;
+}
+
+void VS1011_print_registers(void){
+	unsigned char i;
+	for(i = 0; i< 14; i++){
+		unsigned int regval = VS1011_read_SCI(i);
+		printk("mp3_drv.ko : %d \n", regval);		
+	}
+}
+
+void VS1011_volume(unsigned char left, unsigned char right){
+	unsigned int regval = left;
+	regval <<=8;
+	regval += right;
+	VS1011_send_SCI(REG_VOL, regval);
+}
+
+void VS1011_set_bass(unsigned int regval){
+	VS1011_send_SCI(REG_BASS, regval);
+}
+
+void VS1011_set_reg(unsigned int reg, unsigned int regval){
+	VS1011_send_SCI(reg, regval);
+}
+
+/*
+int vs_test(void) {	
+	SPI_init_vs1011();
+	printk("%u\n", *R_GEN_CONFIG);
+	VS1001_init(_crystal_freq);
+	VS1001_print_registers();
+	VS1001_volume(0x30, 0x30); 
+	msDelay(1000);
+	VS1001_sine(1, 0x30);
+	msDelay(1000);
+	VS1001_sine(0, 0);
+	VS1001_send_zeros(0x20);
+	msDelay(1000);
+	VS1001_sine(1, 0x30);
+	msDelay(1000);
+	VS1001_sine(0, 0);
+	VS1001_send_zeros(0x20);
+	msDelay(1000);
+	VS1001_sine(1, 0x30);
+	msDelay(1000);
+	VS1001_sine(0, 0);
+	
+	AUDIO_DATA a;
+	VS1001_get_audio_data(&a);
+	printk("mp3_drv.ko : rate : %d, bit : %d, stereo : %d \n", a.sample_rate, a.bitrate, a.is_stereo);
+	VS1001_SW_reset(_crystal_freq);
+	return 0;
+}*/
+