summaryrefslogtreecommitdiff
path: root/target/linux
diff options
context:
space:
mode:
Diffstat (limited to 'target/linux')
-rw-r--r--target/linux/atheros/config-2.6.26236
-rw-r--r--target/linux/atheros/files-2.6.26/arch/mips/atheros/Kconfig27
-rw-r--r--target/linux/atheros/files-2.6.26/arch/mips/atheros/Makefile13
-rw-r--r--target/linux/atheros/files-2.6.26/arch/mips/atheros/ar5312/Makefile11
-rw-r--r--target/linux/atheros/files-2.6.26/arch/mips/atheros/ar5312/board.c473
-rw-r--r--target/linux/atheros/files-2.6.26/arch/mips/atheros/ar5312/irq.c174
-rw-r--r--target/linux/atheros/files-2.6.26/arch/mips/atheros/ar5315/Makefile12
-rw-r--r--target/linux/atheros/files-2.6.26/arch/mips/atheros/ar5315/board.c414
-rw-r--r--target/linux/atheros/files-2.6.26/arch/mips/atheros/ar5315/irq.c359
-rw-r--r--target/linux/atheros/files-2.6.26/arch/mips/atheros/ar5315/pci.c265
-rw-r--r--target/linux/atheros/files-2.6.26/arch/mips/atheros/board.c299
-rw-r--r--target/linux/atheros/files-2.6.26/arch/mips/atheros/prom.c45
-rw-r--r--target/linux/atheros/files-2.6.26/arch/mips/atheros/reset.c162
-rw-r--r--target/linux/atheros/files-2.6.26/drivers/mtd/devices/spiflash.c533
-rw-r--r--target/linux/atheros/files-2.6.26/drivers/mtd/devices/spiflash.h119
-rw-r--r--target/linux/atheros/files-2.6.26/drivers/net/ar2313/Makefile5
-rw-r--r--target/linux/atheros/files-2.6.26/drivers/net/ar2313/ar2313.c1409
-rw-r--r--target/linux/atheros/files-2.6.26/drivers/net/ar2313/ar2313.h195
-rw-r--r--target/linux/atheros/files-2.6.26/drivers/net/ar2313/dma.h141
-rw-r--r--target/linux/atheros/files-2.6.26/drivers/watchdog/ar2315-wtd.c198
-rw-r--r--target/linux/atheros/files-2.6.26/include/asm-mips/mach-atheros/ar5312/ar5312.h234
-rw-r--r--target/linux/atheros/files-2.6.26/include/asm-mips/mach-atheros/ar5315/ar5315.h694
-rw-r--r--target/linux/atheros/files-2.6.26/include/asm-mips/mach-atheros/ar531x.h149
-rw-r--r--target/linux/atheros/files-2.6.26/include/asm-mips/mach-atheros/ar531x_platform.h28
-rw-r--r--target/linux/atheros/files-2.6.26/include/asm-mips/mach-atheros/cpu-feature-overrides.h84
-rw-r--r--target/linux/atheros/files-2.6.26/include/asm-mips/mach-atheros/dma-coherence.h41
-rw-r--r--target/linux/atheros/files-2.6.26/include/asm-mips/mach-atheros/gpio.h118
-rw-r--r--target/linux/atheros/files-2.6.26/include/asm-mips/mach-atheros/reset.h6
-rw-r--r--target/linux/atheros/files-2.6.26/include/asm-mips/mach-atheros/war.h25
-rw-r--r--target/linux/atheros/patches-2.6.26/100-board.patch66
-rw-r--r--target/linux/atheros/patches-2.6.26/110-spiflash.patch20
-rw-r--r--target/linux/atheros/patches-2.6.26/120-watchdog.patch25
-rw-r--r--target/linux/atheros/patches-2.6.26/130-ar2313_ethernet.patch25
-rw-r--r--target/linux/atheros/patches-2.6.26/135-ar2313_2.6.26.patch11
-rw-r--r--target/linux/atheros/patches-2.6.26/140-redboot_partition_scan.patch54
-rw-r--r--target/linux/atheros/patches-2.6.26/150-bridge-printk.patch26
-rw-r--r--target/linux/atheros/patches-2.6.26/200-ar2313_enable_mvswitch.patch70
-rw-r--r--target/linux/atheros/patches-2.6.26/900-cevt_r4k_irq_disable_hazard.patch10
-rw-r--r--target/linux/atheros/patches-2.6.26/901-get_c0_compare_irq_function.patch43
39 files changed, 0 insertions, 6819 deletions
diff --git a/target/linux/atheros/config-2.6.26 b/target/linux/atheros/config-2.6.26
deleted file mode 100644
index c800a87..0000000
--- a/target/linux/atheros/config-2.6.26
+++ /dev/null
@@ -1,236 +0,0 @@
-CONFIG_32BIT=y
-# CONFIG_64BIT is not set
-CONFIG_AR2313=y
-# CONFIG_ARCH_HAS_ILOG2_U32 is not set
-# CONFIG_ARCH_HAS_ILOG2_U64 is not set
-CONFIG_ARCH_POPULATES_NODE_MAP=y
-# CONFIG_ARCH_SUPPORTS_MSI is not set
-CONFIG_ARCH_SUPPORTS_OPROFILE=y
-CONFIG_ARCH_SUSPEND_POSSIBLE=y
-CONFIG_ATHEROS=y
-CONFIG_ATHEROS_AR5312=y
-CONFIG_ATHEROS_AR5315=y
-CONFIG_ATHEROS_AR5315_PCI=y
-CONFIG_ATHEROS_WDT=y
-# CONFIG_ATM is not set
-# CONFIG_ATMEL is not set
-CONFIG_BASE_SMALL=0
-# CONFIG_BCM47XX is not set
-CONFIG_BITREVERSE=y
-# CONFIG_BROADCOM_PHY is not set
-# CONFIG_BT is not set
-CONFIG_CEVT_R4K=y
-CONFIG_CLASSIC_RCU=y
-CONFIG_CMDLINE="console=ttyS0,9600 rootfstype=squashfs,jffs2 init=/etc/preinit"
-CONFIG_CPU_BIG_ENDIAN=y
-CONFIG_CPU_HAS_LLSC=y
-CONFIG_CPU_HAS_PREFETCH=y
-CONFIG_CPU_HAS_SYNC=y
-# CONFIG_CPU_LITTLE_ENDIAN is not set
-# CONFIG_CPU_LOONGSON2 is not set
-CONFIG_CPU_MIPS32=y
-CONFIG_CPU_MIPS32_R1=y
-# CONFIG_CPU_MIPS32_R2 is not set
-# CONFIG_CPU_MIPS64_R1 is not set
-# CONFIG_CPU_MIPS64_R2 is not set
-CONFIG_CPU_MIPSR1=y
-# CONFIG_CPU_NEVADA is not set
-# CONFIG_CPU_R10000 is not set
-# CONFIG_CPU_R3000 is not set
-# CONFIG_CPU_R4300 is not set
-# CONFIG_CPU_R4X00 is not set
-# CONFIG_CPU_R5000 is not set
-# CONFIG_CPU_R5432 is not set
-# CONFIG_CPU_R6000 is not set
-# CONFIG_CPU_R8000 is not set
-# CONFIG_CPU_RM7000 is not set
-# CONFIG_CPU_RM9000 is not set
-# CONFIG_CPU_SB1 is not set
-CONFIG_CPU_SUPPORTS_32BIT_KERNEL=y
-CONFIG_CPU_SUPPORTS_HIGHMEM=y
-# CONFIG_CPU_TX39XX is not set
-# CONFIG_CPU_TX49XX is not set
-# CONFIG_CPU_VR41XX is not set
-CONFIG_CSRC_R4K=y
-CONFIG_DEVPORT=y
-# CONFIG_DM9000 is not set
-CONFIG_DMA_NEED_PCI_MAP_STATE=y
-CONFIG_DMA_NONCOHERENT=y
-# CONFIG_E1000E_ENABLED is not set
-# CONFIG_FIXED_PHY is not set
-CONFIG_FS_POSIX_ACL=y
-CONFIG_GENERIC_CLOCKEVENTS=y
-CONFIG_GENERIC_CLOCKEVENTS_BUILD=y
-CONFIG_GENERIC_CMOS_UPDATE=y
-# CONFIG_GENERIC_FIND_FIRST_BIT is not set
-CONFIG_GENERIC_FIND_NEXT_BIT=y
-CONFIG_GENERIC_GPIO=y
-# CONFIG_GENERIC_HARDIRQS_NO__DO_IRQ is not set
-CONFIG_GPIO_DEVICE=y
-CONFIG_HAS_DMA=y
-CONFIG_HAS_IOMEM=y
-CONFIG_HAS_IOPORT=y
-# CONFIG_HAVE_DMA_ATTRS is not set
-CONFIG_HAVE_IDE=y
-# CONFIG_HAVE_KPROBES is not set
-# CONFIG_HAVE_KRETPROBES is not set
-CONFIG_HAVE_OPROFILE=y
-# CONFIG_HERMES is not set
-# CONFIG_HOSTAP is not set
-CONFIG_HW_HAS_PCI=y
-CONFIG_HW_RANDOM=y
-# CONFIG_I2C is not set
-# CONFIG_IBM_NEW_EMAC_EMAC4 is not set
-# CONFIG_IBM_NEW_EMAC_RGMII is not set
-# CONFIG_IBM_NEW_EMAC_TAH is not set
-# CONFIG_IBM_NEW_EMAC_ZMII is not set
-CONFIG_ICPLUS_PHY=y
-# CONFIG_IDE is not set
-CONFIG_INITRAMFS_SOURCE=""
-CONFIG_IPV6_NDISC_NODETYPE=y
-# CONFIG_IPW2100 is not set
-# CONFIG_IPW2200 is not set
-CONFIG_IRQ_CPU=y
-# CONFIG_IWLWIFI_LEDS is not set
-# CONFIG_LEDS_ALIX is not set
-CONFIG_LEDS_GPIO=y
-# CONFIG_LEMOTE_FULONG is not set
-# CONFIG_MACH_ALCHEMY is not set
-# CONFIG_MACH_DECSTATION is not set
-# CONFIG_MACH_JAZZ is not set
-# CONFIG_MACH_VR41XX is not set
-# CONFIG_MDIO_BITBANG is not set
-CONFIG_MIPS=y
-# CONFIG_MIPS_ATLAS is not set
-# CONFIG_MIPS_COBALT is not set
-CONFIG_MIPS_L1_CACHE_SHIFT=5
-# CONFIG_MIPS_MACHINE is not set
-# CONFIG_MIPS_MALTA is not set
-CONFIG_MIPS_MT_DISABLED=y
-# CONFIG_MIPS_MT_SMP is not set
-# CONFIG_MIPS_MT_SMTC is not set
-# CONFIG_MIPS_SEAD is not set
-# CONFIG_MIPS_SIM is not set
-CONFIG_MTD=y
-# CONFIG_MTD_ABSENT is not set
-CONFIG_MTD_BLKDEVS=y
-CONFIG_MTD_BLOCK=y
-# CONFIG_MTD_BLOCK2MTD is not set
-CONFIG_MTD_CFI=y
-CONFIG_MTD_CFI_ADV_OPTIONS=y
-CONFIG_MTD_CFI_AMDSTD=y
-# CONFIG_MTD_CFI_BE_BYTE_SWAP is not set
-# CONFIG_MTD_CFI_GEOMETRY is not set
-CONFIG_MTD_CFI_I1=y
-CONFIG_MTD_CFI_I2=y
-# CONFIG_MTD_CFI_I4 is not set
-# CONFIG_MTD_CFI_I8 is not set
-# CONFIG_MTD_CFI_INTELEXT is not set
-# CONFIG_MTD_CFI_LE_BYTE_SWAP is not set
-CONFIG_MTD_CFI_NOSWAP=y
-# CONFIG_MTD_CFI_STAA is not set
-CONFIG_MTD_CFI_UTIL=y
-CONFIG_MTD_CHAR=y
-# CONFIG_MTD_CMDLINE_PARTS is not set
-CONFIG_MTD_COMPLEX_MAPPINGS=y
-# CONFIG_MTD_CONCAT is not set
-# CONFIG_MTD_DEBUG is not set
-# CONFIG_MTD_DOC2000 is not set
-# CONFIG_MTD_DOC2001 is not set
-# CONFIG_MTD_DOC2001PLUS is not set
-CONFIG_MTD_GEN_PROBE=y
-# CONFIG_MTD_JEDECPROBE is not set
-CONFIG_MTD_MAP_BANK_WIDTH_1=y
-# CONFIG_MTD_MAP_BANK_WIDTH_16 is not set
-CONFIG_MTD_MAP_BANK_WIDTH_2=y
-# CONFIG_MTD_MAP_BANK_WIDTH_32 is not set
-CONFIG_MTD_MAP_BANK_WIDTH_4=y
-# CONFIG_MTD_MAP_BANK_WIDTH_8 is not set
-# CONFIG_MTD_MTDRAM is not set
-CONFIG_MTD_MYLOADER_PARTS=y
-# CONFIG_MTD_ONENAND is not set
-# CONFIG_MTD_OTP is not set
-CONFIG_MTD_PARTITIONS=y
-# CONFIG_MTD_PCI is not set
-# CONFIG_MTD_PHRAM is not set
-CONFIG_MTD_PHYSMAP=y
-CONFIG_MTD_PHYSMAP_BANKWIDTH=0
-CONFIG_MTD_PHYSMAP_LEN=0x0
-CONFIG_MTD_PHYSMAP_START=0x0
-# CONFIG_MTD_PLATRAM is not set
-# CONFIG_MTD_PMC551 is not set
-# CONFIG_MTD_RAM is not set
-CONFIG_MTD_REDBOOT_DIRECTORY_BLOCK=-3
-CONFIG_MTD_REDBOOT_PARTS=y
-CONFIG_MTD_REDBOOT_PARTS_READONLY=y
-# CONFIG_MTD_ROM is not set
-# CONFIG_MTD_SLRAM is not set
-CONFIG_MTD_SPIFLASH=y
-CONFIG_MVSWITCH_PHY=y
-# CONFIG_NET_PCI is not set
-# CONFIG_NET_VENDOR_3COM is not set
-# CONFIG_NO_IOPORT is not set
-# CONFIG_OCF_OCF is not set
-CONFIG_PAGEFLAGS_EXTENDED=y
-# CONFIG_PAGE_SIZE_16KB is not set
-CONFIG_PAGE_SIZE_4KB=y
-# CONFIG_PAGE_SIZE_64KB is not set
-# CONFIG_PAGE_SIZE_8KB is not set
-CONFIG_PCI=y
-# CONFIG_PCIPCWATCHDOG is not set
-CONFIG_PCI_DOMAINS=y
-# CONFIG_PCSPKR_PLATFORM is not set
-CONFIG_PHYLIB=y
-# CONFIG_PMC_MSP is not set
-# CONFIG_PMC_YOSEMITE is not set
-# CONFIG_PNX8550_JBS is not set
-# CONFIG_PNX8550_STB810 is not set
-# CONFIG_PRISM54 is not set
-# CONFIG_QSEMI_PHY is not set
-# CONFIG_REALTEK_PHY is not set
-CONFIG_RFKILL_LEDS=y
-CONFIG_RTC_LIB=y
-CONFIG_RWSEM_GENERIC_SPINLOCK=y
-CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y
-# CONFIG_SCSI_WAIT_SCAN is not set
-# CONFIG_SERIAL_8250_EXTENDED is not set
-CONFIG_SERIAL_8250_NR_UARTS=1
-CONFIG_SERIAL_8250_RUNTIME_UARTS=1
-# CONFIG_SGI_IP22 is not set
-# CONFIG_SGI_IP27 is not set
-# CONFIG_SGI_IP28 is not set
-# CONFIG_SGI_IP32 is not set
-# CONFIG_SIBYTE_BIGSUR is not set
-# CONFIG_SIBYTE_CARMEL is not set
-# CONFIG_SIBYTE_CRHINE is not set
-# CONFIG_SIBYTE_CRHONE is not set
-# CONFIG_SIBYTE_LITTLESUR is not set
-# CONFIG_SIBYTE_RHONE is not set
-# CONFIG_SIBYTE_SENTOSA is not set
-# CONFIG_SIBYTE_SWARM is not set
-# CONFIG_SMSC_PHY is not set
-# CONFIG_SOFT_WATCHDOG is not set
-# CONFIG_SPARSEMEM_STATIC is not set
-# CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set
-CONFIG_SSB_POSSIBLE=y
-CONFIG_SYSVIPC_SYSCTL=y
-CONFIG_SYS_HAS_CPU_MIPS32_R1=y
-CONFIG_SYS_SUPPORTS_32BIT_KERNEL=y
-CONFIG_SYS_SUPPORTS_ARBIT_HZ=y
-CONFIG_SYS_SUPPORTS_BIG_ENDIAN=y
-CONFIG_TICK_ONESHOT=y
-# CONFIG_TOSHIBA_JMR3927 is not set
-# CONFIG_TOSHIBA_RBTX4927 is not set
-# CONFIG_TOSHIBA_RBTX4938 is not set
-CONFIG_TRAD_SIGNALS=y
-# CONFIG_USB is not set
-# CONFIG_USB_EHCI_HCD is not set
-CONFIG_USB_STORAGE_CYPRESS_ATACB=y
-CONFIG_USB_SUPPORT=y
-# CONFIG_USB_UHCI_HCD is not set
-# CONFIG_USB_WDM is not set
-# CONFIG_VGASTATE is not set
-# CONFIG_VIDEO_MEDIA is not set
-# CONFIG_VIDEO_V4L2 is not set
-# CONFIG_VIDEO_V4L2_COMMON is not set
-CONFIG_ZONE_DMA_FLAG=0
diff --git a/target/linux/atheros/files-2.6.26/arch/mips/atheros/Kconfig b/target/linux/atheros/files-2.6.26/arch/mips/atheros/Kconfig
deleted file mode 100644
index 953f0cb..0000000
--- a/target/linux/atheros/files-2.6.26/arch/mips/atheros/Kconfig
+++ /dev/null
@@ -1,27 +0,0 @@
-config ATHEROS_AR5312
- bool "Atheros 5312/2312+ support"
- depends on ATHEROS
- default y
-
-config ATHEROS_AR5315
- bool "Atheros 5315/2315+ support"
- depends on ATHEROS
- select DMA_NONCOHERENT
- select CEVT_R4K
- select CSRC_R4K
- select IRQ_CPU
- select SYS_HAS_CPU_MIPS32_R1
- select SYS_SUPPORTS_32BIT_KERNEL
- select SYS_SUPPORTS_BIG_ENDIAN
- select GENERIC_GPIO
- default y
-
-config ATHEROS_AR5315_PCI
- bool "PCI support"
- select HW_HAS_PCI
- select PCI
- select USB_ARCH_HAS_HCD
- select USB_ARCH_HAS_OHCI
- select USB_ARCH_HAS_EHCI
- depends on ATHEROS_AR5315
- default n
diff --git a/target/linux/atheros/files-2.6.26/arch/mips/atheros/Makefile b/target/linux/atheros/files-2.6.26/arch/mips/atheros/Makefile
deleted file mode 100644
index 2c2b991..0000000
--- a/target/linux/atheros/files-2.6.26/arch/mips/atheros/Makefile
+++ /dev/null
@@ -1,13 +0,0 @@
-#
-# 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 (C) 2006 FON Technology, SL.
-# Copyright (C) 2006 Imre Kaloz <kaloz@openwrt.org>
-# Copyright (C) 2006 Felix Fietkau <nbd@openwrt.org>
-#
-
-obj-y += board.o prom.o reset.o
-obj-$(CONFIG_ATHEROS_AR5312) += ar5312/
-obj-$(CONFIG_ATHEROS_AR5315) += ar5315/
diff --git a/target/linux/atheros/files-2.6.26/arch/mips/atheros/ar5312/Makefile b/target/linux/atheros/files-2.6.26/arch/mips/atheros/ar5312/Makefile
deleted file mode 100644
index 6c50d99..0000000
--- a/target/linux/atheros/files-2.6.26/arch/mips/atheros/ar5312/Makefile
+++ /dev/null
@@ -1,11 +0,0 @@
-#
-# 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 (C) 2007 FON Technology, SL.
-# Copyright (C) 2007 Imre Kaloz <kaloz@openwrt.org>
-# Copyright (C) 2007 Felix Fietkau <nbd@openwrt.org>
-#
-
-obj-y := board.o irq.o
diff --git a/target/linux/atheros/files-2.6.26/arch/mips/atheros/ar5312/board.c b/target/linux/atheros/files-2.6.26/arch/mips/atheros/ar5312/board.c
deleted file mode 100644
index 938db11..0000000
--- a/target/linux/atheros/files-2.6.26/arch/mips/atheros/ar5312/board.c
+++ /dev/null
@@ -1,473 +0,0 @@
-/*
- * 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 (C) 2003 Atheros Communications, Inc., All Rights Reserved.
- * Copyright (C) 2006 FON Technology, SL.
- * Copyright (C) 2006 Imre Kaloz <kaloz@openwrt.org>
- * Copyright (C) 2006 Felix Fietkau <nbd@openwrt.org>
- */
-
-/*
- * Platform devices for Atheros SoCs
- */
-
-#include <linux/autoconf.h>
-#include <linux/init.h>
-#include <linux/module.h>
-#include <linux/types.h>
-#include <linux/string.h>
-#include <linux/mtd/physmap.h>
-#include <linux/platform_device.h>
-#include <linux/kernel.h>
-#include <linux/reboot.h>
-#include <asm/bootinfo.h>
-#include <asm/reboot.h>
-#include <asm/time.h>
-#include <asm/irq.h>
-#include <asm/io.h>
-#include <ar531x.h>
-#include <linux/leds.h>
-
-#define NO_PHY 0x1f
-
-static int is_5312 = 0;
-static struct platform_device *ar5312_devs[6];
-
-static struct resource ar5312_eth0_res[] = {
- {
- .name = "eth0_membase",
- .flags = IORESOURCE_MEM,
- .start = KSEG1ADDR(AR531X_ENET0),
- .end = KSEG1ADDR(AR531X_ENET0 + 0x2000),
- },
- {
- .name = "eth0_irq",
- .flags = IORESOURCE_IRQ,
- .start = AR5312_IRQ_ENET0_INTRS,
- .end = AR5312_IRQ_ENET0_INTRS,
- },
-};
-static struct ar531x_eth ar5312_eth0_data = {
- .phy = NO_PHY,
- .mac = 0,
- .reset_base = AR531X_RESET,
- .reset_mac = AR531X_RESET_ENET0,
- .reset_phy = AR531X_RESET_EPHY0,
- .phy_base = KSEG1ADDR(AR531X_ENET0),
-};
-
-static struct resource ar5312_eth1_res[] = {
- {
- .name = "eth1_membase",
- .flags = IORESOURCE_MEM,
- .start = KSEG1ADDR(AR531X_ENET1),
- .end = KSEG1ADDR(AR531X_ENET1 + 0x2000),
- },
- {
- .name = "eth1_irq",
- .flags = IORESOURCE_IRQ,
- .start = AR5312_IRQ_ENET1_INTRS,
- .end = AR5312_IRQ_ENET1_INTRS,
- },
-};
-static struct ar531x_eth ar5312_eth1_data = {
- .phy = NO_PHY,
- .mac = 1,
- .reset_base = AR531X_RESET,
- .reset_mac = AR531X_RESET_ENET1,
- .reset_phy = AR531X_RESET_EPHY1,
- .phy_base = KSEG1ADDR(AR531X_ENET1),
-};
-
-static struct platform_device ar5312_eth[] = {
- {
- .id = 0,
- .name = "ar531x-eth",
- .dev.platform_data = &ar5312_eth0_data,
- .resource = ar5312_eth0_res,
- .num_resources = ARRAY_SIZE(ar5312_eth0_res)
- },
- {
- .id = 1,
- .name = "ar531x-eth",
- .dev.platform_data = &ar5312_eth1_data,
- .resource = ar5312_eth1_res,
- .num_resources = ARRAY_SIZE(ar5312_eth1_res)
- },
-};
-
-
-/*
- * AR2312/3 ethernet uses the PHY of ENET0, but the MAC
- * of ENET1. Atheros calls it 'twisted' for a reason :)
- */
-static struct resource ar231x_eth0_res[] = {
- {
- .name = "eth0_membase",
- .flags = IORESOURCE_MEM,
- .start = KSEG1ADDR(AR531X_ENET1),
- .end = KSEG1ADDR(AR531X_ENET1 + 0x2000),
- },
- {
- .name = "eth0_irq",
- .flags = IORESOURCE_IRQ,
- .start = AR5312_IRQ_ENET1_INTRS,
- .end = AR5312_IRQ_ENET1_INTRS,
- },
-};
-static struct ar531x_eth ar231x_eth0_data = {
- .phy = 1,
- .mac = 1,
- .reset_base = AR531X_RESET,
- .reset_mac = AR531X_RESET_ENET1,
- .reset_phy = AR531X_RESET_EPHY1,
- .phy_base = KSEG1ADDR(AR531X_ENET0),
-};
-static struct platform_device ar231x_eth0 = {
- .id = 0,
- .name = "ar531x-eth",
- .dev.platform_data = &ar231x_eth0_data,
- .resource = ar231x_eth0_res,
- .num_resources = ARRAY_SIZE(ar231x_eth0_res)
-};
-
-
-static struct platform_device ar5312_wmac[] = {
- {
- .id = 0,
- .name = "ar531x-wmac",
- },
- {
- .id = 1,
- .name = "ar531x-wmac",
- },
-};
-
-static struct physmap_flash_data ar5312_flash_data = {
- .width = 2,
-};
-
-static struct resource ar5312_flash_resource = {
- .start = AR531X_FLASH,
- .end = AR531X_FLASH + 0x800000 - 1,
- .flags = IORESOURCE_MEM,
-};
-
-static struct platform_device ar5312_physmap_flash = {
- .name = "physmap-flash",
- .id = 0,
- .dev = {
- .platform_data = &ar5312_flash_data,
- },
- .num_resources = 1,
- .resource = &ar5312_flash_resource,
-};
-
-#ifdef CONFIG_LEDS_GPIO
-static struct gpio_led ar5312_leds[] = {
- { .name = "wlan", .gpio = 0, .active_low = 1, },
-};
-
-static const struct gpio_led_platform_data ar5312_led_data = {
- .num_leds = ARRAY_SIZE(ar5312_leds),
- .leds = (void *) ar5312_leds,
-};
-
-static struct platform_device ar5312_gpio_leds = {
- .name = "leds-gpio",
- .id = -1,
- .dev = {
- .platform_data = (void *) &ar5312_led_data,
- }
-};
-#endif
-
-/*
- * NB: This mapping size is larger than the actual flash size,
- * but this shouldn't be a problem here, because the flash
- * will simply be mapped multiple times.
- */
-static char __init *ar5312_flash_limit(void)
-{
- u32 ctl;
- /*
- * Configure flash bank 0.
- * Assume 8M window size. Flash will be aliased if it's smaller
- */
- ctl = FLASHCTL_E |
- FLASHCTL_AC_8M |
- FLASHCTL_RBLE |
- (0x01 << FLASHCTL_IDCY_S) |
- (0x07 << FLASHCTL_WST1_S) |
- (0x07 << FLASHCTL_WST2_S) |
- (sysRegRead(AR531X_FLASHCTL0) & FLASHCTL_MW);
-
- sysRegWrite(AR531X_FLASHCTL0, ctl);
-
- /* Disable other flash banks */
- sysRegWrite(AR531X_FLASHCTL1,
- sysRegRead(AR531X_FLASHCTL1) & ~(FLASHCTL_E | FLASHCTL_AC));
-
- sysRegWrite(AR531X_FLASHCTL2,
- sysRegRead(AR531X_FLASHCTL2) & ~(FLASHCTL_E | FLASHCTL_AC));
-
- return (char *) KSEG1ADDR(AR531X_FLASH + 0x800000);
-}
-
-static struct ar531x_config __init *init_wmac(int unit)
-{
- struct ar531x_config *config;
-
- config = (struct ar531x_config *) kzalloc(sizeof(struct ar531x_config), GFP_KERNEL);
- config->board = board_config;
- config->radio = radio_config;
- config->unit = unit;
- config->tag = (u_int16_t) ((sysRegRead(AR531X_REV) >> AR531X_REV_WMAC_MIN_S) & AR531X_REV_CHIP);
-
- return config;
-}
-
-int __init ar5312_init_devices(void)
-{
- struct ar531x_boarddata *bcfg;
- char *radio, *c;
- int dev = 0;
- uint32_t fctl = 0;
-
- if (!is_5312)
- return 0;
-
- /* Locate board/radio config data */
- ar531x_find_config(ar5312_flash_limit());
- bcfg = (struct ar531x_boarddata *) board_config;
-
-
- /*
- * Chip IDs and hardware detection for some Atheros
- * models are really broken!
- *
- * Atheros uses a disabled WMAC0 and Silicon ID of AR5312
- * as indication for AR2312, which is otherwise
- * indistinguishable from the real AR5312.
- */
- if (radio_config) {
- radio = radio_config + AR531X_RADIO_MASK_OFF;
- if ((*((u32 *) radio) & AR531X_RADIO0_MASK) == 0)
- bcfg->config |= BD_ISCASPER;
- } else
- radio = NULL;
-
- /* AR2313 has CPU minor rev. 10 */
- if ((current_cpu_data.processor_id & 0xff) == 0x0a)
- mips_machtype = MACH_ATHEROS_AR2313;
-
- /* AR2312 shares the same Silicon ID as AR5312 */
- else if (bcfg->config & BD_ISCASPER)
- mips_machtype = MACH_ATHEROS_AR2312;
-
- /* Everything else is probably AR5312 or compatible */
- else
- mips_machtype = MACH_ATHEROS_AR5312;
-
- ar5312_eth0_data.board_config = board_config;
- ar5312_eth1_data.board_config = board_config;
-
- /* fixup flash width */
- fctl = sysRegRead(AR531X_FLASHCTL) & FLASHCTL_MW;
- switch (fctl) {
- case FLASHCTL_MWx16:
- ar5312_flash_data.width = 2;
- break;
- case FLASHCTL_MWx8:
- default:
- ar5312_flash_data.width = 1;
- break;
- }
-
- ar5312_devs[dev++] = &ar5312_physmap_flash;
-
-#ifdef CONFIG_LEDS_GPIO
- ar5312_leds[0].gpio = bcfg->sysLedGpio;
- ar5312_devs[dev++] = &ar5312_gpio_leds;
-#endif
-
- if (!memcmp(bcfg->enet0Mac, "\xff\xff\xff\xff\xff\xff", 6))
- memcpy(bcfg->enet0Mac, bcfg->enet1Mac, 6);
-
- if (memcmp(bcfg->enet0Mac, bcfg->enet1Mac, 6) == 0) {
- /* ENET0 and ENET1 have the same mac.
- * Increment the one from ENET1 */
- c = bcfg->enet1Mac + 5;
- while ((c >= (char *) bcfg->enet1Mac) && !(++(*c)))
- c--;
- }
-
- switch(mips_machtype) {
- case MACH_ATHEROS_AR5312:
- ar5312_eth0_data.macaddr = bcfg->enet0Mac;
- ar5312_eth1_data.macaddr = bcfg->enet1Mac;
- ar5312_devs[dev++] = &ar5312_eth[0];
- ar5312_devs[dev++] = &ar5312_eth[1];
- break;
- case MACH_ATHEROS_AR2312:
- case MACH_ATHEROS_AR2313:
- ar231x_eth0_data.macaddr = bcfg->enet0Mac;
- ar5312_devs[dev++] = &ar231x_eth0;
- ar5312_flash_data.width = 1;
- break;
- }
-
- if (radio) {
- if (mips_machtype == MACH_ATHEROS_AR5312) {
- if (*((u32 *) radio) & AR531X_RADIO0_MASK) {
- ar5312_wmac[0].dev.platform_data = init_wmac(0);
- ar5312_devs[dev++] = &ar5312_wmac[0];
- }
- }
- if (*((u32 *) radio) & AR531X_RADIO1_MASK) {
- ar5312_wmac[1].dev.platform_data = init_wmac(1);
- ar5312_devs[dev++] = &ar5312_wmac[1];
- }
- }
-
- return platform_add_devices(ar5312_devs, dev);
-}
-
-
-static void ar5312_halt(void)
-{
- while (1);
-}
-
-static void ar5312_power_off(void)
-{
- ar5312_halt();
-}
-
-
-static void ar5312_restart(char *command)
-{
- /* reset the system */
- for(;;) sysRegWrite(AR531X_RESET, AR531X_RESET_SYSTEM);
-}
-
-
-/*
- * This table is indexed by bits 5..4 of the CLOCKCTL1 register
- * to determine the predevisor value.
- */
-static int __initdata CLOCKCTL1_PREDIVIDE_TABLE[4] = {
- 1,
- 2,
- 4,
- 5
-};
-
-
-static unsigned int __init ar5312_cpu_frequency(void)
-{
- unsigned int result;
- unsigned int predivide_mask, predivide_shift;
- unsigned int multiplier_mask, multiplier_shift;
- unsigned int clockCtl1, preDivideSelect, preDivisor, multiplier;
- unsigned int doubler_mask;
- unsigned int wisoc_revision;
-
- /* Trust the bootrom's idea of cpu frequency. */
- if ((result = sysRegRead(AR5312_SCRATCH)))
- return result;
-
- wisoc_revision = (sysRegRead(AR531X_REV) & AR531X_REV_MAJ) >> AR531X_REV_MAJ_S;
- if (wisoc_revision == AR531X_REV_MAJ_AR2313) {
- predivide_mask = AR2313_CLOCKCTL1_PREDIVIDE_MASK;
- predivide_shift = AR2313_CLOCKCTL1_PREDIVIDE_SHIFT;
- multiplier_mask = AR2313_CLOCKCTL1_MULTIPLIER_MASK;
- multiplier_shift = AR2313_CLOCKCTL1_MULTIPLIER_SHIFT;
- doubler_mask = AR2313_CLOCKCTL1_DOUBLER_MASK;
- } else { /* AR5312 and AR2312 */
- predivide_mask = AR5312_CLOCKCTL1_PREDIVIDE_MASK;
- predivide_shift = AR5312_CLOCKCTL1_PREDIVIDE_SHIFT;
- multiplier_mask = AR5312_CLOCKCTL1_MULTIPLIER_MASK;
- multiplier_shift = AR5312_CLOCKCTL1_MULTIPLIER_SHIFT;
- doubler_mask = AR5312_CLOCKCTL1_DOUBLER_MASK;
- }
-
- /*
- * Clocking is derived from a fixed 40MHz input clock.
- *
- * cpuFreq = InputClock * MULT (where MULT is PLL multiplier)
- * sysFreq = cpuFreq / 4 (used for APB clock, serial,
- * flash, Timer, Watchdog Timer)
- *
- * cntFreq = cpuFreq / 2 (use for CPU count/compare)
- *
- * So, for example, with a PLL multiplier of 5, we have
- *
- * cpuFreq = 200MHz
- * sysFreq = 50MHz
- * cntFreq = 100MHz
- *
- * We compute the CPU frequency, based on PLL settings.
- */
-
- clockCtl1 = sysRegRead(AR5312_CLOCKCTL1);
- preDivideSelect = (clockCtl1 & predivide_mask) >> predivide_shift;
- preDivisor = CLOCKCTL1_PREDIVIDE_TABLE[preDivideSelect];
- multiplier = (clockCtl1 & multiplier_mask) >> multiplier_shift;
-
- if (clockCtl1 & doubler_mask) {
- multiplier = multiplier << 1;
- }
- return (40000000 / preDivisor) * multiplier;
-}
-
-static inline int ar5312_sys_frequency(void)
-{
- return ar5312_cpu_frequency() / 4;
-}
-
-static void __init ar5312_time_init(void)
-{
- mips_hpt_frequency = ar5312_cpu_frequency() / 2;
-}
-
-
-void __init ar5312_prom_init(void)
-{
- u32 memsize, memcfg, bank0AC, bank1AC;
-
- is_5312 = 1;
-
- /* Detect memory size */
- memcfg = sysRegRead(AR531X_MEM_CFG1);
- bank0AC = (memcfg & MEM_CFG1_AC0) >> MEM_CFG1_AC0_S;
- bank1AC = (memcfg & MEM_CFG1_AC1) >> MEM_CFG1_AC1_S;
- memsize = (bank0AC ? (1 << (bank0AC+1)) : 0)
- + (bank1AC ? (1 << (bank1AC+1)) : 0);
- memsize <<= 20;
- add_memory_region(0, memsize, BOOT_MEM_RAM);
-
- /* Initialize it to AR5312 for now. Real detection will be done
- * in ar5312_init_devices() */
- mips_machtype = MACH_ATHEROS_AR5312;
-}
-
-void __init ar5312_plat_setup(void)
-{
- /* Clear any lingering AHB errors */
- sysRegRead(AR531X_PROCADDR);
- sysRegRead(AR531X_DMAADDR);
- sysRegWrite(AR531X_WD_CTRL, AR531X_WD_CTRL_IGNORE_EXPIRATION);
-
- board_time_init = ar5312_time_init;
-
- _machine_restart = ar5312_restart;
- _machine_halt = ar5312_halt;
- pm_power_off = ar5312_power_off;
-
- serial_setup(KSEG1ADDR(AR531X_UART0), ar5312_sys_frequency());
-}
-
-arch_initcall(ar5312_init_devices);
diff --git a/target/linux/atheros/files-2.6.26/arch/mips/atheros/ar5312/irq.c b/target/linux/atheros/files-2.6.26/arch/mips/atheros/ar5312/irq.c
deleted file mode 100644
index 0cbdc8e..0000000
--- a/target/linux/atheros/files-2.6.26/arch/mips/atheros/ar5312/irq.c
+++ /dev/null
@@ -1,174 +0,0 @@
-/*
- * 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 (C) 2003 Atheros Communications, Inc., All Rights Reserved.
- * Copyright (C) 2006 FON Technology, SL.
- * Copyright (C) 2006 Imre Kaloz <kaloz@openwrt.org>
- * Copyright (C) 2006 Felix Fietkau <nbd@openwrt.org>
- */
-
-/*
- * Platform devices for Atheros SoCs
- */
-
-#include <linux/init.h>
-#include <linux/module.h>
-#include <linux/types.h>
-#include <linux/string.h>
-#include <linux/kernel.h>
-#include <linux/reboot.h>
-#include <asm/bootinfo.h>
-#include <asm/time.h>
-#include <asm/irq.h>
-#include <asm/io.h>
-
-#include <ar531x.h>
-#include <gpio.h>
-
-/*
- * Called when an interrupt is received, this function
- * determines exactly which interrupt it was, and it
- * invokes the appropriate handler.
- *
- * Implicitly, we also define interrupt priority by
- * choosing which to dispatch first.
- */
-asmlinkage void ar5312_irq_dispatch(void)
-{
- int pending = read_c0_status() & read_c0_cause();
-
- if (pending & CAUSEF_IP2)
- do_IRQ(AR5312_IRQ_WLAN0_INTRS);
- else if (pending & CAUSEF_IP3)
- do_IRQ(AR5312_IRQ_ENET0_INTRS);
- else if (pending & CAUSEF_IP4)
- do_IRQ(AR5312_IRQ_ENET1_INTRS);
- else if (pending & CAUSEF_IP5)
- do_IRQ(AR5312_IRQ_WLAN1_INTRS);
- else if (pending & CAUSEF_IP6) {
- unsigned int ar531x_misc_intrs = sysRegRead(AR531X_ISR) & sysRegRead(AR531X_IMR);
-
- if (ar531x_misc_intrs & AR531X_ISR_TIMER) {
- do_IRQ(AR531X_MISC_IRQ_TIMER);
- (void)sysRegRead(AR531X_TIMER);
- } else if (ar531x_misc_intrs & AR531X_ISR_AHBPROC)
- do_IRQ(AR531X_MISC_IRQ_AHB_PROC);
- else if ((ar531x_misc_intrs & AR531X_ISR_UART0))
- do_IRQ(AR531X_MISC_IRQ_UART0);
- else if (ar531x_misc_intrs & AR531X_ISR_WD)
- do_IRQ(AR531X_MISC_IRQ_WATCHDOG);
- else
- do_IRQ(AR531X_MISC_IRQ_NONE);
- } else if (pending & CAUSEF_IP7) {
- do_IRQ(AR531X_IRQ_CPU_CLOCK);
- }
-}
-
-
-/* Enable the specified AR531X_MISC_IRQ interrupt */
-static void
-ar5312_misc_intr_enable(unsigned int irq)
-{
- unsigned int imr;
-
- imr = sysRegRead(AR531X_IMR);
- imr |= (1 << (irq - AR531X_MISC_IRQ_BASE - 1));
- sysRegWrite(AR531X_IMR, imr);
- sysRegRead(AR531X_IMR); /* flush write buffer */
-}
-
-/* Disable the specified AR531X_MISC_IRQ interrupt */
-static void
-ar5312_misc_intr_disable(unsigned int irq)
-{
- unsigned int imr;
-
- imr = sysRegRead(AR531X_IMR);
- imr &= ~(1 << (irq - AR531X_MISC_IRQ_BASE - 1));
- sysRegWrite(AR531X_IMR, imr);
- sysRegRead(AR531X_IMR); /* flush write buffer */
-}
-
-/* Turn on the specified AR531X_MISC_IRQ interrupt */
-static unsigned int
-ar5312_misc_intr_startup(unsigned int irq)
-{
- ar5312_misc_intr_enable(irq);
- return 0;
-}
-
-/* Turn off the specified AR531X_MISC_IRQ interrupt */
-static void
-ar5312_misc_intr_shutdown(unsigned int irq)
-{
- ar5312_misc_intr_disable(irq);
-}
-
-static void
-ar5312_misc_intr_ack(unsigned int irq)
-{
- ar5312_misc_intr_disable(irq);
-}
-
-static void
-ar5312_misc_intr_end(unsigned int irq)
-{
- if (!(irq_desc[irq].status & (IRQ_DISABLED | IRQ_INPROGRESS)))
- ar5312_misc_intr_enable(irq);
-}
-
-static struct irq_chip ar5312_misc_intr_controller = {
- .typename = "AR5312 misc",
- .startup = ar5312_misc_intr_startup,
- .shutdown = ar5312_misc_intr_shutdown,
- .enable = ar5312_misc_intr_enable,
- .disable = ar5312_misc_intr_disable,
- .ack = ar5312_misc_intr_ack,
- .end = ar5312_misc_intr_end,
-};
-
-static irqreturn_t ar5312_ahb_proc_handler(int cpl, void *dev_id)
-{
- u32 proc1 = sysRegRead(AR531X_PROC1);
- u32 procAddr = sysRegRead(AR531X_PROCADDR); /* clears error state */
- u32 dma1 = sysRegRead(AR531X_DMA1);
- u32 dmaAddr = sysRegRead(AR531X_DMAADDR); /* clears error state */
-
- printk("AHB interrupt: PROCADDR=0x%8.8x PROC1=0x%8.8x DMAADDR=0x%8.8x DMA1=0x%8.8x\n",
- procAddr, proc1, dmaAddr, dma1);
-
- machine_restart("AHB error"); /* Catastrophic failure */
- return IRQ_HANDLED;
-}
-
-
-static struct irqaction ar5312_ahb_proc_interrupt = {
- .handler = ar5312_ahb_proc_handler,
- .flags = IRQF_DISABLED,
- .name = "ar5312_ahb_proc_interrupt",
-};
-
-
-static struct irqaction cascade = {
- .handler = no_action,
- .flags = IRQF_DISABLED,
- .name = "cascade",
-};
-
-void __init ar5312_misc_intr_init(int irq_base)
-{
- int i;
-
- for (i = irq_base; i < irq_base + AR531X_MISC_IRQ_COUNT; i++) {
- irq_desc[i].status = IRQ_DISABLED;
- irq_desc[i].action = NULL;
- irq_desc[i].depth = 1;
- irq_desc[i].chip = &ar5312_misc_intr_controller;
- }
- setup_irq(AR531X_MISC_IRQ_AHB_PROC, &ar5312_ahb_proc_interrupt);
- setup_irq(AR5312_IRQ_MISC_INTRS, &cascade);
-}
-
-
diff --git a/target/linux/atheros/files-2.6.26/arch/mips/atheros/ar5315/Makefile b/target/linux/atheros/files-2.6.26/arch/mips/atheros/ar5315/Makefile
deleted file mode 100644
index 9b90011..0000000
--- a/target/linux/atheros/files-2.6.26/arch/mips/atheros/ar5315/Makefile
+++ /dev/null
@@ -1,12 +0,0 @@
-#
-# 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 (C) 2007 FON Technology, SL.
-# Copyright (C) 2007 Imre Kaloz <kaloz@openwrt.org>
-# Copyright (C) 2007 Felix Fietkau <nbd@openwrt.org>
-#
-
-obj-y := board.o irq.o
-obj-$(CONFIG_ATHEROS_AR5315_PCI) += pci.o
diff --git a/target/linux/atheros/files-2.6.26/arch/mips/atheros/ar5315/board.c b/target/linux/atheros/files-2.6.26/arch/mips/atheros/ar5315/board.c
deleted file mode 100644
index 6ee75a9..0000000
--- a/target/linux/atheros/files-2.6.26/arch/mips/atheros/ar5315/board.c
+++ /dev/null
@@ -1,414 +0,0 @@
-/*
- * 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 (C) 2003 Atheros Communications, Inc., All Rights Reserved.
- * Copyright (C) 2006 FON Technology, SL.
- * Copyright (C) 2006 Imre Kaloz <kaloz@openwrt.org>
- * Copyright (C) 2006 Felix Fietkau <nbd@openwrt.org>
- */
-
-/*
- * Platform devices for Atheros SoCs
- */
-
-#include <linux/autoconf.h>
-#include <linux/init.h>
-#include <linux/module.h>
-#include <linux/types.h>
-#include <linux/string.h>
-#include <linux/platform_device.h>
-#include <linux/kernel.h>
-#include <linux/reboot.h>
-#include <linux/delay.h>
-#include <asm/bootinfo.h>
-#include <asm/reboot.h>
-#include <asm/time.h>
-#include <asm/irq.h>
-#include <asm/io.h>
-#include <ar531x.h>
-#include <linux/leds.h>
-#include <asm/gpio.h>
-
-static int is_5315 = 0;
-
-static struct resource ar5315_eth_res[] = {
- {
- .name = "eth0_membase",
- .flags = IORESOURCE_MEM,
- .start = AR5315_ENET0,
- .end = AR5315_ENET0 + 0x2000,
- },
- {
- .name = "eth0_irq",
- .flags = IORESOURCE_IRQ,
- .start = AR5315_IRQ_ENET0_INTRS,
- .end = AR5315_IRQ_ENET0_INTRS,
- },
-};
-
-static struct ar531x_eth ar5315_eth_data = {
- .phy = 1,
- .mac = 0,
- .reset_base = AR5315_RESET,
- .reset_mac = AR5315_RESET_ENET0,
- .reset_phy = AR5315_RESET_EPHY0,
- .phy_base = AR5315_ENET0
-};
-
-static struct platform_device ar5315_eth = {
- .id = 0,
- .name = "ar531x-eth",
- .dev.platform_data = &ar5315_eth_data,
- .resource = ar5315_eth_res,
- .num_resources = ARRAY_SIZE(ar5315_eth_res)
-};
-
-static struct platform_device ar5315_wmac = {
- .id = 0,
- .name = "ar531x-wmac",
- /* FIXME: add resources */
-};
-
-static struct resource ar5315_spiflash_res[] = {
- {
- .name = "flash_base",
- .flags = IORESOURCE_MEM,
- .start = KSEG1ADDR(AR5315_SPI_READ),
- .end = KSEG1ADDR(AR5315_SPI_READ) + 0x800000,
- },
- {
- .name = "flash_regs",
- .flags = IORESOURCE_MEM,
- .start = 0x11300000,
- .end = 0x11300012,
- },
-};
-
-static struct platform_device ar5315_spiflash = {
- .id = 0,
- .name = "spiflash",
- .resource = ar5315_spiflash_res,
- .num_resources = ARRAY_SIZE(ar5315_spiflash_res)
-};
-
-#ifdef CONFIG_LEDS_GPIO
-static struct gpio_led ar5315_leds[8];
-
-static struct gpio_led_platform_data ar5315_led_data = {
- .num_leds = ARRAY_SIZE(ar5315_leds),
- .leds = (void *) ar5315_leds,
-};
-
-static struct platform_device ar5315_gpio_leds = {
- .name = "leds-gpio",
- .id = -1,
- .dev = {
- .platform_data = (void *) &ar5315_led_data,
- }
-};
-#endif
-
-static struct platform_device ar5315_wdt =
-{
- .id = 0,
- .name = "ar2315_wdt",
-};
-
-static __initdata struct platform_device *ar5315_devs[6];
-
-static void *flash_regs;
-
-static inline __u32 spiflash_regread32(int reg)
-{
- volatile __u32 *data = (__u32 *)(flash_regs + reg);
-
- return (*data);
-}
-
-static inline void spiflash_regwrite32(int reg, __u32 data)
-{
- volatile __u32 *addr = (__u32 *)(flash_regs + reg);
-
- *addr = data;
-}
-
-#define SPI_FLASH_CTL 0x00
-#define SPI_FLASH_OPCODE 0x04
-#define SPI_FLASH_DATA 0x08
-
-static __u8 spiflash_probe(void)
-{
- __u32 reg;
-
- do {
- reg = spiflash_regread32(SPI_FLASH_CTL);
- } while (reg & SPI_CTL_BUSY);
-
- spiflash_regwrite32(SPI_FLASH_OPCODE, 0xab);
-
- reg = (reg & ~SPI_CTL_TX_RX_CNT_MASK) | 4 |
- (1 << 4) | SPI_CTL_START;
-
- spiflash_regwrite32(SPI_FLASH_CTL, reg);
-
- do {
- reg = spiflash_regread32(SPI_FLASH_CTL);
- } while (reg & SPI_CTL_BUSY);
-
- reg = (__u32) spiflash_regread32(SPI_FLASH_DATA);
- reg &= 0xff;
-
- return (u8) reg;
-}
-
-
-#define STM_8MBIT_SIGNATURE 0x13
-#define STM_16MBIT_SIGNATURE 0x14
-#define STM_32MBIT_SIGNATURE 0x15
-#define STM_64MBIT_SIGNATURE 0x16
-#define STM_128MBIT_SIGNATURE 0x17
-
-
-static char __init *ar5315_flash_limit(void)
-{
- u8 sig;
- u32 flash_size = 0;
-
- /* probe the flash chip size */
- flash_regs = ioremap_nocache(ar5315_spiflash_res[1].start, ar5315_spiflash_res[1].end - ar5315_spiflash_res[1].start);
- sig = spiflash_probe();
- iounmap(flash_regs);
-
- switch(sig) {
- case STM_8MBIT_SIGNATURE:
- flash_size = 0x00100000;
- break;
- case STM_16MBIT_SIGNATURE:
- flash_size = 0x00200000;
- break;
- case STM_32MBIT_SIGNATURE:
- flash_size = 0x00400000;
- break;
- case STM_64MBIT_SIGNATURE:
- flash_size = 0x00800000;
- break;
- case STM_128MBIT_SIGNATURE:
- flash_size = 0x01000000;
- break;
- }
-
- ar5315_spiflash_res[0].end = ar5315_spiflash_res[0].start + flash_size;
- return (char *) ar5315_spiflash_res[0].end;
-}
-
-int __init ar5315_init_devices(void)
-{
- struct ar531x_config *config;
- struct ar531x_boarddata *bcfg;
- int dev = 0;
-#ifdef CONFIG_LEDS_GPIO
- int i;
- char *tmp;
-#endif
-
- if (!is_5315)
- return 0;
-
- /* Find board configuration */
- ar531x_find_config(ar5315_flash_limit());
- bcfg = (struct ar531x_boarddata *) board_config;
-
- config = (struct ar531x_config *) kzalloc(sizeof(struct ar531x_config), GFP_KERNEL);
- config->board = board_config;
- config->radio = radio_config;
- config->unit = 0;
- config->tag = (u_int16_t) (sysRegRead(AR5315_SREV) & AR5315_REV_CHIP);
-
- ar5315_eth_data.board_config = board_config;
- ar5315_eth_data.macaddr = bcfg->enet0Mac;
- ar5315_wmac.dev.platform_data = config;
-
- ar5315_devs[dev++] = &ar5315_eth;
- ar5315_devs[dev++] = &ar5315_wmac;
- ar5315_devs[dev++] = &ar5315_spiflash;
- ar5315_devs[dev++] = &ar5315_wdt;
-
-#ifdef CONFIG_LEDS_GPIO
- ar5315_led_data.num_leds = 0;
- for(i = 1; i < 8; i++)
- {
- if((i != AR5315_RESET_GPIO) && (i != bcfg->resetConfigGpio))
- {
- if(i == bcfg->sysLedGpio)
- {
- tmp = kstrdup("wlan", GFP_KERNEL);
- } else {
- tmp = kmalloc(6, GFP_KERNEL);
- if(tmp)
- sprintf((char*)tmp, "gpio%d", i);
- }
- if(tmp)
- {
- ar5315_leds[ar5315_led_data.num_leds].name = tmp;
- ar5315_leds[ar5315_led_data.num_leds].gpio = i;
- ar5315_leds[ar5315_led_data.num_leds].active_low = 0;
- ar5315_led_data.num_leds++;
- } else {
- printk("failed to alloc led string\n");
- continue;
- }
- }
- }
- ar5315_devs[dev++] = &ar5315_gpio_leds;
-#endif
-
- return platform_add_devices(ar5315_devs, dev);
-}
-
-static void ar5315_halt(void)
-{
- while (1);
-}
-
-static void ar5315_power_off(void)
-{
- ar5315_halt();
-}
-
-
-static void ar5315_restart(char *command)
-{
- void (*mips_reset_vec)(void) = (void *) 0xbfc00000;
-
- /* reset the system */
- sysRegWrite(AR5315_COLD_RESET,AR5317_RESET_SYSTEM);
-
- /* Cold reset does not work on the AR2315/6, use the GPIO reset bits a workaround.
- * give it some time to attempt a gpio based hardware reset
- * (atheros reference design workaround) */
- gpio_direction_output(AR5315_RESET_GPIO, 0);
- mdelay(100);
-
- /* Some boards (e.g. Senao EOC-2610) don't implement the reset logic
- * workaround. Attempt to jump to the mips reset location -
- * the boot loader itself might be able to recover the system */
- mips_reset_vec();
-}
-
-
-/*
- * This table is indexed by bits 5..4 of the CLOCKCTL1 register
- * to determine the predevisor value.
- */
-static int __initdata CLOCKCTL1_PREDIVIDE_TABLE[4] = {
- 1,
- 2,
- 4,
- 5
-};
-
-static int __initdata PLLC_DIVIDE_TABLE[5] = {
- 2,
- 3,
- 4,
- 6,
- 3
-};
-
-static unsigned int __init
-ar5315_sys_clk(unsigned int clockCtl)
-{
- unsigned int pllcCtrl,cpuDiv;
- unsigned int pllcOut,refdiv,fdiv,divby2;
- unsigned int clkDiv;
-
- pllcCtrl = sysRegRead(AR5315_PLLC_CTL);
- refdiv = (pllcCtrl & PLLC_REF_DIV_M) >> PLLC_REF_DIV_S;
- refdiv = CLOCKCTL1_PREDIVIDE_TABLE[refdiv];
- fdiv = (pllcCtrl & PLLC_FDBACK_DIV_M) >> PLLC_FDBACK_DIV_S;
- divby2 = (pllcCtrl & PLLC_ADD_FDBACK_DIV_M) >> PLLC_ADD_FDBACK_DIV_S;
- divby2 += 1;
- pllcOut = (40000000/refdiv)*(2*divby2)*fdiv;
-
-
- /* clkm input selected */
- switch(clockCtl & CPUCLK_CLK_SEL_M) {
- case 0:
- case 1:
- clkDiv = PLLC_DIVIDE_TABLE[(pllcCtrl & PLLC_CLKM_DIV_M) >> PLLC_CLKM_DIV_S];
- break;
- case 2:
- clkDiv = PLLC_DIVIDE_TABLE[(pllcCtrl & PLLC_CLKC_DIV_M) >> PLLC_CLKC_DIV_S];
- break;
- default:
- pllcOut = 40000000;
- clkDiv = 1;
- break;
- }
- cpuDiv = (clockCtl & CPUCLK_CLK_DIV_M) >> CPUCLK_CLK_DIV_S;
- cpuDiv = cpuDiv * 2 ?: 1;
- return (pllcOut/(clkDiv * cpuDiv));
-}
-
-static inline unsigned int ar5315_cpu_frequency(void)
-{
- return ar5315_sys_clk(sysRegRead(AR5315_CPUCLK));
-}
-
-static inline unsigned int ar5315_apb_frequency(void)
-{
- return ar5315_sys_clk(sysRegRead(AR5315_AMBACLK));
-}
-
-static void __init ar5315_time_init(void)
-{
- mips_hpt_frequency = ar5315_cpu_frequency() / 2;
-}
-
-void __init ar5315_prom_init(void)
-{
- u32 memsize, memcfg, devid;
-
- is_5315 = 1;
- memcfg = sysRegRead(AR5315_MEM_CFG);
- memsize = 1 + ((memcfg & SDRAM_DATA_WIDTH_M) >> SDRAM_DATA_WIDTH_S);
- memsize <<= 1 + ((memcfg & SDRAM_COL_WIDTH_M) >> SDRAM_COL_WIDTH_S);
- memsize <<= 1 + ((memcfg & SDRAM_ROW_WIDTH_M) >> SDRAM_ROW_WIDTH_S);
- memsize <<= 3;
- add_memory_region(0, memsize, BOOT_MEM_RAM);
-
- /* Detect the hardware based on the device ID */
- devid = sysRegRead(AR5315_SREV) & AR5315_REV_CHIP;
- switch(devid) {
- case 0x90:
- case 0x91:
- mips_machtype = MACH_ATHEROS_AR2317;
- break;
- default:
- mips_machtype = MACH_ATHEROS_AR2315;
- break;
- }
-}
-
-void __init ar5315_plat_setup(void)
-{
- unsigned int config = read_c0_config();
-
- /* Clear any lingering AHB errors */
- write_c0_config(config & ~0x3);
- sysRegWrite(AR5315_AHB_ERR0,AHB_ERROR_DET);
- sysRegRead(AR5315_AHB_ERR1);
- sysRegWrite(AR5315_WDC, WDC_IGNORE_EXPIRATION);
-
- board_time_init = ar5315_time_init;
-
- _machine_restart = ar5315_restart;
- _machine_halt = ar5315_halt;
- pm_power_off = ar5315_power_off;
-
- serial_setup(KSEG1ADDR(AR5315_UART0), ar5315_apb_frequency());
-}
-
-arch_initcall(ar5315_init_devices);
diff --git a/target/linux/atheros/files-2.6.26/arch/mips/atheros/ar5315/irq.c b/target/linux/atheros/files-2.6.26/arch/mips/atheros/ar5315/irq.c
deleted file mode 100644
index 581b1a4a..0000000
--- a/target/linux/atheros/files-2.6.26/arch/mips/atheros/ar5315/irq.c
+++ /dev/null
@@ -1,359 +0,0 @@
-/*
- * 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 (C) 2003 Atheros Communications, Inc., All Rights Reserved.
- * Copyright (C) 2006 FON Technology, SL.
- * Copyright (C) 2006 Imre Kaloz <kaloz@openwrt.org>
- * Copyright (C) 2006 Felix Fietkau <nbd@openwrt.org>
- */
-
-/*
- * Platform devices for Atheros SoCs
- */
-
-#include <linux/init.h>
-#include <linux/module.h>
-#include <linux/types.h>
-#include <linux/string.h>
-#include <linux/kernel.h>
-#include <linux/reboot.h>
-#include <linux/interrupt.h>
-#include <linux/bitops.h>
-#include <asm/bootinfo.h>
-#include <asm/irq_cpu.h>
-#include <asm/io.h>
-
-#include <ar531x.h>
-#include <gpio.h>
-
-static u32 gpiointmask = 0, gpiointval = 0;
-
-static inline void ar5315_gpio_irq(void)
-{
- u32 pend;
- sysRegWrite(AR5315_ISR, sysRegRead(AR5315_IMR) | ~AR5315_ISR_GPIO);
-
- /* only do one gpio interrupt at a time */
- pend = (sysRegRead(AR5315_GPIO_DI) ^ gpiointval) & gpiointmask;
- if (!pend)
- return;
-
- do_IRQ(AR531X_GPIO_IRQ_BASE + fls(pend) - 1);
-}
-
-
-/*
- * Called when an interrupt is received, this function
- * determines exactly which interrupt it was, and it
- * invokes the appropriate handler.
- *
- * Implicitly, we also define interrupt priority by
- * choosing which to dispatch first.
- */
-asmlinkage void ar5315_irq_dispatch(void)
-{
- int pending = read_c0_status() & read_c0_cause();
-
- if (pending & CAUSEF_IP3)
- do_IRQ(AR5315_IRQ_WLAN0_INTRS);
- else if (pending & CAUSEF_IP4)
- do_IRQ(AR5315_IRQ_ENET0_INTRS);
-#ifdef CONFIG_PCI
- else if (pending & CAUSEF_IP5)
- ar5315_pci_irq(AR5315_IRQ_LCBUS_PCI);
-#endif
- else if (pending & CAUSEF_IP2) {
- unsigned int ar531x_misc_intrs = sysRegRead(AR5315_ISR) & sysRegRead(AR5315_IMR);
-
- if (ar531x_misc_intrs & AR5315_ISR_SPI)
- do_IRQ(AR531X_MISC_IRQ_SPI);
- else if (ar531x_misc_intrs & AR5315_ISR_TIMER)
- do_IRQ(AR531X_MISC_IRQ_TIMER);
- else if (ar531x_misc_intrs & AR5315_ISR_AHB)
- do_IRQ(AR531X_MISC_IRQ_AHB_PROC);
- else if (ar531x_misc_intrs & AR5315_ISR_GPIO)
- ar5315_gpio_irq();
- else if (ar531x_misc_intrs & AR5315_ISR_UART0)
- do_IRQ(AR531X_MISC_IRQ_UART0);
- else if (ar531x_misc_intrs & AR5315_ISR_WD)
- do_IRQ(AR531X_MISC_IRQ_WATCHDOG);
- else
- do_IRQ(AR531X_MISC_IRQ_NONE);
- } else if (pending & CAUSEF_IP7)
- do_IRQ(AR531X_IRQ_CPU_CLOCK);
-}
-
-#ifdef CONFIG_PCI
-static inline void pci_abort_irq(void)
-{
- sysRegWrite(AR5315_PCI_INT_STATUS, AR5315_PCI_ABORT_INT);
- (void)sysRegRead(AR5315_PCI_INT_STATUS); /* flush write to hardware */
-}
-
-static inline void pci_ack_irq(void)
-{
- sysRegWrite(AR5315_PCI_INT_STATUS, AR5315_PCI_EXT_INT);
- (void)sysRegRead(AR5315_PCI_INT_STATUS); /* flush write to hardware */
-}
-
-void ar5315_pci_irq(int irq)
-{
- if (sysRegRead(AR5315_PCI_INT_STATUS) == AR5315_PCI_ABORT_INT)
- pci_abort_irq();
- else {
- do_IRQ(irq);
- pci_ack_irq();
- }
-}
-#endif
-
-static void ar5315_gpio_intr_enable(unsigned int irq)
-{
- u32 gpio, mask;
- gpio = irq - AR531X_GPIO_IRQ_BASE;
- mask = 1 << gpio;
- gpiointmask |= mask;
-
- /* reconfigure GPIO line as input */
- sysRegMask(AR5315_GPIO_CR, AR5315_GPIO_CR_M(gpio), AR5315_GPIO_CR_I(gpio));
-
- /* Enable interrupt with edge detection */
- sysRegMask(AR5315_GPIO_INT, AR5315_GPIO_INT_M | AR5315_GPIO_INT_LVL_M, gpio | AR5315_GPIO_INT_LVL(3));
-}
-
-static void ar5315_gpio_intr_disable(unsigned int irq)
-{
- u32 gpio, mask;
- gpio = irq - AR531X_GPIO_IRQ_BASE;
- mask = 1 << gpio;
-
- gpiointmask &= ~mask;
-
- /* Disable interrupt with edge detection */
- sysRegMask(AR5315_GPIO_INT, AR5315_GPIO_INT_M | AR5315_GPIO_INT_LVL_M, gpio | AR5315_GPIO_INT_LVL(0));
-}
-
-/* Turn on the specified AR531X_MISC_IRQ interrupt */
-static unsigned int ar5315_gpio_intr_startup(unsigned int irq)
-{
- ar5315_gpio_intr_enable(irq);
- return 0;
-}
-
-/* Turn off the specified AR531X_MISC_IRQ interrupt */
-static void
-ar5315_gpio_intr_shutdown(unsigned int irq)
-{
- ar5315_gpio_intr_disable(irq);
-}
-
-static void
-ar5315_gpio_intr_ack(unsigned int irq)
-{
- ar5315_gpio_intr_disable(irq);
-}
-
-static void
-ar5315_gpio_intr_end(unsigned int irq)
-{
- if (!(irq_desc[irq].status & (IRQ_DISABLED | IRQ_INPROGRESS)))
- ar5315_gpio_intr_enable(irq);
-}
-
-static struct irq_chip ar5315_gpio_intr_controller = {
- .typename = "AR5315 GPIO",
- .startup = ar5315_gpio_intr_startup,
- .shutdown = ar5315_gpio_intr_shutdown,
- .enable = ar5315_gpio_intr_enable,
- .disable = ar5315_gpio_intr_disable,
- .ack = ar5315_gpio_intr_ack,
- .end = ar5315_gpio_intr_end,
-};
-
-
-/* Enable the specified AR531X_MISC_IRQ interrupt */
-static void
-ar5315_misc_intr_enable(unsigned int irq)
-{
- unsigned int imr;
-
- imr = sysRegRead(AR5315_IMR);
- switch(irq)
- {
- case AR531X_MISC_IRQ_SPI:
- imr |= AR5315_ISR_SPI;
- break;
-
- case AR531X_MISC_IRQ_TIMER:
- imr |= AR5315_ISR_TIMER;
- break;
-
- case AR531X_MISC_IRQ_AHB_PROC:
- imr |= AR5315_ISR_AHB;
- break;
-
- case AR531X_MISC_IRQ_AHB_DMA:
- imr |= 0/* ?? */;
- break;
-
- case AR531X_MISC_IRQ_GPIO:
- imr |= AR5315_ISR_GPIO;
- break;
-
- case AR531X_MISC_IRQ_UART0:
- imr |= AR5315_ISR_UART0;
- break;
-
-
- case AR531X_MISC_IRQ_WATCHDOG:
- imr |= AR5315_ISR_WD;
- break;
-
- case AR531X_MISC_IRQ_LOCAL:
- imr |= 0/* ?? */;
- break;
-
- }
- sysRegWrite(AR5315_IMR, imr);
- imr=sysRegRead(AR5315_IMR); /* flush write buffer */
-}
-
-/* Disable the specified AR531X_MISC_IRQ interrupt */
-static void
-ar5315_misc_intr_disable(unsigned int irq)
-{
- unsigned int imr;
-
- imr = sysRegRead(AR5315_IMR);
- switch(irq)
- {
- case AR531X_MISC_IRQ_SPI:
- imr &= ~AR5315_ISR_SPI;
- break;
-
- case AR531X_MISC_IRQ_TIMER:
- imr &= (~AR5315_ISR_TIMER);
- break;
-
- case AR531X_MISC_IRQ_AHB_PROC:
- imr &= (~AR5315_ISR_AHB);
- break;
-
- case AR531X_MISC_IRQ_AHB_DMA:
- imr &= 0/* ?? */;
- break;
-
- case AR531X_MISC_IRQ_GPIO:
- imr &= ~AR5315_ISR_GPIO;
- break;
-
- case AR531X_MISC_IRQ_UART0:
- imr &= (~AR5315_ISR_UART0);
- break;
-
- case AR531X_MISC_IRQ_WATCHDOG:
- imr &= (~AR5315_ISR_WD);
- break;
-
- case AR531X_MISC_IRQ_LOCAL:
- imr &= ~0/* ?? */;
- break;
-
- }
- sysRegWrite(AR5315_IMR, imr);
- sysRegRead(AR5315_IMR); /* flush write buffer */
-}
-
-/* Turn on the specified AR531X_MISC_IRQ interrupt */
-static unsigned int
-ar5315_misc_intr_startup(unsigned int irq)
-{
- ar5315_misc_intr_enable(irq);
- return 0;
-}
-
-/* Turn off the specified AR531X_MISC_IRQ interrupt */
-static void
-ar5315_misc_intr_shutdown(unsigned int irq)
-{
- ar5315_misc_intr_disable(irq);
-}
-
-static void
-ar5315_misc_intr_ack(unsigned int irq)
-{
- ar5315_misc_intr_disable(irq);
-}
-
-static void
-ar5315_misc_intr_end(unsigned int irq)
-{
- if (!(irq_desc[irq].status & (IRQ_DISABLED | IRQ_INPROGRESS)))
- ar5315_misc_intr_enable(irq);
-}
-
-static struct irq_chip ar5315_misc_intr_controller = {
- .typename = "AR5315 misc",
- .startup = ar5315_misc_intr_startup,
- .shutdown = ar5315_misc_intr_shutdown,
- .enable = ar5315_misc_intr_enable,
- .disable = ar5315_misc_intr_disable,
- .ack = ar5315_misc_intr_ack,
- .end = ar5315_misc_intr_end,
-};
-
-static irqreturn_t ar5315_ahb_proc_handler(int cpl, void *dev_id)
-{
- sysRegWrite(AR5315_AHB_ERR0,AHB_ERROR_DET);
- sysRegRead(AR5315_AHB_ERR1);
-
- printk("AHB fatal error\n");
- machine_restart("AHB error"); /* Catastrophic failure */
-
- return IRQ_HANDLED;
-}
-
-static struct irqaction ar5315_ahb_proc_interrupt = {
- .handler = ar5315_ahb_proc_handler,
- .flags = IRQF_DISABLED,
- .name = "ar5315_ahb_proc_interrupt",
-};
-
-
-static struct irqaction cascade = {
- .handler = no_action,
- .flags = IRQF_DISABLED,
- .name = "cascade",
-};
-
-static void ar5315_gpio_intr_init(int irq_base)
-{
- int i;
-
- for (i = irq_base; i < irq_base + AR531X_GPIO_IRQ_COUNT; i++) {
- irq_desc[i].status = IRQ_DISABLED;
- irq_desc[i].action = NULL;
- irq_desc[i].depth = 1;
- irq_desc[i].chip = &ar5315_gpio_intr_controller;
- }
- setup_irq(AR531X_MISC_IRQ_GPIO, &cascade);
- gpiointval = sysRegRead(AR5315_GPIO_DI);
-}
-
-void ar5315_misc_intr_init(int irq_base)
-{
- int i;
-
- for (i = irq_base; i < irq_base + AR531X_MISC_IRQ_COUNT; i++) {
- irq_desc[i].status = IRQ_DISABLED;
- irq_desc[i].action = NULL;
- irq_desc[i].depth = 1;
- irq_desc[i].chip = &ar5315_misc_intr_controller;
- }
- setup_irq(AR531X_MISC_IRQ_AHB_PROC, &ar5315_ahb_proc_interrupt);
- setup_irq(AR5315_IRQ_MISC_INTRS, &cascade);
- ar5315_gpio_intr_init(AR531X_GPIO_IRQ_BASE);
-}
-
diff --git a/target/linux/atheros/files-2.6.26/arch/mips/atheros/ar5315/pci.c b/target/linux/atheros/files-2.6.26/arch/mips/atheros/ar5315/pci.c
deleted file mode 100644
index 166fa1c..0000000
--- a/target/linux/atheros/files-2.6.26/arch/mips/atheros/ar5315/pci.c
+++ /dev/null
@@ -1,265 +0,0 @@
-/*
- * 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, MA 02111-1307, USA.
- */
-
-#include <linux/types.h>
-#include <linux/pci.h>
-#include <linux/kernel.h>
-#include <linux/init.h>
-#include <linux/mm.h>
-#include <linux/spinlock.h>
-#include <linux/delay.h>
-#include <linux/irq.h>
-#include <asm/bootinfo.h>
-#include <asm/paccess.h>
-#include <asm/irq_cpu.h>
-#include <asm/io.h>
-#include "ar531x.h"
-
-#define AR531X_MEM_BASE 0x80800000UL
-#define AR531X_MEM_SIZE 0x00ffffffUL
-#define AR531X_IO_SIZE 0x00007fffUL
-#define IDSEL_SHIFT 13
-
-static spinlock_t ar531x_pci_lock = SPIN_LOCK_UNLOCKED;
-static u32 cfgaddr;
-
-static int config_access(int busno, int dev, int func, int where, int size, u32 ptr, int write)
-{
- u32 address; /* Address to read from */
- u32 reg;
- unsigned long flags;
- int ret = -1;
- if ((busno != 0) || ((dev != 0) && (dev != 3)) || (func > 2))
- return ret;
-
- spin_lock_irqsave(&ar531x_pci_lock, flags);
-
- /* Select Configuration access */
- reg = sysRegRead(AR5315_PCI_MISC_CONFIG);
- reg |= AR5315_PCIMISC_CFG_SEL;
- sysRegWrite(AR5315_PCI_MISC_CONFIG, reg);
- (void)sysRegRead(AR5315_PCI_MISC_CONFIG);
-
- address = (u32)cfgaddr + (1 << (IDSEL_SHIFT + dev)) + (func << 8) + where;
-
- if (size == 1)
- address ^= 0x3;
- else if (size == 2)
- address ^= 0x2;
-
- if (write) {
- if (size == 1)
- ret = put_dbe(ptr, (u8 *) address);
- else if (size == 2)
- ret = put_dbe(ptr, (u16 *) address);
- else if (size == 4)
- ret = put_dbe(ptr, (u32 *) address);
- } else {
- if (size == 1)
- ret = get_dbe(*((u32 *)ptr), (u8 *) address);
- else if (size == 2)
- ret = get_dbe(*((u32 *)ptr), (u16 *) address);
- else if (size == 4)
- ret = get_dbe(*((u32 *)ptr), (u32 *) address);
- }
-
- /* Select Memory access */
- reg = sysRegRead(AR5315_PCI_MISC_CONFIG);
- reg &= ~AR5315_PCIMISC_CFG_SEL;
- sysRegWrite(AR5315_PCI_MISC_CONFIG, reg);
- (void)sysRegRead(AR5315_PCI_MISC_CONFIG);
-
- spin_unlock_irqrestore(&ar531x_pci_lock, flags);
-
- if (ret) {
- *((u32 *)ptr) = 0xffffffff;
- return PCIBIOS_DEVICE_NOT_FOUND;
- }
-
- return PCIBIOS_SUCCESSFUL;
-}
-
-static int ar531x_pci_read(struct pci_bus *bus, unsigned int devfn, int where, int size, u32 * value)
-{
- return config_access(bus->number, PCI_SLOT(devfn), PCI_FUNC(devfn), where, size, (u32) value, 0);
-}
-
-static int ar531x_pci_write(struct pci_bus *bus, unsigned int devfn, int where, int size, u32 value)
-{
- return config_access(bus->number, PCI_SLOT(devfn), PCI_FUNC(devfn), where, size, value, 1);
-}
-
-struct pci_ops ar531x_pci_ops = {
- .read = ar531x_pci_read,
- .write = ar531x_pci_write,
-};
-
-static struct resource ar531x_mem_resource = {
- .name = "AR531x PCI MEM",
- .start = AR531X_MEM_BASE,
- .end = AR531X_MEM_BASE + AR531X_MEM_SIZE - AR531X_IO_SIZE - 1 + 0x4000000,
- .flags = IORESOURCE_MEM,
-};
-
-static struct resource ar531x_io_resource = {
- .name = "AR531x PCI I/O",
- .start = AR531X_MEM_BASE + AR531X_MEM_SIZE - AR531X_IO_SIZE,
- .end = AR531X_MEM_BASE + AR531X_MEM_SIZE - 1,
- .flags = IORESOURCE_IO,
-};
-
-struct pci_controller ar531x_pci_controller = {
- .pci_ops = &ar531x_pci_ops,
- .mem_resource = &ar531x_mem_resource,
- .io_resource = &ar531x_io_resource,
- .mem_offset = 0x00000000UL,
- .io_offset = 0x00000000UL,
-};
-
-int pcibios_map_irq(const struct pci_dev *dev, u8 slot, u8 pin)
-{
- return AR5315_IRQ_LCBUS_PCI;
-}
-
-int pcibios_plat_dev_init(struct pci_dev *dev)
-{
- u32 reg;
-
- pci_write_config_byte(dev, PCI_INTERRUPT_LINE, 5);
- pci_write_config_word(dev, 0x40, 0);
-
- /* Clear any pending Abort or external Interrupts
- * and enable interrupt processing */
- reg = sysRegRead(AR5315_PCI_INTEN_REG);
- reg &= ~AR5315_PCI_INT_ENABLE;
- sysRegWrite(AR5315_PCI_INTEN_REG, reg);
-
- reg = sysRegRead(AR5315_PCI_INT_STATUS);
- reg |= (AR5315_PCI_ABORT_INT | AR5315_PCI_EXT_INT);
- sysRegWrite(AR5315_PCI_INT_STATUS, reg);
-
- reg = sysRegRead(AR5315_PCI_INT_MASK);
- reg |= (AR5315_PCI_EXT_INT | AR5315_PCI_ABORT_INT);
- sysRegWrite(AR5315_PCI_INT_MASK, reg);
-
- reg = sysRegRead(AR5315_PCI_INTEN_REG);
- reg |= AR5315_PCI_INT_ENABLE;
- sysRegWrite(AR5315_PCI_INTEN_REG, reg);
-
- return 0;
-}
-
-static void ar5315_pci_fixup(struct pci_dev *dev)
-{
- struct pci_bus *bus = dev->bus;
-
- if ((PCI_SLOT(dev->devfn) != 3) || (PCI_FUNC(dev->devfn) != 0) || (bus->number != 0))
- return;
-
-#define _DEV bus->number, PCI_SLOT(dev->devfn), PCI_FUNC(dev->devfn)
- printk("PCI: fixing up device %d,%d,%d\n", _DEV);
- /* fix up mbars */
- config_access(_DEV, PCI_BASE_ADDRESS_0, 4, HOST_PCI_MBAR0, 1);
- config_access(_DEV, PCI_BASE_ADDRESS_1, 4, HOST_PCI_MBAR1, 1);
- config_access(_DEV, PCI_BASE_ADDRESS_2, 4, HOST_PCI_MBAR2, 1);
- config_access(_DEV, PCI_COMMAND, 4,
- PCI_COMMAND_MEMORY|PCI_COMMAND_MASTER|PCI_COMMAND_SPECIAL|
- PCI_COMMAND_INVALIDATE|PCI_COMMAND_PARITY|PCI_COMMAND_SERR|
- PCI_COMMAND_FAST_BACK, 1);
-#undef _DEV
-}
-DECLARE_PCI_FIXUP_HEADER(PCI_ANY_ID, PCI_ANY_ID, ar5315_pci_fixup);
-
-int __init ar5315_pci_init(void)
-{
- u32 reg;
-
- if (mips_machtype != MACH_ATHEROS_AR2315)
- return -ENODEV;
-
- printk("AR531x PCI init... \n");
-
- cfgaddr = (u32) ioremap_nocache(0x80000000, 1*1024*1024); /* Remap PCI config space */
- ar531x_pci_controller.io_map_base =
- (unsigned long) ioremap_nocache(AR531X_MEM_BASE + AR531X_MEM_SIZE, AR531X_IO_SIZE);
- set_io_port_base(ar531x_pci_controller.io_map_base); /* PCI I/O space */
-
- reg = sysRegRead(AR5315_RESET);
- sysRegWrite(AR5315_RESET, reg | AR5315_RESET_PCIDMA);
-
- udelay(10*1000);
-
- sysRegWrite(AR5315_RESET, reg & ~AR5315_RESET_PCIDMA);
- sysRegRead(AR5315_RESET); /* read after */
-
- udelay(10*1000);
-
- reg = sysRegRead(AR5315_ENDIAN_CTL);
- reg |= AR5315_CONFIG_PCIAHB | AR5315_CONFIG_PCIAHB_BRIDGE;
-
- sysRegWrite(AR5315_ENDIAN_CTL, reg);
-
- reg = sysRegRead(AR5315_PCICLK);
- reg = 4;
- sysRegWrite(AR5315_PCICLK, reg);
-
- reg = sysRegRead(AR5315_AHB_ARB_CTL);
- reg |= (ARB_PCI);
- sysRegWrite(AR5315_AHB_ARB_CTL, reg);
-
- reg = sysRegRead(AR5315_IF_CTL);
- reg &= ~(IF_PCI_CLK_MASK | IF_MASK);
- reg |= (IF_PCI | IF_PCI_HOST | IF_PCI_INTR | (IF_PCI_CLK_OUTPUT_CLK << IF_PCI_CLK_SHIFT));
-
- sysRegWrite(AR5315_IF_CTL, reg);
-
- /* Reset the PCI bus by setting bits 5-4 in PCI_MCFG */
- reg = sysRegRead(AR5315_PCI_MISC_CONFIG);
- reg &= ~(AR5315_PCIMISC_RST_MODE);
- reg |= AR5315_PCIRST_LOW;
- sysRegWrite(AR5315_PCI_MISC_CONFIG, reg);
-
- /* wait for 100 ms */
- udelay(100*1000);
-
- /* Bring the PCI out of reset */
- reg = sysRegRead(AR5315_PCI_MISC_CONFIG);
- reg &= ~(AR5315_PCIMISC_RST_MODE);
- reg |= (AR5315_PCIRST_HIGH | AR5315_PCICACHE_DIS | 0x8);
- sysRegWrite(AR5315_PCI_MISC_CONFIG, reg);
-
- sysRegWrite(AR5315_PCI_UNCACHE_CFG,
- 0x1E | /* 1GB uncached */
- (1 << 5) | /* Enable uncached */
- (0x2 << 30) /* Base: 0x80000000 */
- );
- (void)sysRegRead(AR5315_PCI_UNCACHE_CFG); /* flush */
-
- udelay(500*1000);
-
- /* dirty hack - anyone with a datasheet that knows the memory map ? */
- ioport_resource.start = 0x10000000;
- ioport_resource.end = 0xffffffff;
- iomem_resource.start = 0x10000000;
- iomem_resource.end = 0xffffffff;
-
- register_pci_controller(&ar531x_pci_controller);
-
- printk("done\n");
- return 0;
-}
-
-arch_initcall(ar5315_pci_init);
diff --git a/target/linux/atheros/files-2.6.26/arch/mips/atheros/board.c b/target/linux/atheros/files-2.6.26/arch/mips/atheros/board.c
deleted file mode 100644
index 4a22493..0000000
--- a/target/linux/atheros/files-2.6.26/arch/mips/atheros/board.c
+++ /dev/null
@@ -1,299 +0,0 @@
-/*
- * 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 (C) 2003 Atheros Communications, Inc., All Rights Reserved.
- * Copyright (C) 2006 FON Technology, SL.
- * Copyright (C) 2006 Imre Kaloz <kaloz@openwrt.org>
- * Copyright (C) 2006 Felix Fietkau <nbd@openwrt.org>
- */
-
-/*
- * Platform devices for Atheros SoCs
- */
-
-#include <linux/autoconf.h>
-#include <linux/init.h>
-#include <linux/module.h>
-#include <linux/types.h>
-#include <linux/string.h>
-#include <linux/platform_device.h>
-#include <linux/kernel.h>
-#include <linux/serial.h>
-#include <linux/serial_core.h>
-#include <linux/random.h>
-#include <asm/bootinfo.h>
-#include <asm/irq_cpu.h>
-#include <asm/io.h>
-#include <ar531x.h>
-
-char *board_config = NULL;
-char *radio_config = NULL;
-int broken_boarddata = 0;
-
-extern int early_serial_setup(struct uart_port *port);
-
-static inline bool
-check_radio_magic(unsigned char *addr)
-{
- addr += 0x7a; /* offset for flash magic */
- if ((addr[0] == 0x5a) && (addr[1] == 0xa5)) {
- return 1;
- }
- return 0;
-}
-
-static inline bool
-check_board_data(unsigned char *flash_limit, unsigned char *addr, bool broken)
-{
- /* config magic found */
- if ( *(int *)addr == 0x35333131)
- return 1;
-
- if (!broken)
- return 0;
-
- if (check_radio_magic(addr + 0xf8))
- radio_config = addr + 0xf8;
- if ((addr < flash_limit + 0x10000) &&
- check_radio_magic(addr + 0x10000))
- radio_config = addr + 0x10000;
-
- if (radio_config) {
- /* broken board data detected, use radio data to find the offset,
- * user will fix this */
- broken_boarddata = 1;
- return 1;
- }
- return 0;
-}
-
-static u8 *find_board_config(char *flash_limit, bool broken)
-{
- char *addr;
- int found = 0;
-
- for (addr = (char *) (flash_limit - 0x1000);
- addr >= (char *) (flash_limit - 0x30000);
- addr -= 0x1000) {
-
- if (check_board_data(flash_limit, addr, broken)) {
- found = 1;
- break;
- }
- }
-
- if (!found)
- addr = NULL;
-
- return addr;
-}
-
-static u8 *find_radio_config(char *flash_limit, char *board_config)
-{
- int dataFound;
- char *radio_config;
-
- /*
- * Now find the start of Radio Configuration data, using heuristics:
- * Search forward from Board Configuration data by 0x1000 bytes
- * at a time until we find non-0xffffffff.
- */
- dataFound = 0;
- for (radio_config = board_config + 0x1000;
- (radio_config < flash_limit);
- radio_config += 0x1000) {
- if ((*(u32 *)radio_config != 0xffffffff) &&
- check_radio_magic(radio_config)) {
- dataFound = 1;
- break;
- }
- }
-
-#ifdef CONFIG_ATHEROS_AR5315
- if (!dataFound) { /* AR2316 relocates radio config to new location */
- for (radio_config = board_config + 0xf8;
- (radio_config < flash_limit - 0x1000 + 0xf8);
- radio_config += 0x1000) {
- if ((*(u32 *)radio_config != 0xffffffff) &&
- check_radio_magic(radio_config)) {
- dataFound = 1;
- break;
- }
- }
- }
-#endif
-
- if (!dataFound) {
- printk("Could not find Radio Configuration data\n");
- radio_config = 0;
- }
-
- return (u8 *) radio_config;
-}
-
-int __init ar531x_find_config(char *flash_limit)
-{
- struct ar531x_boarddata *bd;
- unsigned int rcfg_size;
- char *bcfg, *rcfg;
-
- /* Copy the board and radio data to RAM, because with the new
- * spiflash driver, accessing the mapped memory directly is no
- * longer safe */
-
- bcfg = find_board_config(flash_limit, false);
- if (!bcfg)
- bcfg = find_board_config(flash_limit, true);
- if (!bcfg) {
- printk("WARNING: No board configuration data found!\n");
- return -ENODEV;
- }
-
- board_config = kzalloc(BOARD_CONFIG_BUFSZ, GFP_KERNEL);
- memcpy(board_config, bcfg, 0x100);
- if (broken_boarddata) {
- printk("WARNING: broken board data detected\n");
- bd = (struct ar531x_boarddata *)board_config;
- if (!memcmp(bd->enet0Mac, "\x00\x00\x00\x00\x00\x00", 6)) {
- printk("Fixing up empty mac addresses\n");
- bd->enet0Mac[1] = 0x13;
- bd->enet0Mac[2] = 0x37;
- get_random_bytes(bd->enet0Mac + 3, 3);
- bd->wlan0Mac[1] = 0x13;
- bd->wlan0Mac[2] = 0x37;
- get_random_bytes(bd->wlan0Mac + 3, 3);
- }
- }
-
-
- /* Radio config starts 0x100 bytes after board config, regardless
- * of what the physical layout on the flash chip looks like */
-
- if (radio_config)
- rcfg = radio_config;
- else
- rcfg = find_radio_config(flash_limit, bcfg);
-
- if (!rcfg)
- return -ENODEV;
-
- radio_config = board_config + 0x100 + ((rcfg - bcfg) & 0xfff);
- printk("Radio config found at offset 0x%x(0x%x)\n", rcfg - bcfg, radio_config - board_config);
- rcfg_size = BOARD_CONFIG_BUFSZ - (radio_config - board_config);
- memcpy(radio_config, rcfg, rcfg_size);
-
- return 0;
-}
-
-void __init serial_setup(unsigned long mapbase, unsigned int uartclk)
-{
- struct uart_port s;
-
- memset(&s, 0, sizeof(s));
-
- s.flags = UPF_BOOT_AUTOCONF | UPF_SKIP_TEST;
- s.iotype = UPIO_MEM;
- s.irq = AR531X_MISC_IRQ_UART0;
- s.regshift = 2;
- s.mapbase = mapbase;
- s.uartclk = uartclk;
- s.membase = (void __iomem *)s.mapbase;
-
- early_serial_setup(&s);
-}
-
-void __init plat_mem_setup(void)
-{
- DO_AR5312(ar5312_plat_setup();)
- DO_AR5315(ar5315_plat_setup();)
-
- /* Disable data watchpoints */
- write_c0_watchlo0(0);
-}
-
-const char *get_system_type(void)
-{
- switch (mips_machtype) {
-#ifdef CONFIG_ATHEROS_AR5312
- case MACH_ATHEROS_AR5312:
- return "Atheros AR5312";
-
- case MACH_ATHEROS_AR2312:
- return "Atheros AR2312";
-
- case MACH_ATHEROS_AR2313:
- return "Atheros AR2313";
-#endif
-#ifdef CONFIG_ATHEROS_AR5315
- case MACH_ATHEROS_AR2315:
- return "Atheros AR2315";
- case MACH_ATHEROS_AR2316:
- return "Atheros AR2316";
- case MACH_ATHEROS_AR2317:
- return "Atheros AR2317";
- case MACH_ATHEROS_AR2318:
- return "Atheros AR2318";
-#endif
- }
- return "Atheros (unknown)";
-}
-
-#if (LINUX_VERSION_CODE < KERNEL_VERSION(2,6,24))
-void __init plat_timer_setup(struct irqaction *irq)
-{
- unsigned int count;
-
- /* Usually irq is timer_irqaction (timer_interrupt) */
- setup_irq(AR531X_IRQ_CPU_CLOCK, irq);
-
- /* to generate the first CPU timer interrupt */
- count = read_c0_count();
- write_c0_compare(count + 1000);
-}
-#endif
-
-asmlinkage void plat_irq_dispatch(void)
-{
- DO_AR5312(ar5312_irq_dispatch();)
- DO_AR5315(ar5315_irq_dispatch();)
-}
-
-#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,24))
-void (*board_time_init)(void);
-void __init plat_time_init(void) {
- board_time_init();
-}
-#endif
-
-void __init arch_init_irq(void)
-{
- clear_c0_status(ST0_IM);
- mips_cpu_irq_init();
-
- /* Initialize interrupt controllers */
- DO_AR5312(ar5312_misc_intr_init(AR531X_MISC_IRQ_BASE);)
- DO_AR5315(ar5315_misc_intr_init(AR531X_MISC_IRQ_BASE);)
-}
-
-static int __init ar531x_register_gpiodev(void)
-{
- static struct resource res = {
- .start = 0xFFFFFFFF,
- };
- struct platform_device *pdev;
-
- printk(KERN_INFO "ar531x: Registering GPIODEV device\n");
-
- pdev = platform_device_register_simple("GPIODEV", 0, &res, 1);
-
- if (!pdev) {
- printk(KERN_ERR "ar531x: GPIODEV init failed\n");
- return -ENODEV;
- }
-
- return 0;
-}
-
-device_initcall(ar531x_register_gpiodev);
diff --git a/target/linux/atheros/files-2.6.26/arch/mips/atheros/prom.c b/target/linux/atheros/files-2.6.26/arch/mips/atheros/prom.c
deleted file mode 100644
index 82617cd..0000000
--- a/target/linux/atheros/files-2.6.26/arch/mips/atheros/prom.c
+++ /dev/null
@@ -1,45 +0,0 @@
-/*
- * 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 MontaVista Software Inc
- * Copyright (C) 2003 Atheros Communications, Inc., All Rights Reserved.
- * Copyright (C) 2006 FON Technology, SL.
- * Copyright (C) 2006 Imre Kaloz <kaloz@openwrt.org>
- * Copyright (C) 2006 Felix Fietkau <nbd@openwrt.org>
- */
-
-/*
- * Prom setup file for ar531x
- */
-
-#include <linux/init.h>
-#include <linux/autoconf.h>
-#include <linux/kernel.h>
-#include <linux/string.h>
-#include <linux/mm.h>
-#include <linux/bootmem.h>
-
-#include <asm/bootinfo.h>
-#include <asm/addrspace.h>
-#include <ar531x.h>
-
-void __init prom_init(void)
-{
- char **argv;
-
- mips_machtype = -1;
-
- DO_AR5312(ar5312_prom_init();)
- DO_AR5315(ar5315_prom_init();)
-#if 0
- argv = (char **)fw_arg1;
- /* RedBoot desired command line is argv[1] */
- strcat(arcs_cmdline, argv[1]);
-#endif
-}
-
-void __init prom_free_prom_memory(void)
-{
-}
diff --git a/target/linux/atheros/files-2.6.26/arch/mips/atheros/reset.c b/target/linux/atheros/files-2.6.26/arch/mips/atheros/reset.c
deleted file mode 100644
index eb525da..0000000
--- a/target/linux/atheros/files-2.6.26/arch/mips/atheros/reset.c
+++ /dev/null
@@ -1,162 +0,0 @@
-#include <linux/module.h>
-#include <linux/timer.h>
-#include <linux/interrupt.h>
-#include <linux/kobject.h>
-#include <linux/workqueue.h>
-#include <linux/skbuff.h>
-#include <linux/netlink.h>
-#include <net/sock.h>
-#include <asm/uaccess.h>
-#include <ar531x.h>
-
-#define AR531X_RESET_GPIO_IRQ (AR531X_GPIO_IRQ(bcfg->resetConfigGpio))
-
-struct event_t {
- struct work_struct wq;
- int set;
- unsigned long jiffies;
-};
-
-static struct ar531x_boarddata *bcfg;
-static struct timer_list rst_button_timer;
-
-extern struct sock *uevent_sock;
-extern u64 uevent_next_seqnum(void);
-static unsigned long seen;
-
-static inline void add_msg(struct sk_buff *skb, char *msg)
-{
- char *scratch;
- scratch = skb_put(skb, strlen(msg) + 1);
- sprintf(scratch, msg);
-}
-
-static void hotplug_button(struct work_struct *wq)
-{
- struct sk_buff *skb;
- struct event_t *event;
- size_t len;
- char *scratch, *s;
- char buf[128];
-
- event = container_of(wq, struct event_t, wq);
- if (!uevent_sock)
- goto done;
-
- /* allocate message with the maximum possible size */
- s = event->set ? "pressed" : "released";
- len = strlen(s) + 2;
- skb = alloc_skb(len + 2048, GFP_KERNEL);
- if (!skb)
- goto done;
-
- /* add header */
- scratch = skb_put(skb, len);
- sprintf(scratch, "%s@",s);
-
- /* copy keys to our continuous event payload buffer */
- add_msg(skb, "HOME=/");
- add_msg(skb, "PATH=/sbin:/bin:/usr/sbin:/usr/bin");
- add_msg(skb, "SUBSYSTEM=button");
- add_msg(skb, "BUTTON=reset");
- add_msg(skb, (event->set ? "ACTION=pressed" : "ACTION=released"));
- sprintf(buf, "SEEN=%ld", (event->jiffies - seen)/HZ);
- add_msg(skb, buf);
- snprintf(buf, 128, "SEQNUM=%llu", uevent_next_seqnum());
- add_msg(skb, buf);
-
- NETLINK_CB(skb).dst_group = 1;
- netlink_broadcast(uevent_sock, skb, 0, 1, GFP_KERNEL);
-
-done:
- kfree(event);
-}
-
-static int no_release_workaround = 1;
-
-static void
-reset_button_poll(unsigned long unused)
-{
- struct event_t *event;
- int gpio = ~0;
-
- if(!no_release_workaround)
- return;
-
- DO_AR5315(gpio = sysRegRead(AR5315_GPIO_DI);)
- gpio &= 1 << (AR531X_RESET_GPIO_IRQ - AR531X_GPIO_IRQ_BASE);
- if(gpio)
- {
- rst_button_timer.expires = jiffies + (HZ / 4);
- add_timer(&rst_button_timer);
- } else {
- event = (struct event_t *) kzalloc(sizeof(struct event_t), GFP_ATOMIC);
- if (!event)
- {
- printk("Could not alloc hotplug event\n");
- return;
- }
- event->set = 0;
- event->jiffies = jiffies;
- INIT_WORK(&event->wq, (void *)(void *)hotplug_button);
- schedule_work(&event->wq);
- }
-}
-
-static irqreturn_t button_handler(int irq, void *dev_id)
-{
- static int pressed = 0;
- struct event_t *event;
- u32 gpio = ~0;
-
- event = (struct event_t *) kzalloc(sizeof(struct event_t), GFP_ATOMIC);
- if (!event)
- return IRQ_NONE;
-
- pressed = !pressed;
-
- DO_AR5315(gpio = sysRegRead(AR5315_GPIO_DI);)
- gpio &= 1 << (irq - AR531X_GPIO_IRQ_BASE);
-
- event->set = gpio;
- if(!event->set)
- no_release_workaround = 0;
-
- event->jiffies = jiffies;
-
- INIT_WORK(&event->wq, (void *)(void *)hotplug_button);
- schedule_work(&event->wq);
-
- seen = jiffies;
- if(event->set && no_release_workaround)
- mod_timer(&rst_button_timer, jiffies + (HZ / 4));
-
- return IRQ_HANDLED;
-}
-
-void ar531x_disable_reset_button(void)
-{
- disable_irq(AR531X_RESET_GPIO_IRQ);
-}
-
-EXPORT_SYMBOL(ar531x_disable_reset_button);
-
-int __init ar531x_init_reset(void)
-{
- bcfg = (struct ar531x_boarddata *) board_config;
-
- seen = jiffies;
-
- init_timer(&rst_button_timer);
- rst_button_timer.function = reset_button_poll;
- rst_button_timer.expires = jiffies + HZ / 50;
- add_timer(&rst_button_timer);
-
- request_irq(AR531X_RESET_GPIO_IRQ, &button_handler, IRQF_SAMPLE_RANDOM, "ar531x_reset", NULL);
-
- return 0;
-}
-
-
-
-module_init(ar531x_init_reset);
diff --git a/target/linux/atheros/files-2.6.26/drivers/mtd/devices/spiflash.c b/target/linux/atheros/files-2.6.26/drivers/mtd/devices/spiflash.c
deleted file mode 100644
index 92d4fff..0000000
--- a/target/linux/atheros/files-2.6.26/drivers/mtd/devices/spiflash.c
+++ /dev/null
@@ -1,533 +0,0 @@
-
-/*
- * MTD driver for the SPI Flash Memory support.
- *
- * Copyright (c) 2005-2006 Atheros Communications Inc.
- * Copyright (C) 2006-2007 FON Technology, SL.
- * Copyright (C) 2006-2007 Imre Kaloz <kaloz@openwrt.org>
- * Copyright (C) 2006-2007 Felix Fietkau <nbd@openwrt.org>
- *
- * This code is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 2 as
- * published by the Free Software Foundation.
- *
- */
-
-/*===========================================================================
-** !!!! VERY IMPORTANT NOTICE !!!! FLASH DATA STORED IN LITTLE ENDIAN FORMAT
-**
-** This module contains the Serial Flash access routines for the Atheros SOC.
-** The Atheros SOC integrates a SPI flash controller that is used to access
-** serial flash parts. The SPI flash controller executes in "Little Endian"
-** mode. THEREFORE, all WRITES and READS from the MIPS CPU must be
-** BYTESWAPPED! The SPI Flash controller hardware by default performs READ
-** ONLY byteswapping when accessed via the SPI Flash Alias memory region
-** (Physical Address 0x0800_0000 - 0x0fff_ffff). The data stored in the
-** flash sectors is stored in "Little Endian" format.
-**
-** The spiflash_write() routine performs byteswapping on all write
-** operations.
-**===========================================================================*/
-
-#include <linux/kernel.h>
-#include <linux/module.h>
-#include <linux/types.h>
-#include <linux/version.h>
-#include <linux/errno.h>
-#include <linux/slab.h>
-#include <linux/mtd/mtd.h>
-#include <linux/mtd/partitions.h>
-#include <linux/platform_device.h>
-#include <linux/sched.h>
-#include <linux/squashfs_fs.h>
-#include <linux/root_dev.h>
-#include <linux/delay.h>
-#include <asm/delay.h>
-#include <asm/io.h>
-#include "spiflash.h"
-
-#ifndef __BIG_ENDIAN
-#error This driver currently only works with big endian CPU.
-#endif
-
-#define MAX_PARTS 32
-
-#define SPIFLASH "spiflash: "
-
-#define MIN(a,b) ((a) < (b) ? (a) : (b))
-
-#define busy_wait(condition, wait) \
- do { \
- while (condition) { \
- spin_unlock_bh(&spidata->mutex); \
- if (wait > 1) \
- msleep(wait); \
- else if ((wait == 1) && need_resched()) \
- schedule(); \
- else \
- udelay(1); \
- spin_lock_bh(&spidata->mutex); \
- } \
- } while (0)
-
-
-static __u32 spiflash_regread32(int reg);
-static void spiflash_regwrite32(int reg, __u32 data);
-static __u32 spiflash_sendcmd (int op, u32 addr);
-
-int __init spiflash_init (void);
-void __exit spiflash_exit (void);
-static int spiflash_probe_chip (void);
-static int spiflash_erase (struct mtd_info *mtd,struct erase_info *instr);
-static int spiflash_read (struct mtd_info *mtd, loff_t from,size_t len,size_t *retlen,u_char *buf);
-static int spiflash_write (struct mtd_info *mtd,loff_t to,size_t len,size_t *retlen,const u_char *buf);
-
-/* Flash configuration table */
-struct flashconfig {
- __u32 byte_cnt;
- __u32 sector_cnt;
- __u32 sector_size;
- __u32 cs_addrmask;
-} flashconfig_tbl[MAX_FLASH] =
- {
- { 0, 0, 0, 0},
- { STM_1MB_BYTE_COUNT, STM_1MB_SECTOR_COUNT, STM_1MB_SECTOR_SIZE, 0x0},
- { STM_2MB_BYTE_COUNT, STM_2MB_SECTOR_COUNT, STM_2MB_SECTOR_SIZE, 0x0},
- { STM_4MB_BYTE_COUNT, STM_4MB_SECTOR_COUNT, STM_4MB_SECTOR_SIZE, 0x0},
- { STM_8MB_BYTE_COUNT, STM_8MB_SECTOR_COUNT, STM_8MB_SECTOR_SIZE, 0x0},
- { STM_16MB_BYTE_COUNT, STM_16MB_SECTOR_COUNT, STM_16MB_SECTOR_SIZE, 0x0}
- };
-
-/* Mapping of generic opcodes to STM serial flash opcodes */
-#define SPI_WRITE_ENABLE 0
-#define SPI_WRITE_DISABLE 1
-#define SPI_RD_STATUS 2
-#define SPI_WR_STATUS 3
-#define SPI_RD_DATA 4
-#define SPI_FAST_RD_DATA 5
-#define SPI_PAGE_PROGRAM 6
-#define SPI_SECTOR_ERASE 7
-#define SPI_BULK_ERASE 8
-#define SPI_DEEP_PWRDOWN 9
-#define SPI_RD_SIG 10
-#define SPI_MAX_OPCODES 11
-
-struct opcodes {
- __u16 code;
- __s8 tx_cnt;
- __s8 rx_cnt;
-} stm_opcodes[] = {
- {STM_OP_WR_ENABLE, 1, 0},
- {STM_OP_WR_DISABLE, 1, 0},
- {STM_OP_RD_STATUS, 1, 1},
- {STM_OP_WR_STATUS, 1, 0},
- {STM_OP_RD_DATA, 4, 4},
- {STM_OP_FAST_RD_DATA, 5, 0},
- {STM_OP_PAGE_PGRM, 8, 0},
- {STM_OP_SECTOR_ERASE, 4, 0},
- {STM_OP_BULK_ERASE, 1, 0},
- {STM_OP_DEEP_PWRDOWN, 1, 0},
- {STM_OP_RD_SIG, 4, 1},
-};
-
-/* Driver private data structure */
-struct spiflash_data {
- struct mtd_info *mtd;
- struct mtd_partition *parsed_parts; /* parsed partitions */
- void *readaddr; /* memory mapped data for read */
- void *mmraddr; /* memory mapped register space */
- wait_queue_head_t wq;
- spinlock_t mutex;
- int state;
-};
-enum {
- FL_READY,
- FL_READING,
- FL_ERASING,
- FL_WRITING
-};
-
-static struct spiflash_data *spidata;
-
-extern int parse_redboot_partitions(struct mtd_info *master, struct mtd_partition **pparts);
-
-/***************************************************************************************************/
-
-static __u32
-spiflash_regread32(int reg)
-{
- volatile __u32 *data = (__u32 *)(spidata->mmraddr + reg);
-
- return (*data);
-}
-
-static void
-spiflash_regwrite32(int reg, __u32 data)
-{
- volatile __u32 *addr = (__u32 *)(spidata->mmraddr + reg);
-
- *addr = data;
- return;
-}
-
-
-static __u32
-spiflash_sendcmd (int op, u32 addr)
-{
- u32 reg;
- u32 mask;
- struct opcodes *ptr_opcode;
-
- ptr_opcode = &stm_opcodes[op];
- busy_wait((reg = spiflash_regread32(SPI_FLASH_CTL)) & SPI_CTL_BUSY, 0);
- spiflash_regwrite32(SPI_FLASH_OPCODE, ((u32) ptr_opcode->code) | (addr << 8));
-
- reg = (reg & ~SPI_CTL_TX_RX_CNT_MASK) | ptr_opcode->tx_cnt |
- (ptr_opcode->rx_cnt << 4) | SPI_CTL_START;
-
- spiflash_regwrite32(SPI_FLASH_CTL, reg);
- busy_wait(spiflash_regread32(SPI_FLASH_CTL) & SPI_CTL_BUSY, 0);
-
- if (!ptr_opcode->rx_cnt)
- return 0;
-
- reg = (__u32) spiflash_regread32(SPI_FLASH_DATA);
-
- switch (ptr_opcode->rx_cnt) {
- case 1:
- mask = 0x000000ff;
- break;
- case 2:
- mask = 0x0000ffff;
- break;
- case 3:
- mask = 0x00ffffff;
- break;
- default:
- mask = 0xffffffff;
- break;
- }
- reg &= mask;
-
- return reg;
-}
-
-
-
-/* Probe SPI flash device
- * Function returns 0 for failure.
- * and flashconfig_tbl array index for success.
- */
-static int
-spiflash_probe_chip (void)
-{
- __u32 sig;
- int flash_size;
-
- /* Read the signature on the flash device */
- spin_lock_bh(&spidata->mutex);
- sig = spiflash_sendcmd(SPI_RD_SIG, 0);
- spin_unlock_bh(&spidata->mutex);
-
- switch (sig) {
- case STM_8MBIT_SIGNATURE:
- flash_size = FLASH_1MB;
- break;
- case STM_16MBIT_SIGNATURE:
- flash_size = FLASH_2MB;
- break;
- case STM_32MBIT_SIGNATURE:
- flash_size = FLASH_4MB;
- break;
- case STM_64MBIT_SIGNATURE:
- flash_size = FLASH_8MB;
- break;
- case STM_128MBIT_SIGNATURE:
- flash_size = FLASH_16MB;
- break;
- default:
- printk (KERN_WARNING SPIFLASH "Read of flash device signature failed!\n");
- return (0);
- }
-
- return (flash_size);
-}
-
-
-/* wait until the flash chip is ready and grab a lock */
-static int spiflash_wait_ready(int state)
-{
- DECLARE_WAITQUEUE(wait, current);
-
-retry:
- spin_lock_bh(&spidata->mutex);
- if (spidata->state != FL_READY) {
- set_current_state(TASK_UNINTERRUPTIBLE);
- add_wait_queue(&spidata->wq, &wait);
- spin_unlock_bh(&spidata->mutex);
- schedule();
- remove_wait_queue(&spidata->wq, &wait);
-
- if(signal_pending(current))
- return 0;
-
- goto retry;
- }
- spidata->state = state;
-
- return 1;
-}
-
-static inline void spiflash_done(void)
-{
- spidata->state = FL_READY;
- spin_unlock_bh(&spidata->mutex);
- wake_up(&spidata->wq);
-}
-
-static int
-spiflash_erase (struct mtd_info *mtd,struct erase_info *instr)
-{
- struct opcodes *ptr_opcode;
- u32 temp, reg;
-
- /* sanity checks */
- if (instr->addr + instr->len > mtd->size) return (-EINVAL);
-
- if (!spiflash_wait_ready(FL_ERASING))
- return -EINTR;
-
- spiflash_sendcmd(SPI_WRITE_ENABLE, 0);
- busy_wait((reg = spiflash_regread32(SPI_FLASH_CTL)) & SPI_CTL_BUSY, 0);
- reg = spiflash_regread32(SPI_FLASH_CTL);
-
- ptr_opcode = &stm_opcodes[SPI_SECTOR_ERASE];
- temp = ((__u32)instr->addr << 8) | (__u32)(ptr_opcode->code);
- spiflash_regwrite32(SPI_FLASH_OPCODE, temp);
-
- reg = (reg & ~SPI_CTL_TX_RX_CNT_MASK) | ptr_opcode->tx_cnt | SPI_CTL_START;
- spiflash_regwrite32(SPI_FLASH_CTL, reg);
-
- /* this will take some time */
- spin_unlock_bh(&spidata->mutex);
- msleep(800);
- spin_lock_bh(&spidata->mutex);
-
- busy_wait(spiflash_sendcmd(SPI_RD_STATUS, 0) & SPI_STATUS_WIP, 20);
- spiflash_done();
-
- instr->state = MTD_ERASE_DONE;
- if (instr->callback) instr->callback (instr);
-
- return 0;
-}
-
-static int
-spiflash_read (struct mtd_info *mtd, loff_t from,size_t len,size_t *retlen,u_char *buf)
-{
- u8 *read_addr;
-
- /* sanity checks */
- if (!len) return (0);
- if (from + len > mtd->size) return (-EINVAL);
-
- /* we always read len bytes */
- *retlen = len;
-
- if (!spiflash_wait_ready(FL_READING))
- return -EINTR;
- read_addr = (u8 *)(spidata->readaddr + from);
- memcpy(buf, read_addr, len);
- spiflash_done();
-
- return 0;
-}
-
-static int
-spiflash_write (struct mtd_info *mtd,loff_t to,size_t len,size_t *retlen,const u_char *buf)
-{
- u32 opcode, bytes_left;
-
- *retlen = 0;
-
- /* sanity checks */
- if (!len) return (0);
- if (to + len > mtd->size) return (-EINVAL);
-
- opcode = stm_opcodes[SPI_PAGE_PROGRAM].code;
- bytes_left = len;
-
- do {
- u32 xact_len, reg, page_offset, spi_data = 0;
-
- xact_len = MIN(bytes_left, sizeof(__u32));
-
- /* 32-bit writes cannot span across a page boundary
- * (256 bytes). This types of writes require two page
- * program operations to handle it correctly. The STM part
- * will write the overflow data to the beginning of the
- * current page as opposed to the subsequent page.
- */
- page_offset = (to & (STM_PAGE_SIZE - 1)) + xact_len;
-
- if (page_offset > STM_PAGE_SIZE) {
- xact_len -= (page_offset - STM_PAGE_SIZE);
- }
-
- if (!spiflash_wait_ready(FL_WRITING))
- return -EINTR;
-
- spiflash_sendcmd(SPI_WRITE_ENABLE, 0);
- switch (xact_len) {
- case 1:
- spi_data = (u32) ((u8) *buf);
- break;
- case 2:
- spi_data = (buf[1] << 8) | buf[0];
- break;
- case 3:
- spi_data = (buf[2] << 16) | (buf[1] << 8) | buf[0];
- break;
- case 4:
- spi_data = (buf[3] << 24) | (buf[2] << 16) |
- (buf[1] << 8) | buf[0];
- break;
- default:
- spi_data = 0;
- break;
- }
-
- spiflash_regwrite32(SPI_FLASH_DATA, spi_data);
- opcode = (opcode & SPI_OPCODE_MASK) | ((__u32)to << 8);
- spiflash_regwrite32(SPI_FLASH_OPCODE, opcode);
-
- reg = spiflash_regread32(SPI_FLASH_CTL);
- reg = (reg & ~SPI_CTL_TX_RX_CNT_MASK) | (xact_len + 4) | SPI_CTL_START;
- spiflash_regwrite32(SPI_FLASH_CTL, reg);
-
- /* give the chip some time before we start busy waiting */
- spin_unlock_bh(&spidata->mutex);
- schedule();
- spin_lock_bh(&spidata->mutex);
-
- busy_wait(spiflash_sendcmd(SPI_RD_STATUS, 0) & SPI_STATUS_WIP, 0);
- spiflash_done();
-
- bytes_left -= xact_len;
- to += xact_len;
- buf += xact_len;
-
- *retlen += xact_len;
- } while (bytes_left != 0);
-
- return 0;
-}
-
-
-#ifdef CONFIG_MTD_PARTITIONS
-static const char *part_probe_types[] = { "cmdlinepart", "RedBoot", "MyLoader", NULL };
-#endif
-
-
-static int spiflash_probe(struct platform_device *pdev)
-{
- int result = -1;
- int index, num_parts;
- struct mtd_info *mtd;
-
- spidata->mmraddr = ioremap_nocache(SPI_FLASH_MMR, SPI_FLASH_MMR_SIZE);
- spin_lock_init(&spidata->mutex);
- init_waitqueue_head(&spidata->wq);
- spidata->state = FL_READY;
-
- if (!spidata->mmraddr) {
- printk (KERN_WARNING SPIFLASH "Failed to map flash device\n");
- kfree(spidata);
- spidata = NULL;
- }
-
- mtd = kzalloc(sizeof(struct mtd_info), GFP_KERNEL);
- if (!mtd) {
- kfree(spidata);
- return -ENXIO;
- }
-
- if (!(index = spiflash_probe_chip())) {
- printk (KERN_WARNING SPIFLASH "Found no serial flash device\n");
- goto error;
- }
-
- spidata->readaddr = ioremap_nocache(SPI_FLASH_READ, flashconfig_tbl[index].byte_cnt);
- if (!spidata->readaddr) {
- printk (KERN_WARNING SPIFLASH "Failed to map flash device\n");
- goto error;
- }
-
- mtd->name = "spiflash";
- mtd->type = MTD_NORFLASH;
- mtd->flags = (MTD_CAP_NORFLASH|MTD_WRITEABLE);
- mtd->size = flashconfig_tbl[index].byte_cnt;
- mtd->erasesize = flashconfig_tbl[index].sector_size;
- mtd->writesize = 1;
- mtd->numeraseregions = 0;
- mtd->eraseregions = NULL;
- mtd->erase = spiflash_erase;
- mtd->read = spiflash_read;
- mtd->write = spiflash_write;
- mtd->owner = THIS_MODULE;
-
- /* parse redboot partitions */
- num_parts = parse_mtd_partitions(mtd, part_probe_types, &spidata->parsed_parts, 0);
- if (!num_parts)
- goto error;
-
- result = add_mtd_partitions(mtd, spidata->parsed_parts, num_parts);
- spidata->mtd = mtd;
-
- return (result);
-
-error:
- kfree(mtd);
- kfree(spidata);
- return -ENXIO;
-}
-
-static int spiflash_remove (struct platform_device *pdev)
-{
- del_mtd_partitions (spidata->mtd);
- kfree(spidata->mtd);
- return 0;
-}
-
-struct platform_driver spiflash_driver = {
- .driver.name = "spiflash",
- .probe = spiflash_probe,
- .remove = spiflash_remove,
-};
-
-int __init
-spiflash_init (void)
-{
- spidata = kmalloc(sizeof(struct spiflash_data), GFP_KERNEL);
- if (!spidata)
- return (-ENXIO);
-
- spin_lock_init(&spidata->mutex);
- platform_driver_register(&spiflash_driver);
-
- return 0;
-}
-
-void __exit
-spiflash_exit (void)
-{
- kfree(spidata);
-}
-
-module_init (spiflash_init);
-module_exit (spiflash_exit);
-
-MODULE_LICENSE("GPL");
-MODULE_AUTHOR("OpenWrt.org, Atheros Communications Inc");
-MODULE_DESCRIPTION("MTD driver for SPI Flash on Atheros SOC");
-
diff --git a/target/linux/atheros/files-2.6.26/drivers/mtd/devices/spiflash.h b/target/linux/atheros/files-2.6.26/drivers/mtd/devices/spiflash.h
deleted file mode 100644
index 146fd67..0000000
--- a/target/linux/atheros/files-2.6.26/drivers/mtd/devices/spiflash.h
+++ /dev/null
@@ -1,119 +0,0 @@
-/*
- * SPI Flash Memory support header file.
- *
- *
- *
- * Copyright (c) 2005, Atheros Communications Inc.
- * Copyright (C) 2006 FON Technology, SL.
- * Copyright (C) 2006 Imre Kaloz <kaloz@openwrt.org>
- *
- * This code is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 2 as
- * published by the Free Software Foundation.
- *
- */
-#define FLASH_1MB 1
-#define FLASH_2MB 2
-#define FLASH_4MB 3
-#define FLASH_8MB 4
-#define FLASH_16MB 5
-#define MAX_FLASH 6
-
-#define STM_PAGE_SIZE 256
-
-#define SFI_WRITE_BUFFER_SIZE 4
-#define SFI_FLASH_ADDR_MASK 0x00ffffff
-
-#define STM_8MBIT_SIGNATURE 0x13
-#define STM_M25P80_BYTE_COUNT 1048576
-#define STM_M25P80_SECTOR_COUNT 16
-#define STM_M25P80_SECTOR_SIZE 0x10000
-
-#define STM_16MBIT_SIGNATURE 0x14
-#define STM_M25P16_BYTE_COUNT 2097152
-#define STM_M25P16_SECTOR_COUNT 32
-#define STM_M25P16_SECTOR_SIZE 0x10000
-
-#define STM_32MBIT_SIGNATURE 0x15
-#define STM_M25P32_BYTE_COUNT 4194304
-#define STM_M25P32_SECTOR_COUNT 64
-#define STM_M25P32_SECTOR_SIZE 0x10000
-
-#define STM_64MBIT_SIGNATURE 0x16
-#define STM_M25P64_BYTE_COUNT 8388608
-#define STM_M25P64_SECTOR_COUNT 128
-#define STM_M25P64_SECTOR_SIZE 0x10000
-
-#define STM_128MBIT_SIGNATURE 0x17
-#define STM_M25P128_BYTE_COUNT 16777216
-#define STM_M25P128_SECTOR_COUNT 256
-#define STM_M25P128_SECTOR_SIZE 0x10000
-
-#define STM_1MB_BYTE_COUNT STM_M25P80_BYTE_COUNT
-#define STM_1MB_SECTOR_COUNT STM_M25P80_SECTOR_COUNT
-#define STM_1MB_SECTOR_SIZE STM_M25P80_SECTOR_SIZE
-#define STM_2MB_BYTE_COUNT STM_M25P16_BYTE_COUNT
-#define STM_2MB_SECTOR_COUNT STM_M25P16_SECTOR_COUNT
-#define STM_2MB_SECTOR_SIZE STM_M25P16_SECTOR_SIZE
-#define STM_4MB_BYTE_COUNT STM_M25P32_BYTE_COUNT
-#define STM_4MB_SECTOR_COUNT STM_M25P32_SECTOR_COUNT
-#define STM_4MB_SECTOR_SIZE STM_M25P32_SECTOR_SIZE
-#define STM_8MB_BYTE_COUNT STM_M25P64_BYTE_COUNT
-#define STM_8MB_SECTOR_COUNT STM_M25P64_SECTOR_COUNT
-#define STM_8MB_SECTOR_SIZE STM_M25P64_SECTOR_SIZE
-#define STM_16MB_BYTE_COUNT STM_M25P128_BYTE_COUNT
-#define STM_16MB_SECTOR_COUNT STM_M25P128_SECTOR_COUNT
-#define STM_16MB_SECTOR_SIZE STM_M25P128_SECTOR_SIZE
-
-/*
- * ST Microelectronics Opcodes for Serial Flash
- */
-
-#define STM_OP_WR_ENABLE 0x06 /* Write Enable */
-#define STM_OP_WR_DISABLE 0x04 /* Write Disable */
-#define STM_OP_RD_STATUS 0x05 /* Read Status */
-#define STM_OP_WR_STATUS 0x01 /* Write Status */
-#define STM_OP_RD_DATA 0x03 /* Read Data */
-#define STM_OP_FAST_RD_DATA 0x0b /* Fast Read Data */
-#define STM_OP_PAGE_PGRM 0x02 /* Page Program */
-#define STM_OP_SECTOR_ERASE 0xd8 /* Sector Erase */
-#define STM_OP_BULK_ERASE 0xc7 /* Bulk Erase */
-#define STM_OP_DEEP_PWRDOWN 0xb9 /* Deep Power-Down Mode */
-#define STM_OP_RD_SIG 0xab /* Read Electronic Signature */
-
-#define STM_STATUS_WIP 0x01 /* Write-In-Progress */
-#define STM_STATUS_WEL 0x02 /* Write Enable Latch */
-#define STM_STATUS_BP0 0x04 /* Block Protect 0 */
-#define STM_STATUS_BP1 0x08 /* Block Protect 1 */
-#define STM_STATUS_BP2 0x10 /* Block Protect 2 */
-#define STM_STATUS_SRWD 0x80 /* Status Register Write Disable */
-
-/*
- * SPI Flash Interface Registers
- */
-#define AR531XPLUS_SPI_READ 0x08000000
-#define AR531XPLUS_SPI_MMR 0x11300000
-#define AR531XPLUS_SPI_MMR_SIZE 12
-
-#define AR531XPLUS_SPI_CTL 0x00
-#define AR531XPLUS_SPI_OPCODE 0x04
-#define AR531XPLUS_SPI_DATA 0x08
-
-#define SPI_FLASH_READ AR531XPLUS_SPI_READ
-#define SPI_FLASH_MMR AR531XPLUS_SPI_MMR
-#define SPI_FLASH_MMR_SIZE AR531XPLUS_SPI_MMR_SIZE
-#define SPI_FLASH_CTL AR531XPLUS_SPI_CTL
-#define SPI_FLASH_OPCODE AR531XPLUS_SPI_OPCODE
-#define SPI_FLASH_DATA AR531XPLUS_SPI_DATA
-
-#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
-
-#define SPI_STATUS_WIP STM_STATUS_WIP
diff --git a/target/linux/atheros/files-2.6.26/drivers/net/ar2313/Makefile b/target/linux/atheros/files-2.6.26/drivers/net/ar2313/Makefile
deleted file mode 100644
index 9eb63e4..0000000
--- a/target/linux/atheros/files-2.6.26/drivers/net/ar2313/Makefile
+++ /dev/null
@@ -1,5 +0,0 @@
-#
-# Makefile for the AR2313 ethernet driver
-#
-
-obj-$(CONFIG_AR2313) += ar2313.o
diff --git a/target/linux/atheros/files-2.6.26/drivers/net/ar2313/ar2313.c b/target/linux/atheros/files-2.6.26/drivers/net/ar2313/ar2313.c
deleted file mode 100644
index 727d190..0000000
--- a/target/linux/atheros/files-2.6.26/drivers/net/ar2313/ar2313.c
+++ /dev/null
@@ -1,1409 +0,0 @@
-/*
- * ar2313.c: Linux driver for the Atheros AR231x Ethernet device.
- *
- * Copyright (C) 2004 by Sameer Dekate <sdekate@arubanetworks.com>
- * Copyright (C) 2006 Imre Kaloz <kaloz@openwrt.org>
- * Copyright (C) 2006-2007 Felix Fietkau <nbd@openwrt.org>
- *
- * Thanks to Atheros for providing hardware and documentation
- * enabling me to write this driver.
- *
- * 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.
- *
- * Additional credits:
- * This code is taken from John Taylor's Sibyte driver and then
- * modified for the AR2313.
- */
-
-#include <linux/autoconf.h>
-#include <linux/module.h>
-#include <linux/version.h>
-#include <linux/types.h>
-#include <linux/errno.h>
-#include <linux/ioport.h>
-#include <linux/pci.h>
-#include <linux/netdevice.h>
-#include <linux/etherdevice.h>
-#include <linux/skbuff.h>
-#include <linux/init.h>
-#include <linux/delay.h>
-#include <linux/mm.h>
-#include <linux/highmem.h>
-#include <linux/sockios.h>
-#include <linux/pkt_sched.h>
-#include <linux/compile.h>
-#include <linux/mii.h>
-#include <linux/phy.h>
-#include <linux/ethtool.h>
-#include <linux/ctype.h>
-#include <linux/platform_device.h>
-
-#include <net/sock.h>
-#include <net/ip.h>
-
-#include <asm/system.h>
-#include <asm/io.h>
-#include <asm/irq.h>
-#include <asm/byteorder.h>
-#include <asm/uaccess.h>
-#include <asm/bootinfo.h>
-
-#define AR2313_MTU 1692
-#define AR2313_PRIOS 1
-#define AR2313_QUEUES (2*AR2313_PRIOS)
-#define AR2313_DESCR_ENTRIES 64
-
-#undef INDEX_DEBUG
-#define DEBUG 0
-#define DEBUG_TX 0
-#define DEBUG_RX 0
-#define DEBUG_INT 0
-#define DEBUG_MC 0
-#define DEBUG_ERR 1
-
-#ifndef min
-#define min(a,b) (((a)<(b))?(a):(b))
-#endif
-
-#ifndef SMP_CACHE_BYTES
-#define SMP_CACHE_BYTES L1_CACHE_BYTES
-#endif
-
-#define AR2313_MBOX_SET_BIT 0x8
-
-#define BOARD_IDX_STATIC 0
-#define BOARD_IDX_OVERFLOW -1
-
-#include "dma.h"
-#include "ar2313.h"
-
-/*
- * New interrupt handler strategy:
- *
- * An old interrupt handler worked using the traditional method of
- * replacing an skbuff with a new one when a packet arrives. However
- * the rx rings do not need to contain a static number of buffer
- * descriptors, thus it makes sense to move the memory allocation out
- * of the main interrupt handler and do it in a bottom half handler
- * and only allocate new buffers when the number of buffers in the
- * ring is below a certain threshold. In order to avoid starving the
- * NIC under heavy load it is however necessary to force allocation
- * when hitting a minimum threshold. The strategy for alloction is as
- * follows:
- *
- * RX_LOW_BUF_THRES - allocate buffers in the bottom half
- * RX_PANIC_LOW_THRES - we are very low on buffers, allocate
- * the buffers in the interrupt handler
- * RX_RING_THRES - maximum number of buffers in the rx ring
- *
- * One advantagous side effect of this allocation approach is that the
- * entire rx processing can be done without holding any spin lock
- * since the rx rings and registers are totally independent of the tx
- * ring and its registers. This of course includes the kmalloc's of
- * new skb's. Thus start_xmit can run in parallel with rx processing
- * and the memory allocation on SMP systems.
- *
- * Note that running the skb reallocation in a bottom half opens up
- * another can of races which needs to be handled properly. In
- * particular it can happen that the interrupt handler tries to run
- * the reallocation while the bottom half is either running on another
- * CPU or was interrupted on the same CPU. To get around this the
- * driver uses bitops to prevent the reallocation routines from being
- * reentered.
- *
- * TX handling can also be done without holding any spin lock, wheee
- * this is fun! since tx_csm is only written to by the interrupt
- * handler.
- */
-
-/*
- * Threshold values for RX buffer allocation - the low water marks for
- * when to start refilling the rings are set to 75% of the ring
- * sizes. It seems to make sense to refill the rings entirely from the
- * intrrupt handler once it gets below the panic threshold, that way
- * we don't risk that the refilling is moved to another CPU when the
- * one running the interrupt handler just got the slab code hot in its
- * cache.
- */
-#define RX_RING_SIZE AR2313_DESCR_ENTRIES
-#define RX_PANIC_THRES (RX_RING_SIZE/4)
-#define RX_LOW_THRES ((3*RX_RING_SIZE)/4)
-#define CRC_LEN 4
-#define RX_OFFSET 2
-
-#if defined(CONFIG_VLAN_8021Q) || defined(CONFIG_VLAN_8021Q_MODULE)
-#define VLAN_HDR 4
-#else
-#define VLAN_HDR 0
-#endif
-
-#define AR2313_BUFSIZE (AR2313_MTU + VLAN_HDR + ETH_HLEN + CRC_LEN + RX_OFFSET)
-
-#ifdef MODULE
-MODULE_LICENSE("GPL");
-MODULE_AUTHOR("Sameer Dekate <sdekate@arubanetworks.com>, Imre Kaloz <kaloz@openwrt.org>, Felix Fietkau <nbd@openwrt.org>");
-MODULE_DESCRIPTION("AR2313 Ethernet driver");
-#endif
-
-#define virt_to_phys(x) ((u32)(x) & 0x1fffffff)
-
-// prototypes
-#ifdef TX_TIMEOUT
-static void ar2313_tx_timeout(struct net_device *dev);
-#endif
-static void ar2313_halt(struct net_device *dev);
-static void rx_tasklet_func(unsigned long data);
-static void rx_tasklet_cleanup(struct net_device *dev);
-static void ar2313_multicast_list(struct net_device *dev);
-
-static int mdiobus_read(struct mii_bus *bus, int phy_addr, int regnum);
-static int mdiobus_write(struct mii_bus *bus, int phy_addr, int regnum, u16 value);
-static int mdiobus_reset(struct mii_bus *bus);
-static int mdiobus_probe (struct net_device *dev);
-static void ar2313_adjust_link(struct net_device *dev);
-
-#ifndef ERR
-#define ERR(fmt, args...) printk("%s: " fmt, __func__, ##args)
-#endif
-
-
-int __init ar2313_probe(struct platform_device *pdev)
-{
- struct net_device *dev;
- struct ar2313_private *sp;
- struct resource *res;
- unsigned long ar_eth_base;
- char buf[64];
-
- dev = alloc_etherdev(sizeof(struct ar2313_private));
-
- if (dev == NULL) {
- printk(KERN_ERR
- "ar2313: Unable to allocate net_device structure!\n");
- return -ENOMEM;
- }
-
- platform_set_drvdata(pdev, dev);
-
- sp = netdev_priv(dev);
- sp->dev = dev;
- sp->cfg = pdev->dev.platform_data;
-
- sprintf(buf, "eth%d_membase", pdev->id);
- res = platform_get_resource_byname(pdev, IORESOURCE_MEM, buf);
- if (!res)
- return -ENODEV;
-
- sp->link = 0;
- ar_eth_base = res->start;
- sp->phy = sp->cfg->phy;
-
- sprintf(buf, "eth%d_irq", pdev->id);
- dev->irq = platform_get_irq_byname(pdev, buf);
-
- spin_lock_init(&sp->lock);
-
- /* initialize func pointers */
- dev->open = &ar2313_open;
- dev->stop = &ar2313_close;
- dev->hard_start_xmit = &ar2313_start_xmit;
-
- dev->set_multicast_list = &ar2313_multicast_list;
-#ifdef TX_TIMEOUT
- dev->tx_timeout = ar2313_tx_timeout;
- dev->watchdog_timeo = AR2313_TX_TIMEOUT;
-#endif
- dev->do_ioctl = &ar2313_ioctl;
-
- // SAMEER: do we need this?
- dev->features |= NETIF_F_HIGHDMA;
-
- tasklet_init(&sp->rx_tasklet, rx_tasklet_func, (unsigned long) dev);
- tasklet_disable(&sp->rx_tasklet);
-
- sp->eth_regs =
- ioremap_nocache(virt_to_phys(ar_eth_base), sizeof(*sp->eth_regs));
- if (!sp->eth_regs) {
- printk("Can't remap eth registers\n");
- return (-ENXIO);
- }
-
- /*
- * When there's only one MAC, PHY regs are typically on ENET0,
- * even though the MAC might be on ENET1.
- * Needto remap PHY regs separately in this case
- */
- if (virt_to_phys(ar_eth_base) == virt_to_phys(sp->phy_regs))
- sp->phy_regs = sp->eth_regs;
- else {
- sp->phy_regs =
- ioremap_nocache(virt_to_phys(sp->cfg->phy_base),
- sizeof(*sp->phy_regs));
- if (!sp->phy_regs) {
- printk("Can't remap phy registers\n");
- return (-ENXIO);
- }
- }
-
- sp->dma_regs =
- ioremap_nocache(virt_to_phys(ar_eth_base + 0x1000),
- sizeof(*sp->dma_regs));
- dev->base_addr = (unsigned int) sp->dma_regs;
- if (!sp->dma_regs) {
- printk("Can't remap DMA registers\n");
- return (-ENXIO);
- }
-
- sp->int_regs = ioremap_nocache(virt_to_phys(sp->cfg->reset_base), 4);
- if (!sp->int_regs) {
- printk("Can't remap INTERRUPT registers\n");
- return (-ENXIO);
- }
-
- strncpy(sp->name, "Atheros AR231x", sizeof(sp->name) - 1);
- sp->name[sizeof(sp->name) - 1] = '\0';
- memcpy(dev->dev_addr, sp->cfg->macaddr, 6);
- sp->board_idx = BOARD_IDX_STATIC;
-
- if (ar2313_init(dev)) {
- /*
- * ar2313_init() calls ar2313_init_cleanup() on error.
- */
- kfree(dev);
- return -ENODEV;
- }
-
- if (register_netdev(dev)) {
- printk("%s: register_netdev failed\n", __func__);
- return -1;
- }
-
- printk("%s: %s: %02x:%02x:%02x:%02x:%02x:%02x, irq %d\n",
- dev->name, sp->name,
- dev->dev_addr[0], dev->dev_addr[1], dev->dev_addr[2],
- dev->dev_addr[3], dev->dev_addr[4], dev->dev_addr[5], dev->irq);
-
- sp->mii_bus.priv = dev;
- sp->mii_bus.read = mdiobus_read;
- sp->mii_bus.write = mdiobus_write;
- sp->mii_bus.reset = mdiobus_reset;
- sp->mii_bus.name = "ar2313_eth_mii";
- sp->mii_bus.id = 0;
- sp->mii_bus.irq = kmalloc(sizeof(int), GFP_KERNEL);
- *sp->mii_bus.irq = PHY_POLL;
-
- mdiobus_register(&sp->mii_bus);
-
- if (mdiobus_probe(dev) != 0) {
- printk(KERN_ERR "ar2313: mdiobus_probe failed");
- rx_tasklet_cleanup(dev);
- ar2313_init_cleanup(dev);
- unregister_netdev(dev);
- kfree(dev);
- } else {
- /* start link poll timer */
- ar2313_setup_timer(dev);
- }
-
- return 0;
-}
-
-#if 0
-static void ar2313_dump_regs(struct net_device *dev)
-{
- unsigned int *ptr, i;
- struct ar2313_private *sp = netdev_priv(dev);
-
- ptr = (unsigned int *) sp->eth_regs;
- for (i = 0; i < (sizeof(ETHERNET_STRUCT) / sizeof(unsigned int));
- i++, ptr++) {
- printk("ENET: %08x = %08x\n", (int) ptr, *ptr);
- }
-
- ptr = (unsigned int *) sp->dma_regs;
- for (i = 0; i < (sizeof(DMA) / sizeof(unsigned int)); i++, ptr++) {
- printk("DMA: %08x = %08x\n", (int) ptr, *ptr);
- }
-
- ptr = (unsigned int *) sp->int_regs;
- for (i = 0; i < (sizeof(INTERRUPT) / sizeof(unsigned int)); i++, ptr++) {
- printk("INT: %08x = %08x\n", (int) ptr, *ptr);
- }
-
- for (i = 0; i < AR2313_DESCR_ENTRIES; i++) {
- ar2313_descr_t *td = &sp->tx_ring[i];
- printk("Tx desc %2d: %08x %08x %08x %08x\n", i,
- td->status, td->devcs, td->addr, td->descr);
- }
-}
-#endif
-
-#ifdef TX_TIMEOUT
-static void ar2313_tx_timeout(struct net_device *dev)
-{
- struct ar2313_private *sp = netdev_priv(dev);
- unsigned long flags;
-
-#if DEBUG_TX
- printk("Tx timeout\n");
-#endif
- spin_lock_irqsave(&sp->lock, flags);
- ar2313_restart(dev);
- spin_unlock_irqrestore(&sp->lock, flags);
-}
-#endif
-
-#if DEBUG_MC
-static void printMcList(struct net_device *dev)
-{
- struct dev_mc_list *list = dev->mc_list;
- int num = 0, i;
- while (list) {
- printk("%d MC ADDR ", num);
- for (i = 0; i < list->dmi_addrlen; i++) {
- printk(":%02x", list->dmi_addr[i]);
- }
- list = list->next;
- printk("\n");
- }
-}
-#endif
-
-/*
- * Set or clear the multicast filter for this adaptor.
- * THIS IS ABSOLUTE CRAP, disabled
- */
-static void ar2313_multicast_list(struct net_device *dev)
-{
- /*
- * Always listen to broadcasts and
- * treat IFF bits independently
- */
- struct ar2313_private *sp = netdev_priv(dev);
- unsigned int recognise;
-
- recognise = sp->eth_regs->mac_control;
-
- if (dev->flags & IFF_PROMISC) { /* set promiscuous mode */
- recognise |= MAC_CONTROL_PR;
- } else {
- recognise &= ~MAC_CONTROL_PR;
- }
-
- if ((dev->flags & IFF_ALLMULTI) || (dev->mc_count > 15)) {
-#if DEBUG_MC
- printMcList(dev);
- printk("%s: all MULTICAST mc_count %d\n", __FUNCTION__,
- dev->mc_count);
-#endif
- recognise |= MAC_CONTROL_PM; /* all multicast */
- } else if (dev->mc_count > 0) {
-#if DEBUG_MC
- printMcList(dev);
- printk("%s: mc_count %d\n", __FUNCTION__, dev->mc_count);
-#endif
- recognise |= MAC_CONTROL_PM; /* for the time being */
- }
-#if DEBUG_MC
- printk("%s: setting %08x to %08x\n", __FUNCTION__, (int) sp->eth_regs,
- recognise);
-#endif
-
- sp->eth_regs->mac_control = recognise;
-}
-
-static void rx_tasklet_cleanup(struct net_device *dev)
-{
- struct ar2313_private *sp = netdev_priv(dev);
-
- /*
- * Tasklet may be scheduled. Need to get it removed from the list
- * since we're about to free the struct.
- */
-
- sp->unloading = 1;
- tasklet_enable(&sp->rx_tasklet);
- tasklet_kill(&sp->rx_tasklet);
-}
-
-static int __exit ar2313_remove(struct platform_device *pdev)
-{
- struct net_device *dev = platform_get_drvdata(pdev);
- rx_tasklet_cleanup(dev);
- ar2313_init_cleanup(dev);
- unregister_netdev(dev);
- kfree(dev);
- return 0;
-}
-
-
-/*
- * Restart the AR2313 ethernet controller.
- */
-static int ar2313_restart(struct net_device *dev)
-{
- /* disable interrupts */
- disable_irq(dev->irq);
-
- /* stop mac */
- ar2313_halt(dev);
-
- /* initialize */
- ar2313_init(dev);
-
- /* enable interrupts */
- enable_irq(dev->irq);
-
- return 0;
-}
-
-static struct platform_driver ar2313_driver = {
- .driver.name = "ar531x-eth",
- .probe = ar2313_probe,
- .remove = ar2313_remove,
-};
-
-int __init ar2313_module_init(void)
-{
- return platform_driver_register(&ar2313_driver);
-}
-
-void __exit ar2313_module_cleanup(void)
-{
- platform_driver_unregister(&ar2313_driver);
-}
-
-module_init(ar2313_module_init);
-module_exit(ar2313_module_cleanup);
-
-
-static void ar2313_free_descriptors(struct net_device *dev)
-{
- struct ar2313_private *sp = netdev_priv(dev);
- if (sp->rx_ring != NULL) {
- kfree((void *) KSEG0ADDR(sp->rx_ring));
- sp->rx_ring = NULL;
- sp->tx_ring = NULL;
- }
-}
-
-
-static int ar2313_allocate_descriptors(struct net_device *dev)
-{
- struct ar2313_private *sp = netdev_priv(dev);
- int size;
- int j;
- ar2313_descr_t *space;
-
- if (sp->rx_ring != NULL) {
- printk("%s: already done.\n", __FUNCTION__);
- return 0;
- }
-
- size =
- (sizeof(ar2313_descr_t) * (AR2313_DESCR_ENTRIES * AR2313_QUEUES));
- space = kmalloc(size, GFP_KERNEL);
- if (space == NULL)
- return 1;
-
- /* invalidate caches */
- dma_cache_inv((unsigned int) space, size);
-
- /* now convert pointer to KSEG1 */
- space = (ar2313_descr_t *) KSEG1ADDR(space);
-
- memset((void *) space, 0, size);
-
- sp->rx_ring = space;
- space += AR2313_DESCR_ENTRIES;
-
- sp->tx_ring = space;
- space += AR2313_DESCR_ENTRIES;
-
- /* Initialize the transmit Descriptors */
- for (j = 0; j < AR2313_DESCR_ENTRIES; j++) {
- ar2313_descr_t *td = &sp->tx_ring[j];
- td->status = 0;
- td->devcs = DMA_TX1_CHAINED;
- td->addr = 0;
- td->descr =
- virt_to_phys(&sp->
- tx_ring[(j + 1) & (AR2313_DESCR_ENTRIES - 1)]);
- }
-
- return 0;
-}
-
-
-/*
- * Generic cleanup handling data allocated during init. Used when the
- * module is unloaded or if an error occurs during initialization
- */
-static void ar2313_init_cleanup(struct net_device *dev)
-{
- struct ar2313_private *sp = netdev_priv(dev);
- struct sk_buff *skb;
- int j;
-
- ar2313_free_descriptors(dev);
-
- if (sp->eth_regs)
- iounmap((void *) sp->eth_regs);
- if (sp->dma_regs)
- iounmap((void *) sp->dma_regs);
-
- if (sp->rx_skb) {
- for (j = 0; j < AR2313_DESCR_ENTRIES; j++) {
- skb = sp->rx_skb[j];
- if (skb) {
- sp->rx_skb[j] = NULL;
- dev_kfree_skb(skb);
- }
- }
- kfree(sp->rx_skb);
- sp->rx_skb = NULL;
- }
-
- if (sp->tx_skb) {
- for (j = 0; j < AR2313_DESCR_ENTRIES; j++) {
- skb = sp->tx_skb[j];
- if (skb) {
- sp->tx_skb[j] = NULL;
- dev_kfree_skb(skb);
- }
- }
- kfree(sp->tx_skb);
- sp->tx_skb = NULL;
- }
-}
-
-static int ar2313_setup_timer(struct net_device *dev)
-{
- struct ar2313_private *sp = netdev_priv(dev);
-
- init_timer(&sp->link_timer);
-
- sp->link_timer.function = ar2313_link_timer_fn;
- sp->link_timer.data = (int) dev;
- sp->link_timer.expires = jiffies + HZ;
-
- add_timer(&sp->link_timer);
- return 0;
-
-}
-
-static void ar2313_link_timer_fn(unsigned long data)
-{
- struct net_device *dev = (struct net_device *) data;
- struct ar2313_private *sp = netdev_priv(dev);
-
- // see if the link status changed
- // This was needed to make sure we set the PHY to the
- // autonegotiated value of half or full duplex.
- ar2313_check_link(dev);
-
- // Loop faster when we don't have link.
- // This was needed to speed up the AP bootstrap time.
- if (sp->link == 0) {
- mod_timer(&sp->link_timer, jiffies + HZ / 2);
- } else {
- mod_timer(&sp->link_timer, jiffies + LINK_TIMER);
- }
-}
-
-static void ar2313_check_link(struct net_device *dev)
-{
- struct ar2313_private *sp = netdev_priv(dev);
- u16 phyData;
-
- phyData = mdiobus_read(&sp->mii_bus, sp->phy, MII_BMSR);
- if (sp->phyData != phyData) {
- if (phyData & BMSR_LSTATUS) {
- /* link is present, ready link partner ability to deterine
- duplexity */
- int duplex = 0;
- u16 reg;
-
- sp->link = 1;
- reg = mdiobus_read(&sp->mii_bus, sp->phy, MII_BMCR);
- if (reg & BMCR_ANENABLE) {
- /* auto neg enabled */
- reg = mdiobus_read(&sp->mii_bus, sp->phy, MII_LPA);
- duplex = (reg & (LPA_100FULL | LPA_10FULL)) ? 1 : 0;
- } else {
- /* no auto neg, just read duplex config */
- duplex = (reg & BMCR_FULLDPLX) ? 1 : 0;
- }
-
- printk(KERN_INFO "%s: Configuring MAC for %s duplex\n",
- dev->name, (duplex) ? "full" : "half");
-
- if (duplex) {
- /* full duplex */
- sp->eth_regs->mac_control =
- ((sp->eth_regs->
- mac_control | MAC_CONTROL_F) & ~MAC_CONTROL_DRO);
- } else {
- /* half duplex */
- sp->eth_regs->mac_control =
- ((sp->eth_regs->
- mac_control | MAC_CONTROL_DRO) & ~MAC_CONTROL_F);
- }
- } else {
- /* no link */
- sp->link = 0;
- }
- sp->phyData = phyData;
- }
-}
-
-static int ar2313_reset_reg(struct net_device *dev)
-{
- struct ar2313_private *sp = netdev_priv(dev);
- unsigned int ethsal, ethsah;
- unsigned int flags;
-
- *sp->int_regs |= sp->cfg->reset_mac;
- mdelay(10);
- *sp->int_regs &= ~sp->cfg->reset_mac;
- mdelay(10);
- *sp->int_regs |= sp->cfg->reset_phy;
- mdelay(10);
- *sp->int_regs &= ~sp->cfg->reset_phy;
- mdelay(10);
-
- sp->dma_regs->bus_mode = (DMA_BUS_MODE_SWR);
- mdelay(10);
- sp->dma_regs->bus_mode =
- ((32 << DMA_BUS_MODE_PBL_SHIFT) | DMA_BUS_MODE_BLE);
-
- /* enable interrupts */
- sp->dma_regs->intr_ena = (DMA_STATUS_AIS |
- DMA_STATUS_NIS |
- DMA_STATUS_RI |
- DMA_STATUS_TI | DMA_STATUS_FBE);
- sp->dma_regs->xmt_base = virt_to_phys(sp->tx_ring);
- sp->dma_regs->rcv_base = virt_to_phys(sp->rx_ring);
- sp->dma_regs->control =
- (DMA_CONTROL_SR | DMA_CONTROL_ST | DMA_CONTROL_SF);
-
- sp->eth_regs->flow_control = (FLOW_CONTROL_FCE);
- sp->eth_regs->vlan_tag = (0x8100);
-
- /* Enable Ethernet Interface */
- flags = (MAC_CONTROL_TE | /* transmit enable */
- MAC_CONTROL_PM | /* pass mcast */
- MAC_CONTROL_F | /* full duplex */
- MAC_CONTROL_HBD); /* heart beat disabled */
-
- if (dev->flags & IFF_PROMISC) { /* set promiscuous mode */
- flags |= MAC_CONTROL_PR;
- }
- sp->eth_regs->mac_control = flags;
-
- /* Set all Ethernet station address registers to their initial values */
- ethsah = ((((u_int) (dev->dev_addr[5]) << 8) & (u_int) 0x0000FF00) |
- (((u_int) (dev->dev_addr[4]) << 0) & (u_int) 0x000000FF));
-
- ethsal = ((((u_int) (dev->dev_addr[3]) << 24) & (u_int) 0xFF000000) |
- (((u_int) (dev->dev_addr[2]) << 16) & (u_int) 0x00FF0000) |
- (((u_int) (dev->dev_addr[1]) << 8) & (u_int) 0x0000FF00) |
- (((u_int) (dev->dev_addr[0]) << 0) & (u_int) 0x000000FF));
-
- sp->eth_regs->mac_addr[0] = ethsah;
- sp->eth_regs->mac_addr[1] = ethsal;
-
- mdelay(10);
-
- return (0);
-}
-
-
-static int ar2313_init(struct net_device *dev)
-{
- struct ar2313_private *sp = netdev_priv(dev);
- int ecode = 0;
-
- /*
- * Allocate descriptors
- */
- if (ar2313_allocate_descriptors(dev)) {
- printk("%s: %s: ar2313_allocate_descriptors failed\n",
- dev->name, __FUNCTION__);
- ecode = -EAGAIN;
- goto init_error;
- }
-
- /*
- * Get the memory for the skb rings.
- */
- if (sp->rx_skb == NULL) {
- sp->rx_skb =
- kmalloc(sizeof(struct sk_buff *) * AR2313_DESCR_ENTRIES,
- GFP_KERNEL);
- if (!(sp->rx_skb)) {
- printk("%s: %s: rx_skb kmalloc failed\n",
- dev->name, __FUNCTION__);
- ecode = -EAGAIN;
- goto init_error;
- }
- }
- memset(sp->rx_skb, 0, sizeof(struct sk_buff *) * AR2313_DESCR_ENTRIES);
-
- if (sp->tx_skb == NULL) {
- sp->tx_skb =
- kmalloc(sizeof(struct sk_buff *) * AR2313_DESCR_ENTRIES,
- GFP_KERNEL);
- if (!(sp->tx_skb)) {
- printk("%s: %s: tx_skb kmalloc failed\n",
- dev->name, __FUNCTION__);
- ecode = -EAGAIN;
- goto init_error;
- }
- }
- memset(sp->tx_skb, 0, sizeof(struct sk_buff *) * AR2313_DESCR_ENTRIES);
-
- /*
- * Set tx_csm before we start receiving interrupts, otherwise
- * the interrupt handler might think it is supposed to process
- * tx ints before we are up and running, which may cause a null
- * pointer access in the int handler.
- */
- sp->rx_skbprd = 0;
- sp->cur_rx = 0;
- sp->tx_prd = 0;
- sp->tx_csm = 0;
-
- /*
- * Zero the stats before starting the interface
- */
- memset(&dev->stats, 0, sizeof(dev->stats));
-
- /*
- * We load the ring here as there seem to be no way to tell the
- * firmware to wipe the ring without re-initializing it.
- */
- ar2313_load_rx_ring(dev, RX_RING_SIZE);
-
- /*
- * Init hardware
- */
- ar2313_reset_reg(dev);
-
- /*
- * Get the IRQ
- */
- ecode =
- request_irq(dev->irq, &ar2313_interrupt,
- IRQF_SHARED | IRQF_DISABLED | IRQF_SAMPLE_RANDOM,
- dev->name, dev);
- if (ecode) {
- printk(KERN_WARNING "%s: %s: Requested IRQ %d is busy\n",
- dev->name, __FUNCTION__, dev->irq);
- goto init_error;
- }
-
-
- tasklet_enable(&sp->rx_tasklet);
-
- return 0;
-
- init_error:
- ar2313_init_cleanup(dev);
- return ecode;
-}
-
-/*
- * Load the rx ring.
- *
- * Loading rings is safe without holding the spin lock since this is
- * done only before the device is enabled, thus no interrupts are
- * generated and by the interrupt handler/tasklet handler.
- */
-static void ar2313_load_rx_ring(struct net_device *dev, int nr_bufs)
-{
-
- struct ar2313_private *sp = netdev_priv(dev);
- short i, idx;
-
- idx = sp->rx_skbprd;
-
- for (i = 0; i < nr_bufs; i++) {
- struct sk_buff *skb;
- ar2313_descr_t *rd;
-
- if (sp->rx_skb[idx]) {
-#if DEBUG_RX
- printk(KERN_INFO "ar2313 rx refill full\n");
-#endif /* DEBUG */
- break;
- }
- // partha: create additional room for the second GRE fragment
- skb = alloc_skb(AR2313_BUFSIZE + 128, GFP_ATOMIC);
- if (!skb) {
- printk("\n\n\n\n %s: No memory in system\n\n\n\n",
- __FUNCTION__);
- break;
- }
- // partha: create additional room in the front for tx pkt capture
- skb_reserve(skb, 32);
-
- /*
- * Make sure IP header starts on a fresh cache line.
- */
- skb->dev = dev;
- skb_reserve(skb, RX_OFFSET);
- sp->rx_skb[idx] = skb;
-
- rd = (ar2313_descr_t *) & sp->rx_ring[idx];
-
- /* initialize dma descriptor */
- rd->devcs = ((AR2313_BUFSIZE << DMA_RX1_BSIZE_SHIFT) |
- DMA_RX1_CHAINED);
- rd->addr = virt_to_phys(skb->data);
- rd->descr =
- virt_to_phys(&sp->
- rx_ring[(idx + 1) & (AR2313_DESCR_ENTRIES - 1)]);
- rd->status = DMA_RX_OWN;
-
- idx = DSC_NEXT(idx);
- }
-
- if (!i) {
-#if DEBUG_ERR
- printk(KERN_INFO
- "Out of memory when allocating standard receive buffers\n");
-#endif /* DEBUG */
- } else {
- sp->rx_skbprd = idx;
- }
-
- return;
-}
-
-#define AR2313_MAX_PKTS_PER_CALL 64
-
-static int ar2313_rx_int(struct net_device *dev)
-{
- struct ar2313_private *sp = netdev_priv(dev);
- struct sk_buff *skb, *skb_new;
- ar2313_descr_t *rxdesc;
- unsigned int status;
- u32 idx;
- int pkts = 0;
- int rval;
-
- idx = sp->cur_rx;
-
- /* process at most the entire ring and then wait for another interrupt
- */
- while (1) {
-
- rxdesc = &sp->rx_ring[idx];
- status = rxdesc->status;
- if (status & DMA_RX_OWN) {
- /* SiByte owns descriptor or descr not yet filled in */
- rval = 0;
- break;
- }
-
- if (++pkts > AR2313_MAX_PKTS_PER_CALL) {
- rval = 1;
- break;
- }
-#if DEBUG_RX
- printk("index %d\n", idx);
- printk("RX status %08x\n", rxdesc->status);
- printk("RX devcs %08x\n", rxdesc->devcs);
- printk("RX addr %08x\n", rxdesc->addr);
- printk("RX descr %08x\n", rxdesc->descr);
-#endif
-
- if ((status & (DMA_RX_ERROR | DMA_RX_ERR_LENGTH)) &&
- (!(status & DMA_RX_LONG))) {
-#if DEBUG_RX
- printk("%s: rx ERROR %08x\n", __FUNCTION__, status);
-#endif
- dev->stats.rx_errors++;
- dev->stats.rx_dropped++;
-
- /* add statistics counters */
- if (status & DMA_RX_ERR_CRC)
- dev->stats.rx_crc_errors++;
- if (status & DMA_RX_ERR_COL)
- dev->stats.rx_over_errors++;
- if (status & DMA_RX_ERR_LENGTH)
- dev->stats.rx_length_errors++;
- if (status & DMA_RX_ERR_RUNT)
- dev->stats.rx_over_errors++;
- if (status & DMA_RX_ERR_DESC)
- dev->stats.rx_over_errors++;
-
- } else {
- /* alloc new buffer. */
- skb_new = dev_alloc_skb(AR2313_BUFSIZE + RX_OFFSET + 128);
- if (skb_new != NULL) {
-
- skb = sp->rx_skb[idx];
- /* set skb */
- skb_put(skb,
- ((status >> DMA_RX_LEN_SHIFT) & 0x3fff) - CRC_LEN);
-
- dev->stats.rx_bytes += skb->len;
- skb->protocol = eth_type_trans(skb, dev);
- /* pass the packet to upper layers */
- netif_rx(skb);
-
- skb_new->dev = dev;
- /* 16 bit align */
- skb_reserve(skb_new, RX_OFFSET + 32);
- /* reset descriptor's curr_addr */
- rxdesc->addr = virt_to_phys(skb_new->data);
-
- dev->stats.rx_packets++;
- sp->rx_skb[idx] = skb_new;
- } else {
- dev->stats.rx_dropped++;
- }
- }
-
- rxdesc->devcs = ((AR2313_BUFSIZE << DMA_RX1_BSIZE_SHIFT) |
- DMA_RX1_CHAINED);
- rxdesc->status = DMA_RX_OWN;
-
- idx = DSC_NEXT(idx);
- }
-
- sp->cur_rx = idx;
-
- return rval;
-}
-
-
-static void ar2313_tx_int(struct net_device *dev)
-{
- struct ar2313_private *sp = netdev_priv(dev);
- u32 idx;
- struct sk_buff *skb;
- ar2313_descr_t *txdesc;
- unsigned int status = 0;
-
- idx = sp->tx_csm;
-
- while (idx != sp->tx_prd) {
-
- txdesc = &sp->tx_ring[idx];
-
-#if DEBUG_TX
- printk
- ("%s: TXINT: csm=%d idx=%d prd=%d status=%x devcs=%x addr=%08x descr=%x\n",
- dev->name, sp->tx_csm, idx, sp->tx_prd, txdesc->status,
- txdesc->devcs, txdesc->addr, txdesc->descr);
-#endif /* DEBUG */
-
- if ((status = txdesc->status) & DMA_TX_OWN) {
- /* ar2313 dma still owns descr */
- break;
- }
- /* done with this descriptor */
- dma_unmap_single(NULL, txdesc->addr,
- txdesc->devcs & DMA_TX1_BSIZE_MASK,
- DMA_TO_DEVICE);
- txdesc->status = 0;
-
- if (status & DMA_TX_ERROR) {
- dev->stats.tx_errors++;
- dev->stats.tx_dropped++;
- if (status & DMA_TX_ERR_UNDER)
- dev->stats.tx_fifo_errors++;
- if (status & DMA_TX_ERR_HB)
- dev->stats.tx_heartbeat_errors++;
- if (status & (DMA_TX_ERR_LOSS | DMA_TX_ERR_LINK))
- dev->stats.tx_carrier_errors++;
- if (status & (DMA_TX_ERR_LATE |
- DMA_TX_ERR_COL |
- DMA_TX_ERR_JABBER | DMA_TX_ERR_DEFER))
- dev->stats.tx_aborted_errors++;
- } else {
- /* transmit OK */
- dev->stats.tx_packets++;
- }
-
- skb = sp->tx_skb[idx];
- sp->tx_skb[idx] = NULL;
- idx = DSC_NEXT(idx);
- dev->stats.tx_bytes += skb->len;
- dev_kfree_skb_irq(skb);
- }
-
- sp->tx_csm = idx;
-
- return;
-}
-
-
-static void rx_tasklet_func(unsigned long data)
-{
- struct net_device *dev = (struct net_device *) data;
- struct ar2313_private *sp = netdev_priv(dev);
-
- if (sp->unloading) {
- return;
- }
-
- if (ar2313_rx_int(dev)) {
- tasklet_hi_schedule(&sp->rx_tasklet);
- } else {
- unsigned long flags;
- spin_lock_irqsave(&sp->lock, flags);
- sp->dma_regs->intr_ena |= DMA_STATUS_RI;
- spin_unlock_irqrestore(&sp->lock, flags);
- }
-}
-
-static void rx_schedule(struct net_device *dev)
-{
- struct ar2313_private *sp = netdev_priv(dev);
-
- sp->dma_regs->intr_ena &= ~DMA_STATUS_RI;
-
- tasklet_hi_schedule(&sp->rx_tasklet);
-}
-
-static irqreturn_t ar2313_interrupt(int irq, void *dev_id)
-{
- struct net_device *dev = (struct net_device *) dev_id;
- struct ar2313_private *sp = netdev_priv(dev);
- unsigned int status, enabled;
-
- /* clear interrupt */
- /*
- * Don't clear RI bit if currently disabled.
- */
- status = sp->dma_regs->status;
- enabled = sp->dma_regs->intr_ena;
- sp->dma_regs->status = status & enabled;
-
- if (status & DMA_STATUS_NIS) {
- /* normal status */
- /*
- * Don't schedule rx processing if interrupt
- * is already disabled.
- */
- if (status & enabled & DMA_STATUS_RI) {
- /* receive interrupt */
- rx_schedule(dev);
- }
- if (status & DMA_STATUS_TI) {
- /* transmit interrupt */
- ar2313_tx_int(dev);
- }
- }
-
- if (status & DMA_STATUS_AIS) {
-#if DEBUG_INT
- printk("%s: AIS set %08x & %x\n", __FUNCTION__,
- status, (DMA_STATUS_FBE | DMA_STATUS_TPS));
-#endif
- /* abnormal status */
- if (status & (DMA_STATUS_FBE | DMA_STATUS_TPS)) {
- ar2313_restart(dev);
- }
- }
- return IRQ_HANDLED;
-}
-
-
-static int ar2313_open(struct net_device *dev)
-{
- struct ar2313_private *sp = netdev_priv(dev);
- unsigned int ethsal, ethsah;
-
- /* reset the hardware, in case the MAC address changed */
- ethsah = ((((u_int) (dev->dev_addr[5]) << 8) & (u_int) 0x0000FF00) |
- (((u_int) (dev->dev_addr[4]) << 0) & (u_int) 0x000000FF));
-
- ethsal = ((((u_int) (dev->dev_addr[3]) << 24) & (u_int) 0xFF000000) |
- (((u_int) (dev->dev_addr[2]) << 16) & (u_int) 0x00FF0000) |
- (((u_int) (dev->dev_addr[1]) << 8) & (u_int) 0x0000FF00) |
- (((u_int) (dev->dev_addr[0]) << 0) & (u_int) 0x000000FF));
-
- sp->eth_regs->mac_addr[0] = ethsah;
- sp->eth_regs->mac_addr[1] = ethsal;
-
- mdelay(10);
-
- dev->mtu = 1500;
- netif_start_queue(dev);
-
- sp->eth_regs->mac_control |= MAC_CONTROL_RE;
-
- return 0;
-}
-
-static void ar2313_halt(struct net_device *dev)
-{
- struct ar2313_private *sp = netdev_priv(dev);
- int j;
-
- tasklet_disable(&sp->rx_tasklet);
-
- /* kill the MAC */
- sp->eth_regs->mac_control &= ~(MAC_CONTROL_RE | /* disable Receives */
- MAC_CONTROL_TE); /* disable Transmits */
- /* stop dma */
- sp->dma_regs->control = 0;
- sp->dma_regs->bus_mode = DMA_BUS_MODE_SWR;
-
- /* place phy and MAC in reset */
- *sp->int_regs |= (sp->cfg->reset_mac | sp->cfg->reset_phy);
-
- /* free buffers on tx ring */
- for (j = 0; j < AR2313_DESCR_ENTRIES; j++) {
- struct sk_buff *skb;
- ar2313_descr_t *txdesc;
-
- txdesc = &sp->tx_ring[j];
- txdesc->descr = 0;
-
- skb = sp->tx_skb[j];
- if (skb) {
- dev_kfree_skb(skb);
- sp->tx_skb[j] = NULL;
- }
- }
-}
-
-/*
- * close should do nothing. Here's why. It's called when
- * 'ifconfig bond0 down' is run. If it calls free_irq then
- * the irq is gone forever ! When bond0 is made 'up' again,
- * the ar2313_open () does not call request_irq (). Worse,
- * the call to ar2313_halt() generates a WDOG reset due to
- * the write to 'sp->int_regs' and the box reboots.
- * Commenting this out is good since it allows the
- * system to resume when bond0 is made up again.
- */
-static int ar2313_close(struct net_device *dev)
-{
-#if 0
- /*
- * Disable interrupts
- */
- disable_irq(dev->irq);
-
- /*
- * Without (or before) releasing irq and stopping hardware, this
- * is an absolute non-sense, by the way. It will be reset instantly
- * by the first irq.
- */
- netif_stop_queue(dev);
-
- /* stop the MAC and DMA engines */
- ar2313_halt(dev);
-
- /* release the interrupt */
- free_irq(dev->irq, dev);
-
-#endif
- return 0;
-}
-
-static int ar2313_start_xmit(struct sk_buff *skb, struct net_device *dev)
-{
- struct ar2313_private *sp = netdev_priv(dev);
- ar2313_descr_t *td;
- u32 idx;
-
- idx = sp->tx_prd;
- td = &sp->tx_ring[idx];
-
- if (td->status & DMA_TX_OWN) {
-#if DEBUG_TX
- printk("%s: No space left to Tx\n", __FUNCTION__);
-#endif
- /* free skbuf and lie to the caller that we sent it out */
- dev->stats.tx_dropped++;
- dev_kfree_skb(skb);
-
- /* restart transmitter in case locked */
- sp->dma_regs->xmt_poll = 0;
- return 0;
- }
-
- /* Setup the transmit descriptor. */
- td->devcs = ((skb->len << DMA_TX1_BSIZE_SHIFT) |
- (DMA_TX1_LS | DMA_TX1_IC | DMA_TX1_CHAINED));
- td->addr = dma_map_single(NULL, skb->data, skb->len, DMA_TO_DEVICE);
- td->status = DMA_TX_OWN;
-
- /* kick transmitter last */
- sp->dma_regs->xmt_poll = 0;
-
-#if DEBUG_TX
- printk("index %d\n", idx);
- printk("TX status %08x\n", td->status);
- printk("TX devcs %08x\n", td->devcs);
- printk("TX addr %08x\n", td->addr);
- printk("TX descr %08x\n", td->descr);
-#endif
-
- sp->tx_skb[idx] = skb;
- idx = DSC_NEXT(idx);
- sp->tx_prd = idx;
-
- return 0;
-}
-
-static int ar2313_ioctl(struct net_device *dev, struct ifreq *ifr, int cmd)
-{
- struct mii_ioctl_data *data = (struct mii_ioctl_data *) &ifr->ifr_data;
- struct ar2313_private *sp = netdev_priv(dev);
- int ret;
-
- switch (cmd) {
-
- case SIOCETHTOOL:
- spin_lock_irq(&sp->lock);
- ret = phy_ethtool_ioctl(sp->phy_dev, (void *) ifr->ifr_data);
- spin_unlock_irq(&sp->lock);
- return ret;
-
- case SIOCSIFHWADDR:
- if (copy_from_user
- (dev->dev_addr, ifr->ifr_data, sizeof(dev->dev_addr)))
- return -EFAULT;
- return 0;
-
- case SIOCGIFHWADDR:
- if (copy_to_user
- (ifr->ifr_data, dev->dev_addr, sizeof(dev->dev_addr)))
- return -EFAULT;
- return 0;
-
- case SIOCGMIIPHY:
- case SIOCGMIIREG:
- case SIOCSMIIREG:
- return phy_mii_ioctl(sp->phy_dev, data, cmd);
-
- default:
- break;
- }
-
- return -EOPNOTSUPP;
-}
-
-static void ar2313_adjust_link(struct net_device *dev)
-{
- struct ar2313_private *sp = netdev_priv(dev);
- unsigned int mc;
-
- if (!sp->phy_dev->link)
- return;
-
- if (sp->phy_dev->duplex != sp->oldduplex) {
- mc = readl(&sp->eth_regs->mac_control);
- mc &= ~(MAC_CONTROL_F | MAC_CONTROL_DRO);
- if (sp->phy_dev->duplex)
- mc |= MAC_CONTROL_F;
- else
- mc |= MAC_CONTROL_DRO;
- writel(mc, &sp->eth_regs->mac_control);
- sp->oldduplex = sp->phy_dev->duplex;
- }
-}
-
-#define MII_ADDR(phy, reg) \
- ((reg << MII_ADDR_REG_SHIFT) | (phy << MII_ADDR_PHY_SHIFT))
-
-static int
-mdiobus_read(struct mii_bus *bus, int phy_addr, int regnum)
-{
- struct net_device *const dev = bus->priv;
- struct ar2313_private *sp = netdev_priv(dev);
- volatile ETHERNET_STRUCT *ethernet = sp->phy_regs;
-
- ethernet->mii_addr = MII_ADDR(phy_addr, regnum);
- while (ethernet->mii_addr & MII_ADDR_BUSY);
- return (ethernet->mii_data >> MII_DATA_SHIFT);
-}
-
-static int
-mdiobus_write(struct mii_bus *bus, int phy_addr, int regnum,
- u16 value)
-{
- struct net_device *const dev = bus->priv;
- struct ar2313_private *sp = netdev_priv(dev);
- volatile ETHERNET_STRUCT *ethernet = sp->phy_regs;
-
- while (ethernet->mii_addr & MII_ADDR_BUSY);
- ethernet->mii_data = value << MII_DATA_SHIFT;
- ethernet->mii_addr = MII_ADDR(phy_addr, regnum) | MII_ADDR_WRITE;
-
- return 0;
-}
-
-static int mdiobus_reset(struct mii_bus *bus)
-{
- struct net_device *const dev = bus->priv;
-
- ar2313_reset_reg(dev);
-
- return 0;
-}
-
-static int mdiobus_probe (struct net_device *dev)
-{
- struct ar2313_private *const sp = netdev_priv(dev);
- struct phy_device *phydev = NULL;
- int phy_addr;
-
- /* find the first (lowest address) PHY on the current MAC's MII bus */
- for (phy_addr = 0; phy_addr < PHY_MAX_ADDR; phy_addr++)
- if (sp->mii_bus.phy_map[phy_addr]) {
- phydev = sp->mii_bus.phy_map[phy_addr];
- break; /* break out with first one found */
- }
-
- if (!phydev) {
- printk (KERN_ERR "ar2313:%s: no PHY found\n", dev->name);
- return -1;
- }
-
- /* now we are supposed to have a proper phydev, to attach to... */
- BUG_ON(!phydev);
- BUG_ON(phydev->attached_dev);
-
- phydev = phy_connect(dev, phydev->dev.bus_id, &ar2313_adjust_link, 0,
- PHY_INTERFACE_MODE_MII);
-
- if (IS_ERR(phydev)) {
- printk(KERN_ERR "%s: Could not attach to PHY\n", dev->name);
- return PTR_ERR(phydev);
- }
-
- /* mask with MAC supported features */
- phydev->supported &= (SUPPORTED_10baseT_Half
- | SUPPORTED_10baseT_Full
- | SUPPORTED_100baseT_Half
- | SUPPORTED_100baseT_Full
- | SUPPORTED_Autoneg
- /* | SUPPORTED_Pause | SUPPORTED_Asym_Pause */
- | SUPPORTED_MII
- | SUPPORTED_TP);
-
- phydev->advertising = phydev->supported;
-
- sp->oldduplex = -1;
- sp->phy_dev = phydev;
-
- printk(KERN_INFO "%s: attached PHY driver [%s] "
- "(mii_bus:phy_addr=%s)\n",
- dev->name, phydev->drv->name, phydev->dev.bus_id);
-
- return 0;
-}
-
diff --git a/target/linux/atheros/files-2.6.26/drivers/net/ar2313/ar2313.h b/target/linux/atheros/files-2.6.26/drivers/net/ar2313/ar2313.h
deleted file mode 100644
index 9fa49ca..0000000
--- a/target/linux/atheros/files-2.6.26/drivers/net/ar2313/ar2313.h
+++ /dev/null
@@ -1,195 +0,0 @@
-#ifndef _AR2313_H_
-#define _AR2313_H_
-
-#include <linux/autoconf.h>
-#include <asm/bootinfo.h>
-#include <ar531x_platform.h>
-
-/*
- * probe link timer - 5 secs
- */
-#define LINK_TIMER (5*HZ)
-
-#define IS_DMA_TX_INT(X) (((X) & (DMA_STATUS_TI)) != 0)
-#define IS_DMA_RX_INT(X) (((X) & (DMA_STATUS_RI)) != 0)
-#define IS_DRIVER_OWNED(X) (((X) & (DMA_TX_OWN)) == 0)
-
-#define AR2313_TX_TIMEOUT (HZ/4)
-
-/*
- * Rings
- */
-#define DSC_RING_ENTRIES_SIZE (AR2313_DESCR_ENTRIES * sizeof(struct desc))
-#define DSC_NEXT(idx) ((idx + 1) & (AR2313_DESCR_ENTRIES - 1))
-
-static inline int tx_space(u32 csm, u32 prd)
-{
- return (csm - prd - 1) & (AR2313_DESCR_ENTRIES - 1);
-}
-
-#if MAX_SKB_FRAGS
-#define TX_RESERVED (MAX_SKB_FRAGS+1) /* +1 for message header */
-#define tx_ring_full(csm, prd) (tx_space(csm, prd) <= TX_RESERVED)
-#else
-#define tx_ring_full 0
-#endif
-
-#define AR2313_MBGET 2
-#define AR2313_MBSET 3
-#define AR2313_PCI_RECONFIG 4
-#define AR2313_PCI_DUMP 5
-#define AR2313_TEST_PANIC 6
-#define AR2313_TEST_NULLPTR 7
-#define AR2313_READ_DATA 8
-#define AR2313_WRITE_DATA 9
-#define AR2313_GET_VERSION 10
-#define AR2313_TEST_HANG 11
-#define AR2313_SYNC 12
-
-
-//
-// New Combo structure for Both Eth0 AND eth1
-//
-typedef struct {
- volatile unsigned int mac_control; /* 0x00 */
- volatile unsigned int mac_addr[2]; /* 0x04 - 0x08 */
- volatile unsigned int mcast_table[2]; /* 0x0c - 0x10 */
- volatile unsigned int mii_addr; /* 0x14 */
- volatile unsigned int mii_data; /* 0x18 */
- volatile unsigned int flow_control; /* 0x1c */
- volatile unsigned int vlan_tag; /* 0x20 */
- volatile unsigned int pad[7]; /* 0x24 - 0x3c */
- volatile unsigned int ucast_table[8]; /* 0x40-0x5c */
-
-} ETHERNET_STRUCT;
-
-/********************************************************************
- * Interrupt controller
- ********************************************************************/
-
-typedef struct {
- volatile unsigned int wdog_control; /* 0x08 */
- volatile unsigned int wdog_timer; /* 0x0c */
- volatile unsigned int misc_status; /* 0x10 */
- volatile unsigned int misc_mask; /* 0x14 */
- volatile unsigned int global_status; /* 0x18 */
- volatile unsigned int reserved; /* 0x1c */
- volatile unsigned int reset_control; /* 0x20 */
-} INTERRUPT;
-
-/********************************************************************
- * DMA controller
- ********************************************************************/
-typedef struct {
- volatile unsigned int bus_mode; /* 0x00 (CSR0) */
- volatile unsigned int xmt_poll; /* 0x04 (CSR1) */
- volatile unsigned int rcv_poll; /* 0x08 (CSR2) */
- volatile unsigned int rcv_base; /* 0x0c (CSR3) */
- volatile unsigned int xmt_base; /* 0x10 (CSR4) */
- volatile unsigned int status; /* 0x14 (CSR5) */
- volatile unsigned int control; /* 0x18 (CSR6) */
- volatile unsigned int intr_ena; /* 0x1c (CSR7) */
- volatile unsigned int rcv_missed; /* 0x20 (CSR8) */
- volatile unsigned int reserved[11]; /* 0x24-0x4c (CSR9-19) */
- volatile unsigned int cur_tx_buf_addr; /* 0x50 (CSR20) */
- volatile unsigned int cur_rx_buf_addr; /* 0x50 (CSR21) */
-} DMA;
-
-/*
- * Struct private for the Sibyte.
- *
- * Elements are grouped so variables used by the tx handling goes
- * together, and will go into the same cache lines etc. in order to
- * avoid cache line contention between the rx and tx handling on SMP.
- *
- * Frequently accessed variables are put at the beginning of the
- * struct to help the compiler generate better/shorter code.
- */
-struct ar2313_private {
- struct net_device *dev;
- int version;
- u32 mb[2];
-
- volatile ETHERNET_STRUCT *phy_regs;
- volatile ETHERNET_STRUCT *eth_regs;
- volatile DMA *dma_regs;
- volatile u32 *int_regs;
- struct ar531x_eth *cfg;
-
- spinlock_t lock; /* Serialise access to device */
-
- /*
- * RX and TX descriptors, must be adjacent
- */
- ar2313_descr_t *rx_ring;
- ar2313_descr_t *tx_ring;
-
-
- struct sk_buff **rx_skb;
- struct sk_buff **tx_skb;
-
- /*
- * RX elements
- */
- u32 rx_skbprd;
- u32 cur_rx;
-
- /*
- * TX elements
- */
- u32 tx_prd;
- u32 tx_csm;
-
- /*
- * Misc elements
- */
- int board_idx;
- char name[48];
- struct {
- u32 address;
- u32 length;
- char *mapping;
- } desc;
-
-
- struct timer_list link_timer;
- unsigned short phy; /* merlot phy = 1, samsung phy = 0x1f */
- unsigned short mac;
- unsigned short link; /* 0 - link down, 1 - link up */
- u16 phyData;
-
- struct tasklet_struct rx_tasklet;
- int unloading;
-
- struct phy_device *phy_dev;
- struct mii_bus mii_bus;
- int oldduplex;
-};
-
-
-/*
- * Prototypes
- */
-static int ar2313_init(struct net_device *dev);
-#ifdef TX_TIMEOUT
-static void ar2313_tx_timeout(struct net_device *dev);
-#endif
-#if 0
-static void ar2313_multicast_list(struct net_device *dev);
-#endif
-static int ar2313_restart(struct net_device *dev);
-#if DEBUG
-static void ar2313_dump_regs(struct net_device *dev);
-#endif
-static void ar2313_load_rx_ring(struct net_device *dev, int bufs);
-static irqreturn_t ar2313_interrupt(int irq, void *dev_id);
-static int ar2313_open(struct net_device *dev);
-static int ar2313_start_xmit(struct sk_buff *skb, struct net_device *dev);
-static int ar2313_close(struct net_device *dev);
-static int ar2313_ioctl(struct net_device *dev, struct ifreq *ifr,
- int cmd);
-static void ar2313_init_cleanup(struct net_device *dev);
-static int ar2313_setup_timer(struct net_device *dev);
-static void ar2313_link_timer_fn(unsigned long data);
-static void ar2313_check_link(struct net_device *dev);
-#endif /* _AR2313_H_ */
diff --git a/target/linux/atheros/files-2.6.26/drivers/net/ar2313/dma.h b/target/linux/atheros/files-2.6.26/drivers/net/ar2313/dma.h
deleted file mode 100644
index 691bdab..0000000
--- a/target/linux/atheros/files-2.6.26/drivers/net/ar2313/dma.h
+++ /dev/null
@@ -1,141 +0,0 @@
-#ifndef __ARUBA_DMA_H__
-#define __ARUBA_DMA_H__
-
-/*******************************************************************************
- *
- * Copyright 2002 Integrated Device Technology, Inc.
- * All rights reserved.
- *
- * DMA register definition.
- *
- *
- * Author : ryan.holmQVist@idt.com
- * Date : 20011005
- * Update :
- * $Log: dma.h,v $
- * Revision 1.3 2002/06/06 18:34:03 astichte
- * Added XXX_PhysicalAddress and XXX_VirtualAddress
- *
- * Revision 1.2 2002/06/05 18:30:46 astichte
- * Removed IDTField
- *
- * Revision 1.1 2002/05/29 17:33:21 sysarch
- * jba File moved from vcode/include/idt/acacia
- *
- *
- ******************************************************************************/
-
-#define AR_BIT(x) (1 << (x))
-#define DMA_RX_ERR_CRC AR_BIT(1)
-#define DMA_RX_ERR_DRIB AR_BIT(2)
-#define DMA_RX_ERR_MII AR_BIT(3)
-#define DMA_RX_EV2 AR_BIT(5)
-#define DMA_RX_ERR_COL AR_BIT(6)
-#define DMA_RX_LONG AR_BIT(7)
-#define DMA_RX_LS AR_BIT(8) /* last descriptor */
-#define DMA_RX_FS AR_BIT(9) /* first descriptor */
-#define DMA_RX_MF AR_BIT(10) /* multicast frame */
-#define DMA_RX_ERR_RUNT AR_BIT(11) /* runt frame */
-#define DMA_RX_ERR_LENGTH AR_BIT(12) /* length error */
-#define DMA_RX_ERR_DESC AR_BIT(14) /* descriptor error */
-#define DMA_RX_ERROR AR_BIT(15) /* error summary */
-#define DMA_RX_LEN_MASK 0x3fff0000
-#define DMA_RX_LEN_SHIFT 16
-#define DMA_RX_FILT AR_BIT(30)
-#define DMA_RX_OWN AR_BIT(31) /* desc owned by DMA controller */
-
-#define DMA_RX1_BSIZE_MASK 0x000007ff
-#define DMA_RX1_BSIZE_SHIFT 0
-#define DMA_RX1_CHAINED AR_BIT(24)
-#define DMA_RX1_RER AR_BIT(25)
-
-#define DMA_TX_ERR_UNDER AR_BIT(1) /* underflow error */
-#define DMA_TX_ERR_DEFER AR_BIT(2) /* excessive deferral */
-#define DMA_TX_COL_MASK 0x78
-#define DMA_TX_COL_SHIFT 3
-#define DMA_TX_ERR_HB AR_BIT(7) /* hearbeat failure */
-#define DMA_TX_ERR_COL AR_BIT(8) /* excessive collisions */
-#define DMA_TX_ERR_LATE AR_BIT(9) /* late collision */
-#define DMA_TX_ERR_LINK AR_BIT(10) /* no carrier */
-#define DMA_TX_ERR_LOSS AR_BIT(11) /* loss of carrier */
-#define DMA_TX_ERR_JABBER AR_BIT(14) /* transmit jabber timeout */
-#define DMA_TX_ERROR AR_BIT(15) /* frame aborted */
-#define DMA_TX_OWN AR_BIT(31) /* descr owned by DMA controller */
-
-#define DMA_TX1_BSIZE_MASK 0x000007ff
-#define DMA_TX1_BSIZE_SHIFT 0
-#define DMA_TX1_CHAINED AR_BIT(24) /* chained descriptors */
-#define DMA_TX1_TER AR_BIT(25) /* transmit end of ring */
-#define DMA_TX1_FS AR_BIT(29) /* first segment */
-#define DMA_TX1_LS AR_BIT(30) /* last segment */
-#define DMA_TX1_IC AR_BIT(31) /* interrupt on completion */
-
-#define RCVPKT_LENGTH(X) (X >> 16) /* Received pkt Length */
-
-#define MAC_CONTROL_RE AR_BIT(2) /* receive enable */
-#define MAC_CONTROL_TE AR_BIT(3) /* transmit enable */
-#define MAC_CONTROL_DC AR_BIT(5) /* Deferral check */
-#define MAC_CONTROL_ASTP AR_BIT(8) /* Auto pad strip */
-#define MAC_CONTROL_DRTY AR_BIT(10) /* Disable retry */
-#define MAC_CONTROL_DBF AR_BIT(11) /* Disable bcast frames */
-#define MAC_CONTROL_LCC AR_BIT(12) /* late collision ctrl */
-#define MAC_CONTROL_HP AR_BIT(13) /* Hash Perfect filtering */
-#define MAC_CONTROL_HASH AR_BIT(14) /* Unicast hash filtering */
-#define MAC_CONTROL_HO AR_BIT(15) /* Hash only filtering */
-#define MAC_CONTROL_PB AR_BIT(16) /* Pass Bad frames */
-#define MAC_CONTROL_IF AR_BIT(17) /* Inverse filtering */
-#define MAC_CONTROL_PR AR_BIT(18) /* promiscuous mode (valid frames
- only) */
-#define MAC_CONTROL_PM AR_BIT(19) /* pass multicast */
-#define MAC_CONTROL_F AR_BIT(20) /* full-duplex */
-#define MAC_CONTROL_DRO AR_BIT(23) /* Disable Receive Own */
-#define MAC_CONTROL_HBD AR_BIT(28) /* heart-beat disabled (MUST BE
- SET) */
-#define MAC_CONTROL_BLE AR_BIT(30) /* big endian mode */
-#define MAC_CONTROL_RA AR_BIT(31) /* receive all (valid and invalid
- frames) */
-
-#define MII_ADDR_BUSY AR_BIT(0)
-#define MII_ADDR_WRITE AR_BIT(1)
-#define MII_ADDR_REG_SHIFT 6
-#define MII_ADDR_PHY_SHIFT 11
-#define MII_DATA_SHIFT 0
-
-#define FLOW_CONTROL_FCE AR_BIT(1)
-
-#define DMA_BUS_MODE_SWR AR_BIT(0) /* software reset */
-#define DMA_BUS_MODE_BLE AR_BIT(7) /* big endian mode */
-#define DMA_BUS_MODE_PBL_SHIFT 8 /* programmable burst length 32 */
-#define DMA_BUS_MODE_DBO AR_BIT(20) /* big-endian descriptors */
-
-#define DMA_STATUS_TI AR_BIT(0) /* transmit interrupt */
-#define DMA_STATUS_TPS AR_BIT(1) /* transmit process stopped */
-#define DMA_STATUS_TU AR_BIT(2) /* transmit buffer unavailable */
-#define DMA_STATUS_TJT AR_BIT(3) /* transmit buffer timeout */
-#define DMA_STATUS_UNF AR_BIT(5) /* transmit underflow */
-#define DMA_STATUS_RI AR_BIT(6) /* receive interrupt */
-#define DMA_STATUS_RU AR_BIT(7) /* receive buffer unavailable */
-#define DMA_STATUS_RPS AR_BIT(8) /* receive process stopped */
-#define DMA_STATUS_ETI AR_BIT(10) /* early transmit interrupt */
-#define DMA_STATUS_FBE AR_BIT(13) /* fatal bus interrupt */
-#define DMA_STATUS_ERI AR_BIT(14) /* early receive interrupt */
-#define DMA_STATUS_AIS AR_BIT(15) /* abnormal interrupt summary */
-#define DMA_STATUS_NIS AR_BIT(16) /* normal interrupt summary */
-#define DMA_STATUS_RS_SHIFT 17 /* receive process state */
-#define DMA_STATUS_TS_SHIFT 20 /* transmit process state */
-#define DMA_STATUS_EB_SHIFT 23 /* error bits */
-
-#define DMA_CONTROL_SR AR_BIT(1) /* start receive */
-#define DMA_CONTROL_ST AR_BIT(13) /* start transmit */
-#define DMA_CONTROL_SF AR_BIT(21) /* store and forward */
-
-
-typedef struct {
- volatile unsigned int status; // OWN, Device control and status.
- volatile unsigned int devcs; // pkt Control bits + Length
- volatile unsigned int addr; // Current Address.
- volatile unsigned int descr; // Next descriptor in chain.
-} ar2313_descr_t;
-
-
-#endif // __ARUBA_DMA_H__
diff --git a/target/linux/atheros/files-2.6.26/drivers/watchdog/ar2315-wtd.c b/target/linux/atheros/files-2.6.26/drivers/watchdog/ar2315-wtd.c
deleted file mode 100644
index d71b6f6..0000000
--- a/target/linux/atheros/files-2.6.26/drivers/watchdog/ar2315-wtd.c
+++ /dev/null
@@ -1,198 +0,0 @@
-/*
- * 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, MA 02111-1307 USA
- *
- * Copyright (C) 2008 John Crispin <blogic@openwrt.org>
- * Based on EP93xx and ifxmips wdt driver
- */
-
-#include <linux/interrupt.h>
-#include <linux/module.h>
-#include <linux/moduleparam.h>
-#include <linux/types.h>
-#include <linux/miscdevice.h>
-#include <linux/watchdog.h>
-#include <linux/fs.h>
-#include <linux/ioport.h>
-#include <linux/notifier.h>
-#include <linux/reboot.h>
-#include <linux/init.h>
-#include <linux/platform_device.h>
-
-#include <asm/io.h>
-#include <asm/uaccess.h>
-#include <asm/system.h>
-#include <asm/addrspace.h>
-#include <ar531x.h>
-
-#define CLOCK_RATE 40000000
-#define HEARTBEAT(x) (x < 1 || x > 90)?(20):(x)
-
-static int wdt_timeout = 20;
-static int started = 0;
-static int in_use = 0;
-
-static void
-ar2315_wdt_enable(void)
-{
- sysRegWrite(AR5315_WD, wdt_timeout * CLOCK_RATE);
- sysRegWrite(AR5315_ISR, 0x80);
-}
-
-static ssize_t
-ar2315_wdt_write(struct file *file, const char __user *data, size_t len, loff_t *ppos)
-{
- if(len)
- ar2315_wdt_enable();
- return len;
-}
-
-static int
-ar2315_wdt_open(struct inode *inode, struct file *file)
-{
- if(in_use)
- return -EBUSY;
- ar2315_wdt_enable();
- in_use = started = 1;
- return nonseekable_open(inode, file);
-}
-
-static int
-ar2315_wdt_release(struct inode *inode, struct file *file)
-{
- in_use = 0;
- return 0;
-}
-
-static irqreturn_t
-ar2315_wdt_interrupt(int irq, void *dev_id)
-{
- if(started)
- {
- printk(KERN_CRIT "watchdog expired, rebooting system\n");
- emergency_restart();
- } else {
- sysRegWrite(AR5315_WDC, 0);
- sysRegWrite(AR5315_WD, 0);
- sysRegWrite(AR5315_ISR, 0x80);
- }
- return IRQ_HANDLED;
-}
-
-static struct watchdog_info ident = {
- .options = WDIOF_SETTIMEOUT | WDIOF_KEEPALIVEPING,
- .identity = "ar2315 Watchdog",
-};
-
-static int
-ar2315_wdt_ioctl(struct inode *inode, struct file *file, unsigned int cmd, unsigned long arg)
-{
- int new_wdt_timeout;
- int ret = -ENOIOCTLCMD;
-
- switch(cmd)
- {
- case WDIOC_GETSUPPORT:
- ret = copy_to_user((struct watchdog_info __user *)arg, &ident, sizeof(ident)) ? -EFAULT : 0;
- break;
-
- case WDIOC_KEEPALIVE:
- ar2315_wdt_enable();
- ret = 0;
- break;
-
- case WDIOC_SETTIMEOUT:
- if((ret = get_user(new_wdt_timeout, (int __user *)arg)))
- break;
- wdt_timeout = HEARTBEAT(new_wdt_timeout);
- ar2315_wdt_enable();
- break;
-
- case WDIOC_GETTIMEOUT:
- ret = put_user(wdt_timeout, (int __user *)arg);
- break;
- }
- return ret;
-}
-
-static struct file_operations ar2315_wdt_fops = {
- .owner = THIS_MODULE,
- .llseek = no_llseek,
- .write = ar2315_wdt_write,
- .ioctl = ar2315_wdt_ioctl,
- .open = ar2315_wdt_open,
- .release = ar2315_wdt_release,
-};
-
-static struct miscdevice ar2315_wdt_miscdev = {
- .minor = WATCHDOG_MINOR,
- .name = "watchdog",
- .fops = &ar2315_wdt_fops,
-};
-
-static int
-ar2315_wdt_probe(struct platform_device *dev)
-{
- int ret = 0;
-
- ar2315_wdt_enable();
- ret = request_irq(AR531X_MISC_IRQ_WATCHDOG, ar2315_wdt_interrupt, IRQF_DISABLED, "ar2315_wdt", NULL);
- if(ret)
- {
- printk(KERN_ERR "ar2315wdt: failed to register inetrrupt\n");
- goto out;
- }
-
- ret = misc_register(&ar2315_wdt_miscdev);
- if(ret)
- printk(KERN_ERR "ar2315wdt: failed to register miscdev\n");
-
-out:
- return ret;
-}
-
-static int
-ar2315_wdt_remove(struct platform_device *dev)
-{
- misc_deregister(&ar2315_wdt_miscdev);
- free_irq(AR531X_MISC_IRQ_WATCHDOG, NULL);
- return 0;
-}
-
-static struct platform_driver ar2315_wdt_driver = {
- .probe = ar2315_wdt_probe,
- .remove = ar2315_wdt_remove,
- .driver = {
- .name = "ar2315_wdt",
- .owner = THIS_MODULE,
- },
-};
-
-static int __init
-init_ar2315_wdt(void)
-{
- int ret = platform_driver_register(&ar2315_wdt_driver);
- if(ret)
- printk(KERN_INFO "ar2315_wdt: error registering platfom driver!");
- return ret;
-}
-
-static void __exit
-exit_ar2315_wdt(void)
-{
- platform_driver_unregister(&ar2315_wdt_driver);
-}
-
-module_init(init_ar2315_wdt);
-module_exit(exit_ar2315_wdt);
diff --git a/target/linux/atheros/files-2.6.26/include/asm-mips/mach-atheros/ar5312/ar5312.h b/target/linux/atheros/files-2.6.26/include/asm-mips/mach-atheros/ar5312/ar5312.h
deleted file mode 100644
index afa3aef..0000000
--- a/target/linux/atheros/files-2.6.26/include/asm-mips/mach-atheros/ar5312/ar5312.h
+++ /dev/null
@@ -1,234 +0,0 @@
-/*
- * 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 (C) 2003 Atheros Communications, Inc., All Rights Reserved.
- * Copyright (C) 2006 Imre Kaloz <kaloz@openwrt.org>
- * Copyright (C) 2006 Felix Fietkau <nbd@openwrt.org>
- */
-
-#ifndef AR5312_H
-#define AR5312_H
-
-#include <asm/addrspace.h>
-
-/*
- * IRQs
- */
-
-#define AR5312_IRQ_WLAN0_INTRS MIPS_CPU_IRQ_BASE+2 /* C0_CAUSE: 0x0400 */
-#define AR5312_IRQ_ENET0_INTRS MIPS_CPU_IRQ_BASE+3 /* C0_CAUSE: 0x0800 */
-#define AR5312_IRQ_ENET1_INTRS MIPS_CPU_IRQ_BASE+4 /* C0_CAUSE: 0x1000 */
-#define AR5312_IRQ_WLAN1_INTRS MIPS_CPU_IRQ_BASE+5 /* C0_CAUSE: 0x2000 */
-#define AR5312_IRQ_MISC_INTRS MIPS_CPU_IRQ_BASE+6 /* C0_CAUSE: 0x4000 */
-
-
-/* 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
-#define AR531X_UART0 0xbc000003 /* UART MMR */
-
-/*
- * 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 (AR531X_REV_MAJ|AR531X_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 AR531X_GPIO_CR_M(x) (1 << (x)) /* mask for i/o */
-#define AR531X_GPIO_CR_O(x) (0 << (x)) /* mask for output */
-#define AR531X_GPIO_CR_I(x) (1 << (x)) /* mask for input */
-#define AR531X_GPIO_CR_INT(x) (1 << ((x)+8)) /* mask for interrupt */
-#define AR531X_GPIO_CR_UART(x) (1 << ((x)+16)) /* uart multiplex */
-
-#endif
-
diff --git a/target/linux/atheros/files-2.6.26/include/asm-mips/mach-atheros/ar5315/ar5315.h b/target/linux/atheros/files-2.6.26/include/asm-mips/mach-atheros/ar5315/ar5315.h
deleted file mode 100644
index 8ad8810..0000000
--- a/target/linux/atheros/files-2.6.26/include/asm-mips/mach-atheros/ar5315/ar5315.h
+++ /dev/null
@@ -1,694 +0,0 @@
-/*
- * 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 (C) 2003 Atheros Communications, Inc., All Rights Reserved.
- * Copyright (C) 2006 FON Technology, SL.
- * Copyright (C) 2006 Imre Kaloz <kaloz@openwrt.org>
- * Copyright (C) 2006 Felix Fietkau <nbd@openwrt.org>
- */
-
-#ifndef AR5315_H
-#define AR5315_H
-
-/*
- * IRQs
- */
-#define AR5315_IRQ_MISC_INTRS MIPS_CPU_IRQ_BASE+2 /* C0_CAUSE: 0x0400 */
-#define AR5315_IRQ_WLAN0_INTRS MIPS_CPU_IRQ_BASE+3 /* C0_CAUSE: 0x0800 */
-#define AR5315_IRQ_ENET0_INTRS MIPS_CPU_IRQ_BASE+4 /* C0_CAUSE: 0x1000 */
-#define AR5315_IRQ_LCBUS_PCI MIPS_CPU_IRQ_BASE+5 /* C0_CAUSE: 0x2000 */
-#define AR5315_IRQ_WLAN0_POLL MIPS_CPU_IRQ_BASE+6 /* C0_CAUSE: 0x4000 */
-
-
-/*
- * Address map
- */
-#define AR5315_SDRAM0 0x00000000 /* DRAM */
-#define AR5315_SPI_READ 0x08000000 /* SPI FLASH */
-#define AR5315_WLAN0 0xB0000000 /* Wireless MMR */
-#define AR5315_PCI 0xB0100000 /* PCI MMR */
-#define AR5315_SDRAMCTL 0xB0300000 /* SDRAM MMR */
-#define AR5315_LOCAL 0xB0400000 /* LOCAL BUS MMR */
-#define AR5315_ENET0 0xB0500000 /* ETHERNET MMR */
-#define AR5315_DSLBASE 0xB1000000 /* RESET CONTROL MMR */
-#define AR5315_UART0 0xB1100003 /* UART MMR */
-#define AR5315_SPI 0xB1300000 /* SPI FLASH MMR */
-#define AR5315_FLASHBT 0xBfc00000 /* ro boot alias to FLASH */
-#define AR5315_RAM1 0x40000000 /* ram alias */
-#define AR5315_PCIEXT 0x80000000 /* pci external */
-#define AR5315_RAM2 0xc0000000 /* ram alias */
-#define AR5315_RAM3 0xe0000000 /* ram alias */
-
-/*
- * Reset Register
- */
-#define AR5315_COLD_RESET (AR5315_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 */
-
-#define AR5317_RESET_SYSTEM 0x00000010
-
-/* Warm Reset */
-
-#define AR5315_RESET (AR5315_DSLBASE + 0x0004)
-
-#define AR5315_RESET_WARM_WLAN0_MAC 0x00000001 /* warm reset WLAN0 MAC */
-#define AR5315_RESET_WARM_WLAN0_BB 0x00000002 /* warm reset WLAN0 BaseBand */
-#define AR5315_RESET_MPEGTS_RSVD 0x00000004 /* warm reset MPEG-TS */
-#define AR5315_RESET_PCIDMA 0x00000008 /* warm reset PCI ahb/dma */
-#define AR5315_RESET_MEMCTL 0x00000010 /* warm reset memory controller */
-#define AR5315_RESET_LOCAL 0x00000020 /* warm reset local bus */
-#define AR5315_RESET_I2C_RSVD 0x00000040 /* warm reset I2C bus */
-#define AR5315_RESET_SPI 0x00000080 /* warm reset SPI interface */
-#define AR5315_RESET_UART0 0x00000100 /* warm reset UART0 */
-#define AR5315_RESET_IR_RSVD 0x00000200 /* warm reset IR interface */
-#define AR5315_RESET_EPHY0 0x00000400 /* cold reset ENET0 phy */
-#define AR5315_RESET_ENET0 0x00000800 /* cold reset ENET0 mac */
-
-/*
- * AHB master arbitration control
- */
-#define AR5315_AHB_ARB_CTL (AR5315_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 AR5315_ENDIAN_CTL (AR5315_DSLBASE + 0x000c)
-
-#define AR5315_CONFIG_AHB 0x00000001 /* EC - AHB bridge endianess */
-#define AR5315_CONFIG_WLAN 0x00000002 /* WLAN byteswap */
-#define AR5315_CONFIG_MPEGTS_RSVD 0x00000004 /* MPEG-TS byteswap */
-#define AR5315_CONFIG_PCI 0x00000008 /* PCI byteswap */
-#define AR5315_CONFIG_MEMCTL 0x00000010 /* Memory controller endianess */
-#define AR5315_CONFIG_LOCAL 0x00000020 /* Local bus byteswap */
-#define AR5315_CONFIG_ETHERNET 0x00000040 /* Ethernet byteswap */
-
-#define AR5315_CONFIG_MERGE 0x00000200 /* CPU write buffer merge */
-#define AR5315_CONFIG_CPU 0x00000400 /* CPU big endian */
-#define AR5315_CONFIG_PCIAHB 0x00000800
-#define AR5315_CONFIG_PCIAHB_BRIDGE 0x00001000
-#define AR5315_CONFIG_SPI 0x00008000 /* SPI byteswap */
-#define AR5315_CONFIG_CPU_DRAM 0x00010000
-#define AR5315_CONFIG_CPU_PCI 0x00020000
-#define AR5315_CONFIG_CPU_MMR 0x00040000
-#define AR5315_CONFIG_BIG 0x00000400
-
-
-/*
- * NMI control
- */
-#define AR5315_NMI_CTL (AR5315_DSLBASE + 0x0010)
-
-#define NMI_EN 1
-
-/*
- * Revision Register - Initial value is 0x3010 (WMAC 3.0, AR531X 1.0).
- */
-#define AR5315_SREV (AR5315_DSLBASE + 0x0014)
-
-#define AR5315_REV_MAJ 0x00f0
-#define AR5315_REV_MAJ_S 4
-#define AR5315_REV_MIN 0x000f
-#define AR5315_REV_MIN_S 0
-#define AR5315_REV_CHIP (AR5315_REV_MAJ|AR5315_REV_MIN)
-
-/*
- * Interface Enable
- */
-#define AR5315_IF_CTL (AR5315_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 AR5315_ISR (AR5315_DSLBASE + 0x0020)
-#define AR5315_IMR (AR5315_DSLBASE + 0x0024)
-#define AR5315_GISR (AR5315_DSLBASE + 0x0028)
-
-#define AR5315_ISR_UART0 0x0001 /* high speed UART */
-#define AR5315_ISR_I2C_RSVD 0x0002 /* I2C bus */
-#define AR5315_ISR_SPI 0x0004 /* SPI bus */
-#define AR5315_ISR_AHB 0x0008 /* AHB error */
-#define AR5315_ISR_APB 0x0010 /* APB error */
-#define AR5315_ISR_TIMER 0x0020 /* timer */
-#define AR5315_ISR_GPIO 0x0040 /* GPIO */
-#define AR5315_ISR_WD 0x0080 /* watchdog */
-#define AR5315_ISR_IR_RSVD 0x0100 /* IR */
-
-#define AR5315_GISR_MISC 0x0001
-#define AR5315_GISR_WLAN0 0x0002
-#define AR5315_GISR_MPEGTS_RSVD 0x0004
-#define AR5315_GISR_LOCALPCI 0x0008
-#define AR5315_GISR_WMACPOLL 0x0010
-#define AR5315_GISR_TIMER 0x0020
-#define AR5315_GISR_ETHERNET 0x0040
-
-/*
- * Interrupt routing from IO to the processor IP bits
- * Define our inter mask and level
- */
-#define AR5315_INTR_MISCIO SR_IBIT3
-#define AR5315_INTR_WLAN0 SR_IBIT4
-#define AR5315_INTR_ENET0 SR_IBIT5
-#define AR5315_INTR_LOCALPCI SR_IBIT6
-#define AR5315_INTR_WMACPOLL SR_IBIT7
-#define AR5315_INTR_COMPARE SR_IBIT8
-
-/*
- * Timers
- */
-#define AR5315_TIMER (AR5315_DSLBASE + 0x0030)
-#define AR5315_RELOAD (AR5315_DSLBASE + 0x0034)
-#define AR5315_WD (AR5315_DSLBASE + 0x0038)
-#define AR5315_WDC (AR5315_DSLBASE + 0x003c)
-
-#define WDC_RESET 0x00000002 /* reset on watchdog */
-#define WDC_NMI 0x00000001 /* NMI on watchdog */
-#define WDC_IGNORE_EXPIRATION 0x00000000
-
-/*
- * CPU Performance Counters
- */
-#define AR5315_PERFCNT0 (AR5315_DSLBASE + 0x0048)
-#define AR5315_PERFCNT1 (AR5315_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 AR5315_AHB_ERR0 (AR5315_DSLBASE + 0x0050) /* error */
-#define AR5315_AHB_ERR1 (AR5315_DSLBASE + 0x0054) /* haddr */
-#define AR5315_AHB_ERR2 (AR5315_DSLBASE + 0x0058) /* hwdata */
-#define AR5315_AHB_ERR3 (AR5315_DSLBASE + 0x005c) /* hrdata */
-#define AR5315_AHB_ERR4 (AR5315_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 AR5315_PLLC_CTL (AR5315_DSLBASE + 0x0064)
-#define AR5315_PLLV_CTL (AR5315_DSLBASE + 0x0068)
-#define AR5315_CPUCLK (AR5315_DSLBASE + 0x006c)
-#define AR5315_AMBACLK (AR5315_DSLBASE + 0x0070)
-#define AR5315_SYNCCLK (AR5315_DSLBASE + 0x0074)
-#define AR5315_DSL_SLEEP_CTL (AR5315_DSLBASE + 0x0080)
-#define AR5315_DSL_SLEEP_DUR (AR5315_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 AR5315_AMBA_CLOCK_RATE 20000000
-#define AR5315_CPU_CLOCK_RATE 40000000
-#else
-#if defined(DEFAULT_PLL)
-#define AR5315_AMBA_CLOCK_RATE 40000000
-#define AR5315_CPU_CLOCK_RATE 40000000
-#else
-#define AR5315_AMBA_CLOCK_RATE 92000000
-#define AR5315_CPU_CLOCK_RATE 184000000
-#endif /* ! DEFAULT_PLL */
-#endif /* ! COBRA_EMUL */
-
-#define AR5315_UART_CLOCK_RATE AR5315_AMBA_CLOCK_RATE
-#define AR5315_SDRAM_CLOCK_RATE AR5315_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
-
-
-#define CLOCKCTL_UART0 0x0010 /* enable UART0 external clock */
-
-
- /*
- * Applicable "PCICFG" bits for WLAN(s). Assoc status and LED mode.
- */
-#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 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 AR5315_GPIO_CR_M(x) (1 << (x)) /* mask for i/o */
-#define AR5315_GPIO_CR_O(x) (1 << (x)) /* output */
-#define AR5315_GPIO_CR_I(x) (0) /* input */
-
-#define AR5315_GPIO_INT_S(x) (x) /* interrupt enable */
-#define AR5315_GPIO_INT_M (0x3F) /* mask for int */
-#define AR5315_GPIO_INT_LVL(x) ((x) << 6) /* interrupt level */
-#define AR5315_GPIO_INT_LVL_M ((0x3) << 6) /* mask for int level */
-
-#define AR5315_GPIO_INT_MAX_Y 1 /* Maximum value of Y for AR5313_GPIO_INT_* macros */
-#define AR5315_GPIO_INT_LVL_OFF 0 /* Triggerring off */
-#define AR5315_GPIO_INT_LVL_LOW 1 /* Low Level Triggered */
-#define AR5315_GPIO_INT_LVL_HIGH 2 /* High Level Triggered */
-#define AR5315_GPIO_INT_LVL_EDGE 3 /* Edge Triggered */
-
-#define AR5315_RESET_GPIO 5
-#define AR5315_NUM_GPIO 22
-
-
-/*
- * PCI Clock Control
- */
-
-#define AR5315_PCICLK (AR5315_DSLBASE + 0x00a4)
-
-#define AR5315_PCICLK_INPUT_M 0x3
-#define AR5315_PCICLK_INPUT_S 0
-
-#define AR5315_PCICLK_PLLC_CLKM 0
-#define AR5315_PCICLK_PLLC_CLKM1 1
-#define AR5315_PCICLK_PLLC_CLKC 2
-#define AR5315_PCICLK_REF_CLK 3
-
-#define AR5315_PCICLK_DIV_M 0xc
-#define AR5315_PCICLK_DIV_S 2
-
-#define AR5315_PCICLK_IN_FREQ 0
-#define AR5315_PCICLK_IN_FREQ_DIV_6 1
-#define AR5315_PCICLK_IN_FREQ_DIV_8 2
-#define AR5315_PCICLK_IN_FREQ_DIV_10 3
-
-/*
- * Observation Control Register
- */
-#define AR5315_OCR (AR5315_DSLBASE + 0x00b0)
-#define OCR_GPIO0_IRIN 0x0040
-#define OCR_GPIO1_IROUT 0x0080
-#define OCR_GPIO3_RXCLR 0x0200
-
-/*
- * General Clock Control
- */
-
-#define AR5315_MISCCLK (AR5315_DSLBASE + 0x00b4)
-#define MISCCLK_PLLBYPASS_EN 0x00000001
-#define MISCCLK_PROCREFCLK 0x00000002
-
-/*
- * SDRAM Controller
- * - No read or write buffers are included.
- */
-#define AR5315_MEM_CFG (AR5315_SDRAMCTL + 0x00)
-#define AR5315_MEM_CTRL (AR5315_SDRAMCTL + 0x0c)
-#define AR5315_MEM_REF (AR5315_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
-
-/*
- * SPI Flash Interface Registers
- */
-
-#define AR5315_SPI_CTL (AR5315_SPI + 0x00)
-#define AR5315_SPI_OPCODE (AR5315_SPI + 0x04)
-#define AR5315_SPI_DATA (AR5315_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 (AR5315_PCI + 0x4000)
-#define PCI_MAC_SCR (AR5315_PCI + 0x4004)
-#define PCI_MAC_INTPEND (AR5315_PCI + 0x4008)
-#define PCI_MAC_SFR (AR5315_PCI + 0x400C)
-#define PCI_MAC_PCICFG (AR5315_PCI + 0x4010)
-#define PCI_MAC_SREV (AR5315_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 AR5315_PCI_1MS_REG (AR5315_PCI + 0x0008)
-#define AR5315_PCI_1MS_MASK 0x3FFFF /* # of AHB clk cycles in 1ms */
-
-#define AR5315_PCI_MISC_CONFIG (AR5315_PCI + 0x000c)
-#define AR5315_PCIMISC_TXD_EN 0x00000001 /* Enable TXD for fragments */
-#define AR5315_PCIMISC_CFG_SEL 0x00000002 /* mem or config cycles */
-#define AR5315_PCIMISC_GIG_MASK 0x0000000C /* bits 31-30 for pci req */
-#define AR5315_PCIMISC_RST_MODE 0x00000030
-#define AR5315_PCIRST_INPUT 0x00000000 /* 4:5=0 rst is input */
-#define AR5315_PCIRST_LOW 0x00000010 /* 4:5=1 rst to GND */
-#define AR5315_PCIRST_HIGH 0x00000020 /* 4:5=2 rst to VDD */
-#define AR5315_PCIGRANT_EN 0x00000000 /* 6:7=0 early grant en */
-#define AR5315_PCIGRANT_FRAME 0x00000040 /* 6:7=1 grant waits 4 frame */
-#define AR5315_PCIGRANT_IDLE 0x00000080 /* 6:7=2 grant waits 4 idle */
-#define AR5315_PCIGRANT_GAP 0x00000000 /* 6:7=2 grant waits 4 idle */
-#define AR5315_PCICACHE_DIS 0x00001000 /* PCI external access cache disable */
-
-#define AR5315_PCI_OUT_TSTAMP (AR5315_PCI + 0x0010)
-
-#define AR5315_PCI_UNCACHE_CFG (AR5315_PCI + 0x0014)
-
-#define AR5315_PCI_IN_EN (AR5315_PCI + 0x0100)
-#define AR5315_PCI_IN_EN0 0x01 /* Enable chain 0 */
-#define AR5315_PCI_IN_EN1 0x02 /* Enable chain 1 */
-#define AR5315_PCI_IN_EN2 0x04 /* Enable chain 2 */
-#define AR5315_PCI_IN_EN3 0x08 /* Enable chain 3 */
-
-#define AR5315_PCI_IN_DIS (AR5315_PCI + 0x0104)
-#define AR5315_PCI_IN_DIS0 0x01 /* Disable chain 0 */
-#define AR5315_PCI_IN_DIS1 0x02 /* Disable chain 1 */
-#define AR5315_PCI_IN_DIS2 0x04 /* Disable chain 2 */
-#define AR5315_PCI_IN_DIS3 0x08 /* Disable chain 3 */
-
-#define AR5315_PCI_IN_PTR (AR5315_PCI + 0x0200)
-
-#define AR5315_PCI_OUT_EN (AR5315_PCI + 0x0400)
-#define AR5315_PCI_OUT_EN0 0x01 /* Enable chain 0 */
-
-#define AR5315_PCI_OUT_DIS (AR5315_PCI + 0x0404)
-#define AR5315_PCI_OUT_DIS0 0x01 /* Disable chain 0 */
-
-#define AR5315_PCI_OUT_PTR (AR5315_PCI + 0x0408)
-
-#define AR5315_PCI_INT_STATUS (AR5315_PCI + 0x0500) /* write one to clr */
-#define AR5315_PCI_TXINT 0x00000001 /* Desc In Completed */
-#define AR5315_PCI_TXOK 0x00000002 /* Desc In OK */
-#define AR5315_PCI_TXERR 0x00000004 /* Desc In ERR */
-#define AR5315_PCI_TXEOL 0x00000008 /* Desc In End-of-List */
-#define AR5315_PCI_RXINT 0x00000010 /* Desc Out Completed */
-#define AR5315_PCI_RXOK 0x00000020 /* Desc Out OK */
-#define AR5315_PCI_RXERR 0x00000040 /* Desc Out ERR */
-#define AR5315_PCI_RXEOL 0x00000080 /* Desc Out EOL */
-#define AR5315_PCI_TXOOD 0x00000200 /* Desc In Out-of-Desc */
-#define AR5315_PCI_MASK 0x0000FFFF /* Desc Mask */
-#define AR5315_PCI_EXT_INT 0x02000000
-#define AR5315_PCI_ABORT_INT 0x04000000
-
-#define AR5315_PCI_INT_MASK (AR5315_PCI + 0x0504) /* same as INT_STATUS */
-
-#define AR5315_PCI_INTEN_REG (AR5315_PCI + 0x0508)
-#define AR5315_PCI_INT_DISABLE 0x00 /* disable pci interrupts */
-#define AR5315_PCI_INT_ENABLE 0x01 /* enable pci interrupts */
-
-#define AR5315_PCI_HOST_IN_EN (AR5315_PCI + 0x0800)
-#define AR5315_PCI_HOST_IN_DIS (AR5315_PCI + 0x0804)
-#define AR5315_PCI_HOST_IN_PTR (AR5315_PCI + 0x0810)
-#define AR5315_PCI_HOST_OUT_EN (AR5315_PCI + 0x0900)
-#define AR5315_PCI_HOST_OUT_DIS (AR5315_PCI + 0x0904)
-#define AR5315_PCI_HOST_OUT_PTR (AR5315_PCI + 0x0908)
-
-
-/*
- * Local Bus Interface Registers
- */
-#define AR5315_LB_CONFIG (AR5315_LOCAL + 0x0000)
-#define AR5315_LBCONF_OE 0x00000001 /* =1 OE is low-true */
-#define AR5315_LBCONF_CS0 0x00000002 /* =1 first CS is low-true */
-#define AR5315_LBCONF_CS1 0x00000004 /* =1 2nd CS is low-true */
-#define AR5315_LBCONF_RDY 0x00000008 /* =1 RDY is low-true */
-#define AR5315_LBCONF_WE 0x00000010 /* =1 Write En is low-true */
-#define AR5315_LBCONF_WAIT 0x00000020 /* =1 WAIT is low-true */
-#define AR5315_LBCONF_ADS 0x00000040 /* =1 Adr Strobe is low-true */
-#define AR5315_LBCONF_MOT 0x00000080 /* =0 Intel, =1 Motorola */
-#define AR5315_LBCONF_8CS 0x00000100 /* =1 8 bits CS, 0= 16bits */
-#define AR5315_LBCONF_8DS 0x00000200 /* =1 8 bits Data S, 0=16bits */
-#define AR5315_LBCONF_ADS_EN 0x00000400 /* =1 Enable ADS */
-#define AR5315_LBCONF_ADR_OE 0x00000800 /* =1 Adr cap on OE, WE or DS */
-#define AR5315_LBCONF_ADDT_MUX 0x00001000 /* =1 Adr and Data share bus */
-#define AR5315_LBCONF_DATA_OE 0x00002000 /* =1 Data cap on OE, WE, DS */
-#define AR5315_LBCONF_16DATA 0x00004000 /* =1 Data is 16 bits wide */
-#define AR5315_LBCONF_SWAPDT 0x00008000 /* =1 Byte swap data */
-#define AR5315_LBCONF_SYNC 0x00010000 /* =1 Bus synchronous to clk */
-#define AR5315_LBCONF_INT 0x00020000 /* =1 Intr is low true */
-#define AR5315_LBCONF_INT_CTR0 0x00000000 /* GND high-Z, Vdd is high-Z */
-#define AR5315_LBCONF_INT_CTR1 0x00040000 /* GND drive, Vdd is high-Z */
-#define AR5315_LBCONF_INT_CTR2 0x00080000 /* GND high-Z, Vdd drive */
-#define AR5315_LBCONF_INT_CTR3 0x000C0000 /* GND drive, Vdd drive */
-#define AR5315_LBCONF_RDY_WAIT 0x00100000 /* =1 RDY is negative of WAIT */
-#define AR5315_LBCONF_INT_PULSE 0x00200000 /* =1 Interrupt is a pulse */
-#define AR5315_LBCONF_ENABLE 0x00400000 /* =1 Falcon respond to LB */
-
-#define AR5315_LB_CLKSEL (AR5315_LOCAL + 0x0004)
-#define AR5315_LBCLK_EXT 0x0001 /* use external clk for lb */
-
-#define AR5315_LB_1MS (AR5315_LOCAL + 0x0008)
-#define AR5315_LB1MS_MASK 0x3FFFF /* # of AHB clk cycles in 1ms */
-
-#define AR5315_LB_MISCCFG (AR5315_LOCAL + 0x000C)
-#define AR5315_LBM_TXD_EN 0x00000001 /* Enable TXD for fragments */
-#define AR5315_LBM_RX_INTEN 0x00000002 /* Enable LB ints on RX ready */
-#define AR5315_LBM_MBOXWR_INTEN 0x00000004 /* Enable LB ints on mbox wr */
-#define AR5315_LBM_MBOXRD_INTEN 0x00000008 /* Enable LB ints on mbox rd */
-#define AR5315_LMB_DESCSWAP_EN 0x00000010 /* Byte swap desc enable */
-#define AR5315_LBM_TIMEOUT_MASK 0x00FFFF80
-#define AR5315_LBM_TIMEOUT_SHFT 7
-#define AR5315_LBM_PORTMUX 0x07000000
-
-
-#define AR5315_LB_RXTSOFF (AR5315_LOCAL + 0x0010)
-
-#define AR5315_LB_TX_CHAIN_EN (AR5315_LOCAL + 0x0100)
-#define AR5315_LB_TXEN_0 0x01
-#define AR5315_LB_TXEN_1 0x02
-#define AR5315_LB_TXEN_2 0x04
-#define AR5315_LB_TXEN_3 0x08
-
-#define AR5315_LB_TX_CHAIN_DIS (AR5315_LOCAL + 0x0104)
-#define AR5315_LB_TX_DESC_PTR (AR5315_LOCAL + 0x0200)
-
-#define AR5315_LB_RX_CHAIN_EN (AR5315_LOCAL + 0x0400)
-#define AR5315_LB_RXEN 0x01
-
-#define AR5315_LB_RX_CHAIN_DIS (AR5315_LOCAL + 0x0404)
-#define AR5315_LB_RX_DESC_PTR (AR5315_LOCAL + 0x0408)
-
-#define AR5315_LB_INT_STATUS (AR5315_LOCAL + 0x0500)
-#define AR5315_INT_TX_DESC 0x0001
-#define AR5315_INT_TX_OK 0x0002
-#define AR5315_INT_TX_ERR 0x0004
-#define AR5315_INT_TX_EOF 0x0008
-#define AR5315_INT_RX_DESC 0x0010
-#define AR5315_INT_RX_OK 0x0020
-#define AR5315_INT_RX_ERR 0x0040
-#define AR5315_INT_RX_EOF 0x0080
-#define AR5315_INT_TX_TRUNC 0x0100
-#define AR5315_INT_TX_STARVE 0x0200
-#define AR5315_INT_LB_TIMEOUT 0x0400
-#define AR5315_INT_LB_ERR 0x0800
-#define AR5315_INT_MBOX_WR 0x1000
-#define AR5315_INT_MBOX_RD 0x2000
-
-/* Bit definitions for INT MASK are the same as INT_STATUS */
-#define AR5315_LB_INT_MASK (AR5315_LOCAL + 0x0504)
-
-#define AR5315_LB_INT_EN (AR5315_LOCAL + 0x0508)
-#define AR5315_LB_MBOX (AR5315_LOCAL + 0x0600)
-
-
-
-/*
- * IR Interface Registers
- */
-#define AR5315_IR_PKTDATA (AR5315_IR + 0x0000)
-
-#define AR5315_IR_PKTLEN (AR5315_IR + 0x07fc) /* 0 - 63 */
-
-#define AR5315_IR_CONTROL (AR5315_IR + 0x0800)
-#define AR5315_IRCTL_TX 0x00000000 /* use as tranmitter */
-#define AR5315_IRCTL_RX 0x00000001 /* use as receiver */
-#define AR5315_IRCTL_SAMPLECLK_MASK 0x00003ffe /* Sample clk divisor mask */
-#define AR5315_IRCTL_SAMPLECLK_SHFT 1
-#define AR5315_IRCTL_OUTPUTCLK_MASK 0x03ffc000 /* Output clk divisor mask */
-#define AR5315_IRCTL_OUTPUTCLK_SHFT 14
-
-#define AR5315_IR_STATUS (AR5315_IR + 0x0804)
-#define AR5315_IRSTS_RX 0x00000001 /* receive in progress */
-#define AR5315_IRSTS_TX 0x00000002 /* transmit in progress */
-
-#define AR5315_IR_CONFIG (AR5315_IR + 0x0808)
-#define AR5315_IRCFG_INVIN 0x00000001 /* invert input polarity */
-#define AR5315_IRCFG_INVOUT 0x00000002 /* invert output polarity */
-#define AR5315_IRCFG_SEQ_START_WIN_SEL 0x00000004 /* 1 => 28, 0 => 7 */
-#define AR5315_IRCFG_SEQ_START_THRESH 0x000000f0 /* */
-#define AR5315_IRCFG_SEQ_END_UNIT_SEL 0x00000100 /* */
-#define AR5315_IRCFG_SEQ_END_UNIT_THRESH 0x00007e00 /* */
-#define AR5315_IRCFG_SEQ_END_WIN_SEL 0x00008000 /* */
-#define AR5315_IRCFG_SEQ_END_WIN_THRESH 0x001f0000 /* */
-#define AR5315_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
-
-#endif
-
diff --git a/target/linux/atheros/files-2.6.26/include/asm-mips/mach-atheros/ar531x.h b/target/linux/atheros/files-2.6.26/include/asm-mips/mach-atheros/ar531x.h
deleted file mode 100644
index 8148b76..0000000
--- a/target/linux/atheros/files-2.6.26/include/asm-mips/mach-atheros/ar531x.h
+++ /dev/null
@@ -1,149 +0,0 @@
-#ifndef __AR531X_H
-#define __AR531X_H
-
-#include <linux/version.h>
-#include <asm/cpu-info.h>
-#include <ar531x_platform.h>
-#include <ar5312/ar5312.h>
-#include <ar5315/ar5315.h>
-
-#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,24))
-extern void (*board_time_init)(void);
-#endif
-
-/*
- * Atheros CPUs before the AR2315 are using MIPS 4Kc core, later designs are
- * using MIPS 4KEc R2 core. This makes it easy to determine the board at runtime.
- */
-#ifdef CONFIG_ATHEROS_AR5312
-#define DO_AR5312(...) \
- if (current_cpu_data.cputype != CPU_4KEC) { \
- __VA_ARGS__ \
- }
-#else
-#define DO_AR5312(...)
-#endif
-#ifdef CONFIG_ATHEROS_AR5315
-#define DO_AR5315(...) \
- if (current_cpu_data.cputype == CPU_4KEC) { \
- __VA_ARGS__ \
- }
-#else
-#define DO_AR5315(...)
-#endif
-
-#define AR531X_MISC_IRQ_BASE 0x20
-#define AR531X_GPIO_IRQ_BASE 0x30
-
-/* Software's idea of interrupts handled by "CPU Interrupt Controller" */
-#define AR531X_IRQ_NONE MIPS_CPU_IRQ_BASE+0
-#define AR531X_IRQ_CPU_CLOCK MIPS_CPU_IRQ_BASE+7 /* C0_CAUSE: 0x8000 */
-
-/* Miscellaneous interrupts, which share IP6 */
-#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_SPI AR531X_MISC_IRQ_BASE+9
-#define AR531X_MISC_IRQ_COUNT 10
-
-/* GPIO Interrupts [0..7], share AR531X_MISC_IRQ_GPIO */
-#define AR531X_GPIO_IRQ_NONE AR531X_GPIO_IRQ_BASE+0
-#define AR531X_GPIO_IRQ(n) AR531X_GPIO_IRQ_BASE+n
-#define AR531X_GPIO_IRQ_COUNT 22
-
-#define sysRegRead(phys) \
- (*(volatile u32 *)KSEG1ADDR(phys))
-
-#define sysRegWrite(phys, val) \
- ((*(volatile u32 *)KSEG1ADDR(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) */
-};
-
-#define BOARD_CONFIG_BUFSZ 0x1000
-
-extern char *board_config, *radio_config;
-extern void serial_setup(unsigned long mapbase, unsigned int uartclk);
-extern int ar531x_find_config(char *flash_limit);
-
-extern void ar5312_prom_init(void);
-extern void ar5312_misc_intr_init(int irq_base);
-extern void ar5312_plat_setup(void);
-extern asmlinkage void ar5312_irq_dispatch(void);
-
-extern void ar5315_prom_init(void);
-extern void ar5315_misc_intr_init(int irq_base);
-extern void ar5315_plat_setup(void);
-extern asmlinkage void ar5315_irq_dispatch(void);
-extern void ar5315_pci_irq(int irq);
-static inline u32 sysRegMask(u32 phys, u32 mask, u32 value)
-{
- u32 reg;
-
- reg = sysRegRead(phys);
- reg &= ~mask;
- reg |= value & mask;
- sysRegWrite(phys, reg);
- reg = sysRegRead(phys); /* flush write to the hardware */
-
- return reg;
-}
-
-#define AR531X_NUM_GPIO 8
-
-#endif
diff --git a/target/linux/atheros/files-2.6.26/include/asm-mips/mach-atheros/ar531x_platform.h b/target/linux/atheros/files-2.6.26/include/asm-mips/mach-atheros/ar531x_platform.h
deleted file mode 100644
index bddcd59..0000000
--- a/target/linux/atheros/files-2.6.26/include/asm-mips/mach-atheros/ar531x_platform.h
+++ /dev/null
@@ -1,28 +0,0 @@
-#ifndef __AR531X_PLATFORM_H
-#define __AR531X_PLATFORM_H
-
-/*
- * Board support data. The driver is required to locate
- * and fill-in this information before passing a reference to
- * this structure as the HAL_BUS_TAG parameter supplied to
- * ath_hal_attach.
- */
-struct ar531x_config {
- const char *board; /* board config data */
- const char *radio; /* radio config data */
- int unit; /* unit number [0, 1] */
- u32 tag; /* used as devid for now */
-};
-
-struct ar531x_eth {
- int phy;
- int mac;
- u32 reset_base;
- u32 reset_mac;
- u32 reset_phy;
- u32 phy_base;
- char *board_config;
- char *macaddr;
-};
-
-#endif /* __AR531X_PLATFORM_H */
diff --git a/target/linux/atheros/files-2.6.26/include/asm-mips/mach-atheros/cpu-feature-overrides.h b/target/linux/atheros/files-2.6.26/include/asm-mips/mach-atheros/cpu-feature-overrides.h
deleted file mode 100644
index 97f904b..0000000
--- a/target/linux/atheros/files-2.6.26/include/asm-mips/mach-atheros/cpu-feature-overrides.h
+++ /dev/null
@@ -1,84 +0,0 @@
-/*
- * Atheros SoC specific CPU feature overrides
- *
- * Copyright (C) 2008 Gabor Juhos <juhosg@openwrt.org>
- *
- * This file was derived from: include/asm-mips/cpu-features.h
- * Copyright (C) 2003, 2004 Ralf Baechle
- * Copyright (C) 2004 Maciej W. Rozycki
- *
- * This program is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 as published
- * by the Free Software Foundation.
- *
- */
-#ifndef __ASM_MACH_ATHEROS_CPU_FEATURE_OVERRIDES_H
-#define __ASM_MACH_ATHEROS_CPU_FEATURE_OVERRIDES_H
-
-/*
- * The ATHEROS SoCs have MIPS 4Kc/4KEc core.
- */
-#define cpu_has_tlb 1
-#define cpu_has_4kex 1
-#define cpu_has_3k_cache 0
-#define cpu_has_4k_cache 1
-#define cpu_has_tx39_cache 0
-#define cpu_has_sb1_cache 0
-#define cpu_has_fpu 0
-#define cpu_has_32fpr 0
-#define cpu_has_counter 1
-/* #define cpu_has_watch ? */
-/* #define cpu_has_divec ? */
-/* #define cpu_has_vce ? */
-/* #define cpu_has_cache_cdex_p ? */
-/* #define cpu_has_cache_cdex_s ? */
-/* #define cpu_has_prefetch ? */
-/* #define cpu_has_mcheck ? */
-#define cpu_has_ejtag 1
-
-#if !defined(CONFIG_ATHEROS_AR5312)
-# define cpu_has_llsc 1
-#else
-/*
- * The MIPS 4Kc V0.9 core in the AR5312/AR2312 have problems with the
- * ll/sc instructions.
- */
-# define cpu_has_llsc 0
-#endif
-
-#define cpu_has_mips16 0
-#define cpu_has_mdmx 0
-#define cpu_has_mips3d 0
-#define cpu_has_smartmips 0
-
-/* #define cpu_has_vtag_icache ? */
-/* #define cpu_has_dc_aliases ? */
-/* #define cpu_has_ic_fills_f_dc ? */
-/* #define cpu_has_pindexed_dcache ? */
-
-/* #define cpu_icache_snoops_remote_store ? */
-
-#define cpu_has_mips32r1 1
-
-#if !defined(CONFIG_ATHEROS_AR5312)
-# define cpu_has_mips32r2 1
-#endif
-
-#define cpu_has_mips64r1 0
-#define cpu_has_mips64r2 0
-
-#define cpu_has_dsp 0
-#define cpu_has_mipsmt 0
-
-/* #define cpu_has_nofpuex ? */
-#define cpu_has_64bits 0
-#define cpu_has_64bit_zero_reg 0
-#define cpu_has_64bit_gp_regs 0
-#define cpu_has_64bit_addresses 0
-
-/* #define cpu_has_inclusive_pcaches ? */
-
-/* #define cpu_dcache_line_size() ? */
-/* #define cpu_icache_line_size() ? */
-
-#endif /* __ASM_MACH_ATHEROS_CPU_FEATURE_OVERRIDES_H */
diff --git a/target/linux/atheros/files-2.6.26/include/asm-mips/mach-atheros/dma-coherence.h b/target/linux/atheros/files-2.6.26/include/asm-mips/mach-atheros/dma-coherence.h
deleted file mode 100644
index fe53556..0000000
--- a/target/linux/atheros/files-2.6.26/include/asm-mips/mach-atheros/dma-coherence.h
+++ /dev/null
@@ -1,41 +0,0 @@
-/*
- * 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 (C) 2006 Ralf Baechle <ralf@linux-mips.org>
- * Copyright (C) 2007 Felix Fietkau <nbd@openwrt.org>
- *
- */
-#ifndef __ASM_MACH_GENERIC_DMA_COHERENCE_H
-#define __ASM_MACH_GENERIC_DMA_COHERENCE_H
-
-#define PCI_DMA_OFFSET 0x20000000
-
-struct device;
-
-static dma_addr_t plat_map_dma_mem(struct device *dev, void *addr, size_t size)
-{
- return virt_to_phys(addr) + (dev != NULL ? PCI_DMA_OFFSET : 0);
-}
-
-static dma_addr_t plat_map_dma_mem_page(struct device *dev, struct page *page)
-{
- return page_to_phys(page) + (dev != NULL ? PCI_DMA_OFFSET : 0);
-}
-
-static unsigned long plat_dma_addr_to_phys(dma_addr_t dma_addr)
-{
- return (dma_addr > PCI_DMA_OFFSET ? dma_addr - PCI_DMA_OFFSET : dma_addr);
-}
-
-static void plat_unmap_dma_mem(dma_addr_t dma_addr)
-{
-}
-
-static inline int plat_device_is_coherent(struct device *dev)
-{
- return 0;
-}
-
-#endif /* __ASM_MACH_GENERIC_DMA_COHERENCE_H */
diff --git a/target/linux/atheros/files-2.6.26/include/asm-mips/mach-atheros/gpio.h b/target/linux/atheros/files-2.6.26/include/asm-mips/mach-atheros/gpio.h
deleted file mode 100644
index d09e59d..0000000
--- a/target/linux/atheros/files-2.6.26/include/asm-mips/mach-atheros/gpio.h
+++ /dev/null
@@ -1,118 +0,0 @@
-#ifndef _ATHEROS_GPIO_H_
-#define _ATHEROS_GPIO_H_
-
-#include "ar531x.h"
-
-/* Common AR531X global variables */
-/* extern u32 ar531x_gpio_intr_Mask; */
-
-/* AR5312 exported routines */
-#ifdef CONFIG_ATHEROS_AR5312
-asmlinkage void ar5312_gpio_irq_dispatch(void);
-#endif
-
-/* AR5315 exported routines */
-#ifdef CONFIG_ATHEROS_AR5315
-asmlinkage void ar5315_gpio_irq_dispatch(void);
-#endif
-
-/*
- * Wrappers for the generic GPIO layer
- */
-
-/* Sets a gpio to input, or returns ENXIO for non-existent gpio */
-static inline int gpio_direction_input(unsigned gpio) {
- DO_AR5312( if (gpio > AR531X_NUM_GPIO) { \
- return -ENXIO; \
- } else { \
- sysRegWrite(AR531X_GPIO_CR, \
- sysRegRead(AR531X_GPIO_CR) | \
- AR531X_GPIO_CR_I(gpio) ); \
- return 0; \
- } \
- )
- DO_AR5315( if (gpio > AR5315_NUM_GPIO) { \
- return -ENXIO; \
- } else { \
- sysRegWrite(AR5315_GPIO_CR, \
- ( sysRegRead(AR5315_GPIO_CR) & \
- ~(AR5315_GPIO_CR_M(gpio)) ) | \
- AR5315_GPIO_CR_I(gpio) ); \
- return 0; \
- } \
- )
- return -ENXIO;
-}
-
-/* Sets a gpio to output with value, or returns ENXIO for non-existent gpio */
-static inline int gpio_direction_output(unsigned gpio, int value) {
- DO_AR5312( if (gpio > AR531X_NUM_GPIO) { \
- return -ENXIO; \
- } else { \
- sysRegWrite(AR531X_GPIO_DO, \
- ( (sysRegRead(AR531X_GPIO_DO) & \
- ~(1 << gpio) ) | \
- ((value!=0) << gpio)) ); \
- sysRegWrite(AR531X_GPIO_CR, \
- ( sysRegRead(AR531X_GPIO_CR) & \
- ~(AR531X_GPIO_CR_M(gpio)) )); \
- return 0; \
- } \
- )
- DO_AR5315( if (gpio > AR5315_NUM_GPIO) { \
- return -ENXIO; \
- } else { \
- sysRegWrite(AR5315_GPIO_DO, \
- ( (sysRegRead(AR5315_GPIO_DO) & \
- ~(1 << gpio)) | \
- ((value!=0) << gpio)) ); \
- sysRegWrite(AR5315_GPIO_CR, \
- sysRegRead(AR5315_GPIO_CR) | \
- AR5315_GPIO_CR_O(gpio) ); \
- return 0; \
- } \
- )
- return -ENXIO;
-}
-
-/* Reads the gpio pin. Unchecked function */
-static inline int gpio_get_value(unsigned gpio) {
- DO_AR5312(return (sysRegRead(AR531X_GPIO_DI) & (1 << gpio));)
- DO_AR5315(return (sysRegRead(AR5315_GPIO_DI) & (1 << gpio));)
- return 0;
-}
-
-/* Writes to the gpio pin. Unchecked function */
-static inline void gpio_set_value(unsigned gpio, int value) {
- DO_AR5312( sysRegWrite(AR531X_GPIO_DO, \
- ( (sysRegRead(AR531X_GPIO_DO) & \
- ~(1 << gpio)) | \
- ((value!=0) << gpio)) ); \
- )
- DO_AR5315( sysRegWrite(AR5315_GPIO_DO, \
- ( (sysRegRead(AR5315_GPIO_DO) & \
- ~(1 << gpio)) | \
- ((value!=0) << gpio)) ); \
- )
-}
-
-static inline int gpio_request(unsigned gpio, const char *label) {
- return 0;
-}
-
-static inline void gpio_free(unsigned gpio) {
-}
-
-/* Returns IRQ to attach for gpio. Unchecked function */
-static inline int gpio_to_irq(unsigned gpio) {
- return AR531X_GPIO_IRQ(gpio);
-}
-
-/* Returns gpio for IRQ attached. Unchecked function */
-static inline int irq_to_gpio(unsigned irq) {
- return (irq - (AR531X_GPIO_IRQ(0)));
-}
-
-#include <asm-generic/gpio.h> /* cansleep wrappers */
-
-#endif
diff --git a/target/linux/atheros/files-2.6.26/include/asm-mips/mach-atheros/reset.h b/target/linux/atheros/files-2.6.26/include/asm-mips/mach-atheros/reset.h
deleted file mode 100644
index e9fa4c5..0000000
--- a/target/linux/atheros/files-2.6.26/include/asm-mips/mach-atheros/reset.h
+++ /dev/null
@@ -1,6 +0,0 @@
-#ifndef __AR531X_RESET_H
-#define __AR531X_RESET_H
-
-void ar531x_disable_reset_button(void);
-
-#endif /* __AR531X_RESET_H */
diff --git a/target/linux/atheros/files-2.6.26/include/asm-mips/mach-atheros/war.h b/target/linux/atheros/files-2.6.26/include/asm-mips/mach-atheros/war.h
deleted file mode 100644
index 354c6e6..0000000
--- a/target/linux/atheros/files-2.6.26/include/asm-mips/mach-atheros/war.h
+++ /dev/null
@@ -1,25 +0,0 @@
-/*
- * 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 (C) 2008 Felix Fietkau <nbd@openwrt.org>
- */
-#ifndef __ASM_MIPS_MACH_ATHEROS_WAR_H
-#define __ASM_MIPS_MACH_ATHEROS_WAR_H
-
-#define R4600_V1_INDEX_ICACHEOP_WAR 0
-#define R4600_V1_HIT_CACHEOP_WAR 0
-#define R4600_V2_HIT_CACHEOP_WAR 0
-#define R5432_CP0_INTERRUPT_WAR 0
-#define BCM1250_M3_WAR 0
-#define SIBYTE_1956_WAR 0
-#define MIPS4K_ICACHE_REFILL_WAR 0
-#define MIPS_CACHE_SYNC_WAR 0
-#define TX49XX_ICACHE_INDEX_INV_WAR 0
-#define RM9000_CDEX_SMP_WAR 0
-#define ICACHE_REFILLS_WORKAROUND_WAR 0
-#define R10000_LLSC_WAR 0
-#define MIPS34K_MISSED_ITLB_WAR 0
-
-#endif /* __ASM_MIPS_MACH_ATHEROS_WAR_H */
diff --git a/target/linux/atheros/patches-2.6.26/100-board.patch b/target/linux/atheros/patches-2.6.26/100-board.patch
deleted file mode 100644
index 3bd297b..0000000
--- a/target/linux/atheros/patches-2.6.26/100-board.patch
+++ /dev/null
@@ -1,66 +0,0 @@
---- a/arch/mips/Kconfig
-+++ b/arch/mips/Kconfig
-@@ -59,6 +59,18 @@ config BCM47XX
- help
- Support for BCM47XX based boards
-
-+config ATHEROS
-+ bool "Atheros SoC support (EXPERIMENTAL)"
-+ depends on EXPERIMENTAL
-+ select DMA_NONCOHERENT
-+ select CEVT_R4K
-+ select CSRC_R4K
-+ select IRQ_CPU
-+ select SYS_HAS_CPU_MIPS32_R1
-+ select SYS_SUPPORTS_BIG_ENDIAN
-+ select SYS_SUPPORTS_32BIT_KERNEL
-+ select GENERIC_GPIO
-+
- config MIPS_COBALT
- bool "Cobalt Server"
- select CEVT_R4K
-@@ -687,6 +699,7 @@ config WR_PPMC
-
- endchoice
-
-+source "arch/mips/atheros/Kconfig"
- source "arch/mips/au1000/Kconfig"
- source "arch/mips/basler/excite/Kconfig"
- source "arch/mips/jazz/Kconfig"
---- a/arch/mips/Makefile
-+++ b/arch/mips/Makefile
-@@ -276,6 +276,13 @@ libs-$(CONFIG_MIPS_XXS1500) += arch/mips
- load-$(CONFIG_MIPS_XXS1500) += 0xffffffff80100000
-
- #
-+# Atheros AR5312/AR2312 WiSoC
-+#
-+core-$(CONFIG_ATHEROS) += arch/mips/atheros/
-+cflags-$(CONFIG_ATHEROS) += -Iinclude/asm-mips/mach-atheros
-+load-$(CONFIG_ATHEROS) += 0xffffffff80041000
-+
-+#
- # Cobalt Server
- #
- core-$(CONFIG_MIPS_COBALT) += arch/mips/cobalt/
---- a/include/asm-mips/bootinfo.h
-+++ b/include/asm-mips/bootinfo.h
-@@ -94,6 +94,18 @@
- #define MACH_MSP7120_FPGA 5 /* PMC-Sierra MSP7120 Emulation */
- #define MACH_MSP_OTHER 255 /* PMC-Sierra unknown board type */
-
-+/*
-+ * Valid machtype for group ATHEROS
-+ */
-+#define MACH_GROUP_ATHEROS 26
-+#define MACH_ATHEROS_AR5312 0
-+#define MACH_ATHEROS_AR2312 1
-+#define MACH_ATHEROS_AR2313 2
-+#define MACH_ATHEROS_AR2315 3
-+#define MACH_ATHEROS_AR2316 4
-+#define MACH_ATHEROS_AR2317 5
-+#define MACH_ATHEROS_AR2318 6
-+
- #define CL_SIZE COMMAND_LINE_SIZE
-
- extern char *system_type;
diff --git a/target/linux/atheros/patches-2.6.26/110-spiflash.patch b/target/linux/atheros/patches-2.6.26/110-spiflash.patch
deleted file mode 100644
index 8a1d886..0000000
--- a/target/linux/atheros/patches-2.6.26/110-spiflash.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- a/drivers/mtd/devices/Kconfig
-+++ b/drivers/mtd/devices/Kconfig
-@@ -84,6 +84,10 @@ config M25PXX_USE_FAST_READ
- help
- This option enables FAST_READ access supported by ST M25Pxx.
-
-+config MTD_SPIFLASH
-+ tristate "Atheros AR2315/6/7 SPI Flash support"
-+ depends on ATHEROS_AR5315
-+
- config MTD_SLRAM
- tristate "Uncached system RAM"
- help
---- a/drivers/mtd/devices/Makefile
-+++ b/drivers/mtd/devices/Makefile
-@@ -17,3 +17,4 @@ obj-$(CONFIG_MTD_LART) += lart.o
- obj-$(CONFIG_MTD_BLOCK2MTD) += block2mtd.o
- obj-$(CONFIG_MTD_DATAFLASH) += mtd_dataflash.o
- obj-$(CONFIG_MTD_M25P80) += m25p80.o
-+obj-$(CONFIG_MTD_SPIFLASH) += spiflash.o
diff --git a/target/linux/atheros/patches-2.6.26/120-watchdog.patch b/target/linux/atheros/patches-2.6.26/120-watchdog.patch
deleted file mode 100644
index 5e33c61..0000000
--- a/target/linux/atheros/patches-2.6.26/120-watchdog.patch
+++ /dev/null
@@ -1,25 +0,0 @@
---- a/drivers/watchdog/Kconfig
-+++ b/drivers/watchdog/Kconfig
-@@ -683,6 +683,12 @@ config TXX9_WDT
- help
- Hardware driver for the built-in watchdog timer on TXx9 MIPS SoCs.
-
-+config ATHEROS_WDT
-+ tristate "Atheros wisoc Watchdog Timer"
-+ depends on ATHEROS
-+ help
-+ Hardware driver for the Atheros wisoc Watchdog Timer.
-+
- # PARISC Architecture
-
- # POWERPC Architecture
---- a/drivers/watchdog/Makefile
-+++ b/drivers/watchdog/Makefile
-@@ -97,6 +97,7 @@ obj-$(CONFIG_WDT_RM9K_GPI) += rm9k_wdt.o
- obj-$(CONFIG_SIBYTE_WDOG) += sb_wdog.o
- obj-$(CONFIG_AR7_WDT) += ar7_wdt.o
- obj-$(CONFIG_TXX9_WDT) += txx9wdt.o
-+obj-$(CONFIG_ATHEROS_WDT) += ar2315-wtd.o
-
- # PARISC Architecture
-
diff --git a/target/linux/atheros/patches-2.6.26/130-ar2313_ethernet.patch b/target/linux/atheros/patches-2.6.26/130-ar2313_ethernet.patch
deleted file mode 100644
index 14264e6..0000000
--- a/target/linux/atheros/patches-2.6.26/130-ar2313_ethernet.patch
+++ /dev/null
@@ -1,25 +0,0 @@
---- a/drivers/net/Kconfig
-+++ b/drivers/net/Kconfig
-@@ -367,6 +367,12 @@ config AX88796_93CX6
- help
- Select this if your platform comes with an external 93CX6 eeprom.
-
-+config AR2313
-+ tristate "AR2313 Ethernet support"
-+ depends on NET_ETHERNET && ATHEROS
-+ help
-+ Support for the AR231x/531x ethernet controller
-+
- config MACE
- tristate "MACE (Power Mac ethernet) support"
- depends on PPC_PMAC && PPC32
---- a/drivers/net/Makefile
-+++ b/drivers/net/Makefile
-@@ -194,6 +194,7 @@ obj-$(CONFIG_EQUALIZER) += eql.o
- obj-$(CONFIG_KORINA) += korina.o
- obj-$(CONFIG_MIPS_JAZZ_SONIC) += jazzsonic.o
- obj-$(CONFIG_MIPS_AU1X00_ENET) += au1000_eth.o
-+obj-$(CONFIG_AR2313) += ar2313/
- obj-$(CONFIG_MIPS_SIM_NET) += mipsnet.o
- obj-$(CONFIG_SGI_IOC3_ETH) += ioc3-eth.o
- obj-$(CONFIG_DECLANCE) += declance.o
diff --git a/target/linux/atheros/patches-2.6.26/135-ar2313_2.6.26.patch b/target/linux/atheros/patches-2.6.26/135-ar2313_2.6.26.patch
deleted file mode 100644
index a39b46c..0000000
--- a/target/linux/atheros/patches-2.6.26/135-ar2313_2.6.26.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/drivers/net/ar2313/ar2313.c
-+++ b/drivers/net/ar2313/ar2313.c
-@@ -291,7 +291,7 @@ int __init ar2313_probe(struct platform_
- sp->mii_bus.write = mdiobus_write;
- sp->mii_bus.reset = mdiobus_reset;
- sp->mii_bus.name = "ar2313_eth_mii";
-- sp->mii_bus.id = 0;
-+ snprintf(sp->mii_bus.id, MII_BUS_ID_SIZE, "0");
- sp->mii_bus.irq = kmalloc(sizeof(int), GFP_KERNEL);
- *sp->mii_bus.irq = PHY_POLL;
-
diff --git a/target/linux/atheros/patches-2.6.26/140-redboot_partition_scan.patch b/target/linux/atheros/patches-2.6.26/140-redboot_partition_scan.patch
deleted file mode 100644
index c46a56a..0000000
--- a/target/linux/atheros/patches-2.6.26/140-redboot_partition_scan.patch
+++ /dev/null
@@ -1,54 +0,0 @@
---- a/drivers/mtd/redboot.c
-+++ b/drivers/mtd/redboot.c
-@@ -62,31 +62,32 @@ static int parse_redboot_partitions(stru
- static char nullstring[] = "unallocated";
- #endif
-
-+ buf = vmalloc(master->erasesize);
-+ if (!buf)
-+ return -ENOMEM;
-+
-+ restart:
- if ( directory < 0 ) {
- offset = master->size + directory * master->erasesize;
-- while (master->block_isbad &&
-+ while (master->block_isbad &&
- master->block_isbad(master, offset)) {
- if (!offset) {
- nogood:
- printk(KERN_NOTICE "Failed to find a non-bad block to check for RedBoot partition table\n");
-+ vfree(buf);
- return -EIO;
- }
- offset -= master->erasesize;
- }
- } else {
- offset = directory * master->erasesize;
-- while (master->block_isbad &&
-+ while (master->block_isbad &&
- master->block_isbad(master, offset)) {
- offset += master->erasesize;
- if (offset == master->size)
- goto nogood;
- }
- }
-- buf = vmalloc(master->erasesize);
--
-- if (!buf)
-- return -ENOMEM;
--
- printk(KERN_NOTICE "Searching for RedBoot partition table in %s at offset 0x%lx\n",
- master->name, offset);
-
-@@ -158,6 +159,11 @@ static int parse_redboot_partitions(stru
- }
- if (i == numslots) {
- /* Didn't find it */
-+ if (offset + master->erasesize < master->size) {
-+ /* not at the end of the flash yet, maybe next block :) */
-+ directory++;
-+ goto restart;
-+ }
- printk(KERN_NOTICE "No RedBoot partition table detected in %s\n",
- master->name);
- ret = 0;
diff --git a/target/linux/atheros/patches-2.6.26/150-bridge-printk.patch b/target/linux/atheros/patches-2.6.26/150-bridge-printk.patch
deleted file mode 100644
index b5c80cd..0000000
--- a/target/linux/atheros/patches-2.6.26/150-bridge-printk.patch
+++ /dev/null
@@ -1,26 +0,0 @@
---- a/net/core/dev.c
-+++ b/net/core/dev.c
-@@ -3783,8 +3783,8 @@ int register_netdevice(struct net_device
- /* Fix illegal SG+CSUM combinations. */
- if ((dev->features & NETIF_F_SG) &&
- !(dev->features & NETIF_F_ALL_CSUM)) {
-- printk(KERN_NOTICE "%s: Dropping NETIF_F_SG since no checksum feature.\n",
-- dev->name);
-+ //printk(KERN_NOTICE "%s: Dropping NETIF_F_SG since no checksum feature.\n",
-+ // dev->name);
- dev->features &= ~NETIF_F_SG;
- }
-
-@@ -3797,9 +3797,9 @@ int register_netdevice(struct net_device
- }
- if (dev->features & NETIF_F_UFO) {
- if (!(dev->features & NETIF_F_HW_CSUM)) {
-- printk(KERN_ERR "%s: Dropping NETIF_F_UFO since no "
-- "NETIF_F_HW_CSUM feature.\n",
-- dev->name);
-+ //printk(KERN_ERR "%s: Dropping NETIF_F_UFO since no "
-+ // "NETIF_F_HW_CSUM feature.\n",
-+ // dev->name);
- dev->features &= ~NETIF_F_UFO;
- }
- if (!(dev->features & NETIF_F_SG)) {
diff --git a/target/linux/atheros/patches-2.6.26/200-ar2313_enable_mvswitch.patch b/target/linux/atheros/patches-2.6.26/200-ar2313_enable_mvswitch.patch
deleted file mode 100644
index 4711ef6..0000000
--- a/target/linux/atheros/patches-2.6.26/200-ar2313_enable_mvswitch.patch
+++ /dev/null
@@ -1,70 +0,0 @@
---- a/drivers/net/ar2313/ar2313.c
-+++ b/drivers/net/ar2313/ar2313.c
-@@ -834,6 +834,7 @@ static void ar2313_load_rx_ring(struct n
- for (i = 0; i < nr_bufs; i++) {
- struct sk_buff *skb;
- ar2313_descr_t *rd;
-+ int offset = RX_OFFSET;
-
- if (sp->rx_skb[idx]) {
- #if DEBUG_RX
-@@ -855,7 +856,9 @@ static void ar2313_load_rx_ring(struct n
- * Make sure IP header starts on a fresh cache line.
- */
- skb->dev = dev;
-- skb_reserve(skb, RX_OFFSET);
-+ if (sp->phy_dev)
-+ offset += sp->phy_dev->pkt_align;
-+ skb_reserve(skb, offset);
- sp->rx_skb[idx] = skb;
-
- rd = (ar2313_descr_t *) & sp->rx_ring[idx];
-@@ -946,6 +949,7 @@ static int ar2313_rx_int(struct net_devi
- /* alloc new buffer. */
- skb_new = dev_alloc_skb(AR2313_BUFSIZE + RX_OFFSET + 128);
- if (skb_new != NULL) {
-+ int offset;
-
- skb = sp->rx_skb[idx];
- /* set skb */
-@@ -953,13 +957,17 @@ static int ar2313_rx_int(struct net_devi
- ((status >> DMA_RX_LEN_SHIFT) & 0x3fff) - CRC_LEN);
-
- dev->stats.rx_bytes += skb->len;
-- skb->protocol = eth_type_trans(skb, dev);
-+
- /* pass the packet to upper layers */
-- netif_rx(skb);
-+ sp->rx(skb);
-
- skb_new->dev = dev;
-+
- /* 16 bit align */
-- skb_reserve(skb_new, RX_OFFSET + 32);
-+ offset = RX_OFFSET + 32;
-+ if (sp->phy_dev)
-+ offset += sp->phy_dev->pkt_align;
-+ skb_reserve(skb_new, offset);
- /* reset descriptor's curr_addr */
- rxdesc->addr = virt_to_phys(skb_new->data);
-
-@@ -1370,6 +1378,8 @@ static int mdiobus_probe (struct net_dev
- return PTR_ERR(phydev);
- }
-
-+ sp->rx = phydev->netif_rx;
-+
- /* mask with MAC supported features */
- phydev->supported &= (SUPPORTED_10baseT_Half
- | SUPPORTED_10baseT_Full
---- a/drivers/net/ar2313/ar2313.h
-+++ b/drivers/net/ar2313/ar2313.h
-@@ -107,6 +107,8 @@ typedef struct {
- */
- struct ar2313_private {
- struct net_device *dev;
-+ int (*rx)(struct sk_buff *skb);
-+
- int version;
- u32 mb[2];
-
diff --git a/target/linux/atheros/patches-2.6.26/900-cevt_r4k_irq_disable_hazard.patch b/target/linux/atheros/patches-2.6.26/900-cevt_r4k_irq_disable_hazard.patch
deleted file mode 100644
index fb0f2cc..0000000
--- a/target/linux/atheros/patches-2.6.26/900-cevt_r4k_irq_disable_hazard.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- a/arch/mips/kernel/cevt-r4k.c
-+++ b/arch/mips/kernel/cevt-r4k.c
-@@ -205,6 +205,7 @@ static int c0_compare_int_usable(void)
- while ((int)(read_c0_count() - cnt) <= 0)
- ; /* Wait for expiry */
-
-+ irq_disable_hazard();
- if (!c0_compare_int_pending())
- return 0;
-
diff --git a/target/linux/atheros/patches-2.6.26/901-get_c0_compare_irq_function.patch b/target/linux/atheros/patches-2.6.26/901-get_c0_compare_irq_function.patch
deleted file mode 100644
index 46640ba..0000000
--- a/target/linux/atheros/patches-2.6.26/901-get_c0_compare_irq_function.patch
+++ /dev/null
@@ -1,43 +0,0 @@
---- a/arch/mips/kernel/traps.c
-+++ b/arch/mips/kernel/traps.c
-@@ -43,6 +43,7 @@
- #include <asm/mmu_context.h>
- #include <asm/types.h>
- #include <asm/stacktrace.h>
-+#include <asm/time.h>
-
- extern asmlinkage void handle_int(void);
- extern asmlinkage void handle_tlbm(void);
-@@ -1464,6 +1465,8 @@ void __cpuinit per_cpu_trap_init(void)
- */
- if (cpu_has_mips_r2) {
- cp0_compare_irq = (read_c0_intctl() >> 29) & 7;
-+ if (get_c0_compare_irq)
-+ cp0_compare_irq = get_c0_compare_irq();
- cp0_perfcount_irq = (read_c0_intctl() >> 26) & 7;
- if (cp0_perfcount_irq == cp0_compare_irq)
- cp0_perfcount_irq = -1;
---- a/include/asm-mips/time.h
-+++ b/include/asm-mips/time.h
-@@ -53,6 +53,7 @@ extern int (*perf_irq)(void);
- #ifdef CONFIG_CEVT_R4K
- extern int mips_clockevent_init(void);
- extern unsigned int __weak get_c0_compare_int(void);
-+extern unsigned int __weak get_c0_compare_irq(void);
- #else
- static inline int mips_clockevent_init(void)
- {
---- a/arch/mips/atheros/board.c
-+++ b/arch/mips/atheros/board.c
-@@ -265,6 +265,11 @@ void (*board_time_init)(void);
- void __init plat_time_init(void) {
- board_time_init();
- }
-+
-+unsigned int __cpuinit get_c0_compare_irq(void)
-+{
-+ return CP0_LEGACY_COMPARE_IRQ;
-+}
- #endif
-
- void __init arch_init_irq(void)