change the way ./files* and the generic kernel files are applied. ./files now applies to *ALL* kernel versions, and is copied along with ./files-* - this gets rid of quite a bit of redundancy in the extra kernel drivers.

SVN-Revision: 13010

125 files changed, 4 insertions, 8971 deletions

diff --git a/include/kernel.mk b/include/kernel.mk
index 5232148..a9a350b 100644
--- a/include/kernel.mk
+++ b/include/kernel.mk
@@ -31,7 +31,7 @@ else
   endif
 
   PATCH_DIR ?= ./patches$(shell [ -d "./patches-$(KERNEL_PATCHVER)" ] && printf -- "-$(KERNEL_PATCHVER)" || true )
-  FILES_DIR ?= ./files$(shell [ -d "./files-$(KERNEL_PATCHVER)" ] && printf -- "-$(KERNEL_PATCHVER)" || true )
+  FILES_DIR ?= $(foreach dir,$(wildcard ./files ./files-$(KERNEL_PATCHVER)),"$(dir)")
   KERNEL_BUILD_DIR ?= $(BUILD_DIR_BASE)/linux-$(BOARD)$(if $(SUBTARGET),_$(SUBTARGET))$(if $(BUILD_SUFFIX),_$(BUILD_SUFFIX))
   LINUX_DIR ?= $(KERNEL_BUILD_DIR)/linux-$(LINUX_VERSION)
 
diff --git a/include/quilt.mk b/include/quilt.mk
index 70bc84e..c569231 100644
--- a/include/quilt.mk
+++ b/include/quilt.mk
@@ -68,11 +68,8 @@ endef
 
 define Kernel/Patch/Default
 	rm -rf $(PKG_BUILD_DIR)/patches; mkdir -p $(PKG_BUILD_DIR)/patches
-	if [ -d $(GENERIC_FILES_DIR) ]; then $(CP) $(GENERIC_FILES_DIR)/* $(LINUX_DIR)/; fi
-	if [ -d $(FILES_DIR) ]; then \
-		$(CP) $(FILES_DIR)/* $(LINUX_DIR)/; \
-		find $(LINUX_DIR)/ -name \*.rej | xargs rm -f; \
-	fi
+	$(CP) $(foreach fdir,$(GENERIC_FILES_DIR) $(FILES_DIR),$(fdir)/.) $(LINUX_DIR)/
+	find $(LINUX_DIR)/ -name \*.rej -or -name \*.orig | $(XARGS) rm -f
 	$(call PatchDir,$(GENERIC_PATCH_DIR),generic/)
 	$(call PatchDir,$(PATCH_DIR),platform/)
 endef
diff --git a/include/target.mk b/include/target.mk
index 5b7bf98..f34cf5b 100644
--- a/include/target.mk
+++ b/include/target.mk
@@ -108,7 +108,7 @@ include $(INCLUDE_DIR)/kernel-version.mk
 
 GENERIC_PLATFORM_DIR := $(TOPDIR)/target/linux/generic-$(KERNEL)
 GENERIC_PATCH_DIR := $(GENERIC_PLATFORM_DIR)/patches$(shell [ -d "$(GENERIC_PLATFORM_DIR)/patches-$(KERNEL_PATCHVER)" ] && printf -- "-$(KERNEL_PATCHVER)" || true )
-GENERIC_FILES_DIR := $(GENERIC_PLATFORM_DIR)/files$(shell [ -d "$(GENERIC_PLATFORM_DIR)/files-$(KERNEL_PATCHVER)" ] && printf -- "-$(KERNEL_PATCHVER)" || true )
+GENERIC_FILES_DIR := $(foreach dir,$(wildcard $(GENERIC_PLATFORM_DIR)/files $(GENERIC_PLATFORM_DIR)/files-$(KERNEL_PATCHVER)),"$(dir)")
 
 GENERIC_LINUX_CONFIG?=$(firstword $(wildcard $(GENERIC_PLATFORM_DIR)/config-$(KERNEL_PATCHVER) $(GENERIC_PLATFORM_DIR)/config-default))
 LINUX_CONFIG?=$(firstword $(wildcard $(foreach subdir,$(PLATFORM_DIR) $(PLATFORM_SUBDIR),$(subdir)/config-$(KERNEL_PATCHVER) $(subdir)/config-default)) $(PLATFORM_DIR)/config-$(KERNEL_PATCHVER))
diff --git a/target/linux/brcm47xx/files/arch/mips/bcm947xx/Makefile b/target/linux/brcm47xx/files-2.6.23/arch/mips/bcm947xx/Makefile
index f80945c..f80945c 100644
--- a/target/linux/brcm47xx/files/arch/mips/bcm947xx/Makefile
+++ b/target/linux/brcm47xx/files-2.6.23/arch/mips/bcm947xx/Makefile
diff --git a/target/linux/brcm47xx/files/arch/mips/bcm947xx/cfe_env.c b/target/linux/brcm47xx/files-2.6.23/arch/mips/bcm947xx/cfe_env.c
index c1d5eee..c1d5eee 100644
--- a/target/linux/brcm47xx/files/arch/mips/bcm947xx/cfe_env.c
+++ b/target/linux/brcm47xx/files-2.6.23/arch/mips/bcm947xx/cfe_env.c
diff --git a/target/linux/brcm47xx/files/arch/mips/bcm947xx/include/nvram.h b/target/linux/brcm47xx/files-2.6.23/arch/mips/bcm947xx/include/nvram.h
index 6bb18e8..6bb18e8 100644
--- a/target/linux/brcm47xx/files/arch/mips/bcm947xx/include/nvram.h
+++ b/target/linux/brcm47xx/files-2.6.23/arch/mips/bcm947xx/include/nvram.h
diff --git a/target/linux/brcm47xx/files/arch/mips/bcm947xx/irq.c b/target/linux/brcm47xx/files-2.6.23/arch/mips/bcm947xx/irq.c
index d707894..d707894 100644
--- a/target/linux/brcm47xx/files/arch/mips/bcm947xx/irq.c
+++ b/target/linux/brcm47xx/files-2.6.23/arch/mips/bcm947xx/irq.c
diff --git a/target/linux/brcm47xx/files/arch/mips/bcm947xx/nvram.c b/target/linux/brcm47xx/files-2.6.23/arch/mips/bcm947xx/nvram.c
index 3f32ad9..3f32ad9 100644
--- a/target/linux/brcm47xx/files/arch/mips/bcm947xx/nvram.c
+++ b/target/linux/brcm47xx/files-2.6.23/arch/mips/bcm947xx/nvram.c
diff --git a/target/linux/brcm47xx/files/arch/mips/bcm947xx/prom.c b/target/linux/brcm47xx/files-2.6.23/arch/mips/bcm947xx/prom.c
index 41ea087..41ea087 100644
--- a/target/linux/brcm47xx/files/arch/mips/bcm947xx/prom.c
+++ b/target/linux/brcm47xx/files-2.6.23/arch/mips/bcm947xx/prom.c
diff --git a/target/linux/brcm47xx/files/arch/mips/bcm947xx/setup.c b/target/linux/brcm47xx/files-2.6.23/arch/mips/bcm947xx/setup.c
index 41d7b0b..41d7b0b 100644
--- a/target/linux/brcm47xx/files/arch/mips/bcm947xx/setup.c
+++ b/target/linux/brcm47xx/files-2.6.23/arch/mips/bcm947xx/setup.c
diff --git a/target/linux/brcm47xx/files/arch/mips/bcm947xx/time.c b/target/linux/brcm47xx/files-2.6.23/arch/mips/bcm947xx/time.c
index 62120eb..62120eb 100644
--- a/target/linux/brcm47xx/files/arch/mips/bcm947xx/time.c
+++ b/target/linux/brcm47xx/files-2.6.23/arch/mips/bcm947xx/time.c
diff --git a/target/linux/brcm47xx/files/arch/mips/cfe/Makefile b/target/linux/brcm47xx/files-2.6.23/arch/mips/cfe/Makefile
index d9f046a..d9f046a 100644
--- a/target/linux/brcm47xx/files/arch/mips/cfe/Makefile
+++ b/target/linux/brcm47xx/files-2.6.23/arch/mips/cfe/Makefile
diff --git a/target/linux/brcm47xx/files/arch/mips/cfe/cfe.c b/target/linux/brcm47xx/files-2.6.23/arch/mips/cfe/cfe.c
index 6d16111..6d16111 100644
--- a/target/linux/brcm47xx/files/arch/mips/cfe/cfe.c
+++ b/target/linux/brcm47xx/files-2.6.23/arch/mips/cfe/cfe.c
diff --git a/target/linux/brcm47xx/files/arch/mips/cfe/cfe_private.h b/target/linux/brcm47xx/files-2.6.23/arch/mips/cfe/cfe_private.h
index 0a604d3..0a604d3 100644
--- a/target/linux/brcm47xx/files/arch/mips/cfe/cfe_private.h
+++ b/target/linux/brcm47xx/files-2.6.23/arch/mips/cfe/cfe_private.h
diff --git a/target/linux/brcm47xx/files/drivers/mtd/maps/bcm47xx-flash.c b/target/linux/brcm47xx/files-2.6.23/drivers/mtd/maps/bcm47xx-flash.c
index 6a82f36..6a82f36 100644
--- a/target/linux/brcm47xx/files/drivers/mtd/maps/bcm47xx-flash.c
+++ b/target/linux/brcm47xx/files-2.6.23/drivers/mtd/maps/bcm47xx-flash.c
diff --git a/target/linux/brcm47xx/files/include/asm-mips/cfe.h b/target/linux/brcm47xx/files-2.6.23/include/asm-mips/cfe.h
index 47c3f56..47c3f56 100644
--- a/target/linux/brcm47xx/files/include/asm-mips/cfe.h
+++ b/target/linux/brcm47xx/files-2.6.23/include/asm-mips/cfe.h
diff --git a/target/linux/brcm47xx/files/include/asm-mips/mach-bcm947xx/gpio.h b/target/linux/brcm47xx/files-2.6.23/include/asm-mips/mach-bcm947xx/gpio.h
index e7807ce..e7807ce 100644
--- a/target/linux/brcm47xx/files/include/asm-mips/mach-bcm947xx/gpio.h
+++ b/target/linux/brcm47xx/files-2.6.23/include/asm-mips/mach-bcm947xx/gpio.h
diff --git a/target/linux/brcm47xx/files/include/asm-mips/mach-bcm947xx/kernel-entry-init.h b/target/linux/brcm47xx/files-2.6.23/include/asm-mips/mach-bcm947xx/kernel-entry-init.h
index 7df0dc2..7df0dc2 100644
--- a/target/linux/brcm47xx/files/include/asm-mips/mach-bcm947xx/kernel-entry-init.h
+++ b/target/linux/brcm47xx/files-2.6.23/include/asm-mips/mach-bcm947xx/kernel-entry-init.h
diff --git a/target/linux/generic-2.6/files/drivers/char/gpio_dev.c b/target/linux/generic-2.6/files-2.6.23/drivers/char/gpio_dev.c
index 4dc6374..4dc6374 100644
--- a/target/linux/generic-2.6/files/drivers/char/gpio_dev.c
+++ b/target/linux/generic-2.6/files-2.6.23/drivers/char/gpio_dev.c
diff --git a/target/linux/generic-2.6/files/drivers/input/misc/gpio_buttons.c b/target/linux/generic-2.6/files-2.6.23/drivers/input/misc/gpio_buttons.c
index 83a8178..83a8178 100644
--- a/target/linux/generic-2.6/files/drivers/input/misc/gpio_buttons.c
+++ b/target/linux/generic-2.6/files-2.6.23/drivers/input/misc/gpio_buttons.c
diff --git a/target/linux/generic-2.6/files/drivers/leds/leds-alix.c b/target/linux/generic-2.6/files-2.6.23/drivers/leds/leds-alix.c
index 103ca7d..103ca7d 100644
--- a/target/linux/generic-2.6/files/drivers/leds/leds-alix.c
+++ b/target/linux/generic-2.6/files-2.6.23/drivers/leds/leds-alix.c
diff --git a/target/linux/generic-2.6/files/drivers/leds/ledtrig-default-on.c b/target/linux/generic-2.6/files-2.6.23/drivers/leds/ledtrig-default-on.c
index 92995e4..92995e4 100644
--- a/target/linux/generic-2.6/files/drivers/leds/ledtrig-default-on.c
+++ b/target/linux/generic-2.6/files-2.6.23/drivers/leds/ledtrig-default-on.c
diff --git a/target/linux/generic-2.6/files/drivers/leds/ledtrig-morse.c b/target/linux/generic-2.6/files-2.6.23/drivers/leds/ledtrig-morse.c
index cb47480..cb47480 100644
--- a/target/linux/generic-2.6/files/drivers/leds/ledtrig-morse.c
+++ b/target/linux/generic-2.6/files-2.6.23/drivers/leds/ledtrig-morse.c
diff --git a/target/linux/generic-2.6/files/drivers/leds/ledtrig-netdev.c b/target/linux/generic-2.6/files-2.6.23/drivers/leds/ledtrig-netdev.c
index fac3571..fac3571 100644
--- a/target/linux/generic-2.6/files/drivers/leds/ledtrig-netdev.c
+++ b/target/linux/generic-2.6/files-2.6.23/drivers/leds/ledtrig-netdev.c
diff --git a/target/linux/generic-2.6/files-2.6.25/drivers/net/phy/adm6996.c b/target/linux/generic-2.6/files-2.6.23/drivers/net/phy/adm6996.c
index 3033813..3033813 100644
--- a/target/linux/generic-2.6/files-2.6.25/drivers/net/phy/adm6996.c
+++ b/target/linux/generic-2.6/files-2.6.23/drivers/net/phy/adm6996.c
diff --git a/target/linux/generic-2.6/files-2.6.25/drivers/net/phy/adm6996.h b/target/linux/generic-2.6/files-2.6.23/drivers/net/phy/adm6996.h
index e074901..e074901 100644
--- a/target/linux/generic-2.6/files-2.6.25/drivers/net/phy/adm6996.h
+++ b/target/linux/generic-2.6/files-2.6.23/drivers/net/phy/adm6996.h
diff --git a/target/linux/generic-2.6/files-2.6.25/drivers/net/phy/mvswitch.c b/target/linux/generic-2.6/files-2.6.23/drivers/net/phy/mvswitch.c
index 78e5afe..78e5afe 100644
--- a/target/linux/generic-2.6/files-2.6.25/drivers/net/phy/mvswitch.c
+++ b/target/linux/generic-2.6/files-2.6.23/drivers/net/phy/mvswitch.c
diff --git a/target/linux/generic-2.6/files-2.6.25/drivers/net/phy/mvswitch.h b/target/linux/generic-2.6/files-2.6.23/drivers/net/phy/mvswitch.h
index 1563eec..1563eec 100644
--- a/target/linux/generic-2.6/files-2.6.25/drivers/net/phy/mvswitch.h
+++ b/target/linux/generic-2.6/files-2.6.23/drivers/net/phy/mvswitch.h
diff --git a/target/linux/generic-2.6/files/drivers/spi/spi_gpio.c b/target/linux/generic-2.6/files-2.6.23/drivers/spi/spi_gpio.c
index 31048ac..31048ac 100644
--- a/target/linux/generic-2.6/files/drivers/spi/spi_gpio.c
+++ b/target/linux/generic-2.6/files-2.6.23/drivers/spi/spi_gpio.c
diff --git a/target/linux/generic-2.6/files/drivers/ssb/Kconfig b/target/linux/generic-2.6/files-2.6.23/drivers/ssb/Kconfig
index d976660..d976660 100644
--- a/target/linux/generic-2.6/files/drivers/ssb/Kconfig
+++ b/target/linux/generic-2.6/files-2.6.23/drivers/ssb/Kconfig
diff --git a/target/linux/generic-2.6/files/drivers/ssb/Makefile b/target/linux/generic-2.6/files-2.6.23/drivers/ssb/Makefile
index 7be3975..7be3975 100644
--- a/target/linux/generic-2.6/files/drivers/ssb/Makefile
+++ b/target/linux/generic-2.6/files-2.6.23/drivers/ssb/Makefile
diff --git a/target/linux/generic-2.6/files/drivers/ssb/b43_pci_bridge.c b/target/linux/generic-2.6/files-2.6.23/drivers/ssb/b43_pci_bridge.c
index 2d27d6d..2d27d6d 100644
--- a/target/linux/generic-2.6/files/drivers/ssb/b43_pci_bridge.c
+++ b/target/linux/generic-2.6/files-2.6.23/drivers/ssb/b43_pci_bridge.c
diff --git a/target/linux/generic-2.6/files/drivers/ssb/driver_chipcommon.c b/target/linux/generic-2.6/files-2.6.23/drivers/ssb/driver_chipcommon.c
index 6fbf1c5..6fbf1c5 100644
--- a/target/linux/generic-2.6/files/drivers/ssb/driver_chipcommon.c
+++ b/target/linux/generic-2.6/files-2.6.23/drivers/ssb/driver_chipcommon.c
diff --git a/target/linux/generic-2.6/files/drivers/ssb/driver_extif.c b/target/linux/generic-2.6/files-2.6.23/drivers/ssb/driver_extif.c
index fe55eb8..fe55eb8 100644
--- a/target/linux/generic-2.6/files/drivers/ssb/driver_extif.c
+++ b/target/linux/generic-2.6/files-2.6.23/drivers/ssb/driver_extif.c
diff --git a/target/linux/generic-2.6/files/drivers/ssb/driver_mipscore.c b/target/linux/generic-2.6/files-2.6.23/drivers/ssb/driver_mipscore.c
index a9e7eb4..a9e7eb4 100644
--- a/target/linux/generic-2.6/files/drivers/ssb/driver_mipscore.c
+++ b/target/linux/generic-2.6/files-2.6.23/drivers/ssb/driver_mipscore.c
diff --git a/target/linux/generic-2.6/files/drivers/ssb/driver_pcicore.c b/target/linux/generic-2.6/files-2.6.23/drivers/ssb/driver_pcicore.c
index 2faaa90..2faaa90 100644
--- a/target/linux/generic-2.6/files/drivers/ssb/driver_pcicore.c
+++ b/target/linux/generic-2.6/files-2.6.23/drivers/ssb/driver_pcicore.c
diff --git a/target/linux/generic-2.6/files/drivers/ssb/main.c b/target/linux/generic-2.6/files-2.6.23/drivers/ssb/main.c
index 9028ed5..9028ed5 100644
--- a/target/linux/generic-2.6/files/drivers/ssb/main.c
+++ b/target/linux/generic-2.6/files-2.6.23/drivers/ssb/main.c
diff --git a/target/linux/generic-2.6/files/drivers/ssb/pci.c b/target/linux/generic-2.6/files-2.6.23/drivers/ssb/pci.c
index b434df7..b434df7 100644
--- a/target/linux/generic-2.6/files/drivers/ssb/pci.c
+++ b/target/linux/generic-2.6/files-2.6.23/drivers/ssb/pci.c
diff --git a/target/linux/generic-2.6/files/drivers/ssb/pcihost_wrapper.c b/target/linux/generic-2.6/files-2.6.23/drivers/ssb/pcihost_wrapper.c
index 82a10ab..82a10ab 100644
--- a/target/linux/generic-2.6/files/drivers/ssb/pcihost_wrapper.c
+++ b/target/linux/generic-2.6/files-2.6.23/drivers/ssb/pcihost_wrapper.c
diff --git a/target/linux/generic-2.6/files/drivers/ssb/pcmcia.c b/target/linux/generic-2.6/files-2.6.23/drivers/ssb/pcmcia.c
index 46816cd..46816cd 100644
--- a/target/linux/generic-2.6/files/drivers/ssb/pcmcia.c
+++ b/target/linux/generic-2.6/files-2.6.23/drivers/ssb/pcmcia.c
diff --git a/target/linux/generic-2.6/files/drivers/ssb/scan.c b/target/linux/generic-2.6/files-2.6.23/drivers/ssb/scan.c
index 63ee5cf..63ee5cf 100644
--- a/target/linux/generic-2.6/files/drivers/ssb/scan.c
+++ b/target/linux/generic-2.6/files-2.6.23/drivers/ssb/scan.c
diff --git a/target/linux/generic-2.6/files/drivers/ssb/ssb_private.h b/target/linux/generic-2.6/files-2.6.23/drivers/ssb/ssb_private.h
index a789364..a789364 100644
--- a/target/linux/generic-2.6/files/drivers/ssb/ssb_private.h
+++ b/target/linux/generic-2.6/files-2.6.23/drivers/ssb/ssb_private.h
diff --git a/target/linux/generic-2.6/files/fs/yaffs2/Kconfig b/target/linux/generic-2.6/files-2.6.23/fs/yaffs2/Kconfig
index 7b6f836..7b6f836 100644
--- a/target/linux/generic-2.6/files/fs/yaffs2/Kconfig
+++ b/target/linux/generic-2.6/files-2.6.23/fs/yaffs2/Kconfig
diff --git a/target/linux/generic-2.6/files/fs/yaffs2/Makefile b/target/linux/generic-2.6/files-2.6.23/fs/yaffs2/Makefile
index 73f4658..73f4658 100644
--- a/target/linux/generic-2.6/files/fs/yaffs2/Makefile
+++ b/target/linux/generic-2.6/files-2.6.23/fs/yaffs2/Makefile
diff --git a/target/linux/generic-2.6/files/fs/yaffs2/devextras.h b/target/linux/generic-2.6/files-2.6.23/fs/yaffs2/devextras.h
index fcf2690..fcf2690 100644
--- a/target/linux/generic-2.6/files/fs/yaffs2/devextras.h
+++ b/target/linux/generic-2.6/files-2.6.23/fs/yaffs2/devextras.h
diff --git a/target/linux/generic-2.6/files/fs/yaffs2/moduleconfig.h b/target/linux/generic-2.6/files-2.6.23/fs/yaffs2/moduleconfig.h
index 016391c..016391c 100644
--- a/target/linux/generic-2.6/files/fs/yaffs2/moduleconfig.h
+++ b/target/linux/generic-2.6/files-2.6.23/fs/yaffs2/moduleconfig.h
diff --git a/target/linux/generic-2.6/files/fs/yaffs2/yaffs_checkptrw.c b/target/linux/generic-2.6/files-2.6.23/fs/yaffs2/yaffs_checkptrw.c
index 933a33f..933a33f 100644
--- a/target/linux/generic-2.6/files/fs/yaffs2/yaffs_checkptrw.c
+++ b/target/linux/generic-2.6/files-2.6.23/fs/yaffs2/yaffs_checkptrw.c
diff --git a/target/linux/generic-2.6/files/fs/yaffs2/yaffs_checkptrw.h b/target/linux/generic-2.6/files-2.6.23/fs/yaffs2/yaffs_checkptrw.h
index d3ff174..d3ff174 100644
--- a/target/linux/generic-2.6/files/fs/yaffs2/yaffs_checkptrw.h
+++ b/target/linux/generic-2.6/files-2.6.23/fs/yaffs2/yaffs_checkptrw.h
diff --git a/target/linux/generic-2.6/files/fs/yaffs2/yaffs_ecc.c b/target/linux/generic-2.6/files-2.6.23/fs/yaffs2/yaffs_ecc.c
index e286039..e286039 100644
--- a/target/linux/generic-2.6/files/fs/yaffs2/yaffs_ecc.c
+++ b/target/linux/generic-2.6/files-2.6.23/fs/yaffs2/yaffs_ecc.c
diff --git a/target/linux/generic-2.6/files/fs/yaffs2/yaffs_ecc.h b/target/linux/generic-2.6/files-2.6.23/fs/yaffs2/yaffs_ecc.h
index 79bc3d1..79bc3d1 100644
--- a/target/linux/generic-2.6/files/fs/yaffs2/yaffs_ecc.h
+++ b/target/linux/generic-2.6/files-2.6.23/fs/yaffs2/yaffs_ecc.h
diff --git a/target/linux/generic-2.6/files/fs/yaffs2/yaffs_fs.c b/target/linux/generic-2.6/files-2.6.23/fs/yaffs2/yaffs_fs.c
index 67001b1..67001b1 100644
--- a/target/linux/generic-2.6/files/fs/yaffs2/yaffs_fs.c
+++ b/target/linux/generic-2.6/files-2.6.23/fs/yaffs2/yaffs_fs.c
diff --git a/target/linux/generic-2.6/files/fs/yaffs2/yaffs_guts.c b/target/linux/generic-2.6/files-2.6.23/fs/yaffs2/yaffs_guts.c
index 2ab8146..2ab8146 100644
--- a/target/linux/generic-2.6/files/fs/yaffs2/yaffs_guts.c
+++ b/target/linux/generic-2.6/files-2.6.23/fs/yaffs2/yaffs_guts.c
diff --git a/target/linux/generic-2.6/files/fs/yaffs2/yaffs_guts.h b/target/linux/generic-2.6/files-2.6.23/fs/yaffs2/yaffs_guts.h
index ea06c1a..ea06c1a 100644
--- a/target/linux/generic-2.6/files/fs/yaffs2/yaffs_guts.h
+++ b/target/linux/generic-2.6/files-2.6.23/fs/yaffs2/yaffs_guts.h
diff --git a/target/linux/generic-2.6/files/fs/yaffs2/yaffs_mtdif.c b/target/linux/generic-2.6/files-2.6.23/fs/yaffs2/yaffs_mtdif.c
index 466e5a4..466e5a4 100644
--- a/target/linux/generic-2.6/files/fs/yaffs2/yaffs_mtdif.c
+++ b/target/linux/generic-2.6/files-2.6.23/fs/yaffs2/yaffs_mtdif.c
diff --git a/target/linux/generic-2.6/files/fs/yaffs2/yaffs_mtdif.h b/target/linux/generic-2.6/files-2.6.23/fs/yaffs2/yaffs_mtdif.h
index 317600c..317600c 100644
--- a/target/linux/generic-2.6/files/fs/yaffs2/yaffs_mtdif.h
+++ b/target/linux/generic-2.6/files-2.6.23/fs/yaffs2/yaffs_mtdif.h
diff --git a/target/linux/generic-2.6/files/fs/yaffs2/yaffs_mtdif1-compat.c b/target/linux/generic-2.6/files-2.6.23/fs/yaffs2/yaffs_mtdif1-compat.c
index 6a376f1..6a376f1 100644
--- a/target/linux/generic-2.6/files/fs/yaffs2/yaffs_mtdif1-compat.c
+++ b/target/linux/generic-2.6/files-2.6.23/fs/yaffs2/yaffs_mtdif1-compat.c
diff --git a/target/linux/generic-2.6/files/fs/yaffs2/yaffs_mtdif1.c b/target/linux/generic-2.6/files-2.6.23/fs/yaffs2/yaffs_mtdif1.c
index 36d5ade..36d5ade 100644
--- a/target/linux/generic-2.6/files/fs/yaffs2/yaffs_mtdif1.c
+++ b/target/linux/generic-2.6/files-2.6.23/fs/yaffs2/yaffs_mtdif1.c
diff --git a/target/linux/generic-2.6/files/fs/yaffs2/yaffs_mtdif1.h b/target/linux/generic-2.6/files-2.6.23/fs/yaffs2/yaffs_mtdif1.h
index c4f6197..c4f6197 100644
--- a/target/linux/generic-2.6/files/fs/yaffs2/yaffs_mtdif1.h
+++ b/target/linux/generic-2.6/files-2.6.23/fs/yaffs2/yaffs_mtdif1.h
diff --git a/target/linux/generic-2.6/files/fs/yaffs2/yaffs_mtdif2.c b/target/linux/generic-2.6/files-2.6.23/fs/yaffs2/yaffs_mtdif2.c
index cdad073..cdad073 100644
--- a/target/linux/generic-2.6/files/fs/yaffs2/yaffs_mtdif2.c
+++ b/target/linux/generic-2.6/files-2.6.23/fs/yaffs2/yaffs_mtdif2.c
diff --git a/target/linux/generic-2.6/files/fs/yaffs2/yaffs_mtdif2.h b/target/linux/generic-2.6/files-2.6.23/fs/yaffs2/yaffs_mtdif2.h
index b67ba52..b67ba52 100644
--- a/target/linux/generic-2.6/files/fs/yaffs2/yaffs_mtdif2.h
+++ b/target/linux/generic-2.6/files-2.6.23/fs/yaffs2/yaffs_mtdif2.h
diff --git a/target/linux/generic-2.6/files/fs/yaffs2/yaffs_nand.c b/target/linux/generic-2.6/files-2.6.23/fs/yaffs2/yaffs_nand.c
index 4e25033..4e25033 100644
--- a/target/linux/generic-2.6/files/fs/yaffs2/yaffs_nand.c
+++ b/target/linux/generic-2.6/files-2.6.23/fs/yaffs2/yaffs_nand.c
diff --git a/target/linux/generic-2.6/files/fs/yaffs2/yaffs_nand.h b/target/linux/generic-2.6/files-2.6.23/fs/yaffs2/yaffs_nand.h
index 5fa334b..5fa334b 100644
--- a/target/linux/generic-2.6/files/fs/yaffs2/yaffs_nand.h
+++ b/target/linux/generic-2.6/files-2.6.23/fs/yaffs2/yaffs_nand.h
diff --git a/target/linux/generic-2.6/files/fs/yaffs2/yaffs_nandemul2k.h b/target/linux/generic-2.6/files-2.6.23/fs/yaffs2/yaffs_nandemul2k.h
index cd2e96f..cd2e96f 100644
--- a/target/linux/generic-2.6/files/fs/yaffs2/yaffs_nandemul2k.h
+++ b/target/linux/generic-2.6/files-2.6.23/fs/yaffs2/yaffs_nandemul2k.h
diff --git a/target/linux/generic-2.6/files/fs/yaffs2/yaffs_packedtags1.c b/target/linux/generic-2.6/files-2.6.23/fs/yaffs2/yaffs_packedtags1.c
index f480bf1..f480bf1 100644
--- a/target/linux/generic-2.6/files/fs/yaffs2/yaffs_packedtags1.c
+++ b/target/linux/generic-2.6/files-2.6.23/fs/yaffs2/yaffs_packedtags1.c
diff --git a/target/linux/generic-2.6/files/fs/yaffs2/yaffs_packedtags1.h b/target/linux/generic-2.6/files-2.6.23/fs/yaffs2/yaffs_packedtags1.h
index 776c5c2..776c5c2 100644
--- a/target/linux/generic-2.6/files/fs/yaffs2/yaffs_packedtags1.h
+++ b/target/linux/generic-2.6/files-2.6.23/fs/yaffs2/yaffs_packedtags1.h
diff --git a/target/linux/generic-2.6/files/fs/yaffs2/yaffs_packedtags2.c b/target/linux/generic-2.6/files-2.6.23/fs/yaffs2/yaffs_packedtags2.c
index e420f95..e420f95 100644
--- a/target/linux/generic-2.6/files/fs/yaffs2/yaffs_packedtags2.c
+++ b/target/linux/generic-2.6/files-2.6.23/fs/yaffs2/yaffs_packedtags2.c
diff --git a/target/linux/generic-2.6/files/fs/yaffs2/yaffs_packedtags2.h b/target/linux/generic-2.6/files-2.6.23/fs/yaffs2/yaffs_packedtags2.h
index c2242ff..c2242ff 100644
--- a/target/linux/generic-2.6/files/fs/yaffs2/yaffs_packedtags2.h
+++ b/target/linux/generic-2.6/files-2.6.23/fs/yaffs2/yaffs_packedtags2.h
diff --git a/target/linux/generic-2.6/files/fs/yaffs2/yaffs_qsort.c b/target/linux/generic-2.6/files-2.6.23/fs/yaffs2/yaffs_qsort.c
index 474be9c..474be9c 100644
--- a/target/linux/generic-2.6/files/fs/yaffs2/yaffs_qsort.c
+++ b/target/linux/generic-2.6/files-2.6.23/fs/yaffs2/yaffs_qsort.c
diff --git a/target/linux/generic-2.6/files/fs/yaffs2/yaffs_qsort.h b/target/linux/generic-2.6/files-2.6.23/fs/yaffs2/yaffs_qsort.h
index 610b7ec..610b7ec 100644
--- a/target/linux/generic-2.6/files/fs/yaffs2/yaffs_qsort.h
+++ b/target/linux/generic-2.6/files-2.6.23/fs/yaffs2/yaffs_qsort.h
diff --git a/target/linux/generic-2.6/files/fs/yaffs2/yaffs_tagscompat.c b/target/linux/generic-2.6/files-2.6.23/fs/yaffs2/yaffs_tagscompat.c
index 7622b1a..7622b1a 100644
--- a/target/linux/generic-2.6/files/fs/yaffs2/yaffs_tagscompat.c
+++ b/target/linux/generic-2.6/files-2.6.23/fs/yaffs2/yaffs_tagscompat.c
diff --git a/target/linux/generic-2.6/files/fs/yaffs2/yaffs_tagscompat.h b/target/linux/generic-2.6/files-2.6.23/fs/yaffs2/yaffs_tagscompat.h
index a61e3ba..a61e3ba 100644
--- a/target/linux/generic-2.6/files/fs/yaffs2/yaffs_tagscompat.h
+++ b/target/linux/generic-2.6/files-2.6.23/fs/yaffs2/yaffs_tagscompat.h
diff --git a/target/linux/generic-2.6/files/fs/yaffs2/yaffs_tagsvalidity.c b/target/linux/generic-2.6/files-2.6.23/fs/yaffs2/yaffs_tagsvalidity.c
index 9e0bd1c..9e0bd1c 100644
--- a/target/linux/generic-2.6/files/fs/yaffs2/yaffs_tagsvalidity.c
+++ b/target/linux/generic-2.6/files-2.6.23/fs/yaffs2/yaffs_tagsvalidity.c
diff --git a/target/linux/generic-2.6/files/fs/yaffs2/yaffs_tagsvalidity.h b/target/linux/generic-2.6/files-2.6.23/fs/yaffs2/yaffs_tagsvalidity.h
index 2fd0c24..2fd0c24 100644
--- a/target/linux/generic-2.6/files/fs/yaffs2/yaffs_tagsvalidity.h
+++ b/target/linux/generic-2.6/files-2.6.23/fs/yaffs2/yaffs_tagsvalidity.h
diff --git a/target/linux/generic-2.6/files/fs/yaffs2/yaffsinterface.h b/target/linux/generic-2.6/files-2.6.23/fs/yaffs2/yaffsinterface.h
index 810837a..810837a 100644
--- a/target/linux/generic-2.6/files/fs/yaffs2/yaffsinterface.h
+++ b/target/linux/generic-2.6/files-2.6.23/fs/yaffs2/yaffsinterface.h
diff --git a/target/linux/generic-2.6/files/fs/yaffs2/yportenv.h b/target/linux/generic-2.6/files-2.6.23/fs/yaffs2/yportenv.h
index 15ac281..15ac281 100644
--- a/target/linux/generic-2.6/files/fs/yaffs2/yportenv.h
+++ b/target/linux/generic-2.6/files-2.6.23/fs/yaffs2/yportenv.h
diff --git a/target/linux/generic-2.6/files/include/linux/gpio_buttons.h b/target/linux/generic-2.6/files-2.6.23/include/linux/gpio_buttons.h
index f5e6297..f5e6297 100644
--- a/target/linux/generic-2.6/files/include/linux/gpio_buttons.h
+++ b/target/linux/generic-2.6/files-2.6.23/include/linux/gpio_buttons.h
diff --git a/target/linux/generic-2.6/files/include/linux/gpio_dev.h b/target/linux/generic-2.6/files-2.6.23/include/linux/gpio_dev.h
index 3f3c9c7..3f3c9c7 100644
--- a/target/linux/generic-2.6/files/include/linux/gpio_dev.h
+++ b/target/linux/generic-2.6/files-2.6.23/include/linux/gpio_dev.h
diff --git a/target/linux/generic-2.6/files/include/linux/spi/spi_gpio.h b/target/linux/generic-2.6/files-2.6.23/include/linux/spi/spi_gpio.h
index 8e7d4b1..8e7d4b1 100644
--- a/target/linux/generic-2.6/files/include/linux/spi/spi_gpio.h
+++ b/target/linux/generic-2.6/files-2.6.23/include/linux/spi/spi_gpio.h
diff --git a/target/linux/generic-2.6/files/include/linux/ssb/ssb.h b/target/linux/generic-2.6/files-2.6.23/include/linux/ssb/ssb.h
index 9d5da8b..9d5da8b 100644
--- a/target/linux/generic-2.6/files/include/linux/ssb/ssb.h
+++ b/target/linux/generic-2.6/files-2.6.23/include/linux/ssb/ssb.h
diff --git a/target/linux/generic-2.6/files/include/linux/ssb/ssb_driver_chipcommon.h b/target/linux/generic-2.6/files-2.6.23/include/linux/ssb/ssb_driver_chipcommon.h
index 4cb9954..4cb9954 100644
--- a/target/linux/generic-2.6/files/include/linux/ssb/ssb_driver_chipcommon.h
+++ b/target/linux/generic-2.6/files-2.6.23/include/linux/ssb/ssb_driver_chipcommon.h
diff --git a/target/linux/generic-2.6/files/include/linux/ssb/ssb_driver_extif.h b/target/linux/generic-2.6/files-2.6.23/include/linux/ssb/ssb_driver_extif.h
index a916435..a916435 100644
--- a/target/linux/generic-2.6/files/include/linux/ssb/ssb_driver_extif.h
+++ b/target/linux/generic-2.6/files-2.6.23/include/linux/ssb/ssb_driver_extif.h
diff --git a/target/linux/generic-2.6/files/include/linux/ssb/ssb_driver_mips.h b/target/linux/generic-2.6/files-2.6.23/include/linux/ssb/ssb_driver_mips.h
index 5f44e97..5f44e97 100644
--- a/target/linux/generic-2.6/files/include/linux/ssb/ssb_driver_mips.h
+++ b/target/linux/generic-2.6/files-2.6.23/include/linux/ssb/ssb_driver_mips.h
diff --git a/target/linux/generic-2.6/files/include/linux/ssb/ssb_driver_pci.h b/target/linux/generic-2.6/files-2.6.23/include/linux/ssb/ssb_driver_pci.h
index 9cfffb7..9cfffb7 100644
--- a/target/linux/generic-2.6/files/include/linux/ssb/ssb_driver_pci.h
+++ b/target/linux/generic-2.6/files-2.6.23/include/linux/ssb/ssb_driver_pci.h
diff --git a/target/linux/generic-2.6/files/include/linux/ssb/ssb_regs.h b/target/linux/generic-2.6/files-2.6.23/include/linux/ssb/ssb_regs.h
index ebad0ba..ebad0ba 100644
--- a/target/linux/generic-2.6/files/include/linux/ssb/ssb_regs.h
+++ b/target/linux/generic-2.6/files-2.6.23/include/linux/ssb/ssb_regs.h
diff --git a/target/linux/generic-2.6/files-2.6.26/drivers/net/phy/adm6996.c b/target/linux/generic-2.6/files-2.6.26/drivers/net/phy/adm6996.c
deleted file mode 100644
index 3033813..0000000
--- a/target/linux/generic-2.6/files-2.6.26/drivers/net/phy/adm6996.c
+++ /dev/null
@@ -1,170 +0,0 @@
-/*
- * ADM6996 switch driver
- *
- * Copyright (c) 2008 Felix Fietkau <nbd@openwrt.org>
- *
- * This program is free software; you can redistribute  it and/or modify it
- * under  the terms of the GNU General Public License v2 as published by the
- * Free Software Foundation
- */
-#include <linux/kernel.h>
-#include <linux/string.h>
-#include <linux/errno.h>
-#include <linux/unistd.h>
-#include <linux/slab.h>
-#include <linux/interrupt.h>
-#include <linux/init.h>
-#include <linux/delay.h>
-#include <linux/netdevice.h>
-#include <linux/etherdevice.h>
-#include <linux/skbuff.h>
-#include <linux/spinlock.h>
-#include <linux/mm.h>
-#include <linux/module.h>
-#include <linux/mii.h>
-#include <linux/ethtool.h>
-#include <linux/phy.h>
-
-#include <asm/io.h>
-#include <asm/irq.h>
-#include <asm/uaccess.h>
-#include "adm6996.h"
-
-MODULE_DESCRIPTION("Infineon ADM6996 Switch");
-MODULE_AUTHOR("Felix Fietkau");
-MODULE_LICENSE("GPL");
-
-struct adm6996_priv {
-	/* use abstraction for regops, we want to add gpio support in the future */
-	u16 (*read)(struct phy_device *phydev, enum admreg reg);
-	void (*write)(struct phy_device *phydev, enum admreg reg, u16 val);
-};
-
-#define to_adm(_phy) ((struct adm6996_priv *) (_phy)->priv)
-
-
-static inline u16
-r16(struct phy_device *pdev, enum admreg reg)
-{
-	return to_adm(pdev)->read(pdev, reg);
-}
-
-static inline void
-w16(struct phy_device *pdev, enum admreg reg, u16 val)
-{
-	to_adm(pdev)->write(pdev, reg, val);
-}
-
-
-static u16
-adm6996_read_mii_reg(struct phy_device *phydev, enum admreg reg)
-{
-	return phydev->bus->read(phydev->bus, PHYADDR(reg));
-}
-
-static void
-adm6996_write_mii_reg(struct phy_device *phydev, enum admreg reg, u16 val)
-{
-	phydev->bus->write(phydev->bus, PHYADDR(reg), val);
-}
-
-
-static int adm6996_config_init(struct phy_device *pdev)
-{
-	int i;
-
-	printk("%s: ADM6996 PHY driver attached.\n", pdev->attached_dev->name);
-	pdev->supported = ADVERTISED_100baseT_Full;
-	pdev->advertising = ADVERTISED_100baseT_Full;
-
-	/* initialize port and vlan settings */
-	for (i = 0; i < ADM_PHY_PORTS; i++) {
-		w16(pdev, adm_portcfg[i], ADM_PORTCFG_INIT |
-			ADM_PORTCFG_PVID((i == ADM_WAN_PORT) ? 1 : 0));
-	}
-	w16(pdev, adm_portcfg[5], ADM_PORTCFG_CPU);
-
-	/* reset all ports */
-	for (i = 0; i < ADM_PHY_PORTS; i++) {
-		w16(pdev, ADM_PHY_PORT(i), ADM_PHYCFG_INIT);
-	}
-
-	return 0;
-}
-
-static int adm6996_read_status(struct phy_device *phydev)
-{
-	phydev->speed = SPEED_100;
-	phydev->duplex = DUPLEX_FULL;
-	phydev->state = PHY_UP;
-	return 0;
-}
-
-static int adm6996_config_aneg(struct phy_device *phydev)
-{
-	return 0;
-}
-
-static int adm6996_probe(struct phy_device *pdev)
-{
-	struct adm6996_priv *priv;
-
-	priv = kzalloc(sizeof(struct adm6996_priv), GFP_KERNEL);
-	if (priv == NULL)
-		return -ENOMEM;
-
-	priv->read = adm6996_read_mii_reg;
-	priv->write = adm6996_write_mii_reg;
-	pdev->priv = priv;
-	return 0;
-}
-
-static void adm6996_remove(struct phy_device *pdev)
-{
-	kfree(pdev->priv);
-}
-
-static bool adm6996_detect(struct mii_bus *bus, int addr)
-{
-	u16 reg;
-
-	/* we only attach to phy id 0 */
-	if (addr != 0)
-		return false;
-
-	/* look for the switch on the bus */
-	reg = bus->read(bus, PHYADDR(ADM_SIG0)) & ADM_SIG0_MASK;
-	if (reg != ADM_SIG0_VAL)
-		return false;
-
-	reg = bus->read(bus, PHYADDR(ADM_SIG1)) & ADM_SIG1_MASK;
-	if (reg != ADM_SIG1_VAL)
-		return false;
-
-	return true;
-}
-
-static struct phy_driver adm6996_driver = {
-	.name		= "Infineon ADM6996",
-	.features	= PHY_BASIC_FEATURES,
-	.detect		= adm6996_detect,
-	.probe		= adm6996_probe,
-	.remove		= adm6996_remove,
-	.config_init	= &adm6996_config_init,
-	.config_aneg	= &adm6996_config_aneg,
-	.read_status	= &adm6996_read_status,
-	.driver		= { .owner = THIS_MODULE,},
-};
-
-static int __init adm6996_init(void)
-{
-	return phy_driver_register(&adm6996_driver);
-}
-
-static void __exit adm6996_exit(void)
-{
-	phy_driver_unregister(&adm6996_driver);
-}
-
-module_init(adm6996_init);
-module_exit(adm6996_exit);
diff --git a/target/linux/generic-2.6/files-2.6.26/drivers/net/phy/adm6996.h b/target/linux/generic-2.6/files-2.6.26/drivers/net/phy/adm6996.h
deleted file mode 100644
index e074901..0000000
--- a/target/linux/generic-2.6/files-2.6.26/drivers/net/phy/adm6996.h
+++ /dev/null
@@ -1,105 +0,0 @@
-/*
- * ADM6996 switch driver
- *
- * Copyright (c) 2008 Felix Fietkau <nbd@openwrt.org>
- *
- * This program is free software; you can redistribute  it and/or modify it
- * under  the terms of the GNU General Public License v2 as published by the
- * Free Software Foundation
- */
-#ifndef __ADM6996_H
-#define __ADM6996_H
-
-#define ADM_PHY_PORTS	5
-#define ADM_CPU_PORT	5
-#define ADM_WAN_PORT	0 /* FIXME: dynamic ? */
-
-enum admreg {
-	ADM_EEPROM_BASE		= 0x0,
-		ADM_P0_CFG		= ADM_EEPROM_BASE + 1,
-		ADM_P1_CFG		= ADM_EEPROM_BASE + 3,
-		ADM_P2_CFG		= ADM_EEPROM_BASE + 5,
-		ADM_P3_CFG		= ADM_EEPROM_BASE + 7,
-		ADM_P4_CFG		= ADM_EEPROM_BASE + 8,
-		ADM_P5_CFG		= ADM_EEPROM_BASE + 9,
-	ADM_EEPROM_EXT_BASE	= 0x40,
-	ADM_COUNTER_BASE	= 0xa0,
-		ADM_SIG0		= ADM_COUNTER_BASE + 0,
-		ADM_SIG1		= ADM_COUNTER_BASE + 1,
-	ADM_PHY_BASE		= 0x200,
-#define ADM_PHY_PORT(n) (ADM_PHY_BASE + (0x20 * n))
-};
-
-/* Chip identification patterns */
-#define	ADM_SIG0_MASK	0xfff0
-#define ADM_SIG0_VAL	0x1020
-#define ADM_SIG1_MASK	0xffff
-#define ADM_SIG1_VAL	0x0007
-
-enum {
-	ADM_PHYCFG_COLTST     = (1 << 7),	/* Enable collision test */
-	ADM_PHYCFG_DPLX       = (1 << 8),	/* Enable full duplex */
-	ADM_PHYCFG_ANEN_RST   = (1 << 9),	/* Restart auto negotiation (self clear) */
-	ADM_PHYCFG_ISO        = (1 << 10),	/* Isolate PHY */
-	ADM_PHYCFG_PDN        = (1 << 11),	/* Power down PHY */
-	ADM_PHYCFG_ANEN       = (1 << 12),	/* Enable auto negotiation */
-	ADM_PHYCFG_SPEED_100  = (1 << 13),	/* Enable 100 Mbit/s */
-	ADM_PHYCFG_LPBK       = (1 << 14),	/* Enable loopback operation */
-	ADM_PHYCFG_RST        = (1 << 15),	/* Reset the port (self clear) */
-	ADM_PHYCFG_INIT = (
-		ADM_PHYCFG_RST |
-		ADM_PHYCFG_SPEED_100 |
-		ADM_PHYCFG_ANEN |
-		ADM_PHYCFG_ANEN_RST
-	)
-};
-
-enum {
-	ADM_PORTCFG_FC        = (1 << 0),	/* Enable 802.x flow control */
-	ADM_PORTCFG_AN        = (1 << 1),	/* Enable auto-negotiation */
-	ADM_PORTCFG_SPEED_100 = (1 << 2),	/* Enable 100 Mbit/s */
-	ADM_PORTCFG_DPLX      = (1 << 3),	/* Enable full duplex */
-	ADM_PORTCFG_OT        = (1 << 4),	/* Output tagged packets */
-	ADM_PORTCFG_PD        = (1 << 5),	/* Port disable */
-	ADM_PORTCFG_TV_PRIO   = (1 << 6),	/* 0 = VLAN based priority
-	                                 	 * 1 = TOS based priority */
-	ADM_PORTCFG_PPE       = (1 << 7),	/* Port based priority enable */
-	ADM_PORTCFG_PP_S      = (1 << 8),	/* Port based priority, 2 bits */
-	ADM_PORTCFG_PVID_BASE = (1 << 10),	/* Primary VLAN id, 4 bits */
-	ADM_PORTCFG_FSE	      = (1 << 14),	/* Fx select enable */
-	ADM_PORTCFG_CAM       = (1 << 15),	/* Crossover Auto MDIX */
-
-	ADM_PORTCFG_INIT = (
-		ADM_PORTCFG_FC |
-		ADM_PORTCFG_AN |
-		ADM_PORTCFG_SPEED_100 |
-		ADM_PORTCFG_DPLX |
-		ADM_PORTCFG_CAM
-	),
-	ADM_PORTCFG_CPU = (
-		ADM_PORTCFG_FC |
-		ADM_PORTCFG_SPEED_100 |
-		ADM_PORTCFG_OT |
-		ADM_PORTCFG_DPLX
-	),
-};
-
-#define ADM_PORTCFG_PPID(N) ((n & 0x3) << 8)
-#define ADM_PORTCFG_PVID(n) ((n & 0xf) << 10)
-
-static const u8 adm_portcfg[] = {
-	[0] = ADM_P0_CFG,
-	[1] = ADM_P1_CFG,
-	[2] = ADM_P2_CFG,
-	[3] = ADM_P3_CFG,
-	[4] = ADM_P4_CFG,
-	[5] = ADM_P5_CFG,
-};
-
-/*
- * Split the register address in phy id and register
- * it will get combined again by the mdio bus op
- */
-#define PHYADDR(_reg)	((_reg >> 5) & 0xff), (_reg & 0x1f)
-
-#endif
diff --git a/target/linux/generic-2.6/files-2.6.26/drivers/net/phy/mvswitch.c b/target/linux/generic-2.6/files-2.6.26/drivers/net/phy/mvswitch.c
deleted file mode 100644
index 78e5afe..0000000
--- a/target/linux/generic-2.6/files-2.6.26/drivers/net/phy/mvswitch.c
+++ /dev/null
@@ -1,474 +0,0 @@
-/*
- * Marvell 88E6060 switch driver
- * Copyright (c) 2008 Felix Fietkau <nbd@openwrt.org>
- *
- * This program is free software; you can redistribute  it and/or modify it
- * under  the terms of the GNU General Public License v2 as published by the
- * Free Software Foundation
- */
-#include <linux/kernel.h>
-#include <linux/string.h>
-#include <linux/errno.h>
-#include <linux/unistd.h>
-#include <linux/slab.h>
-#include <linux/interrupt.h>
-#include <linux/init.h>
-#include <linux/delay.h>
-#include <linux/netdevice.h>
-#include <linux/etherdevice.h>
-#include <linux/skbuff.h>
-#include <linux/spinlock.h>
-#include <linux/mm.h>
-#include <linux/module.h>
-#include <linux/mii.h>
-#include <linux/ethtool.h>
-#include <linux/phy.h>
-#include <linux/if_vlan.h>
-
-#include <asm/io.h>
-#include <asm/irq.h>
-#include <asm/uaccess.h>
-#include "mvswitch.h"
-
-/* Undefine this to use trailer mode instead.
- * I don't know if header mode works with all chips */
-#define HEADER_MODE	1
-
-MODULE_DESCRIPTION("Marvell 88E6060 Switch driver");
-MODULE_AUTHOR("Felix Fietkau");
-MODULE_LICENSE("GPL");
-
-struct mvswitch_priv {
-	/* the driver's tx function */
-	int (*hardstart)(struct sk_buff *skb, struct net_device *dev);
-	struct vlan_group *grp;
-	u8 vlans[16];
-};
-
-#define to_mvsw(_phy) ((struct mvswitch_priv *) (_phy)->priv)
-
-static inline u16
-r16(struct phy_device *phydev, int addr, int reg)
-{
-	return phydev->bus->read(phydev->bus, addr, reg);
-}
-
-static inline void
-w16(struct phy_device *phydev, int addr, int reg, u16 val)
-{
-	phydev->bus->write(phydev->bus, addr, reg, val);
-}
-
-
-static int
-mvswitch_mangle_tx(struct sk_buff *skb, struct net_device *dev)
-{
-	struct mvswitch_priv *priv;
-	char *buf = NULL;
-	u16 vid;
-
-	priv = dev->phy_ptr;
-	if (unlikely(!priv))
-		goto error;
-
-	if (unlikely(skb->len < 16))
-		goto error;
-
-#ifdef HEADER_MODE
-	if (__vlan_hwaccel_get_tag(skb, &vid))
-		goto error;
-
-	if (skb_cloned(skb) || (skb->len <= 62) || (skb_headroom(skb) < MV_HEADER_SIZE)) {
-		if (pskb_expand_head(skb, MV_HEADER_SIZE, (skb->len < 62 ? 62 - skb->len : 0), GFP_ATOMIC))
-			goto error_expand;
-		if (skb->len < 62)
-			skb->len = 62;
-	}
-	buf = skb_push(skb, MV_HEADER_SIZE);
-#else
-	if (__vlan_get_tag(skb, &vid))
-		goto error;
-
-	if (unlikely((vid > 15 || !priv->vlans[vid])))
-		goto error;
-
-	if (skb->len <= 64) {
-		if (pskb_expand_head(skb, 0, 64 + MV_TRAILER_SIZE - skb->len, GFP_ATOMIC))
-			goto error_expand;
-
-		buf = skb->data + 64;
-		skb->len = 64 + MV_TRAILER_SIZE;
-	} else {
-		if (skb_cloned(skb) || unlikely(skb_tailroom(skb) < 4)) {
-			if (pskb_expand_head(skb, 0, 4, GFP_ATOMIC))
-				goto error_expand;
-		}
-		buf = skb_put(skb, 4);
-	}
-
-	/* move the ethernet header 4 bytes forward, overwriting the vlan tag */
-	memmove(skb->data + 4, skb->data, 12);
-	skb->data += 4;
-	skb->len -= 4;
-	skb->mac_header += 4;
-#endif
-
-	if (!buf)
-		goto error;
-
-
-#ifdef HEADER_MODE
-	/* prepend the tag */
-	*((__be16 *) buf) = cpu_to_be16(
-		((vid << MV_HEADER_VLAN_S) & MV_HEADER_VLAN_M) |
-		((priv->vlans[vid] << MV_HEADER_PORTS_S) & MV_HEADER_PORTS_M)
-	);
-#else
-	/* append the tag */
-	*((__be32 *) buf) = cpu_to_be32((
-		(MV_TRAILER_OVERRIDE << MV_TRAILER_FLAGS_S) |
-		((priv->vlans[vid] & MV_TRAILER_PORTS_M) << MV_TRAILER_PORTS_S)
-	));
-#endif
-
-	return priv->hardstart(skb, dev);
-
-error_expand:
-	if (net_ratelimit())
-		printk("%s: failed to expand/update skb for the switch\n", dev->name);
-
-error:
-	/* any errors? drop the packet! */
-	dev_kfree_skb_any(skb);
-	return 0;
-}
-
-static int
-mvswitch_mangle_rx(struct sk_buff *skb, int napi)
-{
-	struct mvswitch_priv *priv;
-	struct net_device *dev;
-	int vlan = -1;
-	unsigned char *buf;
-	int i;
-
-	dev = skb->dev;
-	if (!dev)
-		goto error;
-
-	priv = dev->phy_ptr;
-	if (!priv)
-		goto error;
-
-	if (!priv->grp)
-		goto error;
-
-#ifdef HEADER_MODE
-	buf = skb->data;
-	skb_pull(skb, MV_HEADER_SIZE);
-#else
-	buf = skb->data + skb->len - MV_TRAILER_SIZE;
-	if (buf[0] != 0x80)
-		goto error;
-#endif
-
-	/* look for the vlan matching the incoming port */
-	for (i = 0; i < ARRAY_SIZE(priv->vlans); i++) {
-		if ((1 << buf[1]) & priv->vlans[i])
-			vlan = i;
-	}
-
-	if (vlan == -1)
-		goto error;
-
-	skb->protocol = eth_type_trans(skb, skb->dev);
-
-	if (napi)
-		return vlan_hwaccel_receive_skb(skb, priv->grp, vlan);
-	else
-		return vlan_hwaccel_rx(skb, priv->grp, vlan);
-
-error:
-	/* no vlan? eat the packet! */
-	dev_kfree_skb_any(skb);
-	return 0;
-}
-
-
-static int
-mvswitch_netif_rx(struct sk_buff *skb)
-{
-	return mvswitch_mangle_rx(skb, 0);
-}
-
-static int
-mvswitch_netif_receive_skb(struct sk_buff *skb)
-{
-	return mvswitch_mangle_rx(skb, 1);
-}
-
-
-static void
-mvswitch_vlan_rx_register(struct net_device *dev, struct vlan_group *grp)
-{
-	struct mvswitch_priv *priv = dev->phy_ptr;
-	priv->grp = grp;
-}
-
-
-static int
-mvswitch_wait_mask(struct phy_device *pdev, int addr, int reg, u16 mask, u16 val)
-{
-	int i = 100;
-	u16 r;
-
-	do {
-		r = r16(pdev, addr, reg) & mask;
-		if (r == val)
-			return 0;
-	} while(--i > 0);
-	return -ETIMEDOUT;
-}
-
-static int
-mvswitch_config_init(struct phy_device *pdev)
-{
-	struct mvswitch_priv *priv = to_mvsw(pdev);
-	struct net_device *dev = pdev->attached_dev;
-	u8 vlmap = 0;
-	int i;
-
-	if (!dev)
-		return -EINVAL;
-
-	printk("%s: Marvell 88E6060 PHY driver attached.\n", dev->name);
-	pdev->supported = ADVERTISED_100baseT_Full;
-	pdev->advertising = ADVERTISED_100baseT_Full;
-	dev->phy_ptr = priv;
-	dev->irq = PHY_POLL;
-
-	/* initialize default vlans */
-	for (i = 0; i < MV_PORTS; i++)
-		priv->vlans[(i == MV_WANPORT ? 1 : 0)] |= (1 << i);
-
-	/* before entering reset, disable all ports */
-	for (i = 0; i < MV_PORTS; i++)
-		w16(pdev, MV_PORTREG(CONTROL, i), 0x00);
-
-	msleep(2); /* wait for the status change to settle in */
-
-	/* put the ATU in reset */
-	w16(pdev, MV_SWITCHREG(ATU_CTRL), MV_ATUCTL_RESET);
-
-	i = mvswitch_wait_mask(pdev, MV_SWITCHREG(ATU_CTRL), MV_ATUCTL_RESET, 0);
-	if (i < 0) {
-		printk("%s: Timeout waiting for the switch to reset.\n", dev->name);
-		return i;
-	}
-
-	/* set the ATU flags */
-	w16(pdev, MV_SWITCHREG(ATU_CTRL),
-		MV_ATUCTL_NO_LEARN |
-		MV_ATUCTL_ATU_1K |
-		MV_ATUCTL_AGETIME(MV_ATUCTL_AGETIME_MIN) /* minimum without disabling ageing */
-	);
-
-	/* initialize the cpu port */
-	w16(pdev, MV_PORTREG(CONTROL, MV_CPUPORT),
-#ifdef HEADER_MODE
-		MV_PORTCTRL_HEADER |
-#else
-		MV_PORTCTRL_RXTR |
-		MV_PORTCTRL_TXTR |
-#endif
-		MV_PORTCTRL_ENABLED
-	);
-	/* wait for the phy change to settle in */
-	msleep(2);
-	for (i = 0; i < MV_PORTS; i++) {
-		u8 pvid = 0;
-		int j;
-
-		vlmap = 0;
-
-		/* look for the matching vlan */
-		for (j = 0; j < ARRAY_SIZE(priv->vlans); j++) {
-			if (priv->vlans[j] & (1 << i)) {
-				vlmap = priv->vlans[j];
-				pvid = j;
-			}
-		}
-		/* leave port unconfigured if it's not part of a vlan */
-		if (!vlmap)
-			continue;
-
-		/* add the cpu port to the allowed destinations list */
-		vlmap |= (1 << MV_CPUPORT);
-
-		/* take port out of its own vlan destination map */
-		vlmap &= ~(1 << i);
-
-		/* apply vlan settings */
-		w16(pdev, MV_PORTREG(VLANMAP, i),
-			MV_PORTVLAN_PORTS(vlmap) |
-			MV_PORTVLAN_ID(i)
-		);
-
-		/* re-enable port */
-		w16(pdev, MV_PORTREG(CONTROL, i),
-			MV_PORTCTRL_ENABLED
-		);
-	}
-
-	w16(pdev, MV_PORTREG(VLANMAP, MV_CPUPORT),
-		MV_PORTVLAN_ID(MV_CPUPORT)
-	);
-
-	/* set the port association vector */
-	for (i = 0; i <= MV_PORTS; i++) {
-		w16(pdev, MV_PORTREG(ASSOC, i),
-			MV_PORTASSOC_PORTS(1 << i)
-		);
-	}
-
-	/* init switch control */
-	w16(pdev, MV_SWITCHREG(CTRL),
-		MV_SWITCHCTL_MSIZE |
-		MV_SWITCHCTL_DROP
-	);
-
-	/* hook into the tx function */
-	priv->hardstart = dev->hard_start_xmit;
-	pdev->netif_receive_skb = mvswitch_netif_receive_skb;
-	pdev->netif_rx = mvswitch_netif_rx;
-	dev->hard_start_xmit = mvswitch_mangle_tx;
-	dev->vlan_rx_register = mvswitch_vlan_rx_register;
-#ifdef HEADER_MODE
-	dev->features |= NETIF_F_HW_VLAN_RX | NETIF_F_HW_VLAN_TX;
-#else
-	dev->features |= NETIF_F_HW_VLAN_RX;
-#endif
-
-	return 0;
-}
-
-static int
-mvswitch_read_status(struct phy_device *pdev)
-{
-	pdev->speed = SPEED_100;
-	pdev->duplex = DUPLEX_FULL;
-	pdev->state = PHY_UP;
-
-	/* XXX ugly workaround: we can't force the switch
-	 * to gracefully handle hosts moving from one port to another,
-	 * so we have to regularly clear the ATU database */
-
-	/* wait for the ATU to become available */
-	mvswitch_wait_mask(pdev, MV_SWITCHREG(ATU_OP), MV_ATUOP_INPROGRESS, 0);
-
-	/* flush the ATU */
-	w16(pdev, MV_SWITCHREG(ATU_OP),
-		MV_ATUOP_INPROGRESS |
-		MV_ATUOP_FLUSH_ALL
-	);
-
-	/* wait for operation to complete */
-	mvswitch_wait_mask(pdev, MV_SWITCHREG(ATU_OP), MV_ATUOP_INPROGRESS, 0);
-
-	return 0;
-}
-
-static int
-mvswitch_config_aneg(struct phy_device *phydev)
-{
-	return 0;
-}
-
-static void
-mvswitch_remove(struct phy_device *pdev)
-{
-	struct mvswitch_priv *priv = to_mvsw(pdev);
-	struct net_device *dev = pdev->attached_dev;
-
-	/* restore old xmit handler */
-	if (priv->hardstart && dev)
-		dev->hard_start_xmit = priv->hardstart;
-	dev->vlan_rx_register = NULL;
-	dev->vlan_rx_kill_vid = NULL;
-	dev->phy_ptr = NULL;
-	dev->features &= ~NETIF_F_HW_VLAN_RX;
-	kfree(priv);
-}
-
-static bool
-mvswitch_detect(struct mii_bus *bus, int addr)
-{
-	u16 reg;
-	int i;
-
-	/* we attach to phy id 31 to make sure that the late probe works */
-	if (addr != 31)
-		return false;
-
-	/* look for the switch on the bus */
-	reg = bus->read(bus, MV_PORTREG(IDENT, 0)) & MV_IDENT_MASK;
-	if (reg != MV_IDENT_VALUE)
-		return false;
-
-	/* 
-	 * Now that we've established that the switch actually exists, let's 
-	 * get rid of the competition :)
-	 */
-	for (i = 0; i < 31; i++) {
-		if (!bus->phy_map[i])
-			continue;
-
-		device_unregister(&bus->phy_map[i]->dev);
-		kfree(bus->phy_map[i]);
-		bus->phy_map[i] = NULL;
-	}
-
-	return true;
-}
-
-static int
-mvswitch_probe(struct phy_device *pdev)
-{
-	struct mvswitch_priv *priv;
-
-	priv = kzalloc(sizeof(struct mvswitch_priv), GFP_KERNEL);
-	if (priv == NULL)
-		return -ENOMEM;
-
-	pdev->priv = priv;
-
-	return 0;
-}
-
-
-static struct phy_driver mvswitch_driver = {
-	.name		= "Marvell 88E6060",
-	.features	= PHY_BASIC_FEATURES,
-	.detect		= &mvswitch_detect,
-	.probe		= &mvswitch_probe,
-	.remove		= &mvswitch_remove,
-	.config_init	= &mvswitch_config_init,
-	.config_aneg	= &mvswitch_config_aneg,
-	.read_status	= &mvswitch_read_status,
-	.driver		= { .owner = THIS_MODULE,},
-};
-
-static int __init
-mvswitch_init(void)
-{
-	return phy_driver_register(&mvswitch_driver);
-}
-
-static void __exit
-mvswitch_exit(void)
-{
-	phy_driver_unregister(&mvswitch_driver);
-}
-
-module_init(mvswitch_init);
-module_exit(mvswitch_exit);
diff --git a/target/linux/generic-2.6/files-2.6.26/drivers/net/phy/mvswitch.h b/target/linux/generic-2.6/files-2.6.26/drivers/net/phy/mvswitch.h
deleted file mode 100644
index 1563eec..0000000
--- a/target/linux/generic-2.6/files-2.6.26/drivers/net/phy/mvswitch.h
+++ /dev/null
@@ -1,145 +0,0 @@
-/*
- * Marvell 88E6060 switch driver
- * Copyright (c) 2008 Felix Fietkau <nbd@openwrt.org>
- *
- * This program is free software; you can redistribute  it and/or modify it
- * under  the terms of the GNU General Public License v2 as published by the
- * Free Software Foundation
- */
-#ifndef __MVSWITCH_H
-#define __MVSWITCH_H
-
-#define MV_HEADER_SIZE	2
-#define MV_HEADER_PORTS_M	0x001f
-#define MV_HEADER_PORTS_S	0
-#define MV_HEADER_VLAN_M	0xf000
-#define MV_HEADER_VLAN_S	12
-
-#define MV_TRAILER_SIZE	4
-#define MV_TRAILER_PORTS_M	0x1f
-#define MV_TRAILER_PORTS_S	16
-#define MV_TRAILER_FLAGS_S	24
-#define MV_TRAILER_OVERRIDE	0x80
-
-
-#define MV_PORTS	5
-#define MV_WANPORT	4
-#define MV_CPUPORT	5
-
-#define MV_BASE		0x10
-
-#define MV_PHYPORT_BASE		(MV_BASE + 0x0)
-#define MV_PHYPORT(_n)		(MV_PHYPORT_BASE + (_n))
-#define MV_SWITCHPORT_BASE	(MV_BASE + 0x8)
-#define MV_SWITCHPORT(_n)	(MV_SWITCHPORT_BASE + (_n))
-#define MV_SWITCHREGS		(MV_BASE + 0xf)
-
-enum {
-	MV_PHY_CONTROL      = 0x00,
-	MV_PHY_STATUS       = 0x01,
-	MV_PHY_IDENT0       = 0x02,
-	MV_PHY_IDENT1       = 0x03,
-	MV_PHY_ANEG         = 0x04,
-	MV_PHY_LINK_ABILITY = 0x05,
-	MV_PHY_ANEG_EXPAND  = 0x06,
-	MV_PHY_XMIT_NEXTP   = 0x07,
-	MV_PHY_LINK_NEXTP   = 0x08,
-	MV_PHY_CONTROL1     = 0x10,
-	MV_PHY_STATUS1      = 0x11,
-	MV_PHY_INTR_EN      = 0x12,
-	MV_PHY_INTR_STATUS  = 0x13,
-	MV_PHY_INTR_PORT    = 0x14,
-	MV_PHY_RECV_COUNTER = 0x16,
-	MV_PHY_LED_PARALLEL = 0x16,
-	MV_PHY_LED_STREAM   = 0x17,
-	MV_PHY_LED_CTRL     = 0x18,
-	MV_PHY_LED_OVERRIDE = 0x19,
-	MV_PHY_VCT_CTRL     = 0x1a,
-	MV_PHY_VCT_STATUS   = 0x1b,
-	MV_PHY_CONTROL2     = 0x1e
-};
-#define MV_PHYREG(_type, _port) MV_PHYPORT(_port), MV_PHY_##_type
-
-enum {
-	MV_PORT_STATUS      = 0x00,
-	MV_PORT_IDENT       = 0x03,
-	MV_PORT_CONTROL     = 0x04,
-	MV_PORT_VLANMAP     = 0x06,
-	MV_PORT_ASSOC       = 0x0b,
-	MV_PORT_RXCOUNT     = 0x10,
-	MV_PORT_TXCOUNT     = 0x11,
-};
-#define MV_PORTREG(_type, _port) MV_SWITCHPORT(_port), MV_PORT_##_type
-
-enum {
-	MV_PORTCTRL_BLOCK   =  (1 << 0),
-	MV_PORTCTRL_LEARN   =  (2 << 0),
-	MV_PORTCTRL_ENABLED =  (3 << 0),
-	MV_PORTCTRL_VLANTUN =  (1 << 7),	/* Enforce VLANs on packets */
-	MV_PORTCTRL_RXTR    =  (1 << 8),	/* Enable Marvell packet trailer for ingress */
-	MV_PORTCTRL_HEADER	= (1 << 11),	/* Enable Marvell packet header mode for port */
-	MV_PORTCTRL_TXTR    = (1 << 14),	/* Enable Marvell packet trailer for egress */
-	MV_PORTCTRL_FORCEFL = (1 << 15),	/* force flow control */
-};
-
-#define MV_PORTVLAN_ID(_n) (((_n) & 0xf) << 12)
-#define MV_PORTVLAN_PORTS(_n) ((_n) & 0x3f)
-
-#define MV_PORTASSOC_PORTS(_n) ((_n) & 0x1f)
-#define MV_PORTASSOC_MONITOR	(1 << 15)
-
-enum {
-	MV_SWITCH_MAC0      = 0x01,
-	MV_SWITCH_MAC1      = 0x02,
-	MV_SWITCH_MAC2      = 0x03,
-	MV_SWITCH_CTRL      = 0x04,
-	MV_SWITCH_ATU_CTRL  = 0x0a,
-	MV_SWITCH_ATU_OP    = 0x0b,
-	MV_SWITCH_ATU_DATA  = 0x0c,
-	MV_SWITCH_ATU_MAC0  = 0x0d,
-	MV_SWITCH_ATU_MAC1  = 0x0e,
-	MV_SWITCH_ATU_MAC2  = 0x0f,
-};
-#define MV_SWITCHREG(_type) MV_SWITCHREGS, MV_SWITCH_##_type
-
-enum {
-	MV_SWITCHCTL_EEIE   =  (1 << 0),	/* EEPROM interrupt enable */
-	MV_SWITCHCTL_PHYIE  =  (1 << 1),	/* PHY interrupt enable */
-	MV_SWITCHCTL_ATUDONE=  (1 << 2),	/* ATU done interrupt enable */
-	MV_SWITCHCTL_ATUIE  =  (1 << 3),	/* ATU interrupt enable */
-	MV_SWITCHCTL_CTRMODE=  (1 << 8),	/* statistics for rx and tx errors */
-	MV_SWITCHCTL_RELOAD =  (1 << 9),	/* reload registers from eeprom */
-	MV_SWITCHCTL_MSIZE  = (1 << 10),	/* increase maximum frame size */
-	MV_SWITCHCTL_DROP   = (1 << 13),	/* discard frames with excessive collisions */
-};
-
-enum {
-#define MV_ATUCTL_AGETIME_MIN	16
-#define MV_ATUCTL_AGETIME_MAX	4080
-#define MV_ATUCTL_AGETIME(_n)	((((_n) / 16) & 0xff) << 4)
-	MV_ATUCTL_ATU_256   = (0 << 12),
-	MV_ATUCTL_ATU_512   = (1 << 12),
-	MV_ATUCTL_ATU_1K	= (2 << 12),
-	MV_ATUCTL_ATUMASK   = (3 << 12),
-	MV_ATUCTL_NO_LEARN  = (1 << 14),
-	MV_ATUCTL_RESET     = (1 << 15),
-};
-
-enum {
-#define MV_ATUOP_DBNUM(_n)	((_n) & 0x0f)
-
-	MV_ATUOP_NOOP       = (0 << 12),
-	MV_ATUOP_FLUSH_ALL  = (1 << 12),
-	MV_ATUOP_FLUSH_U    = (2 << 12),
-	MV_ATUOP_LOAD_DB    = (3 << 12),
-	MV_ATUOP_GET_NEXT   = (4 << 12),
-	MV_ATUOP_FLUSH_DB   = (5 << 12),
-	MV_ATUOP_FLUSH_DB_UU= (6 << 12),
-
-	MV_ATUOP_INPROGRESS = (1 << 15),
-};
-
-#define MV_IDENT_MASK		0xfff0
-#define MV_IDENT_VALUE		0x0600
-
-#endif
diff --git a/target/linux/generic-2.6/files-2.6.27/drivers/net/phy/adm6996.c b/target/linux/generic-2.6/files-2.6.27/drivers/net/phy/adm6996.c
deleted file mode 100644
index 3033813..0000000
--- a/target/linux/generic-2.6/files-2.6.27/drivers/net/phy/adm6996.c
+++ /dev/null
@@ -1,170 +0,0 @@
-/*
- * ADM6996 switch driver
- *
- * Copyright (c) 2008 Felix Fietkau <nbd@openwrt.org>
- *
- * This program is free software; you can redistribute  it and/or modify it
- * under  the terms of the GNU General Public License v2 as published by the
- * Free Software Foundation
- */
-#include <linux/kernel.h>
-#include <linux/string.h>
-#include <linux/errno.h>
-#include <linux/unistd.h>
-#include <linux/slab.h>
-#include <linux/interrupt.h>
-#include <linux/init.h>
-#include <linux/delay.h>
-#include <linux/netdevice.h>
-#include <linux/etherdevice.h>
-#include <linux/skbuff.h>
-#include <linux/spinlock.h>
-#include <linux/mm.h>
-#include <linux/module.h>
-#include <linux/mii.h>
-#include <linux/ethtool.h>
-#include <linux/phy.h>
-
-#include <asm/io.h>
-#include <asm/irq.h>
-#include <asm/uaccess.h>
-#include "adm6996.h"
-
-MODULE_DESCRIPTION("Infineon ADM6996 Switch");
-MODULE_AUTHOR("Felix Fietkau");
-MODULE_LICENSE("GPL");
-
-struct adm6996_priv {
-	/* use abstraction for regops, we want to add gpio support in the future */
-	u16 (*read)(struct phy_device *phydev, enum admreg reg);
-	void (*write)(struct phy_device *phydev, enum admreg reg, u16 val);
-};
-
-#define to_adm(_phy) ((struct adm6996_priv *) (_phy)->priv)
-
-
-static inline u16
-r16(struct phy_device *pdev, enum admreg reg)
-{
-	return to_adm(pdev)->read(pdev, reg);
-}
-
-static inline void
-w16(struct phy_device *pdev, enum admreg reg, u16 val)
-{
-	to_adm(pdev)->write(pdev, reg, val);
-}
-
-
-static u16
-adm6996_read_mii_reg(struct phy_device *phydev, enum admreg reg)
-{
-	return phydev->bus->read(phydev->bus, PHYADDR(reg));
-}
-
-static void
-adm6996_write_mii_reg(struct phy_device *phydev, enum admreg reg, u16 val)
-{
-	phydev->bus->write(phydev->bus, PHYADDR(reg), val);
-}
-
-
-static int adm6996_config_init(struct phy_device *pdev)
-{
-	int i;
-
-	printk("%s: ADM6996 PHY driver attached.\n", pdev->attached_dev->name);
-	pdev->supported = ADVERTISED_100baseT_Full;
-	pdev->advertising = ADVERTISED_100baseT_Full;
-
-	/* initialize port and vlan settings */
-	for (i = 0; i < ADM_PHY_PORTS; i++) {
-		w16(pdev, adm_portcfg[i], ADM_PORTCFG_INIT |
-			ADM_PORTCFG_PVID((i == ADM_WAN_PORT) ? 1 : 0));
-	}
-	w16(pdev, adm_portcfg[5], ADM_PORTCFG_CPU);
-
-	/* reset all ports */
-	for (i = 0; i < ADM_PHY_PORTS; i++) {
-		w16(pdev, ADM_PHY_PORT(i), ADM_PHYCFG_INIT);
-	}
-
-	return 0;
-}
-
-static int adm6996_read_status(struct phy_device *phydev)
-{
-	phydev->speed = SPEED_100;
-	phydev->duplex = DUPLEX_FULL;
-	phydev->state = PHY_UP;
-	return 0;
-}
-
-static int adm6996_config_aneg(struct phy_device *phydev)
-{
-	return 0;
-}
-
-static int adm6996_probe(struct phy_device *pdev)
-{
-	struct adm6996_priv *priv;
-
-	priv = kzalloc(sizeof(struct adm6996_priv), GFP_KERNEL);
-	if (priv == NULL)
-		return -ENOMEM;
-
-	priv->read = adm6996_read_mii_reg;
-	priv->write = adm6996_write_mii_reg;
-	pdev->priv = priv;
-	return 0;
-}
-
-static void adm6996_remove(struct phy_device *pdev)
-{
-	kfree(pdev->priv);
-}
-
-static bool adm6996_detect(struct mii_bus *bus, int addr)
-{
-	u16 reg;
-
-	/* we only attach to phy id 0 */
-	if (addr != 0)
-		return false;
-
-	/* look for the switch on the bus */
-	reg = bus->read(bus, PHYADDR(ADM_SIG0)) & ADM_SIG0_MASK;
-	if (reg != ADM_SIG0_VAL)
-		return false;
-
-	reg = bus->read(bus, PHYADDR(ADM_SIG1)) & ADM_SIG1_MASK;
-	if (reg != ADM_SIG1_VAL)
-		return false;
-
-	return true;
-}
-
-static struct phy_driver adm6996_driver = {
-	.name		= "Infineon ADM6996",
-	.features	= PHY_BASIC_FEATURES,
-	.detect		= adm6996_detect,
-	.probe		= adm6996_probe,
-	.remove		= adm6996_remove,
-	.config_init	= &adm6996_config_init,
-	.config_aneg	= &adm6996_config_aneg,
-	.read_status	= &adm6996_read_status,
-	.driver		= { .owner = THIS_MODULE,},
-};
-
-static int __init adm6996_init(void)
-{
-	return phy_driver_register(&adm6996_driver);
-}
-
-static void __exit adm6996_exit(void)
-{
-	phy_driver_unregister(&adm6996_driver);
-}
-
-module_init(adm6996_init);
-module_exit(adm6996_exit);
diff --git a/target/linux/generic-2.6/files-2.6.27/drivers/net/phy/adm6996.h b/target/linux/generic-2.6/files-2.6.27/drivers/net/phy/adm6996.h
deleted file mode 100644
index e074901..0000000
--- a/target/linux/generic-2.6/files-2.6.27/drivers/net/phy/adm6996.h
+++ /dev/null
@@ -1,105 +0,0 @@
-/*
- * ADM6996 switch driver
- *
- * Copyright (c) 2008 Felix Fietkau <nbd@openwrt.org>
- *
- * This program is free software; you can redistribute  it and/or modify it
- * under  the terms of the GNU General Public License v2 as published by the
- * Free Software Foundation
- */
-#ifndef __ADM6996_H
-#define __ADM6996_H
-
-#define ADM_PHY_PORTS	5
-#define ADM_CPU_PORT	5
-#define ADM_WAN_PORT	0 /* FIXME: dynamic ? */
-
-enum admreg {
-	ADM_EEPROM_BASE		= 0x0,
-		ADM_P0_CFG		= ADM_EEPROM_BASE + 1,
-		ADM_P1_CFG		= ADM_EEPROM_BASE + 3,
-		ADM_P2_CFG		= ADM_EEPROM_BASE + 5,
-		ADM_P3_CFG		= ADM_EEPROM_BASE + 7,
-		ADM_P4_CFG		= ADM_EEPROM_BASE + 8,
-		ADM_P5_CFG		= ADM_EEPROM_BASE + 9,
-	ADM_EEPROM_EXT_BASE	= 0x40,
-	ADM_COUNTER_BASE	= 0xa0,
-		ADM_SIG0		= ADM_COUNTER_BASE + 0,
-		ADM_SIG1		= ADM_COUNTER_BASE + 1,
-	ADM_PHY_BASE		= 0x200,
-#define ADM_PHY_PORT(n) (ADM_PHY_BASE + (0x20 * n))
-};
-
-/* Chip identification patterns */
-#define	ADM_SIG0_MASK	0xfff0
-#define ADM_SIG0_VAL	0x1020
-#define ADM_SIG1_MASK	0xffff
-#define ADM_SIG1_VAL	0x0007
-
-enum {
-	ADM_PHYCFG_COLTST     = (1 << 7),	/* Enable collision test */
-	ADM_PHYCFG_DPLX       = (1 << 8),	/* Enable full duplex */
-	ADM_PHYCFG_ANEN_RST   = (1 << 9),	/* Restart auto negotiation (self clear) */
-	ADM_PHYCFG_ISO        = (1 << 10),	/* Isolate PHY */
-	ADM_PHYCFG_PDN        = (1 << 11),	/* Power down PHY */
-	ADM_PHYCFG_ANEN       = (1 << 12),	/* Enable auto negotiation */
-	ADM_PHYCFG_SPEED_100  = (1 << 13),	/* Enable 100 Mbit/s */
-	ADM_PHYCFG_LPBK       = (1 << 14),	/* Enable loopback operation */
-	ADM_PHYCFG_RST        = (1 << 15),	/* Reset the port (self clear) */
-	ADM_PHYCFG_INIT = (
-		ADM_PHYCFG_RST |
-		ADM_PHYCFG_SPEED_100 |
-		ADM_PHYCFG_ANEN |
-		ADM_PHYCFG_ANEN_RST
-	)
-};
-
-enum {
-	ADM_PORTCFG_FC        = (1 << 0),	/* Enable 802.x flow control */
-	ADM_PORTCFG_AN        = (1 << 1),	/* Enable auto-negotiation */
-	ADM_PORTCFG_SPEED_100 = (1 << 2),	/* Enable 100 Mbit/s */
-	ADM_PORTCFG_DPLX      = (1 << 3),	/* Enable full duplex */
-	ADM_PORTCFG_OT        = (1 << 4),	/* Output tagged packets */
-	ADM_PORTCFG_PD        = (1 << 5),	/* Port disable */
-	ADM_PORTCFG_TV_PRIO   = (1 << 6),	/* 0 = VLAN based priority
-	                                 	 * 1 = TOS based priority */
-	ADM_PORTCFG_PPE       = (1 << 7),	/* Port based priority enable */
-	ADM_PORTCFG_PP_S      = (1 << 8),	/* Port based priority, 2 bits */
-	ADM_PORTCFG_PVID_BASE = (1 << 10),	/* Primary VLAN id, 4 bits */
-	ADM_PORTCFG_FSE	      = (1 << 14),	/* Fx select enable */
-	ADM_PORTCFG_CAM       = (1 << 15),	/* Crossover Auto MDIX */
-
-	ADM_PORTCFG_INIT = (
-		ADM_PORTCFG_FC |
-		ADM_PORTCFG_AN |
-		ADM_PORTCFG_SPEED_100 |
-		ADM_PORTCFG_DPLX |
-		ADM_PORTCFG_CAM
-	),
-	ADM_PORTCFG_CPU = (
-		ADM_PORTCFG_FC |
-		ADM_PORTCFG_SPEED_100 |
-		ADM_PORTCFG_OT |
-		ADM_PORTCFG_DPLX
-	),
-};
-
-#define ADM_PORTCFG_PPID(N) ((n & 0x3) << 8)
-#define ADM_PORTCFG_PVID(n) ((n & 0xf) << 10)
-
-static const u8 adm_portcfg[] = {
-	[0] = ADM_P0_CFG,
-	[1] = ADM_P1_CFG,
-	[2] = ADM_P2_CFG,
-	[3] = ADM_P3_CFG,
-	[4] = ADM_P4_CFG,
-	[5] = ADM_P5_CFG,
-};
-
-/*
- * Split the register address in phy id and register
- * it will get combined again by the mdio bus op
- */
-#define PHYADDR(_reg)	((_reg >> 5) & 0xff), (_reg & 0x1f)
-
-#endif
diff --git a/target/linux/generic-2.6/files-2.6.27/drivers/net/phy/mvswitch.c b/target/linux/generic-2.6/files-2.6.27/drivers/net/phy/mvswitch.c
deleted file mode 100644
index 78e5afe..0000000
--- a/target/linux/generic-2.6/files-2.6.27/drivers/net/phy/mvswitch.c
+++ /dev/null
@@ -1,474 +0,0 @@
-/*
- * Marvell 88E6060 switch driver
- * Copyright (c) 2008 Felix Fietkau <nbd@openwrt.org>
- *
- * This program is free software; you can redistribute  it and/or modify it
- * under  the terms of the GNU General Public License v2 as published by the
- * Free Software Foundation
- */
-#include <linux/kernel.h>
-#include <linux/string.h>
-#include <linux/errno.h>
-#include <linux/unistd.h>
-#include <linux/slab.h>
-#include <linux/interrupt.h>
-#include <linux/init.h>
-#include <linux/delay.h>
-#include <linux/netdevice.h>
-#include <linux/etherdevice.h>
-#include <linux/skbuff.h>
-#include <linux/spinlock.h>
-#include <linux/mm.h>
-#include <linux/module.h>
-#include <linux/mii.h>
-#include <linux/ethtool.h>
-#include <linux/phy.h>
-#include <linux/if_vlan.h>
-
-#include <asm/io.h>
-#include <asm/irq.h>
-#include <asm/uaccess.h>
-#include "mvswitch.h"
-
-/* Undefine this to use trailer mode instead.
- * I don't know if header mode works with all chips */
-#define HEADER_MODE	1
-
-MODULE_DESCRIPTION("Marvell 88E6060 Switch driver");
-MODULE_AUTHOR("Felix Fietkau");
-MODULE_LICENSE("GPL");
-
-struct mvswitch_priv {
-	/* the driver's tx function */
-	int (*hardstart)(struct sk_buff *skb, struct net_device *dev);
-	struct vlan_group *grp;
-	u8 vlans[16];
-};
-
-#define to_mvsw(_phy) ((struct mvswitch_priv *) (_phy)->priv)
-
-static inline u16
-r16(struct phy_device *phydev, int addr, int reg)
-{
-	return phydev->bus->read(phydev->bus, addr, reg);
-}
-
-static inline void
-w16(struct phy_device *phydev, int addr, int reg, u16 val)
-{
-	phydev->bus->write(phydev->bus, addr, reg, val);
-}
-
-
-static int
-mvswitch_mangle_tx(struct sk_buff *skb, struct net_device *dev)
-{
-	struct mvswitch_priv *priv;
-	char *buf = NULL;
-	u16 vid;
-
-	priv = dev->phy_ptr;
-	if (unlikely(!priv))
-		goto error;
-
-	if (unlikely(skb->len < 16))
-		goto error;
-
-#ifdef HEADER_MODE
-	if (__vlan_hwaccel_get_tag(skb, &vid))
-		goto error;
-
-	if (skb_cloned(skb) || (skb->len <= 62) || (skb_headroom(skb) < MV_HEADER_SIZE)) {
-		if (pskb_expand_head(skb, MV_HEADER_SIZE, (skb->len < 62 ? 62 - skb->len : 0), GFP_ATOMIC))
-			goto error_expand;
-		if (skb->len < 62)
-			skb->len = 62;
-	}
-	buf = skb_push(skb, MV_HEADER_SIZE);
-#else
-	if (__vlan_get_tag(skb, &vid))
-		goto error;
-
-	if (unlikely((vid > 15 || !priv->vlans[vid])))
-		goto error;
-
-	if (skb->len <= 64) {
-		if (pskb_expand_head(skb, 0, 64 + MV_TRAILER_SIZE - skb->len, GFP_ATOMIC))
-			goto error_expand;
-
-		buf = skb->data + 64;
-		skb->len = 64 + MV_TRAILER_SIZE;
-	} else {
-		if (skb_cloned(skb) || unlikely(skb_tailroom(skb) < 4)) {
-			if (pskb_expand_head(skb, 0, 4, GFP_ATOMIC))
-				goto error_expand;
-		}
-		buf = skb_put(skb, 4);
-	}
-
-	/* move the ethernet header 4 bytes forward, overwriting the vlan tag */
-	memmove(skb->data + 4, skb->data, 12);
-	skb->data += 4;
-	skb->len -= 4;
-	skb->mac_header += 4;
-#endif
-
-	if (!buf)
-		goto error;
-
-
-#ifdef HEADER_MODE
-	/* prepend the tag */
-	*((__be16 *) buf) = cpu_to_be16(
-		((vid << MV_HEADER_VLAN_S) & MV_HEADER_VLAN_M) |
-		((priv->vlans[vid] << MV_HEADER_PORTS_S) & MV_HEADER_PORTS_M)
-	);
-#else
-	/* append the tag */
-	*((__be32 *) buf) = cpu_to_be32((
-		(MV_TRAILER_OVERRIDE << MV_TRAILER_FLAGS_S) |
-		((priv->vlans[vid] & MV_TRAILER_PORTS_M) << MV_TRAILER_PORTS_S)
-	));
-#endif
-
-	return priv->hardstart(skb, dev);
-
-error_expand:
-	if (net_ratelimit())
-		printk("%s: failed to expand/update skb for the switch\n", dev->name);
-
-error:
-	/* any errors? drop the packet! */
-	dev_kfree_skb_any(skb);
-	return 0;
-}
-
-static int
-mvswitch_mangle_rx(struct sk_buff *skb, int napi)
-{
-	struct mvswitch_priv *priv;
-	struct net_device *dev;
-	int vlan = -1;
-	unsigned char *buf;
-	int i;
-
-	dev = skb->dev;
-	if (!dev)
-		goto error;
-
-	priv = dev->phy_ptr;
-	if (!priv)
-		goto error;
-
-	if (!priv->grp)
-		goto error;
-
-#ifdef HEADER_MODE
-	buf = skb->data;
-	skb_pull(skb, MV_HEADER_SIZE);
-#else
-	buf = skb->data + skb->len - MV_TRAILER_SIZE;
-	if (buf[0] != 0x80)
-		goto error;
-#endif
-
-	/* look for the vlan matching the incoming port */
-	for (i = 0; i < ARRAY_SIZE(priv->vlans); i++) {
-		if ((1 << buf[1]) & priv->vlans[i])
-			vlan = i;
-	}
-
-	if (vlan == -1)
-		goto error;
-
-	skb->protocol = eth_type_trans(skb, skb->dev);
-
-	if (napi)
-		return vlan_hwaccel_receive_skb(skb, priv->grp, vlan);
-	else
-		return vlan_hwaccel_rx(skb, priv->grp, vlan);
-
-error:
-	/* no vlan? eat the packet! */
-	dev_kfree_skb_any(skb);
-	return 0;
-}
-
-
-static int
-mvswitch_netif_rx(struct sk_buff *skb)
-{
-	return mvswitch_mangle_rx(skb, 0);
-}
-
-static int
-mvswitch_netif_receive_skb(struct sk_buff *skb)
-{
-	return mvswitch_mangle_rx(skb, 1);
-}
-
-
-static void
-mvswitch_vlan_rx_register(struct net_device *dev, struct vlan_group *grp)
-{
-	struct mvswitch_priv *priv = dev->phy_ptr;
-	priv->grp = grp;
-}
-
-
-static int
-mvswitch_wait_mask(struct phy_device *pdev, int addr, int reg, u16 mask, u16 val)
-{
-	int i = 100;
-	u16 r;
-
-	do {
-		r = r16(pdev, addr, reg) & mask;
-		if (r == val)
-			return 0;
-	} while(--i > 0);
-	return -ETIMEDOUT;
-}
-
-static int
-mvswitch_config_init(struct phy_device *pdev)
-{
-	struct mvswitch_priv *priv = to_mvsw(pdev);
-	struct net_device *dev = pdev->attached_dev;
-	u8 vlmap = 0;
-	int i;
-
-	if (!dev)
-		return -EINVAL;
-
-	printk("%s: Marvell 88E6060 PHY driver attached.\n", dev->name);
-	pdev->supported = ADVERTISED_100baseT_Full;
-	pdev->advertising = ADVERTISED_100baseT_Full;
-	dev->phy_ptr = priv;
-	dev->irq = PHY_POLL;
-
-	/* initialize default vlans */
-	for (i = 0; i < MV_PORTS; i++)
-		priv->vlans[(i == MV_WANPORT ? 1 : 0)] |= (1 << i);
-
-	/* before entering reset, disable all ports */
-	for (i = 0; i < MV_PORTS; i++)
-		w16(pdev, MV_PORTREG(CONTROL, i), 0x00);
-
-	msleep(2); /* wait for the status change to settle in */
-
-	/* put the ATU in reset */
-	w16(pdev, MV_SWITCHREG(ATU_CTRL), MV_ATUCTL_RESET);
-
-	i = mvswitch_wait_mask(pdev, MV_SWITCHREG(ATU_CTRL), MV_ATUCTL_RESET, 0);
-	if (i < 0) {
-		printk("%s: Timeout waiting for the switch to reset.\n", dev->name);
-		return i;
-	}
-
-	/* set the ATU flags */
-	w16(pdev, MV_SWITCHREG(ATU_CTRL),
-		MV_ATUCTL_NO_LEARN |
-		MV_ATUCTL_ATU_1K |
-		MV_ATUCTL_AGETIME(MV_ATUCTL_AGETIME_MIN) /* minimum without disabling ageing */
-	);
-
-	/* initialize the cpu port */
-	w16(pdev, MV_PORTREG(CONTROL, MV_CPUPORT),
-#ifdef HEADER_MODE
-		MV_PORTCTRL_HEADER |
-#else
-		MV_PORTCTRL_RXTR |
-		MV_PORTCTRL_TXTR |
-#endif
-		MV_PORTCTRL_ENABLED
-	);
-	/* wait for the phy change to settle in */
-	msleep(2);
-	for (i = 0; i < MV_PORTS; i++) {
-		u8 pvid = 0;
-		int j;
-
-		vlmap = 0;
-
-		/* look for the matching vlan */
-		for (j = 0; j < ARRAY_SIZE(priv->vlans); j++) {
-			if (priv->vlans[j] & (1 << i)) {
-				vlmap = priv->vlans[j];
-				pvid = j;
-			}
-		}
-		/* leave port unconfigured if it's not part of a vlan */
-		if (!vlmap)
-			continue;
-
-		/* add the cpu port to the allowed destinations list */
-		vlmap |= (1 << MV_CPUPORT);
-
-		/* take port out of its own vlan destination map */
-		vlmap &= ~(1 << i);
-
-		/* apply vlan settings */
-		w16(pdev, MV_PORTREG(VLANMAP, i),
-			MV_PORTVLAN_PORTS(vlmap) |
-			MV_PORTVLAN_ID(i)
-		);
-
-		/* re-enable port */
-		w16(pdev, MV_PORTREG(CONTROL, i),
-			MV_PORTCTRL_ENABLED
-		);
-	}
-
-	w16(pdev, MV_PORTREG(VLANMAP, MV_CPUPORT),
-		MV_PORTVLAN_ID(MV_CPUPORT)
-	);
-
-	/* set the port association vector */
-	for (i = 0; i <= MV_PORTS; i++) {
-		w16(pdev, MV_PORTREG(ASSOC, i),
-			MV_PORTASSOC_PORTS(1 << i)
-		);
-	}
-
-	/* init switch control */
-	w16(pdev, MV_SWITCHREG(CTRL),
-		MV_SWITCHCTL_MSIZE |
-		MV_SWITCHCTL_DROP
-	);
-
-	/* hook into the tx function */
-	priv->hardstart = dev->hard_start_xmit;
-	pdev->netif_receive_skb = mvswitch_netif_receive_skb;
-	pdev->netif_rx = mvswitch_netif_rx;
-	dev->hard_start_xmit = mvswitch_mangle_tx;
-	dev->vlan_rx_register = mvswitch_vlan_rx_register;
-#ifdef HEADER_MODE
-	dev->features |= NETIF_F_HW_VLAN_RX | NETIF_F_HW_VLAN_TX;
-#else
-	dev->features |= NETIF_F_HW_VLAN_RX;
-#endif
-
-	return 0;
-}
-
-static int
-mvswitch_read_status(struct phy_device *pdev)
-{
-	pdev->speed = SPEED_100;
-	pdev->duplex = DUPLEX_FULL;
-	pdev->state = PHY_UP;
-
-	/* XXX ugly workaround: we can't force the switch
-	 * to gracefully handle hosts moving from one port to another,
-	 * so we have to regularly clear the ATU database */
-
-	/* wait for the ATU to become available */
-	mvswitch_wait_mask(pdev, MV_SWITCHREG(ATU_OP), MV_ATUOP_INPROGRESS, 0);
-
-	/* flush the ATU */
-	w16(pdev, MV_SWITCHREG(ATU_OP),
-		MV_ATUOP_INPROGRESS |
-		MV_ATUOP_FLUSH_ALL
-	);
-
-	/* wait for operation to complete */
-	mvswitch_wait_mask(pdev, MV_SWITCHREG(ATU_OP), MV_ATUOP_INPROGRESS, 0);
-
-	return 0;
-}
-
-static int
-mvswitch_config_aneg(struct phy_device *phydev)
-{
-	return 0;
-}
-
-static void
-mvswitch_remove(struct phy_device *pdev)
-{
-	struct mvswitch_priv *priv = to_mvsw(pdev);
-	struct net_device *dev = pdev->attached_dev;
-
-	/* restore old xmit handler */
-	if (priv->hardstart && dev)
-		dev->hard_start_xmit = priv->hardstart;
-	dev->vlan_rx_register = NULL;
-	dev->vlan_rx_kill_vid = NULL;
-	dev->phy_ptr = NULL;
-	dev->features &= ~NETIF_F_HW_VLAN_RX;
-	kfree(priv);
-}
-
-static bool
-mvswitch_detect(struct mii_bus *bus, int addr)
-{
-	u16 reg;
-	int i;
-
-	/* we attach to phy id 31 to make sure that the late probe works */
-	if (addr != 31)
-		return false;
-
-	/* look for the switch on the bus */
-	reg = bus->read(bus, MV_PORTREG(IDENT, 0)) & MV_IDENT_MASK;
-	if (reg != MV_IDENT_VALUE)
-		return false;
-
-	/* 
-	 * Now that we've established that the switch actually exists, let's 
-	 * get rid of the competition :)
-	 */
-	for (i = 0; i < 31; i++) {
-		if (!bus->phy_map[i])
-			continue;
-
-		device_unregister(&bus->phy_map[i]->dev);
-		kfree(bus->phy_map[i]);
-		bus->phy_map[i] = NULL;
-	}
-
-	return true;
-}
-
-static int
-mvswitch_probe(struct phy_device *pdev)
-{
-	struct mvswitch_priv *priv;
-
-	priv = kzalloc(sizeof(struct mvswitch_priv), GFP_KERNEL);
-	if (priv == NULL)
-		return -ENOMEM;
-
-	pdev->priv = priv;
-
-	return 0;
-}
-
-
-static struct phy_driver mvswitch_driver = {
-	.name		= "Marvell 88E6060",
-	.features	= PHY_BASIC_FEATURES,
-	.detect		= &mvswitch_detect,
-	.probe		= &mvswitch_probe,
-	.remove		= &mvswitch_remove,
-	.config_init	= &mvswitch_config_init,
-	.config_aneg	= &mvswitch_config_aneg,
-	.read_status	= &mvswitch_read_status,
-	.driver		= { .owner = THIS_MODULE,},
-};
-
-static int __init
-mvswitch_init(void)
-{
-	return phy_driver_register(&mvswitch_driver);
-}
-
-static void __exit
-mvswitch_exit(void)
-{
-	phy_driver_unregister(&mvswitch_driver);
-}
-
-module_init(mvswitch_init);
-module_exit(mvswitch_exit);
diff --git a/target/linux/generic-2.6/files-2.6.27/drivers/net/phy/mvswitch.h b/target/linux/generic-2.6/files-2.6.27/drivers/net/phy/mvswitch.h
deleted file mode 100644
index 1563eec..0000000
--- a/target/linux/generic-2.6/files-2.6.27/drivers/net/phy/mvswitch.h
+++ /dev/null
@@ -1,145 +0,0 @@
-/*
- * Marvell 88E6060 switch driver
- * Copyright (c) 2008 Felix Fietkau <nbd@openwrt.org>
- *
- * This program is free software; you can redistribute  it and/or modify it
- * under  the terms of the GNU General Public License v2 as published by the
- * Free Software Foundation
- */
-#ifndef __MVSWITCH_H
-#define __MVSWITCH_H
-
-#define MV_HEADER_SIZE	2
-#define MV_HEADER_PORTS_M	0x001f
-#define MV_HEADER_PORTS_S	0
-#define MV_HEADER_VLAN_M	0xf000
-#define MV_HEADER_VLAN_S	12
-
-#define MV_TRAILER_SIZE	4
-#define MV_TRAILER_PORTS_M	0x1f
-#define MV_TRAILER_PORTS_S	16
-#define MV_TRAILER_FLAGS_S	24
-#define MV_TRAILER_OVERRIDE	0x80
-
-
-#define MV_PORTS	5
-#define MV_WANPORT	4
-#define MV_CPUPORT	5
-
-#define MV_BASE		0x10
-
-#define MV_PHYPORT_BASE		(MV_BASE + 0x0)
-#define MV_PHYPORT(_n)		(MV_PHYPORT_BASE + (_n))
-#define MV_SWITCHPORT_BASE	(MV_BASE + 0x8)
-#define MV_SWITCHPORT(_n)	(MV_SWITCHPORT_BASE + (_n))
-#define MV_SWITCHREGS		(MV_BASE + 0xf)
-
-enum {
-	MV_PHY_CONTROL      = 0x00,
-	MV_PHY_STATUS       = 0x01,
-	MV_PHY_IDENT0       = 0x02,
-	MV_PHY_IDENT1       = 0x03,
-	MV_PHY_ANEG         = 0x04,
-	MV_PHY_LINK_ABILITY = 0x05,
-	MV_PHY_ANEG_EXPAND  = 0x06,
-	MV_PHY_XMIT_NEXTP   = 0x07,
-	MV_PHY_LINK_NEXTP   = 0x08,
-	MV_PHY_CONTROL1     = 0x10,
-	MV_PHY_STATUS1      = 0x11,
-	MV_PHY_INTR_EN      = 0x12,
-	MV_PHY_INTR_STATUS  = 0x13,
-	MV_PHY_INTR_PORT    = 0x14,
-	MV_PHY_RECV_COUNTER = 0x16,
-	MV_PHY_LED_PARALLEL = 0x16,
-	MV_PHY_LED_STREAM   = 0x17,
-	MV_PHY_LED_CTRL     = 0x18,
-	MV_PHY_LED_OVERRIDE = 0x19,
-	MV_PHY_VCT_CTRL     = 0x1a,
-	MV_PHY_VCT_STATUS   = 0x1b,
-	MV_PHY_CONTROL2     = 0x1e
-};
-#define MV_PHYREG(_type, _port) MV_PHYPORT(_port), MV_PHY_##_type
-
-enum {
-	MV_PORT_STATUS      = 0x00,
-	MV_PORT_IDENT       = 0x03,
-	MV_PORT_CONTROL     = 0x04,
-	MV_PORT_VLANMAP     = 0x06,
-	MV_PORT_ASSOC       = 0x0b,
-	MV_PORT_RXCOUNT     = 0x10,
-	MV_PORT_TXCOUNT     = 0x11,
-};
-#define MV_PORTREG(_type, _port) MV_SWITCHPORT(_port), MV_PORT_##_type
-
-enum {
-	MV_PORTCTRL_BLOCK   =  (1 << 0),
-	MV_PORTCTRL_LEARN   =  (2 << 0),
-	MV_PORTCTRL_ENABLED =  (3 << 0),
-	MV_PORTCTRL_VLANTUN =  (1 << 7),	/* Enforce VLANs on packets */
-	MV_PORTCTRL_RXTR    =  (1 << 8),	/* Enable Marvell packet trailer for ingress */
-	MV_PORTCTRL_HEADER	= (1 << 11),	/* Enable Marvell packet header mode for port */
-	MV_PORTCTRL_TXTR    = (1 << 14),	/* Enable Marvell packet trailer for egress */
-	MV_PORTCTRL_FORCEFL = (1 << 15),	/* force flow control */
-};
-
-#define MV_PORTVLAN_ID(_n) (((_n) & 0xf) << 12)
-#define MV_PORTVLAN_PORTS(_n) ((_n) & 0x3f)
-
-#define MV_PORTASSOC_PORTS(_n) ((_n) & 0x1f)
-#define MV_PORTASSOC_MONITOR	(1 << 15)
-
-enum {
-	MV_SWITCH_MAC0      = 0x01,
-	MV_SWITCH_MAC1      = 0x02,
-	MV_SWITCH_MAC2      = 0x03,
-	MV_SWITCH_CTRL      = 0x04,
-	MV_SWITCH_ATU_CTRL  = 0x0a,
-	MV_SWITCH_ATU_OP    = 0x0b,
-	MV_SWITCH_ATU_DATA  = 0x0c,
-	MV_SWITCH_ATU_MAC0  = 0x0d,
-	MV_SWITCH_ATU_MAC1  = 0x0e,
-	MV_SWITCH_ATU_MAC2  = 0x0f,
-};
-#define MV_SWITCHREG(_type) MV_SWITCHREGS, MV_SWITCH_##_type
-
-enum {
-	MV_SWITCHCTL_EEIE   =  (1 << 0),	/* EEPROM interrupt enable */
-	MV_SWITCHCTL_PHYIE  =  (1 << 1),	/* PHY interrupt enable */
-	MV_SWITCHCTL_ATUDONE=  (1 << 2),	/* ATU done interrupt enable */
-	MV_SWITCHCTL_ATUIE  =  (1 << 3),	/* ATU interrupt enable */
-	MV_SWITCHCTL_CTRMODE=  (1 << 8),	/* statistics for rx and tx errors */
-	MV_SWITCHCTL_RELOAD =  (1 << 9),	/* reload registers from eeprom */
-	MV_SWITCHCTL_MSIZE  = (1 << 10),	/* increase maximum frame size */
-	MV_SWITCHCTL_DROP   = (1 << 13),	/* discard frames with excessive collisions */
-};
-
-enum {
-#define MV_ATUCTL_AGETIME_MIN	16
-#define MV_ATUCTL_AGETIME_MAX	4080
-#define MV_ATUCTL_AGETIME(_n)	((((_n) / 16) & 0xff) << 4)
-	MV_ATUCTL_ATU_256   = (0 << 12),
-	MV_ATUCTL_ATU_512   = (1 << 12),
-	MV_ATUCTL_ATU_1K	= (2 << 12),
-	MV_ATUCTL_ATUMASK   = (3 << 12),
-	MV_ATUCTL_NO_LEARN  = (1 << 14),
-	MV_ATUCTL_RESET     = (1 << 15),
-};
-
-enum {
-#define MV_ATUOP_DBNUM(_n)	((_n) & 0x0f)
-
-	MV_ATUOP_NOOP       = (0 << 12),
-	MV_ATUOP_FLUSH_ALL  = (1 << 12),
-	MV_ATUOP_FLUSH_U    = (2 << 12),
-	MV_ATUOP_LOAD_DB    = (3 << 12),
-	MV_ATUOP_GET_NEXT   = (4 << 12),
-	MV_ATUOP_FLUSH_DB   = (5 << 12),
-	MV_ATUOP_FLUSH_DB_UU= (6 << 12),
-
-	MV_ATUOP_INPROGRESS = (1 << 15),
-};
-
-#define MV_IDENT_MASK		0xfff0
-#define MV_IDENT_VALUE		0x0600
-
-#endif
diff --git a/target/linux/generic-2.6/files-2.6.27/drivers/net/phy/swconfig.c b/target/linux/generic-2.6/files-2.6.27/drivers/net/phy/swconfig.c
deleted file mode 100644
index ade2842..0000000
--- a/target/linux/generic-2.6/files-2.6.27/drivers/net/phy/swconfig.c
+++ /dev/null
@@ -1,872 +0,0 @@
-/*
- * swconfig.c: Switch configuration API
- *
- * Copyright (C) 2008 Felix Fietkau <nbd@openwrt.org>
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- */
-
-#include <linux/types.h>
-#include <linux/module.h>
-#include <linux/init.h>
-#include <linux/list.h>
-#include <linux/if.h>
-#include <linux/if_ether.h>
-#include <linux/capability.h>
-#include <linux/skbuff.h>
-#include <linux/switch.h>
-
-//#define DEBUG 1
-#ifdef DEBUG
-#define DPRINTF(format, ...) printk("%s: " format, __func__, ##__VA_ARGS__)
-#else
-#define DPRINTF(...) do {} while(0)
-#endif
-
-MODULE_AUTHOR("Felix Fietkau <nbd@openwrt.org>");
-MODULE_LICENSE("GPL");
-
-static int swdev_id = 0;
-static struct list_head swdevs;
-static spinlock_t swdevs_lock = SPIN_LOCK_UNLOCKED;
-struct swconfig_callback;
-
-struct swconfig_callback
-{
-	struct sk_buff *msg;
-	struct genlmsghdr *hdr;
-	struct genl_info *info;
-	int cmd;
-
-	/* callback for filling in the message data */
-	int (*fill)(struct swconfig_callback *cb, void *arg);
-
-	/* callback for closing the message before sending it */
-	int (*close)(struct swconfig_callback *cb, void *arg);
-
-	struct nlattr *nest[4];
-	int args[4];
-};
-
-/* defaults */
-
-static int
-swconfig_get_vlan_ports(struct switch_dev *dev, struct switch_attr *attr, struct switch_val *val)
-{
-	int ret;
-	if (val->port_vlan >= dev->vlans)
-		return -EINVAL;
-
-	if (!dev->get_vlan_ports)
-		return -EOPNOTSUPP;
-
-	ret = dev->get_vlan_ports(dev, val);
-	printk("SET PORTS %d\n", val->len);
-	return ret;
-}
-
-static int
-swconfig_set_vlan_ports(struct switch_dev *dev, struct switch_attr *attr, struct switch_val *val)
-{
-	int i;
-
-	if (val->port_vlan >= dev->vlans)
-		return -EINVAL;
-
-	/* validate ports */
-	if (val->len > dev->ports)
-		return -EINVAL;
-
-	for (i = 0; i < val->len; i++) {
-		if (val->value.ports[i].id >= dev->ports)
-			return -EINVAL;
-	}
-
-	if (!dev->set_vlan_ports)
-		return -EOPNOTSUPP;
-
-	printk("SET PORTS %d\n", val->len);
-	return dev->set_vlan_ports(dev, val);
-}
-
-static int
-swconfig_apply_config(struct switch_dev *dev, struct switch_attr *attr, struct switch_val *val)
-{
-	/* don't complain if not supported by the switch driver */
-	if (!dev->apply_config)
-		return 0;
-
-	return dev->apply_config(dev);
-}
-
-
-enum global_defaults {
-	GLOBAL_APPLY,
-};
-
-enum vlan_defaults {
-	VLAN_PORTS,
-};
-
-enum port_defaults {
-	PORT_LINK,
-};
-
-static struct switch_attr default_global[] = {
-	[GLOBAL_APPLY] = {
-		.type = SWITCH_TYPE_NOVAL,
-		.name = "apply",
-		.description = "Activate changes in the hardware",
-		.set = swconfig_apply_config,
-	}
-};
-
-static struct switch_attr default_port[] = {
-	[PORT_LINK] = {
-		.type = SWITCH_TYPE_INT,
-		.name = "link",
-		.description = "Current link speed",
-	}
-};
-
-static struct switch_attr default_vlan[] = {
-	[VLAN_PORTS] = {
-		.type = SWITCH_TYPE_PORTS,
-		.name = "ports",
-		.description = "VLAN port mapping",
-		.set = swconfig_set_vlan_ports,
-		.get = swconfig_get_vlan_ports,
-	},
-};
-
-
-static void swconfig_defaults_init(struct switch_dev *dev)
-{
-	dev->def_global = 0;
-	dev->def_vlan = 0;
-	dev->def_port = 0;
-
-	if (dev->get_vlan_ports || dev->set_vlan_ports)
-		set_bit(VLAN_PORTS, &dev->def_vlan);
-
-	/* always present, can be no-op */
-	set_bit(GLOBAL_APPLY, &dev->def_global);
-}
-
-
-static struct genl_family switch_fam = {
-	.id = GENL_ID_GENERATE,
-	.name = "switch",
-	.hdrsize = 0,
-	.version = 1,
-	.maxattr = SWITCH_ATTR_MAX,
-};
-
-static const struct nla_policy switch_policy[SWITCH_ATTR_MAX+1] = {
-	[SWITCH_ATTR_ID] = { .type = NLA_U32 },
-	[SWITCH_ATTR_OP_ID] = { .type = NLA_U32 },
-	[SWITCH_ATTR_OP_PORT] = { .type = NLA_U32 },
-	[SWITCH_ATTR_OP_VLAN] = { .type = NLA_U32 },
-	[SWITCH_ATTR_OP_VALUE_INT] = { .type = NLA_U32 },
-	[SWITCH_ATTR_OP_VALUE_STR] = { .type = NLA_NUL_STRING },
-	[SWITCH_ATTR_OP_VALUE_PORTS] = { .type = NLA_NESTED },
-	[SWITCH_ATTR_TYPE] = { .type = NLA_U32 },
-};
-
-static const struct nla_policy port_policy[SWITCH_PORT_ATTR_MAX+1] = {
-	[SWITCH_PORT_ID] = { .type = NLA_U32 },
-	[SWITCH_PORT_FLAG_TAGGED] = { .type = NLA_FLAG },
-};
-
-static inline void
-swconfig_lock(void)
-{
-	spin_lock(&swdevs_lock);
-}
-
-static inline void
-swconfig_unlock(void)
-{
-	spin_unlock(&swdevs_lock);
-}
-
-static struct switch_dev *
-swconfig_get_dev(struct genl_info *info)
-{
-	struct switch_dev *dev = NULL;
-	struct switch_dev *p;
-	int id;
-
-	if (!info->attrs[SWITCH_ATTR_ID])
-		goto done;
-
-	id = nla_get_u32(info->attrs[SWITCH_ATTR_ID]);
-	swconfig_lock();
-	list_for_each_entry(p, &swdevs, dev_list) {
-		if (id != p->id)
-			continue;
-
-		dev = p;
-		break;
-	}
-	if (dev)
-		spin_lock(&dev->lock);
-	else
-		DPRINTF("device %d not found\n", id);
-	swconfig_unlock();
-done:
-	return dev;
-}
-
-static inline void
-swconfig_put_dev(struct switch_dev *dev)
-{
-	spin_unlock(&dev->lock);
-}
-
-static int
-swconfig_dump_attr(struct swconfig_callback *cb, void *arg)
-{
-	struct switch_attr *op = arg;
-	struct genl_info *info = cb->info;
-	struct sk_buff *msg = cb->msg;
-	int id = cb->args[0];
-	void *hdr;
-
-	hdr = genlmsg_put(msg, info->snd_pid, info->snd_seq, &switch_fam,
-			NLM_F_MULTI, SWITCH_CMD_NEW_ATTR);
-	if (IS_ERR(hdr))
-		return -1;
-
-	NLA_PUT_U32(msg, SWITCH_ATTR_OP_ID, id);
-	NLA_PUT_U32(msg, SWITCH_ATTR_OP_TYPE, op->type);
-	NLA_PUT_STRING(msg, SWITCH_ATTR_OP_NAME, op->name);
-	if (op->description)
-		NLA_PUT_STRING(msg, SWITCH_ATTR_OP_DESCRIPTION,
-			op->description);
-
-	return genlmsg_end(msg, hdr);
-nla_put_failure:
-	genlmsg_cancel(msg, hdr);
-	return -EMSGSIZE;
-}
-
-/* spread multipart messages across multiple message buffers */
-static int
-swconfig_send_multipart(struct swconfig_callback *cb, void *arg)
-{
-	struct genl_info *info = cb->info;
-	int restart = 0;
-	int err;
-
-	do {
-		if (!cb->msg) {
-			cb->msg = nlmsg_new(NLMSG_GOODSIZE, GFP_KERNEL);
-			if (cb->msg == NULL)
-				goto error;
-		}
-
-		if (!(cb->fill(cb, arg) < 0))
-			break;
-
-		/* fill failed, check if this was already the second attempt */
-		if (restart)
-			goto error;
-
-		/* try again in a new message, send the current one */
-		restart = 1;
-		if (cb->close) {
-			if (cb->close(cb, arg) < 0)
-				goto error;
-		}
-		err = genlmsg_unicast(cb->msg, info->snd_pid);
-		cb->msg = NULL;
-		if (err < 0)
-			goto error;
-
-	} while (restart);
-
-	return 0;
-
-error:
-	if (cb->msg)
-		nlmsg_free(cb->msg);
-	return -1;
-}
-
-static int
-swconfig_list_attrs(struct sk_buff *skb, struct genl_info *info)
-{
-	struct genlmsghdr *hdr = nlmsg_data(info->nlhdr);
-	const struct switch_attrlist *alist;
-	struct switch_dev *dev;
-	struct swconfig_callback cb;
-	int err = -EINVAL;
-	int i;
-
-	/* defaults */
-	struct switch_attr *def_list;
-	unsigned long *def_active;
-	int n_def;
-
-	dev = swconfig_get_dev(info);
-	if (!dev)
-		return -EINVAL;
-
-	switch(hdr->cmd) {
-	case SWITCH_CMD_LIST_GLOBAL:
-		alist = &dev->attr_global;
-		def_list = default_global;
-		def_active = &dev->def_global;
-		n_def = ARRAY_SIZE(default_global);
-		break;
-	case SWITCH_CMD_LIST_VLAN:
-		alist = &dev->attr_vlan;
-		def_list = default_vlan;
-		def_active = &dev->def_vlan;
-		n_def = ARRAY_SIZE(default_vlan);
-		break;
-	case SWITCH_CMD_LIST_PORT:
-		alist = &dev->attr_port;
-		def_list = default_port;
-		def_active = &dev->def_port;
-		n_def = ARRAY_SIZE(default_port);
-		break;
-	default:
-		WARN_ON(1);
-		goto out;
-	}
-
-	memset(&cb, 0, sizeof(cb));
-	cb.info = info;
-	cb.fill = swconfig_dump_attr;
-	for (i = 0; i < alist->n_attr; i++) {
-		if (alist->attr[i].disabled)
-			continue;
-		cb.args[0] = i;
-		err = swconfig_send_multipart(&cb, &alist->attr[i]);
-		if (err < 0)
-			goto error;
-	}
-
-	/* defaults */
-	for (i = 0; i < n_def; i++) {
-		if (!test_bit(i, def_active))
-			continue;
-		cb.args[0] = SWITCH_ATTR_DEFAULTS_OFFSET + i;
-		err = swconfig_send_multipart(&cb, &def_list[i]);
-		if (err < 0)
-			goto error;
-	}
-	swconfig_put_dev(dev);
-
-	if (!cb.msg)
-		return 0;
-
-	return genlmsg_unicast(cb.msg, info->snd_pid);
-
-error:
-	if (cb.msg)
-		nlmsg_free(cb.msg);
-out:
-	swconfig_put_dev(dev);
-	return err;
-}
-
-static struct switch_attr *
-swconfig_lookup_attr(struct switch_dev *dev, struct genl_info *info,
-		struct switch_val *val)
-{
-	struct genlmsghdr *hdr = nlmsg_data(info->nlhdr);
-	const struct switch_attrlist *alist;
-	struct switch_attr *attr = NULL;
-	int attr_id;
-
-	/* defaults */
-	struct switch_attr *def_list;
-	unsigned long *def_active;
-	int n_def;
-
-	if (!info->attrs[SWITCH_ATTR_OP_ID])
-		goto done;
-
-	switch(hdr->cmd) {
-	case SWITCH_CMD_SET_GLOBAL:
-	case SWITCH_CMD_GET_GLOBAL:
-		alist = &dev->attr_global;
-		def_list = default_global;
-		def_active = &dev->def_global;
-		n_def = ARRAY_SIZE(default_global);
-		break;
-	case SWITCH_CMD_SET_VLAN:
-	case SWITCH_CMD_GET_VLAN:
-		alist = &dev->attr_vlan;
-		def_list = default_vlan;
-		def_active = &dev->def_vlan;
-		n_def = ARRAY_SIZE(default_vlan);
-		if (!info->attrs[SWITCH_ATTR_OP_VLAN])
-			goto done;
-		val->port_vlan = nla_get_u32(info->attrs[SWITCH_ATTR_OP_VLAN]);
-		break;
-	case SWITCH_CMD_SET_PORT:
-	case SWITCH_CMD_GET_PORT:
-		alist = &dev->attr_port;
-		def_list = default_port;
-		def_active = &dev->def_port;
-		n_def = ARRAY_SIZE(default_port);
-		if (!info->attrs[SWITCH_ATTR_OP_PORT])
-			goto done;
-		val->port_vlan = nla_get_u32(info->attrs[SWITCH_ATTR_OP_PORT]);
-		break;
-	default:
-		WARN_ON(1);
-		goto done;
-	}
-
-	if (!alist)
-		goto done;
-
-	attr_id = nla_get_u32(info->attrs[SWITCH_ATTR_OP_ID]);
-	if (attr_id >= SWITCH_ATTR_DEFAULTS_OFFSET) {
-		attr_id -= SWITCH_ATTR_DEFAULTS_OFFSET;
-		if (attr_id >= n_def)
-			goto done;
-		if (!test_bit(attr_id, def_active))
-			goto done;
-		attr = &def_list[attr_id];
-	} else {
-		if (attr_id >= alist->n_attr)
-			goto done;
-		attr = &alist->attr[attr_id];
-	}
-
-	if (attr->disabled)
-		attr = NULL;
-
-done:
-	if (!attr)
-		DPRINTF("attribute lookup failed\n");
-	val->attr = attr;
-	return attr;
-}
-
-static int
-swconfig_parse_ports(struct sk_buff *msg, struct nlattr *head,
-		struct switch_val *val, int max)
-{
-	struct nlattr *nla;
-	int rem;
-
-	val->len = 0;
-	nla_for_each_nested(nla, head, rem) {
-		struct nlattr *tb[SWITCH_PORT_ATTR_MAX+1];
-		struct switch_port *port = &val->value.ports[val->len];
-
-		if (val->len >= max)
-			return -EINVAL;
-
-		if (nla_parse_nested(tb, SWITCH_PORT_ATTR_MAX, nla,
-				port_policy))
-			return -EINVAL;
-
-		if (!tb[SWITCH_PORT_ID])
-			return -EINVAL;
-
-		port->id = nla_get_u32(tb[SWITCH_PORT_ID]);
-		if (tb[SWITCH_PORT_FLAG_TAGGED])
-			port->flags |= (1 << SWITCH_PORT_FLAG_TAGGED);
-		val->len++;
-	}
-
-	return 0;
-}
-
-static int
-swconfig_set_attr(struct sk_buff *skb, struct genl_info *info)
-{
-	struct switch_attr *attr;
-	struct switch_dev *dev;
-	struct switch_val val;
-	int err = -EINVAL;
-
-	dev = swconfig_get_dev(info);
-	if (!dev)
-		return -EINVAL;
-
-	memset(&val, 0, sizeof(val));
-	attr = swconfig_lookup_attr(dev, info, &val);
-	if (!attr || !attr->set)
-		goto error;
-
-	val.attr = attr;
-	switch(attr->type) {
-	case SWITCH_TYPE_NOVAL:
-		break;
-	case SWITCH_TYPE_INT:
-		if (!info->attrs[SWITCH_ATTR_OP_VALUE_INT])
-			goto error;
-		val.value.i =
-			nla_get_u32(info->attrs[SWITCH_ATTR_OP_VALUE_INT]);
-		break;
-	case SWITCH_TYPE_STRING:
-		if (!info->attrs[SWITCH_ATTR_OP_VALUE_STR])
-			goto error;
-		val.value.s =
-			nla_data(info->attrs[SWITCH_ATTR_OP_VALUE_STR]);
-		break;
-	case SWITCH_TYPE_PORTS:
-		val.value.ports = dev->portbuf;
-		memset(dev->portbuf, 0,
-			sizeof(struct switch_port) * dev->ports);
-
-		/* TODO: implement multipart? */
-		if (info->attrs[SWITCH_ATTR_OP_VALUE_PORTS]) {
-			err = swconfig_parse_ports(skb,
-				info->attrs[SWITCH_ATTR_OP_VALUE_PORTS], &val, dev->ports);
-			if (err < 0)
-				goto error;
-		} else {
-			val.len = 0;
-			err = 0;
-		}
-		break;
-	default:
-		goto error;
-	}
-
-	err = attr->set(dev, attr, &val);
-error:
-	swconfig_put_dev(dev);
-	return err;
-}
-
-static int
-swconfig_close_portlist(struct swconfig_callback *cb, void *arg)
-{
-	if (cb->nest[0])
-		nla_nest_end(cb->msg, cb->nest[0]);
-	return 0;
-}
-
-static int
-swconfig_send_port(struct swconfig_callback *cb, void *arg)
-{
-	const struct switch_port *port = arg;
-	struct nlattr *p = NULL;
-
-	if (!cb->nest[0]) {
-		cb->nest[0] = nla_nest_start(cb->msg, cb->cmd);
-		if (!cb->nest[0])
-			return -1;
-	}
-
-	p = nla_nest_start(cb->msg, SWITCH_ATTR_PORT);
-	if (!p)
-		goto error;
-
-	NLA_PUT_U32(cb->msg, SWITCH_PORT_ID, port->id);
-	if (port->flags & (1 << SWITCH_PORT_FLAG_TAGGED))
-		NLA_PUT_FLAG(cb->msg, SWITCH_PORT_FLAG_TAGGED);
-
-	nla_nest_end(cb->msg, p);
-	return 0;
-
-nla_put_failure:
-		nla_nest_cancel(cb->msg, p);
-error:
-	nla_nest_cancel(cb->msg, cb->nest[0]);
-	return -1;
-}
-
-static int
-swconfig_send_ports(struct sk_buff **msg, struct genl_info *info, int attr,
-		const struct switch_val *val)
-{
-	struct swconfig_callback cb;
-	int err = 0;
-	int i;
-
-	if (!val->value.ports)
-		return -EINVAL;
-
-	memset(&cb, 0, sizeof(cb));
-	cb.cmd = attr;
-	cb.msg = *msg;
-	cb.info = info;
-	cb.fill = swconfig_send_port;
-	cb.close = swconfig_close_portlist;
-
-	cb.nest[0] = nla_nest_start(cb.msg, cb.cmd);
-	for (i = 0; i < val->len; i++) {
-		err = swconfig_send_multipart(&cb, &val->value.ports[i]);
-		if (err)
-			goto done;
-	}
-	err = val->len;
-	swconfig_close_portlist(&cb, NULL);
-	*msg = cb.msg;
-
-done:
-	return err;
-}
-
-static int
-swconfig_get_attr(struct sk_buff *skb, struct genl_info *info)
-{
-	struct genlmsghdr *hdr = nlmsg_data(info->nlhdr);
-	struct switch_attr *attr;
-	struct switch_dev *dev;
-	struct sk_buff *msg = NULL;
-	struct switch_val val;
-	int err = -EINVAL;
-	int cmd = hdr->cmd;
-
-	dev = swconfig_get_dev(info);
-	if (!dev)
-		return -EINVAL;
-
-	memset(&val, 0, sizeof(val));
-	attr = swconfig_lookup_attr(dev, info, &val);
-	if (!attr || !attr->get)
-		goto error_dev;
-
-	if (attr->type == SWITCH_TYPE_PORTS) {
-		val.value.ports = dev->portbuf;
-		memset(dev->portbuf, 0,
-			sizeof(struct switch_port) * dev->ports);
-	}
-
-	err = attr->get(dev, attr, &val);
-	if (err)
-		goto error;
-
-	msg = nlmsg_new(NLMSG_GOODSIZE, GFP_KERNEL);
-	if (!msg)
-		goto error;
-
-	hdr = genlmsg_put(msg, info->snd_pid, info->snd_seq, &switch_fam,
-			0, cmd);
-	if (IS_ERR(hdr))
-		goto nla_put_failure;
-
-	switch(attr->type) {
-	case SWITCH_TYPE_INT:
-		NLA_PUT_U32(msg, SWITCH_ATTR_OP_VALUE_INT, val.value.i);
-		break;
-	case SWITCH_TYPE_STRING:
-		NLA_PUT_STRING(msg, SWITCH_ATTR_OP_VALUE_STR, val.value.s);
-		break;
-	case SWITCH_TYPE_PORTS:
-		err = swconfig_send_ports(&msg, info,
-				SWITCH_ATTR_OP_VALUE_PORTS, &val);
-		if (err < 0)
-			goto nla_put_failure;
-		break;
-	default:
-		DPRINTF("invalid type in attribute\n");
-		err = -EINVAL;
-		goto error;
-	}
-	err = genlmsg_end(msg, hdr);
-	if (err < 0)
-		goto nla_put_failure;
-
-	swconfig_put_dev(dev);
-	return genlmsg_unicast(msg, info->snd_pid);
-
-nla_put_failure:
-	if (msg)
-		nlmsg_free(msg);
-error_dev:
-	swconfig_put_dev(dev);
-error:
-	if (!err)
-		err = -ENOMEM;
-	return err;
-}
-
-static int
-swconfig_send_switch(struct sk_buff *msg, u32 pid, u32 seq, int flags,
-		const struct switch_dev *dev)
-{
-	void *hdr;
-
-	hdr = genlmsg_put(msg, pid, seq, &switch_fam, flags,
-			SWITCH_CMD_NEW_ATTR);
-	if (IS_ERR(hdr))
-		return -1;
-
-	NLA_PUT_U32(msg, SWITCH_ATTR_ID, dev->id);
-	NLA_PUT_STRING(msg, SWITCH_ATTR_NAME, dev->name);
-	NLA_PUT_STRING(msg, SWITCH_ATTR_DEV_NAME, dev->devname);
-	NLA_PUT_U32(msg, SWITCH_ATTR_VLANS, dev->vlans);
-	NLA_PUT_U32(msg, SWITCH_ATTR_PORTS, dev->ports);
-
-	return genlmsg_end(msg, hdr);
-nla_put_failure:
-	genlmsg_cancel(msg, hdr);
-	return -EMSGSIZE;
-}
-
-static int swconfig_dump_switches(struct sk_buff *skb,
-		struct netlink_callback *cb)
-{
-	struct switch_dev *dev;
-	int start = cb->args[0];
-	int idx = 0;
-
-	swconfig_lock();
-	list_for_each_entry(dev, &swdevs, dev_list) {
-		if (++idx <= start)
-			continue;
-		if (swconfig_send_switch(skb, NETLINK_CB(cb->skb).pid,
-				cb->nlh->nlmsg_seq, NLM_F_MULTI,
-				dev) < 0)
-			break;
-	}
-	swconfig_unlock();
-	cb->args[0] = idx;
-
-	return skb->len;
-}
-
-static int
-swconfig_done(struct netlink_callback *cb)
-{
-	return 0;
-}
-
-static struct genl_ops swconfig_ops[] = {
-	{
-		.cmd = SWITCH_CMD_LIST_GLOBAL,
-		.doit = swconfig_list_attrs,
-		.policy = switch_policy,
-	},
-	{
-		.cmd = SWITCH_CMD_LIST_VLAN,
-		.doit = swconfig_list_attrs,
-		.policy = switch_policy,
-	},
-	{
-		.cmd = SWITCH_CMD_LIST_PORT,
-		.doit = swconfig_list_attrs,
-		.policy = switch_policy,
-	},
-	{
-		.cmd = SWITCH_CMD_GET_GLOBAL,
-		.doit = swconfig_get_attr,
-		.policy = switch_policy,
-	},
-	{
-		.cmd = SWITCH_CMD_GET_VLAN,
-		.doit = swconfig_get_attr,
-		.policy = switch_policy,
-	},
-	{
-		.cmd = SWITCH_CMD_GET_PORT,
-		.doit = swconfig_get_attr,
-		.policy = switch_policy,
-	},
-	{
-		.cmd = SWITCH_CMD_SET_GLOBAL,
-		.doit = swconfig_set_attr,
-		.policy = switch_policy,
-	},
-	{
-		.cmd = SWITCH_CMD_SET_VLAN,
-		.doit = swconfig_set_attr,
-		.policy = switch_policy,
-	},
-	{
-		.cmd = SWITCH_CMD_SET_PORT,
-		.doit = swconfig_set_attr,
-		.policy = switch_policy,
-	},
-	{
-		.cmd = SWITCH_CMD_GET_SWITCH,
-		.dumpit = swconfig_dump_switches,
-		.policy = switch_policy,
-		.done = swconfig_done,
-	}
-};
-
-int
-register_switch(struct switch_dev *dev, struct net_device *netdev)
-{
-	INIT_LIST_HEAD(&dev->dev_list);
-	if (netdev) {
-		dev->netdev = netdev;
-		if (!dev->devname)
-			dev->devname = netdev->name;
-	}
-	BUG_ON(!dev->devname);
-
-	if (dev->ports > 0) {
-		dev->portbuf = kzalloc(sizeof(struct switch_port) * dev->ports,
-				GFP_KERNEL);
-		if (!dev->portbuf)
-			return -ENOMEM;
-	}
-	dev->id = ++swdev_id;
-	swconfig_defaults_init(dev);
-	spin_lock_init(&dev->lock);
-	swconfig_lock();
-	list_add(&dev->dev_list, &swdevs);
-	swconfig_unlock();
-
-	return 0;
-}
-EXPORT_SYMBOL_GPL(register_switch);
-
-void
-unregister_switch(struct switch_dev *dev)
-{
-	kfree(dev->portbuf);
-	spin_lock(&dev->lock);
-	swconfig_lock();
-	list_del(&dev->dev_list);
-	swconfig_unlock();
-}
-EXPORT_SYMBOL_GPL(unregister_switch);
-
-
-static int __init
-swconfig_init(void)
-{
-	int i, err;
-
-	INIT_LIST_HEAD(&swdevs);
-	err = genl_register_family(&switch_fam);
-	if (err)
-		return err;
-
-	for (i = 0; i < ARRAY_SIZE(swconfig_ops); i++) {
-		err = genl_register_ops(&switch_fam, &swconfig_ops[i]);
-		if (err)
-			goto unregister;
-	}
-
-	return 0;
-
-unregister:
-	genl_unregister_family(&switch_fam);
-	return err;
-}
-
-static void __exit
-swconfig_exit(void)
-{
-	genl_unregister_family(&switch_fam);
-}
-
-module_init(swconfig_init);
-module_exit(swconfig_exit);
-
diff --git a/target/linux/generic-2.6/files-2.6.26/drivers/net/phy/swconfig.c b/target/linux/generic-2.6/files/drivers/net/phy/swconfig.c
index ade2842..ade2842 100644
--- a/target/linux/generic-2.6/files-2.6.26/drivers/net/phy/swconfig.c
+++ b/target/linux/generic-2.6/files/drivers/net/phy/swconfig.c
diff --git a/target/linux/rb532/files/arch/mips/pci/fixup-rb500.c b/target/linux/rb532/files/arch/mips/pci/fixup-rb500.c
deleted file mode 100644
index 76c465f..0000000
--- a/target/linux/rb532/files/arch/mips/pci/fixup-rb500.c
+++ /dev/null
@@ -1,51 +0,0 @@
-/*
- * Copyright 2001 MontaVista Software Inc.
- * Author: MontaVista Software, Inc.
- *         	stevel@mvista.com or source@mvista.com
- *
- *  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  SOFTWARE  IS PROVIDED   ``AS  IS'' AND   ANY  EXPRESS OR IMPLIED
- *  WARRANTIES,   INCLUDING, BUT NOT  LIMITED  TO, THE IMPLIED WARRANTIES OF
- *  MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN
- *  NO  EVENT  SHALL   THE AUTHOR  BE    LIABLE FOR ANY   DIRECT, INDIRECT,
- *  INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
- *  NOT LIMITED   TO, PROCUREMENT OF  SUBSTITUTE GOODS  OR SERVICES; LOSS OF
- *  USE, DATA,  OR PROFITS; OR  BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
- *  ANY THEORY OF LIABILITY, WHETHER IN  CONTRACT, STRICT LIABILITY, OR TORT
- *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
- *  THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- *  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.,
- *  675 Mass Ave, Cambridge, MA 02139, USA.
- */
-
-#include <linux/types.h>
-#include <linux/pci.h>
-#include <linux/kernel.h>
-#include <linux/init.h>
-
-#include <asm/pci.h>
-#include <asm/io.h>
-
-#include <asm/rc32434/rc32434.h>
-
-static int __devinitdata irq_map[2][12] = {
-	{ 0, 0, 2, 3, 2, 3, 0, 0, 0, 0, 0, 1 },
-	{ 0, 0, 1, 3, 0, 2, 1, 3, 0, 2, 1, 3 }
-};
-
-int __init pcibios_map_irq(const struct pci_dev *dev, u8 slot, u8 pin)
-{
-	int irq = 0;
-
-	if (dev->bus->number < 2 && PCI_SLOT(dev->devfn) < 12) {
-		irq = irq_map[dev->bus->number][PCI_SLOT(dev->devfn)];
-	}
-	return irq + GROUP4_IRQ_BASE + 4;
-}
-
diff --git a/target/linux/rb532/files/arch/mips/pci/ops-rc32434.c b/target/linux/rb532/files/arch/mips/pci/ops-rc32434.c
deleted file mode 100644
index b90ab1d..0000000
--- a/target/linux/rb532/files/arch/mips/pci/ops-rc32434.c
+++ /dev/null
@@ -1,218 +0,0 @@
-/**************************************************************************
- *
- *  BRIEF MODULE DESCRIPTION
- *     pci_ops for IDT EB434 board
- *
- *  Copyright 2004 IDT Inc. (rischelp@idt.com)
- *  Copyright 2006 Felix Fietkau <nbd@openwrt.org>
- *         
- *  This program is free software; you can redistribute  it and/or modify it
- *  under  the terms of  the GNU General  Public License as published by the
- *  Free Software Foundation;  either version 2 of the  License, or (at your
- *  option) any later version.
- *
- *  THIS  SOFTWARE  IS PROVIDED   ``AS  IS'' AND   ANY  EXPRESS OR IMPLIED
- *  WARRANTIES,   INCLUDING, BUT NOT  LIMITED  TO, THE IMPLIED WARRANTIES OF
- *  MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN
- *  NO  EVENT  SHALL   THE AUTHOR  BE    LIABLE FOR ANY   DIRECT, INDIRECT,
- *  INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
- *  NOT LIMITED   TO, PROCUREMENT OF  SUBSTITUTE GOODS  OR SERVICES; LOSS OF
- *  USE, DATA,  OR PROFITS; OR  BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
- *  ANY THEORY OF LIABILITY, WHETHER IN  CONTRACT, STRICT LIABILITY, OR TORT
- *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
- *  THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- *  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.,
- *  675 Mass Ave, Cambridge, MA 02139, USA.
- *
- *
- **************************************************************************
- * May 2004 rkt, neb
- *
- * Initial Release
- *
- * 
- *
- **************************************************************************
- */
-
-#include <linux/autoconf.h>
-#include <linux/init.h>
-#include <linux/pci.h>
-#include <linux/types.h>
-#include <linux/delay.h>
-
-#include <asm/cpu.h>
-#include <asm/io.h>
-
-#include <asm/rc32434/rc32434.h>
-#include <asm/rc32434/pci.h> 
-
-#define PCI_ACCESS_READ  0
-#define PCI_ACCESS_WRITE 1
-
-
-#define PCI_CFG_SET(bus,slot,func,off) \
-	(rc32434_pci->pcicfga = (0x80000000 | \
-				((bus) << 16) | ((slot)<<11) | \
-				((func)<<8) | (off)))
-
-static inline int config_access(unsigned char access_type, struct pci_bus *bus,
-                         unsigned int devfn, unsigned char where,
-                         u32 * data)
-{ 
-	unsigned int slot = PCI_SLOT(devfn);
-	u8 func = PCI_FUNC(devfn);
-	
-	/* Setup address */
-	PCI_CFG_SET(bus->number, slot, func, where);
-	rc32434_sync();
-	
-	if (access_type == PCI_ACCESS_WRITE)
-		rc32434_pci->pcicfgd = *data;
-	else
-		*data = rc32434_pci->pcicfgd;
-	
-	rc32434_sync();
-	
-	return 0;
-}
-
-
-/*
- * We can't address 8 and 16 bit words directly.  Instead we have to
- * read/write a 32bit word and mask/modify the data we actually want.
- */
-static int read_config_byte(struct pci_bus *bus, unsigned int devfn,
-                            int where, u8 * val)
-{
-	u32 data;
-	int ret;
-	
-	ret = config_access(PCI_ACCESS_READ, bus, devfn, where, &data);
-	*val = (data >> ((where & 3) << 3)) & 0xff;
-	return ret;
-}
-
-static int read_config_word(struct pci_bus *bus, unsigned int devfn,
-                            int where, u16 * val)
-{
-	u32 data;
-	int ret;
-	
-	ret = config_access(PCI_ACCESS_READ, bus, devfn, where, &data);
-	*val = (data >> ((where & 3) << 3)) & 0xffff;
-	return ret;
-}
-
-static int read_config_dword(struct pci_bus *bus, unsigned int devfn,
-                             int where, u32 * val)
-{
-	int ret;
-	int delay = 1;
-
-	if (bus->number == 0 && PCI_SLOT(devfn) > 21)
-		return 0;
-
-retry:
-	ret = config_access(PCI_ACCESS_READ, bus, devfn, where, val);
-	
-	/* PCI scan: check for invalid values, device may not have
-	 * finished initializing */
-
-	if (where == PCI_VENDOR_ID) {
-		if (ret == 0xffffffff || ret == 0x00000000 ||
-			ret == 0x0000ffff || ret == 0xffff0000) {
-
-			if (delay > 4)
-				return 0;
-
-			delay *= 2;
-			msleep(delay);
-			goto retry;
-		}
-	}
-	
-	return ret;
-}
-
-static int
-write_config_byte(struct pci_bus *bus, unsigned int devfn, int where,
-                  u8 val)
-{
-	u32 data = 0;
-	
-	if (config_access(PCI_ACCESS_READ, bus, devfn, where, &data))
-		return -1;
-	
-	data = (data & ~(0xff << ((where & 3) << 3))) |
-		(val << ((where & 3) << 3));
-	
-	if (config_access(PCI_ACCESS_WRITE, bus, devfn, where, &data))
-		return -1;
-	
-	return PCIBIOS_SUCCESSFUL;
-}
-
-
-static int
-write_config_word(struct pci_bus *bus, unsigned int devfn, int where,
-                  u16 val)
-{
-	u32 data = 0;
-	
-	if (config_access(PCI_ACCESS_READ, bus, devfn, where, &data))
-		return -1;
-	
-	data = (data & ~(0xffff << ((where & 3) << 3))) |
-		(val << ((where & 3) << 3));
-	
-	if (config_access(PCI_ACCESS_WRITE, bus, devfn, where, &data))
-		return -1;
-	
-	
-	return PCIBIOS_SUCCESSFUL;
-}
-
-
-static int 
-write_config_dword(struct pci_bus *bus, unsigned int devfn, int where,
-                   u32 val)
-{
-	if (config_access(PCI_ACCESS_WRITE, bus, devfn, where, &val))
-		return -1;
-	
-	return PCIBIOS_SUCCESSFUL;
-}
-
-static int pci_config_read(struct pci_bus *bus, unsigned int devfn,
-			   int where, int size, u32 * val)
-{
-	switch (size) {
-	case 1: 
-		return read_config_byte(bus, devfn, where, (u8 *) val);
-	case 2: 
-		return read_config_word(bus, devfn, where, (u16 *) val);
-	default:
-		return read_config_dword(bus, devfn, where, val);
-	}
-}
-
-static int pci_config_write(struct pci_bus *bus, unsigned int devfn,
-			    int where, int size, u32 val)
-{
-	switch (size) {
-	case 1: 
-		return write_config_byte(bus, devfn, where, (u8) val);
-	case 2: 
-		return write_config_word(bus, devfn, where, (u16) val);
-	default:
-		return write_config_dword(bus, devfn, where, val);
-	}
-}
-
-struct pci_ops rc32434_pci_ops = {
-	.read =  pci_config_read,
-	.write = pci_config_write,
-};
diff --git a/target/linux/rb532/files/arch/mips/pci/pci-rc32434.c b/target/linux/rb532/files/arch/mips/pci/pci-rc32434.c
deleted file mode 100644
index 9ae596c..0000000
--- a/target/linux/rb532/files/arch/mips/pci/pci-rc32434.c
+++ /dev/null
@@ -1,236 +0,0 @@
-/**************************************************************************
- *
- *  BRIEF MODULE DESCRIPTION
- *     PCI initialization for IDT EB434 board
- *
- *  Copyright 2004 IDT Inc. (rischelp@idt.com)
- *
- *  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  SOFTWARE  IS PROVIDED   ``AS  IS'' AND   ANY  EXPRESS OR IMPLIED
- *  WARRANTIES,   INCLUDING, BUT NOT  LIMITED  TO, THE IMPLIED WARRANTIES OF
- *  MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN
- *  NO  EVENT  SHALL   THE AUTHOR  BE    LIABLE FOR ANY   DIRECT, INDIRECT,
- *  INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
- *  NOT LIMITED   TO, PROCUREMENT OF  SUBSTITUTE GOODS  OR SERVICES; LOSS OF
- *  USE, DATA,  OR PROFITS; OR  BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
- *  ANY THEORY OF LIABILITY, WHETHER IN  CONTRACT, STRICT LIABILITY, OR TORT
- *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
- *  THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- *  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.,
- *  675 Mass Ave, Cambridge, MA 02139, USA.
- *
- *
- **************************************************************************
- * May 2004 rkt, neb
- *
- * Initial Release
- *
- *
- *
- **************************************************************************
- */
-
-#include <linux/autoconf.h>
-#include <linux/types.h>
-#include <linux/pci.h>
-#include <linux/kernel.h>
-#include <linux/init.h>
-
-#include <asm/rc32434/rc32434.h>
-#include <asm/rc32434/pci.h>
-
-#define PCI_ACCESS_READ  0
-#define PCI_ACCESS_WRITE 1
-
-/* define an unsigned array for the PCI registers */
-unsigned int korinaCnfgRegs[25] = {
-	KORINA_CNFG1,	 KORINA_CNFG2,  KORINA_CNFG3,  KORINA_CNFG4,
-	KORINA_CNFG5,	 KORINA_CNFG6,  KORINA_CNFG7,  KORINA_CNFG8,
-	KORINA_CNFG9,	 KORINA_CNFG10, KORINA_CNFG11, KORINA_CNFG12,
-	KORINA_CNFG13, KORINA_CNFG14, KORINA_CNFG15, KORINA_CNFG16,
-	KORINA_CNFG17, KORINA_CNFG18, KORINA_CNFG19, KORINA_CNFG20,
-	KORINA_CNFG21, KORINA_CNFG22, KORINA_CNFG23, KORINA_CNFG24
-};
-static struct resource rc32434_res_pci_mem1;
-static struct resource rc32434_res_pci_mem2;
-
-static struct resource rc32434_res_pci_mem1 = {
-	.name = "PCI MEM1",
-	.start = 0x50000000,
-	.end = 0x5FFFFFFF,
-	.flags = IORESOURCE_MEM,
-	.parent = &rc32434_res_pci_mem1,
-	.sibling = NULL,
-	.child = &rc32434_res_pci_mem2
-};
-
-static struct resource rc32434_res_pci_mem2 = {
-	.name = "PCI Mem2",
-	.start = 0x60000000,
-	.end = 0x6FFFFFFF,
-	.flags = IORESOURCE_MEM,
-	.parent = &rc32434_res_pci_mem1,
-	.sibling = NULL,
-	.child = NULL
-};
-
-static struct resource rc32434_res_pci_io1 = {
-	.name = "PCI I/O1",
-	.start = 0x18800000,
-	.end = 0x188FFFFF,
-	.flags = IORESOURCE_IO,
-};
-
-extern struct pci_ops rc32434_pci_ops;
-
-#define PCI_MEM1_START	PCI_ADDR_START
-#define PCI_MEM1_END	PCI_ADDR_START + CPUTOPCI_MEM_WIN - 1
-#define PCI_MEM2_START	PCI_ADDR_START + CPUTOPCI_MEM_WIN
-#define PCI_MEM2_END	PCI_ADDR_START + ( 2* CPUTOPCI_MEM_WIN)  - 1
-#define PCI_IO1_START	PCI_ADDR_START + (2 * CPUTOPCI_MEM_WIN)
-#define PCI_IO1_END 	PCI_ADDR_START + (2* CPUTOPCI_MEM_WIN) + CPUTOPCI_IO_WIN -1
-#define PCI_IO2_START	PCI_ADDR_START + (2 * CPUTOPCI_MEM_WIN) + CPUTOPCI_IO_WIN
-#define PCI_IO2_END 	PCI_ADDR_START + (2* CPUTOPCI_MEM_WIN) + (2 * CPUTOPCI_IO_WIN) -1
-
-
-struct pci_controller rc32434_controller2;
-
-struct pci_controller rc32434_controller = {
-	.pci_ops 	= &rc32434_pci_ops,
-	.mem_resource 	= &rc32434_res_pci_mem1,
-	.io_resource 	= &rc32434_res_pci_io1,
-	.mem_offset     = 0,
-	.io_offset      = 0,
-
-};
-
-#ifdef __MIPSEB__
-#define PCI_ENDIAN_FLAG PCILBAC_sb_m
-#else
-#define PCI_ENDIAN_FLAG 0
-#endif
-
-static int __init rc32434_pcibridge_init(void)
-{
-	unsigned int pcicValue, pcicData = 0;
-	unsigned int dummyRead, pciCntlVal;
-	int loopCount;
-	unsigned int pciConfigAddr;
-
-	pcicValue = rc32434_pci->pcic;
-	pcicValue = (pcicValue >> PCIM_SHFT) & PCIM_BIT_LEN;
-	if (!((pcicValue == PCIM_H_EA) ||
-		 (pcicValue == PCIM_H_IA_FIX) ||
-		(pcicValue == PCIM_H_IA_RR))) {
-		printk("PCI init error!!!\n");
-		/* Not in Host Mode, return ERROR */
-		return -1;
-	}
-	/* Enables the Idle Grant mode, Arbiter Parking */
-	pcicData |=(PCIC_igm_m|PCIC_eap_m|PCIC_en_m);
-	rc32434_pci->pcic = pcicData; /* Enable the PCI bus Interface */
-	/* Zero out the PCI status & PCI Status Mask */
-	for(;;)
-	{
-	   pcicData = rc32434_pci->pcis;
-	   if (!(pcicData & PCIS_rip_m))
-		    break;
-	}
-
-	rc32434_pci->pcis = 0;
-	rc32434_pci->pcism = 0xFFFFFFFF;
-	/* Zero out the PCI decoupled registers */
-	rc32434_pci->pcidac=0; /* disable PCI decoupled accesses at initialization */
-	rc32434_pci->pcidas=0; /* clear the status */
-	rc32434_pci->pcidasm=0x0000007F; /* Mask all the interrupts */
-	/* Mask PCI Messaging Interrupts */
-	rc32434_pci_msg->pciiic = 0;
-	rc32434_pci_msg->pciiim = 0xFFFFFFFF;
-	rc32434_pci_msg->pciioic = 0;
-	rc32434_pci_msg->pciioim = 0;
-
-
-	/* Setup PCILB0 as Memory Window */
-	rc32434_pci->pcilba[0].a = (unsigned int) (PCI_ADDR_START);
-
-	/* setup the PCI map address as same as the local address */
-
-	rc32434_pci->pcilba[0].m = (unsigned int) (PCI_ADDR_START);
-
-
-	/* Setup PCILBA1 as MEM */
-	rc32434_pci->pcilba[0].c = ( ((SIZE_256MB & 0x1f) << PCILBAC_size_b) | PCI_ENDIAN_FLAG);
-	dummyRead = rc32434_pci->pcilba[0].c; /* flush the CPU write Buffers */
-	rc32434_pci->pcilba[1].a = 0x60000000;
-	rc32434_pci->pcilba[1].m = 0x60000000;
-
-	/* setup PCILBA2 as IO Window*/
-	rc32434_pci->pcilba[1].c = (((SIZE_256MB & 0x1f) << PCILBAC_size_b )| PCI_ENDIAN_FLAG);
-	dummyRead = rc32434_pci->pcilba[1].c; /* flush the CPU write Buffers */
-	rc32434_pci->pcilba[2].a = 0x18C00000;
-	rc32434_pci->pcilba[2].m = 0x18FFFFFF;
-
-	/* setup PCILBA2 as IO Window*/
-	rc32434_pci->pcilba[2].c = (((SIZE_4MB & 0x1f) << PCILBAC_size_b) | PCI_ENDIAN_FLAG );
-	dummyRead = rc32434_pci->pcilba[2].c; /* flush the CPU write Buffers */
-
-	/* Setup PCILBA3 as IO Window */
-	rc32434_pci->pcilba[3].a = 0x18800000;
-	rc32434_pci->pcilba[3].m = 0x18800000;
-	rc32434_pci->pcilba[3].c = ( (((SIZE_1MB & 0x1ff) << PCILBAC_size_b) | PCILBAC_msi_m) | PCI_ENDIAN_FLAG);
-	dummyRead = rc32434_pci->pcilba[3].c; /* flush the CPU write Buffers */
-
-	pciConfigAddr=(unsigned int)(0x80000004);
-	for(loopCount=0;loopCount<24;loopCount++){
-		rc32434_pci->pcicfga=pciConfigAddr;
-		dummyRead=rc32434_pci->pcicfga;
-		rc32434_pci->pcicfgd = korinaCnfgRegs[loopCount];
-		dummyRead=rc32434_pci->pcicfgd;
-		pciConfigAddr += 4;
-	}
-	rc32434_pci->pcitc = (unsigned int)((PCITC_RTIMER_VAL&0xff) << PCITC_rtimer_b)
-		| ((PCITC_DTIMER_VAL&0xff) << PCITC_dtimer_b);
-
-	pciCntlVal=rc32434_pci->pcic;
-	pciCntlVal &=~(PCIC_tnr_m);
-	rc32434_pci->pcic = pciCntlVal;
-	pciCntlVal=rc32434_pci->pcic;
-	return 0;
-}
-
-/* Do platform specific device initialization at pci_enable_device() time */
-int pcibios_plat_dev_init(struct pci_dev *dev)
-{
-	if (PCI_SLOT(dev->devfn) == 6 && dev->bus->number == 0) {
-		/* disable prefetched memory range */
-		pci_write_config_word(dev, PCI_PREF_MEMORY_LIMIT, 0);
-		pci_write_config_word(dev, PCI_PREF_MEMORY_BASE, 0x10);
-
-		pci_write_config_byte(dev, PCI_CACHE_LINE_SIZE, 4);
-	}
-	return 0;
-}
-
-static int __init rc32434_pci_init(void)
-{
-	printk("PCI: Initializing PCI\n");
-
-	ioport_resource.start = rc32434_res_pci_io1.start;
-	ioport_resource.end = rc32434_res_pci_io1.end;
-
-	rc32434_pcibridge_init();
-
-	register_pci_controller(&rc32434_controller);
-	rc32434_sync();
-
-	return 0;
-}
-
-arch_initcall(rc32434_pci_init);
-
diff --git a/target/linux/rb532/files/arch/mips/rb500/Makefile b/target/linux/rb532/files/arch/mips/rb500/Makefile
deleted file mode 100644
index d3ae3d9..0000000
--- a/target/linux/rb532/files/arch/mips/rb500/Makefile
+++ /dev/null
@@ -1,5 +0,0 @@
-#
-# Makefile for the RB500 board specific parts of the kernel
-#
-
-obj-y	 += irq.o time.o setup.o serial.o prom.o gpio.o devices.o
diff --git a/target/linux/rb532/files/arch/mips/rb500/devices.c b/target/linux/rb532/files/arch/mips/rb500/devices.c
deleted file mode 100644
index 6372737..0000000
--- a/target/linux/rb532/files/arch/mips/rb500/devices.c
+++ /dev/null
@@ -1,338 +0,0 @@
-/*
- *  RouterBoard 500 Platform devices
- *
- *  Copyright (C) 2006 Felix Fietkau <nbd@openwrt.org>
- *  Copyright (C) 2007 Florian Fainelli <florian@openwrt.org>
- *
- *  This program is free software; you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation; either version 2 of the License, or
- *  (at your option) any later version.
- *
- *  This program is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- *  GNU General Public License for more details.
- */
-#include <linux/kernel.h>
-#include <linux/init.h>
-#include <linux/ctype.h>
-#include <linux/string.h>
-#include <linux/platform_device.h>
-#include <linux/mtd/nand.h>
-#include <linux/mtd/mtd.h>
-#include <linux/mtd/partitions.h>
-#include <linux/gpio_keys.h>
-#include <linux/input.h>
-
-#include <asm/bootinfo.h>
-
-#include <asm/rc32434/rc32434.h>
-#include <asm/rc32434/dma.h>
-#include <asm/rc32434/dma_v.h>
-#include <asm/rc32434/eth.h>
-#include <asm/rc32434/rb.h>
-
-#define ETH0_DMA_RX_IRQ   	GROUP1_IRQ_BASE + 0
-#define ETH0_DMA_TX_IRQ   	GROUP1_IRQ_BASE + 1
-#define ETH0_RX_OVR_IRQ   	GROUP3_IRQ_BASE + 9
-#define ETH0_TX_UND_IRQ   	GROUP3_IRQ_BASE + 10
-
-#define ETH0_RX_DMA_ADDR  (DMA0_PhysicalAddress + 0*DMA_CHAN_OFFSET)
-#define ETH0_TX_DMA_ADDR  (DMA0_PhysicalAddress + 1*DMA_CHAN_OFFSET)
-
-/* NAND definitions */
-#define MEM32(x) *((volatile unsigned *) (x))
-
-#define GPIO_RDY (1 << 0x08)
-#define GPIO_WPX (1 << 0x09)
-#define GPIO_ALE (1 << 0x0a)
-#define GPIO_CLE (1 << 0x0b)
-
-extern char* board_type;
-
-static struct resource korina_dev0_res[] = {
-	{
-		.name = "korina_regs",
-		.start = ETH0_PhysicalAddress,
-		.end = ETH0_PhysicalAddress + sizeof(ETH_t),
-		.flags = IORESOURCE_MEM,
-	 }, {
-		.name = "korina_rx",
-		.start = ETH0_DMA_RX_IRQ,
-		.end = ETH0_DMA_RX_IRQ,
-		.flags = IORESOURCE_IRQ
-	}, {
-		.name = "korina_tx",
-		.start = ETH0_DMA_TX_IRQ,
-		.end = ETH0_DMA_TX_IRQ,
-		.flags = IORESOURCE_IRQ
-	}, {
-		.name = "korina_ovr",
-		.start = ETH0_RX_OVR_IRQ,
-		.end = ETH0_RX_OVR_IRQ,
-		.flags = IORESOURCE_IRQ
-	}, {
-		.name = "korina_und",
-		.start = ETH0_TX_UND_IRQ,
-		.end = ETH0_TX_UND_IRQ,
-		.flags = IORESOURCE_IRQ
-	}, {
-		.name = "korina_dma_rx",
-		.start = ETH0_RX_DMA_ADDR,
-		.end = ETH0_RX_DMA_ADDR + DMA_CHAN_OFFSET - 1,
-		.flags = IORESOURCE_MEM,
-	 }, {
-		.name = "korina_dma_tx",
-		.start = ETH0_TX_DMA_ADDR,
-		.end = ETH0_TX_DMA_ADDR + DMA_CHAN_OFFSET - 1,
-		.flags = IORESOURCE_MEM,
-	 }
-};
-
-static struct korina_device korina_dev0_data = {
-	.name = "korina0",
-	.mac = {0xde, 0xca, 0xff, 0xc0, 0xff, 0xee}
-};
-
-static struct platform_device korina_dev0 = {
-	.id = 0,
-	.name = "korina",
-	.dev.platform_data = &korina_dev0_data,
-	.resource = korina_dev0_res,
-	.num_resources = ARRAY_SIZE(korina_dev0_res),
-};
-
-#define CF_GPIO_NUM 13
-
-static struct resource cf_slot0_res[] = {
-	{
-		.name = "cf_membase",
-		.flags = IORESOURCE_MEM
-	}, {
-		.name = "cf_irq",
-		.start = (8 + 4 * 32 + CF_GPIO_NUM),	/* 149 */
-		.end = (8 + 4 * 32 + CF_GPIO_NUM),
-		.flags = IORESOURCE_IRQ
-	}
-};
-
-static struct cf_device cf_slot0_data = {
-	.gpio_pin = 13
-};
-
-static struct platform_device cf_slot0 = {
-	.id = 0,
-	.name = "rb500-cf",
-	.dev.platform_data = &cf_slot0_data,
-	.resource = cf_slot0_res,
-	.num_resources = ARRAY_SIZE(cf_slot0_res),
-};
-
-/* Resources and device for NAND.  There is no data needed and no irqs, so just define the memory used. */
-
-/*
- * We need to use the OLD Yaffs-1 OOB layout, otherwise the RB bootloader
- * will not be able to find the kernel that we load.  So set the oobinfo
- * when creating the partitions
- */
-static struct nand_ecclayout rb500_nand_ecclayout = {
-	.eccbytes	= 6,
-	.eccpos		= { 8, 9, 10, 13, 14, 15 },
-	.oobavail	= 9,
-	.oobfree	= { { 0, 4 }, { 6, 2 }, { 11, 2 }, { 4, 1 } }
-};
-
-int rb500_dev_ready(struct mtd_info *mtd)
-{
-        return MEM32(IDT434_REG_BASE + GPIOD) & GPIO_RDY;
-}
-
-void rb500_cmd_ctrl(struct mtd_info *mtd, int cmd, unsigned int ctrl)
-{
-        struct nand_chip *chip = mtd->priv;
-        unsigned char orbits, nandbits;
-
-        if (ctrl & NAND_CTRL_CHANGE) {
-
-                orbits = (ctrl & NAND_CLE) << 1;
-                orbits |= (ctrl & NAND_ALE) >> 1;
-
-                nandbits = (~ctrl & NAND_CLE) << 1;
-                nandbits |= (~ctrl & NAND_ALE) >> 1;
-
-                changeLatchU5(orbits, nandbits);
-        }
-        if (cmd != NAND_CMD_NONE)
-                writeb(cmd, chip->IO_ADDR_W);
-}
-
-static struct resource nand_slot0_res[] = {
-	[0] = {
-		.name = "nand_membase",
-		.flags = IORESOURCE_MEM
-	}
-};
-
-struct platform_nand_data rb500_nand_data = {
-	.ctrl.dev_ready = rb500_dev_ready,
-	.ctrl.cmd_ctrl	= rb500_cmd_ctrl,
-};
-
-static struct platform_device nand_slot0 = {
-	.name = "gen_nand",
-	.id = -1,
-	.resource = nand_slot0_res,
-	.num_resources = ARRAY_SIZE(nand_slot0_res),
-	.dev.platform_data = &rb500_nand_data,
-};
-
-static struct mtd_partition rb500_partition_info[] = {
-	{
-		.name = "Routerboard NAND boot",
-		.offset = 0,
-		.size = 4 * 1024 * 1024,
-	}, {
-		.name = "rootfs",
-		.offset = MTDPART_OFS_NXTBLK,
-		.size = MTDPART_SIZ_FULL,
-	}
-};
-
-static struct platform_device rb500_led = {
-	.name = "rb500-led",
-	.id = 0,
-};
-
-static struct gpio_keys_button rb500_gpio_btn[] = {
-	{
-		.gpio = 1,
-		.code = BTN_0,
-		.desc = "S1",
-		.active_low = 1,
-	}
-};
-
-static struct gpio_keys_platform_data rb500_gpio_btn_data = {
-	.buttons = rb500_gpio_btn,
-	.nbuttons = ARRAY_SIZE(rb500_gpio_btn),
-};
-
-static struct platform_device rb500_button = {
-	.name 	= "gpio-keys",
-	.id	= -1,
-	.dev	= {
-		.platform_data = &rb500_gpio_btn_data,
-	}
-};
-
-static struct platform_device *rb500_devs[] = {
-	&korina_dev0,
-	&nand_slot0,
-	&cf_slot0,
-	&rb500_led,
-	&rb500_button
-};
-
-static void __init parse_mac_addr(char *macstr)
-{
-	int i, j;
-	unsigned char result, value;
-
-	for (i = 0; i < 6; i++) {
-		result = 0;
-
-		if (i != 5 && *(macstr + 2) != ':')
-			return;
-
-		for (j = 0; j < 2; j++) {
-			if (isxdigit(*macstr)
-			    && (value =
-				isdigit(*macstr) ? *macstr -
-				'0' : toupper(*macstr) - 'A' + 10) < 16) {
-				result = result * 16 + value;
-				macstr++;
-			} else
-				return;
-		}
-
-		macstr++;
-		korina_dev0_data.mac[i] = result;
-	}
-}
-
-
-/* DEVICE CONTROLLER 1 */
-#define CFG_DC_DEV1 (void*)0xb8010010
-#define CFG_DC_DEV2 (void*)0xb8010020
-#define CFG_DC_DEVBASE    0x0
-#define CFG_DC_DEVMASK    0x4
-#define CFG_DC_DEVC       0x8
-#define CFG_DC_DEVTC      0xC
-
-/* NAND definitions */
-#define NAND_CHIP_DELAY	25
-
-static int rb500_nand_fixup(struct mtd_info *mtd)
-{
-	struct nand_chip *chip = mtd->priv;
-
-	if (mtd->writesize == 512)
-		chip->ecc.layout = &rb500_nand_ecclayout;
-
-	return 0;
-}
-
-static void __init rb500_nand_setup(void)
-{
-	switch (mips_machtype) {
-	case MACH_MIKROTIK_RB532A:
-		changeLatchU5(LO_FOFF | LO_CEX, LO_ULED | LO_ALE | LO_CLE | LO_WPX);
-		break;
-	default:
-		changeLatchU5(LO_WPX | LO_FOFF | LO_CEX, LO_ULED | LO_ALE | LO_CLE);
-		break;
-	}
-
-	/* Setup NAND specific settings */
-	rb500_nand_data.chip.nr_chips = 1;
-	rb500_nand_data.chip.nr_partitions = ARRAY_SIZE(rb500_partition_info);
-	rb500_nand_data.chip.partitions = rb500_partition_info;
-	rb500_nand_data.chip.chip_delay = NAND_CHIP_DELAY;
-	rb500_nand_data.chip.options = NAND_NO_AUTOINCR;
-
-	rb500_nand_data.chip.chip_fixup = &rb500_nand_fixup;
-}
-
-
-static int __init plat_setup_devices(void)
-{
-	/* Look for the CF card reader */
-	if (!readl(CFG_DC_DEV1 + CFG_DC_DEVMASK))
-		rb500_devs[1] = NULL;
-	else {
-		cf_slot0_res[0].start =
-		    readl(CFG_DC_DEV1 + CFG_DC_DEVBASE);
-		cf_slot0_res[0].end = cf_slot0_res[0].start + 0x1000;
-	}
-
-	/* Read the NAND resources from the device controller */
-	nand_slot0_res[0].start = readl(CFG_DC_DEV2 + CFG_DC_DEVBASE);
-	nand_slot0_res[0].end = nand_slot0_res[0].start + 0x1000;
-
-	/* Initialise the NAND device */
-	rb500_nand_setup();
-
-	return platform_add_devices(rb500_devs, ARRAY_SIZE(rb500_devs));
-}
-
-static int __init setup_kmac(char *s)
-{
-	printk("korina mac = %s\n", s);
-	parse_mac_addr(s);
-	return 0;
-}
-
-__setup("kmac=", setup_kmac);
-
-arch_initcall(plat_setup_devices);
diff --git a/target/linux/rb532/files/arch/mips/rb500/gpio.c b/target/linux/rb532/files/arch/mips/rb500/gpio.c
deleted file mode 100644
index 6c92a8f..0000000
--- a/target/linux/rb532/files/arch/mips/rb500/gpio.c
+++ /dev/null
@@ -1,198 +0,0 @@
-/*
- *  Miscellaneous functions for IDT EB434 board
- *
- *  Copyright 2004 IDT Inc. (rischelp@idt.com)
- *  Copyright 2006 Phil Sutter <n0-1@freewrt.org>
- *  Copyright 2007 Florian Fainelli <florian@openwrt.org>
- *
- *  This program is free software; you can redistribute  it and/or modify it
- *  under  the terms of  the GNU General  Public License as published by the
- *  Free Software Foundation;  either version 2 of the  License, or (at your
- *  option) any later version.
- *
- *  THIS  SOFTWARE  IS PROVIDED   ``AS  IS'' AND   ANY  EXPRESS OR IMPLIED
- *  WARRANTIES,   INCLUDING, BUT NOT  LIMITED  TO, THE IMPLIED WARRANTIES OF
- *  MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN
- *  NO  EVENT  SHALL   THE AUTHOR  BE    LIABLE FOR ANY   DIRECT, INDIRECT,
- *  INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
- *  NOT LIMITED   TO, PROCUREMENT OF  SUBSTITUTE GOODS  OR SERVICES; LOSS OF
- *  USE, DATA,  OR PROFITS; OR  BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
- *  ANY THEORY OF LIABILITY, WHETHER IN  CONTRACT, STRICT LIABILITY, OR TORT
- *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
- *  THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- *  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.,
- *  675 Mass Ave, Cambridge, MA 02139, USA.
- */
-
-#include <linux/kernel.h>
-#include <linux/init.h>
-#include <linux/types.h>
-#include <linux/pci.h>
-#include <linux/spinlock.h>
-#include <linux/io.h>
-#include <linux/platform_device.h>
-
-#include <asm/addrspace.h>
-#include <asm/gpio.h>
-
-#include <asm/rc32434/rb.h>
-
-#define GPIO_BADDR  0x18050000
-
-static volatile unsigned char *devCtl3Base;
-static unsigned char latchU5State;
-static spinlock_t clu5Lock = SPIN_LOCK_UNLOCKED;
-
-struct rb500_gpio_reg __iomem *rb500_gpio_reg0;
-EXPORT_SYMBOL(rb500_gpio_reg0);
-
-static struct resource rb500_gpio_reg0_res[] = {
-	{
-		.name 	= "gpio_reg0",
-		.start 	= GPIO_BADDR,
-		.end 	= GPIO_BADDR + sizeof(struct rb500_gpio_reg),
-		.flags 	= IORESOURCE_MEM,
-	}
-};
-
-void set434Reg(unsigned regOffs, unsigned bit, unsigned len, unsigned val)
-{
-	unsigned flags, data;
-	unsigned i = 0;
-
-	spin_lock_irqsave(&clu5Lock, flags);
-	data = *(volatile unsigned *) (IDT434_REG_BASE + regOffs);
-	for (i = 0; i != len; ++i) {
-		if (val & (1 << i))
-			data |= (1 << (i + bit));
-		else
-			data &= ~(1 << (i + bit));
-	}
-	*(volatile unsigned *) (IDT434_REG_BASE + regOffs) = data;
-	spin_unlock_irqrestore(&clu5Lock, flags);
-}
-EXPORT_SYMBOL(set434Reg);
-
-void changeLatchU5(unsigned char orMask, unsigned char nandMask)
-{
-	unsigned flags;
-
-	spin_lock_irqsave(&clu5Lock, flags);
-	latchU5State = (latchU5State | orMask) & ~nandMask;
-	if (!devCtl3Base)
-		devCtl3Base = (volatile unsigned char *)
-		    KSEG1ADDR(*(volatile unsigned *)
-			      KSEG1ADDR(0x18010030));
-	*devCtl3Base = latchU5State;
-	spin_unlock_irqrestore(&clu5Lock, flags);
-}
-EXPORT_SYMBOL(changeLatchU5);
-
-unsigned char getLatchU5State(void)
-{
-	return latchU5State;
-}
-EXPORT_SYMBOL(getLatchU5State);
-
-int rb500_gpio_get_value(unsigned gpio)
-{
-	return readl(&rb500_gpio_reg0->gpiod) & (1 << gpio);
-}
-EXPORT_SYMBOL(rb500_gpio_get_value);
-
-void rb500_gpio_set_value(unsigned gpio, int value)
-{
-	unsigned tmp;
-
-	tmp = readl(&rb500_gpio_reg0->gpiod) & ~(1 << gpio);
-	if (value)
-		tmp |= 1 << gpio;
-
-	writel(tmp, (void *)&rb500_gpio_reg0->gpiod);
-}
-EXPORT_SYMBOL(rb500_gpio_set_value);
-
-int rb500_gpio_direction_input(unsigned gpio)
-{
-	writel(readl(&rb500_gpio_reg0->gpiocfg) & ~(1 << gpio), (void *)&rb500_gpio_reg0->gpiocfg);
-
-	return 0;
-}
-EXPORT_SYMBOL(rb500_gpio_direction_input);
-
-int rb500_gpio_direction_output(unsigned gpio, int value)
-{
-	gpio_set_value(gpio, value);
-	writel(readl(&rb500_gpio_reg0->gpiocfg) | (1 << gpio), (void *)&rb500_gpio_reg0->gpiocfg);
-
-	return 0;
-}
-EXPORT_SYMBOL(rb500_gpio_direction_output);
-
-void rb500_gpio_set_int_level(unsigned gpio, int value)
-{
-	unsigned tmp;
-
-	tmp = readl(&rb500_gpio_reg0->gpioilevel) & ~(1 << gpio);
-	if (value)
-		tmp |= 1 << gpio;
-	writel(tmp, (void *)&rb500_gpio_reg0->gpioilevel);
-}
-EXPORT_SYMBOL(rb500_gpio_set_int_level);
-
-int rb500_gpio_get_int_level(unsigned gpio)
-{
-	return readl(&rb500_gpio_reg0->gpioilevel) & (1 << gpio);
-}
-EXPORT_SYMBOL(rb500_gpio_get_int_level);
-
-void rb500_gpio_set_int_status(unsigned gpio, int value)
-{
-	unsigned tmp;
-
-	tmp = readl(&rb500_gpio_reg0->gpioistat);
-	if (value)
-		tmp |= 1 << gpio;
-	writel(tmp, (void *)&rb500_gpio_reg0->gpioistat);
-}
-EXPORT_SYMBOL(rb500_gpio_set_int_status);
-
-int rb500_gpio_get_int_status(unsigned gpio)
-{
-	return readl(&rb500_gpio_reg0->gpioistat) & (1 << gpio);
-}
-EXPORT_SYMBOL(rb500_gpio_get_int_status);
-
-void rb500_gpio_set_func(unsigned gpio, int value)
-{
-        unsigned tmp;
-
-        tmp = readl(&rb500_gpio_reg0->gpiofunc);
-        if (value)
-                tmp |= 1 << gpio;
-        writel(tmp, (void *)&rb500_gpio_reg0->gpiofunc);
-}
-EXPORT_SYMBOL(rb500_gpio_set_func);
-
-int rb500_gpio_get_func(unsigned gpio)
-{
-        return readl(&rb500_gpio_reg0->gpiofunc) & (1 << gpio);
-}
-EXPORT_SYMBOL(rb500_gpio_get_func);
-
-int __init rb500_gpio_init(void)
-{
-	rb500_gpio_reg0 = ioremap_nocache(rb500_gpio_reg0_res[0].start,
-				rb500_gpio_reg0_res[0].end -
-				rb500_gpio_reg0_res[0].start);
-
-	if (!rb500_gpio_reg0) {
-		printk(KERN_ERR "rb500: cannot remap GPIO register 0\n");
-		return -ENXIO;
-	}
-
-	return 0;
-}
-arch_initcall(rb500_gpio_init);
diff --git a/target/linux/rb532/files/arch/mips/rb500/irq.c b/target/linux/rb532/files/arch/mips/rb500/irq.c
deleted file mode 100644
index 5a4d349..0000000
--- a/target/linux/rb532/files/arch/mips/rb500/irq.c
+++ /dev/null
@@ -1,265 +0,0 @@
-/*
- * BRIEF MODULE DESCRIPTION
- *	RC32434 interrupt routines.
- *
- * Copyright 2002 MontaVista Software Inc.
- * Author: MontaVista Software, Inc.
- *		stevel@mvista.com or source@mvista.com
- *
- *  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  SOFTWARE  IS PROVIDED	  ``AS	IS'' AND   ANY	EXPRESS OR IMPLIED
- *  WARRANTIES,	  INCLUDING, BUT NOT  LIMITED  TO, THE IMPLIED WARRANTIES OF
- *  MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN
- *  NO	EVENT  SHALL   THE AUTHOR  BE	 LIABLE FOR ANY	  DIRECT, INDIRECT,
- *  INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
- *  NOT LIMITED	  TO, PROCUREMENT OF  SUBSTITUTE GOODS	OR SERVICES; LOSS OF
- *  USE, DATA,	OR PROFITS; OR	BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
- *  ANY THEORY OF LIABILITY, WHETHER IN	 CONTRACT, STRICT LIABILITY, OR TORT
- *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
- *  THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- *  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.,
- *  675 Mass Ave, Cambridge, MA 02139, USA.
- */
-
-#include <linux/errno.h>
-#include <linux/init.h>
-#include <linux/kernel_stat.h>
-#include <linux/module.h>
-#include <linux/signal.h>
-#include <linux/sched.h>
-#include <linux/types.h>
-#include <linux/interrupt.h>
-#include <linux/ioport.h>
-#include <linux/timex.h>
-#include <linux/slab.h>
-#include <linux/random.h>
-#include <linux/delay.h>
-
-#include <asm/bitops.h>
-#include <asm/bootinfo.h>
-#include <asm/io.h>
-#include <asm/irq.h>
-#include <asm/time.h>
-#include <asm/mipsregs.h>
-#include <asm/system.h>
-#include <asm/rc32434/rc32434.h>
-#include <asm/rc32434/gpio.h>
-
-extern void set_debug_traps(void);
-extern irq_cpustat_t irq_stat [NR_CPUS];
-unsigned int local_bh_count[NR_CPUS];
-unsigned int local_irq_count[NR_CPUS];
-
-static unsigned int startup_irq(unsigned int irq);
-static void rb500_end_irq(unsigned int irq_nr);
-static void mask_and_ack_irq(unsigned int irq_nr);
-static void rb500_enable_irq(unsigned int irq_nr);
-static void rb500_disable_irq(unsigned int irq_nr);
-
-extern void __init init_generic_irq(void);
-extern struct rb500_gpio_reg __iomem *rb500_gpio_reg0;
-
-typedef struct {
-  u32 mask;       /* mask of valid bits in pending/mask registers */
-  volatile u32 *base_addr;
-} intr_group_t;
-
-#define RC32434_NR_IRQS  (GROUP4_IRQ_BASE + 32)
-
-#if (NR_IRQS < RC32434_NR_IRQS)
-#error Too little irqs defined. Did you override <asm/irq.h> ?
-#endif
-
-static const intr_group_t intr_group[NUM_INTR_GROUPS] = {
-  { 0x0000efff, (u32 *)KSEG1ADDR(IC_GROUP0_PEND + 0 * IC_GROUP_OFFSET) },
-  { 0x00001fff, (u32 *)KSEG1ADDR(IC_GROUP0_PEND + 1 * IC_GROUP_OFFSET) },
-  { 0x00000007, (u32 *)KSEG1ADDR(IC_GROUP0_PEND + 2 * IC_GROUP_OFFSET) },
-  { 0x0003ffff, (u32 *)KSEG1ADDR(IC_GROUP0_PEND + 3 * IC_GROUP_OFFSET) },
-  { 0xffffffff, (u32 *)KSEG1ADDR(IC_GROUP0_PEND + 4 * IC_GROUP_OFFSET) }
-};
-
-#define READ_PEND(base) (*(base))
-#define READ_MASK(base) (*(base + 2))
-#define WRITE_MASK(base, val) (*(base + 2) = (val))
-
-static inline int irq_to_group(unsigned int irq_nr)
-{
-  return ((irq_nr - GROUP0_IRQ_BASE) >> 5);
-}
-
-static inline int group_to_ip(unsigned int group)
-{
-  return group + 2;
-}
-
-static inline void enable_local_irq(unsigned int ip)
-{
-  int ipnum = 0x100 << ip;
-  clear_c0_cause(ipnum);
-  set_c0_status(ipnum);
-}
-
-static inline void disable_local_irq(unsigned int ip)
-{
-  int ipnum = 0x100 << ip;
-  clear_c0_status(ipnum);
-}
-
-static inline void ack_local_irq(unsigned int ip)
-{
-  int ipnum = 0x100 << ip;
-  clear_c0_cause(ipnum);
-}
-
-static void rb500_enable_irq(unsigned int irq_nr)
-{
-  int           ip = irq_nr - GROUP0_IRQ_BASE;
-  unsigned int  group, intr_bit;
-  volatile unsigned int  *addr;
-  
-  
-  if (ip < 0)
-    enable_local_irq(irq_nr);
-  else {
-    group = ip >> 5;
- 
-    ip &= (1<<5)-1;
-    intr_bit = 1 << ip;
- 
-    enable_local_irq(group_to_ip(group));
-    
-    addr = intr_group[group].base_addr;
-    WRITE_MASK(addr, READ_MASK(addr) & ~intr_bit);
-  }
-}
-
-static void rb500_disable_irq(unsigned int irq_nr)
-{
-  int           ip = irq_nr - GROUP0_IRQ_BASE;
-  unsigned int  group, intr_bit, mask;
-  volatile unsigned int  *addr;
-  
-  if (ip < 0) {
-	disable_local_irq(irq_nr);
-    }else{
-    group = ip >> 5;
-    
-    ip &= (1<<5) -1;
-    intr_bit = 1 << ip;
-    addr = intr_group[group].base_addr;
-    mask = READ_MASK(addr);
-    mask |= intr_bit;
-    WRITE_MASK(addr,mask);
-   
-    /*
-     * if there are no more interrupts enabled in this
-     * group, disable corresponding IP
-     */
-    if (mask == intr_group[group].mask)
-      disable_local_irq(group_to_ip(group));
-  }
-}
-
-static unsigned int startup_irq(unsigned int irq_nr)
-{
-  rb500_enable_irq(irq_nr);
-  return 0; 
-}
-
-static void shutdown_irq(unsigned int irq_nr)
-{
-  rb500_disable_irq(irq_nr);
-  return;
-}
-
-static void mask_and_ack_irq(unsigned int irq_nr)
-{
-  rb500_disable_irq(irq_nr);
-  ack_local_irq(group_to_ip(irq_to_group(irq_nr)));
-}
-
-static void rb500_end_irq(unsigned int irq_nr)
-{
-
-  int ip = irq_nr - GROUP0_IRQ_BASE;
-  unsigned int intr_bit, group;
-  volatile unsigned int *addr;
-
-	if ((irq_desc[irq_nr].status & (IRQ_DISABLED | IRQ_INPROGRESS))) {
-		printk("warning: end_irq %d did not enable (%x)\n", 
-			irq_nr, irq_desc[irq_nr].status);
-		return;
-	}
-	
-	if (ip < 0) {
-		enable_local_irq(irq_nr);
-	} else {
-		group = ip >> 5;
-	
-		ip &= (1 << 5) - 1;
-		intr_bit = 1 << ip;
-	
-		if (irq_nr >= GROUP4_IRQ_BASE && irq_nr <= (GROUP4_IRQ_BASE + 13)) {
-			rb500_gpio_reg0->gpioistat = rb500_gpio_reg0->gpioistat & ~intr_bit;
-		}
-	
-		enable_local_irq(group_to_ip(group));
-	
-		addr = intr_group[group].base_addr;
-		WRITE_MASK(addr, READ_MASK(addr) & ~intr_bit);
-	}
-}
-
-static struct hw_interrupt_type rc32434_irq_type = {
-  .typename = "RB500",
-  .startup = startup_irq,
-  .shutdown = shutdown_irq,
-  .enable = rb500_enable_irq,
-  .disable = rb500_disable_irq,
-  .ack = mask_and_ack_irq,
-  .end = rb500_end_irq,
-};
-
-
-void __init arch_init_irq(void)
-{
-	int i;
-
-	printk("Initializing IRQ's: %d out of %d\n", RC32434_NR_IRQS, NR_IRQS);
-	memset(irq_desc, 0, sizeof(irq_desc));
-  
-	for (i = 0; i < RC32434_NR_IRQS; i++) {
-		irq_desc[i].status = IRQ_DISABLED;
-		irq_desc[i].action = NULL;
-		irq_desc[i].depth = 1;
-		irq_desc[i].chip = &rc32434_irq_type;
-		spin_lock_init(&irq_desc[i].lock);
-	}
-}
-
-/* Main Interrupt dispatcher */
-asmlinkage void plat_irq_dispatch(void)
-{
-	unsigned int ip, pend, group;
-	volatile unsigned int *addr;
-	unsigned int cp0_cause = read_c0_cause() & read_c0_status();
-
-	if (cp0_cause & CAUSEF_IP7) {
-		ll_timer_interrupt(7);
-	} else if ((ip = (cp0_cause & 0x7c00))) {
-		group = 21 - rc32434_clz(ip);
-
-		addr = intr_group[group].base_addr;
-
-		pend = READ_PEND(addr);
-		pend &= ~READ_MASK(addr); // only unmasked interrupts
-		pend = 39 - rc32434_clz(pend);
-		do_IRQ((group << 5) + pend);
-	}
-}
diff --git a/target/linux/rb532/files/arch/mips/rb500/prom.c b/target/linux/rb532/files/arch/mips/rb500/prom.c
deleted file mode 100644
index b10172f..0000000
--- a/target/linux/rb532/files/arch/mips/rb500/prom.c
+++ /dev/null
@@ -1,178 +0,0 @@
-/*
-* prom.c
-**********************************************************************
-* P . Sadik Oct 10, 2003
-*
-* Started change log
-* idt_cpu_freq is make a kernel configuration parameter
-* idt_cpu_freq is exported so that other modules can use it.
-* Code cleanup
-**********************************************************************
-* P. Sadik Oct 20, 2003
-*
-* Removed NVRAM code from here, since they are already available under
-* nvram directory.
-* Added serial port initialisation.
-**********************************************************************
-**********************************************************************
-* P. Sadik Oct 30, 2003
-*
-* Added reset_cons_port
-**********************************************************************
-
-  P.Christeas, 2005-2006
-  Port to 2.6, add 2.6 cmdline parsing
-
-*/
-
-#include <linux/autoconf.h>
-#include <linux/init.h>
-#include <linux/mm.h>
-#include <linux/module.h>
-#include <linux/string.h>
-#include <linux/console.h>
-#include <asm/bootinfo.h>
-#include <linux/bootmem.h>
-#include <linux/ioport.h>
-#include <linux/blkdev.h>
-#include <asm/rc32434/ddr.h>
-
-#define PROM_ENTRY(x)   (0xbfc00000+((x)*8))
-extern void __init setup_serial_port(void);
-
-unsigned int idt_cpu_freq = 132000000;
-EXPORT_SYMBOL(idt_cpu_freq);
-unsigned int gpio_bootup_state = 0;
-EXPORT_SYMBOL(gpio_bootup_state);
-
-char mips_mac_address[18] = "08:00:06:05:40:01";
-EXPORT_SYMBOL(mips_mac_address);
-
-/* what to append to cmdline when button is [not] pressed */
-#define GPIO_INIT_NOBUTTON ""
-#define GPIO_INIT_BUTTON   " 2"
-
-#ifdef CONFIG_MIKROTIK_RB500
-unsigned soft_reboot = 0;
-EXPORT_SYMBOL(soft_reboot);
-#endif
-
-#define SR_NMI			0x00180000      /* NMI */
-#define SERIAL_SPEED_ENTRY	0x00000001
-
-#ifdef CONFIG_REMOTE_DEBUG
-extern int remote_debug;
-#endif
-
-#define FREQ_TAG   "HZ="
-#define GPIO_TAG   "gpio="
-#define KMAC_TAG   "kmac="
-#define MEM_TAG	   "mem="
-#define BOARD_TAG  "board="
-#define IGNORE_CMDLINE_MEM 1
-#define DEBUG_DDR
-
-#define BOARD_RB532	"500"
-#define BOARD_RB532A	"500r5"
-
-void parse_soft_settings(unsigned *ptr, unsigned size);
-void parse_hard_settings(unsigned *ptr, unsigned size);
-
-void __init prom_setup_cmdline(void);
-
-void __init prom_init(void)
-{
-	DDR_t ddr = (DDR_t) DDR_VirtualAddress; /* define the pointer to the DDR registers */
-	phys_t memsize = 0-ddr->ddrmask;
-
-	/* this should be the very first message, even before serial is properly initialized */
-	prom_setup_cmdline();
-	setup_serial_port();
-
-	mips_machgroup = MACH_GROUP_MIKROTIK;
-	soft_reboot = read_c0_status() & SR_NMI;
-	pm_power_off = NULL;
-
-	/*
-	 * give all RAM to boot allocator,
-	 * except for the first 0x400 and the last 0x200 bytes
-	 */
-	add_memory_region(ddr->ddrbase + 0x400, memsize - 0x600, BOOT_MEM_RAM);
-}
-
-void __init prom_free_prom_memory(void)
-{
-	/* No prom memory to free */
-}
-
-static inline int match_tag(char *arg, const char *tag)
-{
-	return (strncmp(arg, tag, strlen(tag)) == 0);
-}
-
-static inline unsigned long tag2ul(char *arg, const char *tag)
-{
-	char *num = arg+strlen(tag);
-	return simple_strtoul(num, 0, 10);
-}
-
-extern char _image_cmdline;
-void __init prom_setup_cmdline(void){
-	char cmd_line[CL_SIZE];
-	char *cp;
-	int prom_argc;
-	char **prom_argv, **prom_envp;
-	int i;
-
-	prom_argc = fw_arg0;
-	prom_argv = (char **) fw_arg1;
-	prom_envp = (char **) fw_arg2;
-
-	cp=cmd_line;
-		/* Note: it is common that parameters start at argv[1] and not argv[0],
-		however, our elf loader starts at [0] */
-	for(i=0;i<prom_argc;i++){
-		if (match_tag(prom_argv[i], FREQ_TAG)) {
-			idt_cpu_freq = tag2ul(prom_argv[i], FREQ_TAG);
-			continue;
-		}
-#ifdef IGNORE_CMDLINE_MEM
-		/* parses out the "mem=xx" arg */
-		if (match_tag(prom_argv[i], MEM_TAG)) {
-			continue;
-		}
-#endif
-		if (i>0) *(cp++) = ' ';
-		if (match_tag(prom_argv[i], BOARD_TAG)) {
-			char *board = prom_argv[i] + strlen(BOARD_TAG);
-			if (match_tag(board, BOARD_RB532A))
-				mips_machtype = MACH_MIKROTIK_RB532A;
-			else
-				mips_machtype = MACH_MIKROTIK_RB532;
-		}
-
-		if (match_tag(prom_argv[i], GPIO_TAG)) {
-			gpio_bootup_state = tag2ul(prom_argv[i], GPIO_TAG);
-		}
-		strcpy(cp,prom_argv[i]);
-		cp+=strlen(prom_argv[i]);
-	}
-	*(cp++) = ' ';
-	strcpy(cp,(&_image_cmdline + 8));
-	cp += strlen(&_image_cmdline);
-
-	i=strlen(arcs_cmdline);
-	if (i>0){
-		*(cp++) = ' ';
-		strcpy(cp,arcs_cmdline);
-		cp+=strlen(arcs_cmdline);
-	}
-	if (gpio_bootup_state&0x02)
-		strcpy(cp,GPIO_INIT_NOBUTTON);
-	else
-		strcpy(cp,GPIO_INIT_BUTTON);
-	cmd_line[CL_SIZE-1] = '\0';
-
-	strcpy(arcs_cmdline,cmd_line);
-}
-
diff --git a/target/linux/rb532/files/arch/mips/rb500/serial.c b/target/linux/rb532/files/arch/mips/rb500/serial.c
deleted file mode 100644
index 25a03e0..0000000
--- a/target/linux/rb532/files/arch/mips/rb500/serial.c
+++ /dev/null
@@ -1,78 +0,0 @@
-/**************************************************************************
- *
- *  BRIEF MODULE DESCRIPTION
- *     Serial port initialisation.
- *
- *  Copyright 2004 IDT Inc. (rischelp@idt.com)
- *         
- *  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  SOFTWARE  IS PROVIDED   ``AS  IS'' AND   ANY  EXPRESS OR IMPLIED
- *  WARRANTIES,   INCLUDING, BUT NOT  LIMITED  TO, THE IMPLIED WARRANTIES OF
- *  MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN
- *  NO  EVENT  SHALL   THE AUTHOR  BE    LIABLE FOR ANY   DIRECT, INDIRECT,
- *  INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
- *  NOT LIMITED   TO, PROCUREMENT OF  SUBSTITUTE GOODS  OR SERVICES; LOSS OF
- *  USE, DATA,  OR PROFITS; OR  BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
- *  ANY THEORY OF LIABILITY, WHETHER IN  CONTRACT, STRICT LIABILITY, OR TORT
- *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
- *  THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- *  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.,
- *  675 Mass Ave, Cambridge, MA 02139, USA.
- *
- *
- **************************************************************************
- * May 2004 rkt, neb
- *
- * Initial Release
- *
- * 
- *
- **************************************************************************
- */
-
-
-#include <linux/autoconf.h>
-#include <linux/init.h>
-#include <linux/sched.h>
-#include <linux/pci.h>
-#include <linux/interrupt.h>
-#include <linux/tty.h>
-#include <linux/serial.h>
-#include <linux/serial_core.h>
-#include <linux/serial_8250.h>
-
-#include <asm/time.h>
-#include <asm/cpu.h>
-#include <asm/bootinfo.h>
-#include <asm/irq.h>
-#include <asm/serial.h>
-#include <asm/rc32434/rc32434.h>
-
-extern unsigned int idt_cpu_freq;
-
-static struct uart_port serial_req = {
-	.type = PORT_16550A,
-	.line = 0,
-	.irq = RC32434_UART0_IRQ,
-	//.flags = STD_COM_FLAGS,
-	.iotype = UPIO_MEM,
-	.membase = (char *) KSEG1ADDR(RC32434_UART0_BASE),
-//	.fifosize = 14
-	.regshift = 2
-};
-
-int __init setup_serial_port(void)
-{
-	serial_req.uartclk = idt_cpu_freq;
-
-	if (early_serial_setup(&serial_req))
-		return -ENODEV;
-	
-	return(0);
-}
diff --git a/target/linux/rb532/files/arch/mips/rb500/setup.c b/target/linux/rb532/files/arch/mips/rb500/setup.c
deleted file mode 100644
index 2fda0e2..0000000
--- a/target/linux/rb532/files/arch/mips/rb500/setup.c
+++ /dev/null
@@ -1,81 +0,0 @@
-/*
- * setup.c - boot time setup code
- */
-
-#include <linux/init.h>
-#include <linux/mm.h>
-#include <linux/sched.h>
-#include <linux/irq.h>
-#include <linux/ioport.h>
-#include <linux/pm.h>
-#include <asm/bootinfo.h>
-#include <asm/mipsregs.h>
-#include <asm/pgtable.h>
-#include <asm/reboot.h>
-#include <asm/addrspace.h>     /* for KSEG1ADDR() */
-#include <asm/time.h>
-#include <asm/io.h>
-#include <asm/rc32434/rc32434.h>
-#include <asm/rc32434/pci.h>
-
-#ifdef CONFIG_PCI
-extern void rc32434_time_init(void);
-extern int __init rc32434_pcibridge_init(void);
-#endif
-
-#define epldMask ((volatile unsigned char *)0xB900000d)
-
-static void rb_machine_restart(char *command)
-{
-	/* just jump to the reset vector */
-	* (volatile unsigned *) KSEG1ADDR(0x18008000) = 0x80000001;
-	((void (*)(void))KSEG1ADDR(0x1FC00000u))();
-}
-
-static void rb_machine_halt(void)
-{
-	for(;;) continue;
-}
-
-#ifdef CONFIG_CPU_HAS_WB
-void (*__wbflush) (void);
-
-static void rb_write_buffer_flush(void)
-{
-	__asm__ __volatile__
-	    ("sync\n\t" "nop\n\t" "loop: bc0f loop\n\t" "nop\n\t");
-}
-#endif
-
-void __init plat_mem_setup(void)
-{
-	unsigned int pciCntlVal;
-
-	board_time_init = rc32434_time_init;
-
-#ifdef CONFIG_CPU_HAS_WB
-	__wbflush = rb_write_buffer_flush;
-#endif
-	_machine_restart = rb_machine_restart;
-	_machine_halt = rb_machine_halt;
-	/*_machine_power_off = rb_machine_power_halt;*/
-	pm_power_off = rb_machine_halt;
-
-	set_io_port_base(KSEG1);
-
-	pciCntlVal=rc32434_pci->pcic;
-	pciCntlVal &= 0xFFFFFF7;
-	rc32434_pci->pcic = pciCntlVal;
-
-#ifdef CONFIG_PCI
-	/* Enable PCI interrupts in EPLD Mask register */
-	*epldMask = 0x0;
-	*(epldMask + 1) = 0x0;
-#endif
-	write_c0_wired(0);
-}
-
-const char *get_system_type(void)
-{
-	return "MIPS RB500";
-}
diff --git a/target/linux/rb532/files/arch/mips/rb500/time.c b/target/linux/rb532/files/arch/mips/rb500/time.c
deleted file mode 100644
index 13320a6..0000000
--- a/target/linux/rb532/files/arch/mips/rb500/time.c
+++ /dev/null
@@ -1,94 +0,0 @@
-/*
-****************************************************************************
-* Carsten Langgaard, carstenl@mips.com
-* Copyright (C) 1999,2000 MIPS Technologies, Inc.  All rights reserved.
-*
-***************************************************************************
-*
-*  This program is free software; you can distribute it and/or modify it
-*  under the terms of the GNU General Public License (Version 2) as
-*  published by the Free Software Foundation.
-*
-*  This program is distributed in the hope 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.
-*
-****************************************************************************
-*
-* Setting up the clock on the MIPS boards.
-*
-****************************************************************************
-* P. Sadik Oct 10, 2003
-*
-* Started change log.
-* mips_counter_frequency is now calculated at run time, based on idt_cpu_freq.
-* Code cleanup
-****************************************************************************
-*/
-
-#include <linux/autoconf.h>
-#include <linux/init.h>
-#include <linux/kernel_stat.h>
-#include <linux/sched.h>
-#include <linux/spinlock.h>
-#include <linux/mc146818rtc.h>
-#include <linux/irq.h>
-#include <linux/timex.h>
-
-#include <asm/irq_cpu.h>
-#include <asm/mipsregs.h>
-#include <asm/ptrace.h>
-#include <asm/debug.h>
-#include <asm/rc32434/rc32434.h>
-
-static unsigned long r4k_offset; /* Amount to incr compare reg each time */
-static unsigned long r4k_cur;    /* What counter should be at next timer irq */
-extern unsigned int mips_hpt_frequency;
-extern unsigned int idt_cpu_freq;
-
-/* 
- * Figure out the r4k offset, the amount to increment the compare
- * register for each time tick. There is no RTC available.
- *
- * The RC32434 counts at half the CPU *core* speed.
- */
-static unsigned long __init cal_r4koff(void)
-{
-	mips_hpt_frequency = idt_cpu_freq * IDT_CLOCK_MULT / 2;
-	return (mips_hpt_frequency / HZ);
-}
-
-
-void __init rc32434_time_init(void)
-{
-	unsigned int est_freq, flags;
-
-	local_irq_save(flags);
-
-	printk("calculating r4koff... ");
-	r4k_offset = cal_r4koff();
-	printk("%08lx(%d)\n", r4k_offset, (int) r4k_offset);
-
-	est_freq = 2*r4k_offset*HZ;	
-	est_freq += 5000;	/* round */
-	est_freq -= est_freq%10000;
-	printk("CPU frequency %d.%02d MHz\n", est_freq/1000000, 
-	       (est_freq%1000000)*100/1000000);
-	local_irq_restore(flags);
-}
-
-void __init plat_timer_setup(struct irqaction *irq)
-{
-	/* we are using the cpu counter for timer interrupts */
-	setup_irq(MIPS_CPU_TIMER_IRQ, irq);
-
-	/* to generate the first timer interrupt */
-	r4k_cur = (read_c0_count() + r4k_offset);
-	write_c0_compare(r4k_cur);
-}
-
diff --git a/target/linux/rb532/files/drivers/block/rb500/Makefile b/target/linux/rb532/files/drivers/block/rb500/Makefile
deleted file mode 100644
index 3e14dc3..0000000
--- a/target/linux/rb532/files/drivers/block/rb500/Makefile
+++ /dev/null
@@ -1,3 +0,0 @@
-## Makefile for the RB532 CF port
-
-obj-y		+= bdev.o ata.o
diff --git a/target/linux/rb532/files/drivers/block/rb500/ata.c b/target/linux/rb532/files/drivers/block/rb500/ata.c
deleted file mode 100644
index 31e6782..0000000
--- a/target/linux/rb532/files/drivers/block/rb500/ata.c
+++ /dev/null
@@ -1,487 +0,0 @@
-/* CF-mips driver
-   This is a block driver for the direct (mmaped) interface to the CF-slot,
-   found in Routerboard.com's RB532 board
-   See SDK provided from routerboard.com.
-   
-   Module adapted By P.Christeas <p_christeas@yahoo.com>, 2005-6.
-   Cleaned up and adapted to platform_device by Felix Fietkau <nbd@openwrt.org>
-
-   This work is redistributed under the terms of the GNU General Public License.
-*/
-
-#include <linux/kernel.h>	/* printk() */
-#include <linux/module.h>	/* module to be loadable */
-#include <linux/delay.h>
-#include <linux/sched.h>
-#include <linux/pci.h>
-#include <linux/ioport.h>	/* request_mem_region() */
-
-#include <asm/gpio.h>
-#include <asm/unaligned.h>		/* ioremap() */
-#include <asm/io.h>		/* ioremap() */
-#include <asm/rc32434/rb.h>
-
-#include "ata.h"
-
-#define REQUEST_MEM_REGION 0
-#define DEBUG 1
-
-#if DEBUG
-#define DEBUGP printk
-#else
-#define DEBUGP(format, args...)
-#endif
-
-#define SECS	1000000		/* unit for wait_not_busy() is 1us */
-
-unsigned cf_head = 0;
-unsigned cf_cyl = 0;
-unsigned cf_spt = 0;
-unsigned cf_sectors = 0;
-static unsigned cf_block_size = 1;
-static void *baddr = 0;
-
-#define DBUF32 ((volatile u32 *)((unsigned long)dev->baddr | ATA_DBUF_OFFSET))
-
-
-static void cf_do_tasklet(unsigned long dev_l);
-
-
-static inline void wareg(u8 val, unsigned reg, struct cf_mips_dev* dev)
-{
-	writeb(val, dev->baddr + ATA_REG_OFFSET + reg);
-}
-
-static inline u8 rareg(unsigned reg, struct cf_mips_dev* dev)
-{
-	return readb(dev->baddr + ATA_REG_OFFSET + reg);
-}
-
-static inline int cfrdy(struct cf_mips_dev *dev)
-{
-	return gpio_get_value(dev->pin);
-}
-
-static inline void prepare_cf_irq(struct cf_mips_dev *dev)
-{
-	rb500_gpio_set_int_level(1, dev->pin);	/* interrupt on cf ready (not busy) */
-	rb500_gpio_set_int_status(0, dev->pin); 	/* clear interrupt status */
-}
-
-static inline int cf_present(struct cf_mips_dev* dev)
-{
-	/* TODO: read and configure CIS into memory mapped mode
-	 * TODO:   parse CISTPL_CONFIG on CF+ cards to get base address (0x200)
-	 * TODO:   maybe adjust power saving setting for Hitachi Microdrive
-	 */
-	int i;
-
-	/* setup CFRDY GPIO as input */
-	rb500_gpio_set_func(dev->pin, 0);
-	gpio_direction_input(dev->pin);
-
-	for (i = 0; i < 0x10; ++i) {
-		if (rareg(i,dev) != 0xff)
-			return 1;
-	}
-	return 0;
-}
-
-static inline int is_busy(struct cf_mips_dev *dev)
-{
-	return !cfrdy(dev);
-}
-
-static int wait_not_busy(int to_us, int wait_for_busy,struct cf_mips_dev *dev)
-{
-	int us_passed = 0;
-	if (wait_for_busy && !is_busy(dev)) {
-		/* busy must appear within 400ns,
-		 * but it may dissapear before we see it
-		 *  => must not wait for busy in a loop
-		 */
-		ndelay(400);
-	}
-
-	do {
-		if (us_passed)
-			udelay(1);	/* never reached in async mode */
-		if (!is_busy(dev)) {
-			if (us_passed > 1 * SECS) {
-				printk(KERN_WARNING "cf-mips:   not busy ok (after %dus)"
-				       ", status 0x%02x\n", us_passed, (unsigned) rareg(ATA_REG_ST,dev));
-			}
-			return CF_TRANS_OK;
-		}
-		if (us_passed == 1 * SECS) {
-			printk(KERN_WARNING "cf-mips: wait not busy %dus..\n", to_us);
-		}
-		if (dev->async_mode) {
-			dev->to_timer.expires = jiffies + (to_us * HZ / SECS);
-			dev->irq_enable_time = jiffies;
-			prepare_cf_irq(dev);
-			if (is_busy(dev)) {
-				add_timer(&dev->to_timer);
-				enable_irq(dev->irq);
-				return CF_TRANS_IN_PROGRESS;
-			}
-			continue;
-		}
-		++us_passed;
-	} while (us_passed < to_us);
-
-	printk(KERN_ERR "cf-mips:  wait not busy timeout (%dus)"
-	       ", status 0x%02x, state %d\n",
-	       to_us, (unsigned) rareg(ATA_REG_ST,dev), dev->tstate);
-	return CF_TRANS_FAILED;
-}
-
-static irqreturn_t cf_irq_handler(int irq, void *dev_id)
-{
-	/* While tasklet has not disabled irq, irq will be retried all the time
-	 * because of ILEVEL matching GPIO pin status => deadlock.
-	 * To avoid this, we change ILEVEL to 0.
-	 */
-	struct cf_mips_dev *dev=dev_id;
-
-	rb500_gpio_set_int_level(0, dev->pin);
-	rb500_gpio_set_int_status(0, dev->pin);
-	
-	del_timer(&dev->to_timer);
-	tasklet_schedule(&dev->tasklet);
-	return IRQ_HANDLED;
-}
-
-static int do_reset(struct cf_mips_dev *dev)
-{
-	printk(KERN_INFO "cf-mips: resetting..\n");
-
-	wareg(ATA_REG_DC_SRST, ATA_REG_DC,dev);
-	udelay(1);		/* FIXME: how long should we wait here? */
-	wareg(0, ATA_REG_DC,dev);
-
-	return wait_not_busy(30 * SECS, 1,dev);
-}
-
-static int set_multiple(struct cf_mips_dev *dev)
-{
-	if (dev->block_size <= 1)
-		return CF_TRANS_OK;
-
-	wareg(dev->block_size, ATA_REG_SC,dev);
-	wareg(ATA_REG_DH_BASE | ATA_REG_DH_LBA, ATA_REG_DH,dev);
-	wareg(ATA_CMD_SET_MULTIPLE, ATA_REG_CMD,dev);
-
-	return wait_not_busy(10 * SECS, 1,dev);
-}
-
-static int set_cmd(struct cf_mips_dev *dev)
-{
-	//DEBUGP(KERN_INFO "cf-mips: ata cmd 0x%02x\n", dev->tcmd);
-	// sector_count should be <=24 bits..
-	BUG_ON(dev->tsect_start>=0x10000000);
-	// This way, it addresses 2^24 * 512 = 128G
-
-	if (dev->tsector_count) {
-		wareg(dev->tsector_count & 0xff, ATA_REG_SC,dev);
-		wareg(dev->tsect_start & 0xff, ATA_REG_SN,dev);
-		wareg((dev->tsect_start >> 8) & 0xff, ATA_REG_CL,dev);
-		wareg((dev->tsect_start >> 16) & 0xff, ATA_REG_CH,dev);
-	}
-	wareg(((dev->tsect_start >> 24) & 0x0f) | ATA_REG_DH_BASE | ATA_REG_DH_LBA,
-	      ATA_REG_DH,dev);	/* select drive on all commands */
-	wareg(dev->tcmd, ATA_REG_CMD,dev);
-	return wait_not_busy(10 * SECS, 1,dev);
-}
-
-static int do_trans(struct cf_mips_dev *dev)
-{
-	int res;
-	unsigned st;
-	int transfered;
-	
-	//printk("do_trans: %d sectors left\n",dev->tsectors_left);
-	while (dev->tsectors_left) {
-		transfered = 0;
-
-		st = rareg(ATA_REG_ST,dev);
-		if (!(st & ATA_REG_ST_DRQ)) {
-			printk(KERN_ERR "cf-mips: do_trans without DRQ (status 0x%x)!\n", st);
-			if (st & ATA_REG_ST_ERR) {
-				int errId = rareg(ATA_REG_ERR,dev);
-				printk(KERN_ERR "cf-mips: %s error, status 0x%x, errid 0x%x\n",
-				       (dev->tread ? "read" : "write"), st, errId);
-			}
-			return CF_TRANS_FAILED;
-		}
-		do { /* Fill/read the buffer one block */
-			u32 *qbuf, *qend;
-			qbuf = (u32 *)dev->tbuf;
-			qend = qbuf + CF_SECT_SIZE / sizeof(u32);
-			if (dev->tread) {
-			    while (qbuf!=qend)
-				put_unaligned(*DBUF32,qbuf++);
-				//*(qbuf++) = *DBUF32;
-			}
-			else {
-			    while(qbuf!=qend)
-				*DBUF32 = get_unaligned(qbuf++);
-			}
-
-			dev->tsectors_left--;
-			dev->tbuf += CF_SECT_SIZE;
-			dev->tbuf_size -= CF_SECT_SIZE;
-			transfered++;
-		} while (transfered != dev->block_size && dev->tsectors_left > 0);
-
-		res = wait_not_busy(10 * SECS, 1,dev);
-		if (res != CF_TRANS_OK)
-			return res;
-	};
-
-	st = rareg(ATA_REG_ST,dev);
-	if (st & (ATA_REG_ST_DRQ | ATA_REG_ST_DWF | ATA_REG_ST_ERR)) {
-		if (st & ATA_REG_ST_DRQ) {
-			printk(KERN_ERR "cf-mips: DRQ after all %d sectors are %s"
-			       ", status 0x%x\n", dev->tsector_count, (dev->tread ? "read" : "written"), st);
-		} else if (st & ATA_REG_ST_DWF) {
-			printk(KERN_ERR "cf-mips: write fault, status 0x%x\n", st);
-		} else {
-			int errId = rareg(ATA_REG_ERR,dev);
-			printk(KERN_ERR "cf-mips: %s error, status 0x%x, errid 0x%x\n",
-			       (dev->tread ? "read" : "write"), st, errId);
-		}
-		return CF_TRANS_FAILED;
-	}
-	return CF_TRANS_OK;
-}
-
-static int cf_do_state(struct cf_mips_dev *dev)
-{
-	int res;
-	switch (dev->tstate) {	/* fall through everywhere */
-	case TS_IDLE:
-		dev->tstate = TS_READY;
-		if (is_busy(dev)) {
-			dev->tstate = TS_AFTER_RESET;
-			res = do_reset(dev);
-			if (res != CF_TRANS_OK)
-				break;
-		}
-	case TS_AFTER_RESET:
-		if (dev->tstate == TS_AFTER_RESET) {
-			dev->tstate = TS_READY;
-			res = set_multiple(dev);
-			if (res != CF_TRANS_OK)
-				break;
-		}
-	case TS_READY:
-		dev->tstate = TS_CMD;
-		res = set_cmd(dev);
-		if (res != CF_TRANS_OK)
-			break;;
-	case TS_CMD:
-		dev->tstate = TS_TRANS;
-	case TS_TRANS:
-		res = do_trans(dev);
-		break;
-	default:
-		printk(KERN_ERR "cf-mips: BUG: unknown tstate %d\n", dev->tstate);
-		return CF_TRANS_FAILED;
-	}
-	if (res != CF_TRANS_IN_PROGRESS)
-		dev->tstate = TS_IDLE;
-	return res;
-}
-
-static void cf_do_tasklet(unsigned long dev_l)
-{
-	struct cf_mips_dev* dev=(struct cf_mips_dev*) dev_l;
-	int res;
-
-	disable_irq(dev->irq);
-
-	if (dev->tstate == TS_IDLE)
-		return;		/* can happen when irq is first registered */
-
-#if 0
-	DEBUGP(KERN_WARNING "cf-mips:   not busy ok (tasklet)  status 0x%02x\n",
-	       (unsigned) rareg(ATA_REG_ST,dev));
-#endif
-
-	res = cf_do_state(dev);
-	if (res == CF_TRANS_IN_PROGRESS)
-		return;
-	cf_async_trans_done(dev,res);
-}
-
-static void cf_async_timeout(unsigned long dev_l)
-{
-	struct cf_mips_dev* dev=(struct cf_mips_dev*) dev_l;
-	disable_irq(dev->irq);
-	/* Perhaps send abort to the device? */
-	printk(KERN_ERR "cf-mips:  wait not busy timeout (%lus)"
-	       ", status 0x%02x, state %d\n",
-	       jiffies - dev->irq_enable_time, (unsigned) rareg(ATA_REG_ST,dev), dev->tstate);
-	dev->tstate = TS_IDLE;
-	cf_async_trans_done(dev,CF_TRANS_FAILED);
-}
-
-int cf_do_transfer(struct cf_mips_dev* dev,sector_t sector, unsigned long nsect, 
-	char* buffer, int is_write)
-{
-	BUG_ON(dev->tstate!=TS_IDLE);
-	if (nsect > ATA_MAX_SECT_PER_CMD) {
-		printk(KERN_WARNING "cf-mips: sector count %lu out of range\n",nsect);
-		return CF_TRANS_FAILED;
-	}
-	if (sector + nsect > dev->sectors) {
-		printk(KERN_WARNING "cf-mips: sector %lu out of range\n",sector);
-		return CF_TRANS_FAILED;
-	}
-	dev->tbuf = buffer;
-	dev->tbuf_size = nsect*512;
-	dev->tsect_start = sector;
-	dev->tsector_count = nsect;
-	dev->tsectors_left = dev->tsector_count;
-	dev->tread = (is_write)?0:1;
-	
-	dev->tcmd = (dev->block_size == 1 ?
-		(is_write ? ATA_CMD_WRITE_SECTORS : ATA_CMD_READ_SECTORS) :
-		(is_write ? ATA_CMD_WRITE_MULTIPLE : ATA_CMD_READ_MULTIPLE));
-
-	return cf_do_state(dev);
-}
-
-static int do_identify(struct cf_mips_dev *dev)
-{
-	u16 sbuf[CF_SECT_SIZE >> 1];
- 	int res;
-	char tstr[17]; //serial
-	char tmp;
-	int i;
-	BUG_ON(dev->tstate!=TS_IDLE);
-	dev->tbuf = (char *) sbuf;
-	dev->tbuf_size = CF_SECT_SIZE;
-	dev->tsect_start = 0;
-	dev->tsector_count = 0;
-	dev->tsectors_left = 1;
-	dev->tread = 1;
-	dev->tcmd = ATA_CMD_IDENTIFY_DRIVE;
-
-	DEBUGP(KERN_INFO "cf-mips: identify drive..\n");
-	res = cf_do_state(dev);
-	if (res == CF_TRANS_IN_PROGRESS) {
-		printk(KERN_ERR "cf-mips: BUG: async identify cmd\n");
-		return CF_TRANS_FAILED;
-	}
-	if (res != CF_TRANS_OK)
-		return 0;
-
-	dev->head = sbuf[3];
-	dev->cyl = sbuf[1];
-	dev->spt = sbuf[6];
-	dev->sectors = ((unsigned long) sbuf[7] << 16) | sbuf[8];
-	dev->dtype=sbuf[0];
-	memcpy(tstr, &sbuf[12], 16);
-	tstr[16] = '\0';
-
-	/* Byte-swap the serial number */
-	for (i = 0; i<8; i++) {
-		tmp = tstr[i * 2];
-		tstr[i * 2] = tstr[i * 2 +1];
-		tstr[i * 2 + 1] = tmp;
-	}
-
-	printk(KERN_INFO "cf-mips: %s detected, C/H/S=%d/%d/%d sectors=%u (%uMB) Serial=%s\n",
-	       (sbuf[0] == 0x848A ? "CF card" : "ATA drive"), dev->cyl, dev->head,
-	       dev->spt, dev->sectors, dev->sectors >> 11, tstr);
-	return 1;
-}
-
-static void init_multiple(struct cf_mips_dev * dev)
-{
-	int res;
-	DEBUGP(KERN_INFO "cf-mips: detecting block size\n");
-
-	dev->block_size = 128;	/* max block size = 128 sectors (64KB) */
-	do {
-		wareg(dev->block_size, ATA_REG_SC,dev);
-		wareg(ATA_REG_DH_BASE | ATA_REG_DH_LBA, ATA_REG_DH,dev);
-		wareg(ATA_CMD_SET_MULTIPLE, ATA_REG_CMD,dev);
-
-		res = wait_not_busy(10 * SECS, 1,dev);
-		if (res != CF_TRANS_OK) {
-			printk(KERN_ERR "cf-mips: failed to detect block size: busy!\n");
-			dev->block_size = 1;
-			return;
-		}
-		if ((rareg(ATA_REG_ST,dev) & ATA_REG_ST_ERR) == 0)
-			break;
-		dev->block_size /= 2;
-	} while (dev->block_size > 1);
-
-	printk(KERN_INFO "cf-mips: multiple sectors = %d\n", dev->block_size);
-}
-
-int cf_init(struct cf_mips_dev *dev)
-{
-	tasklet_init(&dev->tasklet,cf_do_tasklet,(unsigned long)dev);
-	dev->baddr = ioremap_nocache((unsigned long)dev->base, CFDEV_BUF_SIZE);
-	if (!dev->baddr) {
-		printk(KERN_ERR "cf-mips: cf_init: ioremap for (%lx,%x) failed\n",
-		       (unsigned long) dev->base, CFDEV_BUF_SIZE);
-		return -EBUSY;
-	}
-
-	if (!cf_present(dev)) {
-		printk(KERN_WARNING "cf-mips: cf card not present\n");
-		iounmap(dev->baddr);
-		return -ENODEV;
-	}
-
-	if (do_reset(dev) != CF_TRANS_OK) {
-		printk(KERN_ERR "cf-mips: cf reset failed\n");
-		iounmap(dev->baddr);
-		return -EBUSY;
-	}
-
-	if (!do_identify(dev)) {
-		printk(KERN_ERR "cf-mips: cf identify failed\n");
-		iounmap(dev->baddr);
-		return -EBUSY;
-	}
-
-/*	set_apm_level(ATA_APM_WITH_STANDBY); */
-	init_multiple(dev);
-
-	init_timer(&dev->to_timer);
-	dev->to_timer.function = cf_async_timeout;
-	dev->to_timer.data = (unsigned long)dev;
-
-	prepare_cf_irq(dev);
-	if (request_irq(dev->irq, cf_irq_handler, 0, "CF Mips", dev)) {
-		printk(KERN_ERR "cf-mips: failed to get irq\n");
-		iounmap(dev->baddr);
-		return -EBUSY;
-	}
-	/* Disable below would be odd, because request will enable, and the tasklet
-	  will disable it itself */
-	//disable_irq(dev->irq);
-	
-	dev->async_mode = 1;
-
-	return 0;
-}
-
-void cf_cleanup(struct cf_mips_dev *dev)
-{
-	iounmap(dev->baddr);
-	free_irq(dev->irq, NULL);
-#if REQUEST_MEM_REGION
-	release_mem_region((unsigned long)dev->base, CFDEV_BUF_SIZE);
-#endif
-}
-
-
-/*eof*/
diff --git a/target/linux/rb532/files/drivers/block/rb500/ata.h b/target/linux/rb532/files/drivers/block/rb500/ata.h
deleted file mode 100644
index 15e8826..0000000
--- a/target/linux/rb532/files/drivers/block/rb500/ata.h
+++ /dev/null
@@ -1,143 +0,0 @@
-/* CF-mips driver
-   This is a block driver for the direct (mmaped) interface to the CF-slot,
-   found in Routerboard.com's RB532 board
-   See SDK provided from routerboard.com.
-   
-   Module adapted By P.Christeas <p_christeas@yahoo.com>, 2005-6.
-   Cleaned up and adapted to platform_device by Felix Fietkau <nbd@openwrt.org>
-
-   This work is redistributed under the terms of the GNU General Public License.
-*/
-
-#ifndef __CFMIPS_ATA_H__
-#define __CFMIPS_ATA_H__
-
-#include <linux/interrupt.h>
-
-#define CFG_DC_DEV1	(void*)0xb8010010
-#define   CFG_DC_DEVBASE	0x0
-#define   CFG_DC_DEVMASK	0x4
-#define   CFG_DC_DEVC		0x8
-#define   CFG_DC_DEVTC		0xC
-
-#define CFDEV_BUF_SIZE	0x1000
-#define ATA_CIS_OFFSET	0x200
-#define ATA_REG_OFFSET	0x800
-#define ATA_DBUF_OFFSET	0xC00
-
-#define ATA_REG_FEAT	0x1
-#define ATA_REG_SC	0x2
-#define ATA_REG_SN	0x3
-#define ATA_REG_CL	0x4
-#define ATA_REG_CH	0x5
-#define ATA_REG_DH	0x6
-#define   ATA_REG_DH_BASE	0xa0
-#define   ATA_REG_DH_LBA	0x40
-#define   ATA_REG_DH_DRV	0x10
-#define ATA_REG_CMD	0x7
-#define ATA_REG_ST	0x7
-#define   ATA_REG_ST_BUSY	0x80
-#define   ATA_REG_ST_RDY	0x40
-#define   ATA_REG_ST_DWF	0x20
-#define   ATA_REG_ST_DSC	0x10
-#define   ATA_REG_ST_DRQ	0x08
-#define   ATA_REG_ST_CORR	0x04
-#define   ATA_REG_ST_ERR	0x01
-#define ATA_REG_ERR	0xd
-#define ATA_REG_DC	0xe
-#define   ATA_REG_DC_IEN	0x02
-#define   ATA_REG_DC_SRST	0x04
-
-#define ATA_CMD_READ_SECTORS	0x20
-#define ATA_CMD_WRITE_SECTORS	0x30
-#define ATA_CMD_EXEC_DRIVE_DIAG	0x90
-#define ATA_CMD_READ_MULTIPLE	0xC4
-#define ATA_CMD_WRITE_MULTIPLE	0xC5
-#define ATA_CMD_SET_MULTIPLE	0xC6
-#define ATA_CMD_IDENTIFY_DRIVE	0xEC
-#define ATA_CMD_SET_FEATURES	0xEF
-
-#define ATA_FEATURE_ENABLE_APM	0x05
-#define ATA_FEATURE_DISABLE_APM	0x85
-#define ATA_APM_DISABLED	0x00
-#define ATA_APM_MIN_POWER	0x01
-#define ATA_APM_WITH_STANDBY	0x7f
-#define ATA_APM_WITHOUT_STANDBY	0x80
-#define ATA_APM_MAX_PERFORMANCE	0xfe
-
-#define CF_SECT_SIZE	0x200
-/* That is the ratio CF_SECT_SIZE/512 (the kernel sector size) */
-#define CF_KERNEL_MUL	1
-#define ATA_MAX_SECT_PER_CMD	0x100
-
-#define CF_TRANS_FAILED		0
-#define CF_TRANS_OK		1
-#define CF_TRANS_IN_PROGRESS	2
-
-
-enum trans_state {
-	TS_IDLE = 0,
-	TS_AFTER_RESET,
-	TS_READY,
-	TS_CMD,
-	TS_TRANS
-};
-
-// 
-// #if DEBUG
-// static unsigned long busy_time;
-// #endif
-
-/** Struct to hold the cfdev
-Actually, all the data here only has one instance. However, for 
-reasons of programming conformity, it is passed around as a pointer
-*/
-struct cf_mips_dev {
-	void *base; /* base address for I/O */
-	void *baddr; /* remapped address */
-
-	int pin; /* gpio pin */
-	int irq; /* gpio irq */
-	
-	unsigned head;
-	unsigned cyl;
-	unsigned spt;
-	unsigned sectors;
-	
-	unsigned short block_size;
-	unsigned dtype ; // ATA or CF
-	struct request_queue *queue;
-	struct gendisk  *gd;
-	
-	/* Transaction state */
-	enum trans_state tstate;
-	char *tbuf;
-	unsigned long tbuf_size;
-	sector_t tsect_start;
-	unsigned tsector_count;
-	unsigned tsectors_left;
-	int tread;
-	unsigned tcmd;
-	int async_mode;
-	unsigned long irq_enable_time;
-	
-	struct request *active_req; /* A request is being carried out. Is that different from tstate? */
-	int users;
-	struct timer_list to_timer;
-	struct tasklet_struct tasklet;
-
-	/** This lock ensures that the requests to this device are all done
-	atomically. Transfers can run in parallel, requests are all queued
-	one-by-one */
-	spinlock_t lock;
-};
-
-int cf_do_transfer(struct cf_mips_dev* dev,sector_t sector, unsigned long nsect, 
-	char* buffer, int is_write);
-int cf_init(struct cf_mips_dev* dev);
-void cf_cleanup(struct cf_mips_dev* dev);
-
-void cf_async_trans_done(struct cf_mips_dev* dev, int result);
-// void *cf_get_next_buf(unsigned long *buf_size);
-
-#endif
diff --git a/target/linux/rb532/files/drivers/block/rb500/bdev.c b/target/linux/rb532/files/drivers/block/rb500/bdev.c
deleted file mode 100644
index f8a9b02..0000000
--- a/target/linux/rb532/files/drivers/block/rb500/bdev.c
+++ /dev/null
@@ -1,340 +0,0 @@
-/* CF-mips driver
-   This is a block driver for the direct (mmaped) interface to the CF-slot,
-   found in Routerboard.com's RB532 board
-   See SDK provided from routerboard.com.
-   
-   Module adapted By P.Christeas <p_christeas@yahoo.com>, 2005-6.
-   Cleaned up and adapted to platform_device by Felix Fietkau <nbd@openwrt.org>
-
-   This work is redistributed under the terms of the GNU General Public License.
-*/
-
-#include <linux/kernel.h>
-#include <linux/module.h>
-#include <linux/init.h>
-#include <linux/time.h>
-#include <linux/wait.h>
-#include <linux/fs.h>
-#include <linux/genhd.h>
-#include <linux/blkdev.h>
-#include <linux/blkpg.h>
-#include <linux/hdreg.h>
-#include <linux/platform_device.h>
-
-#include <asm/uaccess.h>
-#include <asm/io.h>
-#include <asm/gpio.h>
-
-#include <asm/rc32434/rb.h>
-
-#ifdef DEBUG
-#define DEBUGP printk
-#define DLEVEL 1
-#else
-#define DEBUGP(format, args...)
-#define DLEVEL 0
-#endif
-
-#define CF_MIPS_MAJOR 13
-#define MAJOR_NR	CF_MIPS_MAJOR
-#define CF_MAX_PART	16		/* max 15 partitions */
-
-#include "ata.h"
-
-//extern struct block_device_operations cf_bdops;
-
-// static struct hd_struct cf_parts[CF_MAX_PART];
-// static int cf_part_sizes[CF_MAX_PART];
-// static int cf_hsect_sizes[CF_MAX_PART];
-// static int cf_max_sectors[CF_MAX_PART];
-// static int cf_blksize_sizes[CF_MAX_PART];
-
-// static spinlock_t lock = SPIN_LOCK_UNLOCKED;
-
-// volatile int cf_busy = 0;
-
-static struct request *active_req = NULL;
-
-static int cf_open (struct inode *, struct file *);
-static int cf_release (struct inode *, struct file *);
-static int cf_ioctl (struct inode *, struct file *, unsigned, unsigned long);
-
-static void cf_request(request_queue_t * q);
-static int cf_transfer(const struct request *req);
-
-/*long (*unlocked_ioctl) (struct file *, unsigned, unsigned long);
-long (*compat_ioctl) (struct file *, unsigned, unsigned long);*/
-// int (*direct_access) (struct block_device *, sector_t, unsigned long *);
-// int (*media_changed) (struct gendisk *);
-// int (*revalidate_disk) (struct gendisk *);
-
-static struct block_device_operations cf_bdops = {
-      .owner = THIS_MODULE,
-      .open = cf_open,
-      .release = cf_release,
-      .ioctl = cf_ioctl,
-      .media_changed = NULL,
-      .unlocked_ioctl = NULL,
-      .revalidate_disk = NULL,
-      .compat_ioctl = NULL,
-      .direct_access = NULL
-};
-
-
-int cf_mips_probe(struct platform_device *pdev)
-{
-	struct gendisk* cf_gendisk=NULL;
-	struct cf_device *cdev = (struct cf_device *) pdev->dev.platform_data;
-	struct cf_mips_dev *dev;
-	struct resource *r;
-	int reg_result;
-
-	reg_result = register_blkdev(MAJOR_NR, "cf-mips");
-	if (reg_result < 0) {
-		printk(KERN_WARNING "cf-mips: can't get major %d\n", MAJOR_NR);
-		return reg_result;
-	}
-
-	dev = (struct cf_mips_dev *)kmalloc(sizeof(struct cf_mips_dev),GFP_KERNEL);
-	if (!dev)
-		goto out_err;
-	memset(dev, 0, sizeof(struct cf_mips_dev));
-	cdev->dev = dev;
-	
-	dev->pin = cdev->gpio_pin;
-	dev->irq = platform_get_irq_byname(pdev, "cf_irq");
-	r = platform_get_resource_byname(pdev, IORESOURCE_MEM, "cf_membase");
-	dev->base = (void *) r->start;
-	
-	if (cf_init(dev)) goto out_err;
-	printk("init done");
-	
-	spin_lock_init(&dev->lock);
-	dev->queue = blk_init_queue(cf_request,&dev->lock);
-	if (!dev->queue){
-		printk(KERN_ERR "cf-mips: no mem for queue\n");
-		goto out_err;
-	}
-	blk_queue_max_sectors(dev->queue,ATA_MAX_SECT_PER_CMD);
-
-	/* For memory devices, it is always better to avoid crossing segments
-	inside the same request. */
-/*	if (dev->dtype==0x848A){
-		printk(KERN_INFO "Setting boundary for cf to 0x%x",(dev->block_size*512)-1);
-		blk_queue_segment_boundary(dev->queue, (dev->block_size*512)-1);
-	}*/
-
-	dev->gd = alloc_disk(CF_MAX_PART);
-	cf_gendisk = dev->gd;
-	cdev->gd = dev->gd;
-	if (!cf_gendisk) goto out_err; /* Last of these goto's */
-	
-	cf_gendisk->major = MAJOR_NR;
-	cf_gendisk->first_minor = 0;
-	cf_gendisk->queue=dev->queue;
-	BUG_ON(cf_gendisk->minors != CF_MAX_PART);
-	strcpy(cf_gendisk->disk_name,"cfa");
-	cf_gendisk->fops = &cf_bdops;
-	cf_gendisk->flags = 0 ; /* is not yet GENHD_FL_REMOVABLE */
-	cf_gendisk->private_data=dev;
-	
-	set_capacity(cf_gendisk,dev->sectors * CF_KERNEL_MUL);
-	
-	/* Let the disk go live */
-	add_disk(cf_gendisk);
-#if 0
-	result = cf_init();
-	
-	/* default cfg for all partitions */
-	memset(cf_parts, 0, sizeof (cf_parts[0]) * CF_MAX_PART);
-	memset(cf_part_sizes, 0, sizeof (cf_part_sizes[0]) * CF_MAX_PART);
-	for (i = 0; i < CF_MAX_PART; ++i) {
-		cf_hsect_sizes[i] = CF_SECT_SIZE;
-		cf_max_sectors[i] = ATA_MAX_SECT_PER_CMD;
-		cf_blksize_sizes[i] = BLOCK_SIZE;
-	}
-
-	/* setup info for whole disk (partition 0) */
-	cf_part_sizes[0] = cf_sectors / 2;
-	cf_parts[0].nr_sects = cf_sectors;
-
-	blk_size[MAJOR_NR] = cf_part_sizes;
-	blksize_size[MAJOR_NR] = cf_blksize_sizes;
-	max_sectors[MAJOR_NR] = cf_max_sectors;
-	hardsect_size[MAJOR_NR] = cf_hsect_sizes;
-	read_ahead[MAJOR_NR] = 8;	/* (4kB) */
-
-	blk_init_queue(BLK_DEFAULT_QUEUE(MAJOR_NR), DEVICE_REQUEST);
-
-	add_gendisk(&cf_gendisk);
-#endif
-// 	printk(KERN_INFO "cf-mips partition check: \n");
-// 	register_disk(cf_gendisk, MKDEV(MAJOR_NR, 0), CF_MAX_PART,
-// 		      &cf_bdops, dev->sectors);
-	return 0;
-
-out_err:
-	if (dev->queue){
-		blk_cleanup_queue(dev->queue);
-	}
-	if (reg_result) {
-		unregister_blkdev(MAJOR_NR, "cf-mips");
-		return reg_result;
-	}
-	if (dev){
-		cf_cleanup(dev);
-		kfree(dev);
-	}
-	return 1;
-}
-
-static int
-cf_mips_remove(struct platform_device *pdev)
-{
-	struct cf_device *cdev = (struct cf_device *) pdev->dev.platform_data;
-	struct cf_mips_dev *dev = (struct cf_mips_dev *) cdev->dev;
-	
-	unregister_blkdev(MAJOR_NR, "cf-mips");
-	blk_cleanup_queue(dev->queue);
-
-	del_gendisk(dev->gd);
-	cf_cleanup(dev);
-	return 0;
-}
-
-
-static struct platform_driver cf_driver = {
-	.driver.name = "rb500-cf",
-	.probe = cf_mips_probe,
-	.remove = cf_mips_remove,
-};
-
-static int __init cf_mips_init(void)
-{
-	printk(KERN_INFO "cf-mips module loaded\n");
-	return platform_driver_register(&cf_driver);
-}
-
-static void cf_mips_cleanup(void)
-{
-	platform_driver_unregister(&cf_driver);
-	printk(KERN_INFO "cf-mips module removed\n");
-}
-
-module_init(cf_mips_init);
-module_exit(cf_mips_cleanup);
-
-MODULE_LICENSE("GPL");
-MODULE_ALIAS_BLOCKDEV_MAJOR(CF_MIPS_MAJOR);
-
-
-static int cf_open(struct inode *inode, struct file *filp)
-{
-	struct cf_mips_dev  *dev=inode->i_bdev->bd_disk->private_data;
-	int minor = MINOR(inode->i_rdev);
-	
-	if (minor >= CF_MAX_PART)
-		return -ENODEV;
-	//DEBUGP(KERN_INFO "cf-mips module opened, minor %d\n", minor);
-	spin_lock(&dev->lock);
-	dev->users++;
-	spin_unlock(&dev->lock);
-	filp->private_data=dev;
-	
-	/* dirty workaround to set CFRDY GPIO as an input when some other
-	   program sets it as an output */
-	gpio_set_value(dev->pin, 0);
-	return 0;		/* success */
-}
-
-static int cf_release(struct inode *inode, struct file *filp)
-{
-	int minor = MINOR(inode->i_rdev);
-	struct cf_mips_dev  *dev=inode->i_bdev->bd_disk->private_data;
-	spin_lock(&dev->lock);
-	dev->users--;
-	spin_unlock(&dev->lock);
-	return 0;
-}
-
-static int cf_ioctl(struct inode *inode, struct file *filp,
-	 unsigned int cmd, unsigned long arg)
-{
-	unsigned minor = MINOR(inode->i_rdev);
-	struct cf_mips_dev  *dev=inode->i_bdev->bd_disk->private_data;
-
-	DEBUGP(KERN_INFO "cf_ioctl cmd %u\n", cmd);
-	switch (cmd) {
-	case BLKRRPART:	/* re-read partition table */
-		if (!capable(CAP_SYS_ADMIN))
-			return -EACCES;
-		printk(KERN_INFO "cf-mips partition check: \n");
-		register_disk(dev->gd);
-		return 0;
-
-	case HDIO_GETGEO:
-		{
-			struct hd_geometry geo;
-			geo.cylinders = dev->cyl;
-			geo.heads = dev->head;
-			geo.sectors = dev->spt;
-			geo.start = (*dev->gd->part)[minor].start_sect;
-			if (copy_to_user((void *) arg, &geo, sizeof (geo)))
-				return -EFAULT;
-		}
-		return 0;
-	}
-
-	return -EINVAL;		/* unknown command */
-}
-
-static void cf_request(request_queue_t * q)
-{
-	struct cf_mips_dev* dev;
-	
-	struct request * req;
-	int status;
-
-	/* We could have q->queuedata = dev , but haven't yet. */
-	if (active_req)
-		return;
-
-	while ((req=elv_next_request(q))!=NULL){
-		dev=req->rq_disk->private_data;
-		status=cf_transfer(req);
-		if (status==CF_TRANS_IN_PROGRESS){
-			active_req=req;
-			return;
-		}
-		end_request(req,status);
-	}
-}
-
-static int cf_transfer(const struct request *req)
-{
-	struct cf_mips_dev* dev=req->rq_disk->private_data;
-
-	if (!blk_fs_request(req)){	
-		if (printk_ratelimit())
-			printk(KERN_WARNING "cf-mips: skipping non-fs request 0x%x\n",req->cmd[0]);
-		return CF_TRANS_FAILED;
-	}
-	
-	return cf_do_transfer(dev,req->sector,req->current_nr_sectors,req->buffer,rq_data_dir(req));
-}
-
-void cf_async_trans_done(struct cf_mips_dev * dev,int result)
-{
-	struct request *req;
-	
-	spin_lock(&dev->lock);
-	req=active_req;
-	active_req=NULL;
-	end_request(req,result);
-	spin_unlock(&dev->lock);
-
-	spin_lock(&dev->lock);
-	cf_request(dev->queue);
-	spin_unlock(&dev->lock);
-}
-
diff --git a/target/linux/rb532/files/drivers/char/watchdog/rc32434_wdt.c b/target/linux/rb532/files/drivers/char/watchdog/rc32434_wdt.c
deleted file mode 100644
index 2266329..0000000
--- a/target/linux/rb532/files/drivers/char/watchdog/rc32434_wdt.c
+++ /dev/null
@@ -1,240 +0,0 @@
-/*
- *	RC32434_WDT 0.01: IDT Interprise 79RC32434 watchdog driver 
- *	Copyright (c) Ondrej Zajicek <santiago@crfreenet.org>, 2006
- *
- *	based on
- *
- *	SoftDog	0.05:	A Software Watchdog Device
- *
- *	(c) Copyright 1996 Alan Cox <alan@redhat.com>, All Rights Reserved.
- *
- *	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.
- *	
- */
-
-#include <linux/module.h>
-#include <linux/types.h>
-#include <linux/kernel.h>
-#include <linux/fs.h>
-#include <linux/mm.h>
-#include <linux/miscdevice.h>
-#include <linux/watchdog.h>
-#include <linux/reboot.h>
-#include <linux/smp_lock.h>
-#include <linux/init.h>
-#include <asm/bootinfo.h>
-#include <asm/time.h>
-#include <asm/uaccess.h>
-#include <asm/rc32434/integ.h>
-
-#define DEFAULT_TIMEOUT	15		/* (secs) Default is 15 seconds */
-#define MAX_TIMEOUT	20		
-/*
- * (secs) Max is 20 seconds 
- * (max frequency of counter is ~200 MHz, counter is 32-bit unsigned int) 
- */
-
-#define NAME "rc32434_wdt"
-#define VERSION "0.1"
-
-static INTEG_t rc_wdt = (INTEG_t) INTEG_VirtualAddress;                                                                     
-
-static int expect_close = 0;
-static int access = 0;
-static int timeout = 0;
-
-static int nowayout = WATCHDOG_NOWAYOUT;
-module_param(nowayout, int, 0);
-MODULE_PARM_DESC(nowayout, "Watchdog cannot be stopped once started (default=" __MODULE_STRING(WATCHDOG_NOWAYOUT) ")");
-MODULE_LICENSE("GPL");
-
-
-static inline void start_wdt(void)
-{
-	rc_wdt -> wtcount = 0;
-	rc_wdt -> errcs |= ERRCS_wre_m;
-	rc_wdt -> wtc   |= WTC_en_m;
-}
-
-static inline void stop_wdt(void)
-{
-	rc_wdt -> wtc   &= ~WTC_en_m;
-	rc_wdt -> errcs &= ~ERRCS_wre_m;
-}
-
-static inline void set_wdt(int new_timeout)
-{
-	u32 cmp = new_timeout * mips_hpt_frequency;
-	u32 state;
-	
-	timeout = new_timeout;
-	/*
-	 * store and disable WTC
-	 */
-	state = rc_wdt -> wtc & WTC_en_m;
-	rc_wdt -> wtc   &= ~WTC_en_m;
-
-	rc_wdt -> wtcount = 0;
-	rc_wdt -> wtcompare = cmp;
-
-	/*
-	 * restore WTC
-	 */	
-	rc_wdt -> wtc |= state;
-}
-
-static inline void update_wdt(void)
-{
-	rc_wdt -> wtcount = 0;
-}
-
-/*
- *	Allow only one person to hold it open
- */
- 
-static int wdt_open(struct inode *inode, struct file *file)
-{
-	if (access)
-		return -EBUSY;
-	if (nowayout) {
-		__module_get(THIS_MODULE);
-	}
-	/*
-	 *	Activate timer
-	 */
-	start_wdt();
-	printk(KERN_INFO NAME ": enabling watchdog timer\n");
-	access = 1;
-	return 0;
-}
-
-static int wdt_release(struct inode *inode, struct file *file)
-{
-	/*
-	 *	Shut off the timer.
-	 * 	Lock it in if it's a module and we set nowayout
-	 */
-	if (expect_close && nowayout == 0) {
-		stop_wdt ();
-		printk(KERN_INFO NAME ": disabling watchdog timer\n");
-		module_put(THIS_MODULE);
-	} else {
-		printk (KERN_CRIT NAME ": device closed unexpectedly.  WDT will not stop!\n");
-	}
-	access = 0;
-	return 0;
-}
-
-static ssize_t wdt_write(struct file *file, const char *data, size_t len, loff_t *ppos)
-{
-	/*
-	 *	Refresh the timer.
-	 */
-	if (len) {
-		if (!nowayout) {
-			size_t i;
-
-			/* In case it was set long ago */
-			expect_close = 0;
-
-			for (i = 0; i != len; i++) {
-				char c;
-				if (get_user(c, data + i))
-					return -EFAULT;
-				if (c == 'V')
-					expect_close = 1;
-			}
-		}
-		update_wdt ();
-		return len;
-	}
-	return 0;
-}
-
-static int wdt_ioctl(struct inode *inode, struct file *file,
-	unsigned int cmd, unsigned long arg)
-{
-	int new_timeout;
-	static struct watchdog_info ident = {
-		.options =		WDIOF_SETTIMEOUT |
-					WDIOF_KEEPALIVEPING |
-					WDIOF_MAGICCLOSE,
-		.firmware_version =	0,
-		.identity =		"RC32434_WDT Watchdog",
-	};
-	switch (cmd) {
-		default:
-			return -ENOTTY;
-		case WDIOC_GETSUPPORT:
-			if(copy_to_user((struct watchdog_info *)arg, &ident, sizeof(ident)))
-				return -EFAULT;
-			return 0;
-		case WDIOC_GETSTATUS:
-		case WDIOC_GETBOOTSTATUS:
-			return put_user(0,(int *)arg);
-		case WDIOC_KEEPALIVE:
-			update_wdt();
-			return 0;
-		case WDIOC_SETTIMEOUT:
-			if (get_user(new_timeout, (int *)arg))
-				return -EFAULT;
-			if (new_timeout < 1)
-				return -EINVAL;
-			if (new_timeout > MAX_TIMEOUT)
-				return -EINVAL;
-			set_wdt(new_timeout);
-			/* Fall */
-		case WDIOC_GETTIMEOUT:
-			return put_user(timeout, (int *)arg);
-	}
-}
-
-static struct file_operations wdt_fops = {
-	owner:		THIS_MODULE,
-	llseek:		no_llseek,
-	write:		wdt_write,
-	ioctl:		wdt_ioctl,
-	open:		wdt_open,
-	release:	wdt_release,
-};
-
-static struct miscdevice wdt_miscdev = {
-	minor:		WATCHDOG_MINOR,
-	name:		"watchdog",
-	fops:		&wdt_fops,
-};
-
-static char banner[] __initdata = KERN_INFO NAME ": Watchdog Timer version " VERSION ", timer margin: %d sec\n";
-
-static int __init watchdog_init(void)
-{
-	int ret;
-
-	/*
-  	 * There should be check for RC32434 SoC
-	 */
-	if (mips_machgroup != MACH_GROUP_MIKROTIK) return -1;
-
-	ret = misc_register(&wdt_miscdev);
-
-	if (ret)
-		return ret;
-
-	stop_wdt();
-	set_wdt(DEFAULT_TIMEOUT);
-
-	printk(banner, timeout);
-
-	return 0;
-}
-
-static void __exit watchdog_exit(void)
-{
-	misc_deregister(&wdt_miscdev);
-}
-
-module_init(watchdog_init);
-module_exit(watchdog_exit);
diff --git a/target/linux/rb532/files/drivers/leds/leds-rb500.c b/target/linux/rb532/files/drivers/leds/leds-rb500.c
deleted file mode 100644
index 3ab530a..0000000
--- a/target/linux/rb532/files/drivers/leds/leds-rb500.c
+++ /dev/null
@@ -1,81 +0,0 @@
-/*
- * linux/drivers/leds/leds-rb500.c
- *
- * Copyright (C) 2006
- *     Twente Institute for Wireless and Mobile Communications BV
- *
- * 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 (see file GPLv2).
- *
- * Author: Tjalling Hattink <tjalling.hattink@ti-wmc.nl>
- */
-
-#include <linux/kernel.h>
-#include <linux/init.h>
-#include <linux/platform_device.h>
-#include <linux/leds.h>
-#include <asm/rc32434/rb.h>
-
-static void rb500led_amber_set(struct led_classdev *led_cdev, enum led_brightness value)
-{
-	if (value)
-		changeLatchU5(LO_ULED, 0);
-	else
-		changeLatchU5(0, LO_ULED);
-}
-
-static struct led_classdev rb500_amber_led = {
-	.name			= "rb500led:amber",
-	.default_trigger	= "ide-disk",
-	.brightness_set		= rb500led_amber_set,
-};
-
-static int rb500led_probe(struct platform_device *pdev)
-{
-	int ret;
-
-	changeLatchU5(0, LO_ULED);
-
-	ret = led_classdev_register(&pdev->dev, &rb500_amber_led);
-
-	return ret;
-}
-
-static int rb500led_remove(struct platform_device *pdev)
-{
-	led_classdev_unregister(&rb500_amber_led);
-
-	return 0;
-}
-
-static struct platform_driver rb500led_driver = {
-	.probe		= rb500led_probe,
-	.remove		= rb500led_remove,
-	.driver		= {
-		.name		= "rb500-led",
-	},
-};
-
-static int __init rb500led_init(void)
-{
-	return platform_driver_register(&rb500led_driver);
-}
-
-static void __exit rb500led_exit(void)
-{
- 	platform_driver_unregister(&rb500led_driver);
-}
-
-module_init(rb500led_init);
-module_exit(rb500led_exit);
-
-MODULE_AUTHOR("tjalling.hattink@ti-wmc.nl");
-MODULE_DESCRIPTION("Mikrotik RB500 LED driver");
-MODULE_LICENSE("GPL");
diff --git a/target/linux/rb532/files/drivers/net/korina.c b/target/linux/rb532/files/drivers/net/korina.c
deleted file mode 100644
index e89f334..0000000
--- a/target/linux/rb532/files/drivers/net/korina.c
+++ /dev/null
@@ -1,1167 +0,0 @@
-/**************************************************************************
- *
- *  BRIEF MODULE DESCRIPTION
- *     Driver for the IDT RC32434 on-chip ethernet controller.
- *
- *  Copyright 2004 IDT Inc. (rischelp@idt.com)
- *  Copyright 2006 Felix Fietkau <nbd@openwrt.org>
- *         
- *  This program is free software; you can redistribute  it and/or modify it
- *  under  the terms of  the GNU General  Public License as published by the
- *  Free Software Foundation;  either version 2 of the  License, or (at your
- *  option) any later version.
- *
- *  THIS  SOFTWARE  IS PROVIDED   ``AS  IS'' AND   ANY  EXPRESS OR IMPLIED
- *  WARRANTIES,   INCLUDING, BUT NOT  LIMITED  TO, THE IMPLIED WARRANTIES OF
- *  MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN
- *  NO  EVENT  SHALL   THE AUTHOR  BE    LIABLE FOR ANY   DIRECT, INDIRECT,
- *  INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
- *  NOT LIMITED   TO, PROCUREMENT OF  SUBSTITUTE GOODS  OR SERVICES; LOSS OF
- *  USE, DATA,  OR PROFITS; OR  BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
- *  ANY THEORY OF LIABILITY, WHETHER IN  CONTRACT, STRICT LIABILITY, OR TORT
- *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
- *  THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- *  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.,
- *  675 Mass Ave, Cambridge, MA 02139, USA.
- *
- *
- **************************************************************************
- * May 2004 rkt, neb
- *
- * Based on the driver developed by B. Maruthanayakam, H. Kou and others.
- *
- * Aug 2004 Sadik
- *
- * Added NAPI
- *
- **************************************************************************
- */
-
-#include <linux/autoconf.h>
-#include <linux/module.h>
-#include <linux/kernel.h>
-#include <linux/moduleparam.h>
-#include <linux/sched.h>
-#include <linux/ctype.h>
-#include <linux/types.h>
-#include <linux/fcntl.h>
-#include <linux/interrupt.h>
-#include <linux/ptrace.h>
-#include <linux/init.h>
-#include <linux/ioport.h>
-#include <linux/proc_fs.h>
-#include <linux/in.h>
-#include <linux/slab.h>
-#include <linux/string.h>
-#include <linux/delay.h>
-#include <linux/netdevice.h>
-#include <linux/etherdevice.h>
-#include <linux/skbuff.h>
-#include <linux/errno.h>
-#include <linux/platform_device.h>
-#include <asm/bootinfo.h>
-#include <asm/system.h>
-#include <asm/bitops.h>
-#include <asm/pgtable.h>
-#include <asm/segment.h>
-#include <asm/io.h>
-#include <asm/dma.h>
-
-#include <asm/rc32434/rb.h>
-#include "rc32434_eth.h"
-
-#define DRIVER_VERSION "(mar2904)"
-
-#define DRIVER_NAME "rc32434 Ethernet driver. " DRIVER_VERSION
-
-#define STATION_ADDRESS_HIGH(dev) (((dev)->dev_addr[0] << 8) | \
-			           ((dev)->dev_addr[1]))
-#define STATION_ADDRESS_LOW(dev)  (((dev)->dev_addr[2] << 24) | \
-				   ((dev)->dev_addr[3] << 16) | \
-				   ((dev)->dev_addr[4] << 8)  | \
-				   ((dev)->dev_addr[5]))
-
-#define MII_CLOCK 1250000 				/* no more than 2.5MHz */
-#define CONFIG_IDT_USE_NAPI 1
-
-
-static inline void rc32434_abort_tx(struct net_device *dev)
-{
-	struct rc32434_local *lp = (struct rc32434_local *)dev->priv;
-	rc32434_abort_dma(dev, lp->tx_dma_regs);
-	
-}
-
-static inline void rc32434_abort_rx(struct net_device *dev)
-{
-	struct rc32434_local *lp = (struct rc32434_local *)dev->priv;
-	rc32434_abort_dma(dev, lp->rx_dma_regs);
-	
-}
-
-static inline void rc32434_start_tx(struct rc32434_local *lp,  volatile DMAD_t td)
-{
-	rc32434_start_dma(lp->tx_dma_regs, CPHYSADDR(td));
-}
-
-static inline void rc32434_start_rx(struct rc32434_local *lp, volatile DMAD_t rd)
-{
-	rc32434_start_dma(lp->rx_dma_regs, CPHYSADDR(rd));
-}
-
-static inline void rc32434_chain_tx(struct rc32434_local *lp, volatile DMAD_t td)
-{
-	rc32434_chain_dma(lp->tx_dma_regs, CPHYSADDR(td));
-}
-
-static inline void rc32434_chain_rx(struct rc32434_local *lp, volatile DMAD_t rd)
-{
-	rc32434_chain_dma(lp->rx_dma_regs, CPHYSADDR(rd));
-}
-
-#ifdef RC32434_PROC_DEBUG
-static int rc32434_read_proc(char *buf, char **start, off_t fpos,
-			     int length, int *eof, void *data)
-{
-	struct net_device *dev = (struct net_device *)data;
-	struct rc32434_local *lp = (struct rc32434_local *)dev->priv;
-	int len = 0;
-	
-	/* print out header */
-	len += sprintf(buf + len, "\n\tKorina Ethernet Debug\n\n");
-	len += sprintf (buf + len,
-			"DMA halt count      = %10d, DMA run count = %10d\n",
-			lp->dma_halt_cnt, lp->dma_run_cnt);
-	
-	if (fpos >= len) {
-		*start = buf;
-		*eof = 1;
-		return 0;
-	}
-	*start = buf + fpos;
-	
-	if ((len -= fpos) > length) 
-		return length;	
-	*eof = 1;
-	
-	return len;
-	
-}
-#endif
-
-
-/*
- * Restart the RC32434 ethernet controller. 
- */
-static int rc32434_restart(struct net_device *dev)
-{
-	struct rc32434_local *lp = (struct rc32434_local *)dev->priv;
-	
-	/*
-	 * Disable interrupts
-	 */
-	disable_irq(lp->rx_irq);
-	disable_irq(lp->tx_irq);
-#ifdef	RC32434_REVISION
-	disable_irq(lp->ovr_irq);
-#endif	
-	disable_irq(lp->und_irq);
-	
-	/* Mask F E bit in Tx DMA */
-	__raw_writel(__raw_readl(&lp->tx_dma_regs->dmasm) | DMASM_f_m | DMASM_e_m, &lp->tx_dma_regs->dmasm);
-	/* Mask D H E bit in Rx DMA */
-	__raw_writel(__raw_readl(&lp->rx_dma_regs->dmasm) | DMASM_d_m | DMASM_h_m | DMASM_e_m, &lp->rx_dma_regs->dmasm);
-	
-	rc32434_init(dev);
-	rc32434_multicast_list(dev);
-	
-	enable_irq(lp->und_irq);
-#ifdef	RC32434_REVISION
-	enable_irq(lp->ovr_irq);
-#endif
-	enable_irq(lp->tx_irq);
-	enable_irq(lp->rx_irq);
-	
-	return 0;
-}
-
-static int rc32434_probe(struct platform_device *pdev)
-{
-	struct korina_device *bif = (struct korina_device *) pdev->dev.platform_data;
-	struct rc32434_local *lp = NULL;
-	struct net_device *dev = NULL;
-	struct resource *r;
-	int i, retval,err;
-	
-	dev = alloc_etherdev(sizeof(struct rc32434_local));
-	if(!dev) {
-		ERR("Korina_eth: alloc_etherdev failed\n");
-		return -1;
-	}
-
-	platform_set_drvdata(pdev, dev);
-	SET_MODULE_OWNER(dev);
-	bif->dev = dev;
-	
-	memcpy(dev->dev_addr, bif->mac, 6);
-
-	/* Initialize the device structure. */
-	if (dev->priv == NULL) {
-		lp = (struct rc32434_local *)kmalloc(sizeof(*lp), GFP_KERNEL);
-		memset(lp, 0, sizeof(struct rc32434_local));
-	} 
-	else {
-		lp = (struct rc32434_local *)dev->priv;
-	}
-	
-	lp->rx_irq = platform_get_irq_byname(pdev, "korina_rx");
-	lp->tx_irq = platform_get_irq_byname(pdev, "korina_tx");
-	lp->ovr_irq = platform_get_irq_byname(pdev, "korina_ovr");
-	lp->und_irq = platform_get_irq_byname(pdev, "korina_und");
-
-	r = platform_get_resource_byname(pdev, IORESOURCE_MEM, "korina_regs");
-	dev->base_addr = r->start;
-	lp->eth_regs = ioremap_nocache(r->start, r->end - r->start);
-	if (!lp->eth_regs) {
-		ERR("Can't remap eth registers\n");
-		retval = -ENXIO;
-		goto probe_err_out;
-	}
-
-	r = platform_get_resource_byname(pdev, IORESOURCE_MEM, "korina_dma_rx");
-	lp->rx_dma_regs = ioremap_nocache(r->start, r->end - r->start);
-	if (!lp->rx_dma_regs) {
-		ERR("Can't remap Rx DMA registers\n");
-		retval = -ENXIO;
-		goto probe_err_out;
-	}
-
-	r = platform_get_resource_byname(pdev, IORESOURCE_MEM, "korina_dma_tx");
-	lp->tx_dma_regs = ioremap_nocache(r->start, r->end - r->start);
-	if (!lp->tx_dma_regs) {
-		ERR("Can't remap Tx DMA registers\n");
-		retval = -ENXIO;
-		goto probe_err_out;
-	}
-	
-#ifdef RC32434_PROC_DEBUG
-	lp->ps = create_proc_read_entry (bif->name, 0, proc_net,
-					 rc32434_read_proc, dev);
-#endif
-	
-	lp->td_ring =	(DMAD_t)kmalloc(TD_RING_SIZE + RD_RING_SIZE, GFP_KERNEL);
-	if (!lp->td_ring) {
-		ERR("Can't allocate descriptors\n");
-		retval = -ENOMEM;
-		goto probe_err_out;
-	}
-	
-	dma_cache_inv((unsigned long)(lp->td_ring), TD_RING_SIZE + RD_RING_SIZE);
-	
-	/* now convert TD_RING pointer to KSEG1 */
-	lp->td_ring = (DMAD_t )KSEG1ADDR(lp->td_ring);
-	lp->rd_ring = &lp->td_ring[RC32434_NUM_TDS];
-	
-	
-	spin_lock_init(&lp->lock);
-	
-	/* just use the rx dma irq */
-	dev->irq = lp->rx_irq;
-	
-	dev->priv = lp;
-	
-	dev->open = rc32434_open;
-	dev->stop = rc32434_close;
-	dev->hard_start_xmit = rc32434_send_packet;
-	dev->get_stats	= rc32434_get_stats;
-	dev->set_multicast_list = &rc32434_multicast_list;
-	dev->tx_timeout = rc32434_tx_timeout;
-	dev->watchdog_timeo = RC32434_TX_TIMEOUT;
-
-#ifdef CONFIG_IDT_USE_NAPI
-	dev->poll = rc32434_poll;
-	dev->weight = 64;
-	printk("Using NAPI with weight %d\n",dev->weight);
-#else
-	lp->rx_tasklet = kmalloc(sizeof(struct tasklet_struct), GFP_KERNEL);
-	tasklet_init(lp->rx_tasklet, rc32434_rx_tasklet, (unsigned long)dev);
-#endif
-	lp->tx_tasklet = kmalloc(sizeof(struct tasklet_struct), GFP_KERNEL);
-	tasklet_init(lp->tx_tasklet, rc32434_tx_tasklet, (unsigned long)dev);
-	
-	if ((err = register_netdev(dev))) {
-		printk(KERN_ERR "rc32434 ethernet. Cannot register net device %d\n", err);
-		free_netdev(dev);
-		retval = -EINVAL;
-		goto probe_err_out;
-	}
-	
-	INFO("Rx IRQ %d, Tx IRQ %d, ", lp->rx_irq, lp->tx_irq);
-	for (i = 0; i < 6; i++) {
-		printk("%2.2x", dev->dev_addr[i]);
-		if (i<5)
-			printk(":");
-	}
-	printk("\n");
-	
-	return 0;
-	
- probe_err_out:
-	rc32434_cleanup_module();
-	ERR(" failed.  Returns %d\n", retval);
-	return retval;
-	
-}
-
-static int rc32434_remove(struct platform_device *pdev)
-{
-	struct korina_device *bif = (struct korina_device *) pdev->dev.platform_data;
-	
-	if (bif->dev != NULL) {
-		struct rc32434_local *lp = (struct rc32434_local *)bif->dev->priv;
-		if (lp != NULL) {
-			if (lp->eth_regs)
-				iounmap((void*)lp->eth_regs);
-			if (lp->rx_dma_regs)
-				iounmap((void*)lp->rx_dma_regs);
-			if (lp->tx_dma_regs)
-				iounmap((void*)lp->tx_dma_regs);
-			if (lp->td_ring)
-				kfree((void*)KSEG0ADDR(lp->td_ring));
-			
-#ifdef RC32434_PROC_DEBUG
-			if (lp->ps) {
-				remove_proc_entry(bif->name, proc_net);
-			}
-#endif
-			kfree(lp);
-		}
-		
-		platform_set_drvdata(pdev, NULL);
-		unregister_netdev(bif->dev);
-		free_netdev(bif->dev);
-		kfree(bif->dev);
-	}
-	return 0;
-}
-
-
-static int rc32434_open(struct net_device *dev)
-{
-	struct rc32434_local *lp = (struct rc32434_local *)dev->priv;
-	
-	/* Initialize */
-	if (rc32434_init(dev)) {
-		ERR("Error: cannot open the Ethernet device\n");
-		return -EAGAIN;
-	}
-	
-	/* Install the interrupt handler that handles the Done Finished Ovr and Und Events */	
-	if (request_irq(lp->rx_irq, &rc32434_rx_dma_interrupt,
-		  SA_SHIRQ | SA_INTERRUPT,
-			"Korina ethernet Rx", dev)) {
-		ERR(": unable to get Rx DMA IRQ %d\n",
-		    lp->rx_irq);
-		return -EAGAIN;
-	}
-	if (request_irq(lp->tx_irq, &rc32434_tx_dma_interrupt,
-		  SA_SHIRQ | SA_INTERRUPT,
-			"Korina ethernet Tx", dev)) {
-		ERR(": unable to get Tx DMA IRQ %d\n",
-		    lp->tx_irq);
-		free_irq(lp->rx_irq, dev);
-		return -EAGAIN;
-	}
-	
-#ifdef	RC32434_REVISION
-	/* Install handler for overrun error. */
-	if (request_irq(lp->ovr_irq, &rc32434_ovr_interrupt,
-			SA_SHIRQ | SA_INTERRUPT,
-			"Ethernet Overflow", dev)) {
-		ERR(": unable to get OVR IRQ %d\n",
-		    lp->ovr_irq);
-		free_irq(lp->rx_irq, dev);
-		free_irq(lp->tx_irq, dev);
-		return -EAGAIN;
-	}
-#endif
-	
-	/* Install handler for underflow error. */
-	if (request_irq(lp->und_irq, &rc32434_und_interrupt,
-			SA_SHIRQ | SA_INTERRUPT,
-			"Ethernet Underflow", dev)) {
-		ERR(": unable to get UND IRQ %d\n",
-		    lp->und_irq);
-		free_irq(lp->rx_irq, dev);
-		free_irq(lp->tx_irq, dev);
-#ifdef	RC32434_REVISION		
-		free_irq(lp->ovr_irq, dev);		
-#endif
-		return -EAGAIN;
-	}
-	
-	
-	return 0;
-}
-
-
-
-
-static int rc32434_close(struct net_device *dev)
-{
-	struct rc32434_local *lp = (struct rc32434_local *)dev->priv;
-	u32 tmp;
-	
-	/* Disable interrupts */
-	disable_irq(lp->rx_irq);
-	disable_irq(lp->tx_irq);
-#ifdef	RC32434_REVISION
-	disable_irq(lp->ovr_irq);
-#endif
-	disable_irq(lp->und_irq);
-	
-	tmp = __raw_readl(&lp->tx_dma_regs->dmasm);
-	tmp = tmp | DMASM_f_m | DMASM_e_m;
-	__raw_writel(tmp, &lp->tx_dma_regs->dmasm);
-	
-	tmp = __raw_readl(&lp->rx_dma_regs->dmasm);
-	tmp = tmp | DMASM_d_m | DMASM_h_m | DMASM_e_m;
-	__raw_writel(tmp, &lp->rx_dma_regs->dmasm);
-	
-	free_irq(lp->rx_irq, dev);
-	free_irq(lp->tx_irq, dev);
-#ifdef	RC32434_REVISION	
-	free_irq(lp->ovr_irq, dev);
-#endif
-	free_irq(lp->und_irq, dev);
-	return 0;
-}
-
-
-/* transmit packet */
-static int rc32434_send_packet(struct sk_buff *skb, struct net_device *dev)
-{
-	struct rc32434_local		*lp = (struct rc32434_local *)dev->priv;
-	unsigned long 			flags;
-	u32					length;
-	DMAD_t				td;
-	
-	
-	spin_lock_irqsave(&lp->lock, flags);
-	
-	td = &lp->td_ring[lp->tx_chain_tail];
-	
-	/* stop queue when full, drop pkts if queue already full */
-	if(lp->tx_count >= (RC32434_NUM_TDS - 2)) {
-		lp->tx_full = 1;
-		
-		if(lp->tx_count == (RC32434_NUM_TDS - 2)) {
-			netif_stop_queue(dev);
-		}
-		else {
-			lp->stats.tx_dropped++;
-			dev_kfree_skb_any(skb);
-			spin_unlock_irqrestore(&lp->lock, flags);
-			return 1;
-		}	   
-	}	 
-	
-	lp->tx_count ++;
-	
-	lp->tx_skb[lp->tx_chain_tail] = skb;
-	
-	length = skb->len;
-	dma_cache_wback((u32)skb->data, skb->len);
-	
-	/* Setup the transmit descriptor. */
-	dma_cache_inv((u32) td, sizeof(*td));
-	td->ca = CPHYSADDR(skb->data);
-	
-	if(__raw_readl(&(lp->tx_dma_regs->dmandptr)) == 0) {
-		if( lp->tx_chain_status == empty ) {
-			td->control = DMA_COUNT(length) |DMAD_cof_m |DMAD_iof_m;                                /*  Update tail      */
-			lp->tx_chain_tail = (lp->tx_chain_tail + 1) & RC32434_TDS_MASK;                          /*   Move tail       */
-			__raw_writel(CPHYSADDR(&lp->td_ring[lp->tx_chain_head]), &(lp->tx_dma_regs->dmandptr)); /* Write to NDPTR    */
-			lp->tx_chain_head = lp->tx_chain_tail;                                                  /* Move head to tail */
-		}
-		else {
-			td->control = DMA_COUNT(length) |DMAD_cof_m|DMAD_iof_m;                                 /* Update tail */
-			lp->td_ring[(lp->tx_chain_tail-1)& RC32434_TDS_MASK].control &=  ~(DMAD_cof_m);          /* Link to prev */
-			lp->td_ring[(lp->tx_chain_tail-1)& RC32434_TDS_MASK].link =  CPHYSADDR(td);              /* Link to prev */
-			lp->tx_chain_tail = (lp->tx_chain_tail + 1) & RC32434_TDS_MASK;                          /* Move tail */
-			__raw_writel(CPHYSADDR(&lp->td_ring[lp->tx_chain_head]), &(lp->tx_dma_regs->dmandptr)); /* Write to NDPTR */
-			lp->tx_chain_head = lp->tx_chain_tail;                                                  /* Move head to tail */
-			lp->tx_chain_status = empty;
-		}
-	}
-	else {
-		if( lp->tx_chain_status == empty ) {
-			td->control = DMA_COUNT(length) |DMAD_cof_m |DMAD_iof_m;                                /* Update tail */
-			lp->tx_chain_tail = (lp->tx_chain_tail + 1) & RC32434_TDS_MASK;                          /* Move tail */
-			lp->tx_chain_status = filled;
-		}
-		else {
-			td->control = DMA_COUNT(length) |DMAD_cof_m |DMAD_iof_m;                                /* Update tail */
-			lp->td_ring[(lp->tx_chain_tail-1)& RC32434_TDS_MASK].control &=  ~(DMAD_cof_m);          /* Link to prev */
-			lp->td_ring[(lp->tx_chain_tail-1)& RC32434_TDS_MASK].link =  CPHYSADDR(td);              /* Link to prev */
-			lp->tx_chain_tail = (lp->tx_chain_tail + 1) & RC32434_TDS_MASK;                          /* Move tail */
-		}
-	}
-	dma_cache_wback((u32) td, sizeof(*td));
-	
-	dev->trans_start = jiffies;				
-	
-	spin_unlock_irqrestore(&lp->lock, flags);
-	
-	return 0;
-}
-
-
-/* Ethernet MII-PHY Handler */
-static void rc32434_mii_handler(unsigned long data)
-{
-	struct net_device *dev = (struct net_device *)data;		
-	struct rc32434_local *lp = (struct rc32434_local *)dev->priv;
-	unsigned long 	flags;
-	unsigned long duplex_status;
-	int port_addr = (lp->rx_irq == 0x2c? 1:0) << 8;
-	
-	spin_lock_irqsave(&lp->lock, flags);
-	
-	/* Two ports are using the same MII, the difference is the PHY address */
-	__raw_writel(0, &rc32434_eth0_regs->miimcfg);  
-	__raw_writel(0, &rc32434_eth0_regs->miimcmd);  
-	__raw_writel(port_addr |0x05, &rc32434_eth0_regs->miimaddr);  
-	__raw_writel(MIIMCMD_scn_m, &rc32434_eth0_regs->miimcmd);  
-	while(__raw_readl(&rc32434_eth0_regs->miimind) & MIIMIND_nv_m);
-	
-	ERR("irq:%x		port_addr:%x	RDD:%x\n", 
-	    lp->rx_irq, port_addr, __raw_readl(&rc32434_eth0_regs->miimrdd));
-	duplex_status = (__raw_readl(&rc32434_eth0_regs->miimrdd) & 0x140)? ETHMAC2_fd_m: 0;
-	if(duplex_status != lp->duplex_mode) {
-		ERR("The MII-PHY is Auto-negotiated to %s-Duplex mode for Eth-%x\n", duplex_status? "Full":"Half", lp->rx_irq == 0x2c? 1:0);		
-		lp->duplex_mode = duplex_status;
-		rc32434_restart(dev);		
-	}
-	
-	lp->mii_phy_timer.expires = jiffies + 10 * HZ;	
-	add_timer(&lp->mii_phy_timer);
-	
-	spin_unlock_irqrestore(&lp->lock, flags);
-	
-}
-
-#ifdef	RC32434_REVISION	
-/* Ethernet Rx Overflow interrupt */
-static irqreturn_t
-rc32434_ovr_interrupt(int irq, void *dev_id)
-{
-	struct net_device *dev = (struct net_device *)dev_id;
-	struct rc32434_local *lp;
-	unsigned int ovr;
-	irqreturn_t retval = IRQ_NONE;
-	
-	ASSERT(dev != NULL);
-	
-	lp = (struct rc32434_local *)dev->priv;
-	spin_lock(&lp->lock);
-	ovr = __raw_readl(&lp->eth_regs->ethintfc);
-	
-	if(ovr & ETHINTFC_ovr_m) {
-		netif_stop_queue(dev);
-		
-		/* clear OVR bit */
-		__raw_writel((ovr & ~ETHINTFC_ovr_m), &lp->eth_regs->ethintfc);
-		
-		/* Restart interface */
-		rc32434_restart(dev);
-		retval = IRQ_HANDLED;
-	}
-	spin_unlock(&lp->lock);
-	
-	return retval;
-}
-
-#endif
-
-
-/* Ethernet Tx Underflow interrupt */
-static irqreturn_t
-rc32434_und_interrupt(int irq, void *dev_id)
-{
-	struct net_device *dev = (struct net_device *)dev_id;
-	struct rc32434_local *lp;
-	unsigned int und;
-	irqreturn_t retval = IRQ_NONE;
-	
-	ASSERT(dev != NULL);
-	
-	lp = (struct rc32434_local *)dev->priv;
-	
-	spin_lock(&lp->lock);
-	
-	und = __raw_readl(&lp->eth_regs->ethintfc);
-	
-	if(und & ETHINTFC_und_m) {
-		netif_stop_queue(dev);
-		
-		__raw_writel((und & ~ETHINTFC_und_m), &lp->eth_regs->ethintfc);
-		
-		/* Restart interface */
-		rc32434_restart(dev);
-		retval = IRQ_HANDLED;
-	}
-	
-	spin_unlock(&lp->lock);
-	
-	return retval;
-}
-
-
-/* Ethernet Rx DMA interrupt */
-static irqreturn_t
-rc32434_rx_dma_interrupt(int irq, void *dev_id)
-{
-	struct net_device *dev = (struct net_device *)dev_id;
-	struct rc32434_local* lp;
-	volatile u32 dmas,dmasm;
-	irqreturn_t retval;
-	
-	ASSERT(dev != NULL);
-	
-	lp = (struct rc32434_local *)dev->priv;
-	
-	spin_lock(&lp->lock);
-	dmas = __raw_readl(&lp->rx_dma_regs->dmas);
-	if(dmas & (DMAS_d_m|DMAS_h_m|DMAS_e_m)) {
-		/* Mask D H E bit in Rx DMA */
-		dmasm = __raw_readl(&lp->rx_dma_regs->dmasm);
-		__raw_writel(dmasm | (DMASM_d_m | DMASM_h_m | DMASM_e_m), &lp->rx_dma_regs->dmasm);
-#ifdef CONFIG_IDT_USE_NAPI
-		if(netif_rx_schedule_prep(dev))
-                        __netif_rx_schedule(dev);
-#else
-		tasklet_hi_schedule(lp->rx_tasklet);
-#endif
-		
-		if (dmas & DMAS_e_m)
-			ERR(": DMA error\n");
-		
-		retval = IRQ_HANDLED;
-	}
-	else
-		retval = IRQ_NONE;
-	
-	spin_unlock(&lp->lock);
-	return retval;
-}
-
-#ifdef CONFIG_IDT_USE_NAPI
-static int rc32434_poll(struct net_device *rx_data_dev, int *budget)
-#else
-static void rc32434_rx_tasklet(unsigned long rx_data_dev)
-#endif
-{
-	struct net_device *dev = (struct net_device *)rx_data_dev;	
-	struct rc32434_local* lp = netdev_priv(dev);
-	volatile DMAD_t  rd = &lp->rd_ring[lp->rx_next_done];
-	struct sk_buff *skb, *skb_new;
-	u8* pkt_buf;
-	u32 devcs, count, pkt_len, pktuncrc_len;
-	volatile u32 dmas;
-#ifdef CONFIG_IDT_USE_NAPI
-	u32 received = 0;
-	int rx_work_limit = min(*budget,dev->quota);
-#else
-	unsigned long 	flags;
-	spin_lock_irqsave(&lp->lock, flags);
-#endif
-
-	dma_cache_inv((u32)rd, sizeof(*rd));
-	while ( (count = RC32434_RBSIZE - (u32)DMA_COUNT(rd->control)) != 0) {
-#ifdef CONFIG_IDT_USE_NAPI
-		if(--rx_work_limit <0)
-                {
-                        break;
-                }
-#endif
-		/* init the var. used for the later operations within the while loop */
-		skb_new = NULL;
-		devcs = rd->devcs;
-		pkt_len = RCVPKT_LENGTH(devcs);
-		skb = lp->rx_skb[lp->rx_next_done];
-      
-		if (count < 64) {
-			lp->stats.rx_errors++;
-			lp->stats.rx_dropped++;			
-		}
-		else if ((devcs & ( ETHRX_ld_m)) !=	ETHRX_ld_m) {
-			/* check that this is a whole packet */
-			/* WARNING: DMA_FD bit incorrectly set in Rc32434 (errata ref #077) */
-			lp->stats.rx_errors++;
-			lp->stats.rx_dropped++;
-		}
-		else if ( (devcs & ETHRX_rok_m)  ) {
-			
-			{
-				/* must be the (first and) last descriptor then */
-				pkt_buf = (u8*)lp->rx_skb[lp->rx_next_done]->data;
-				
-				pktuncrc_len = pkt_len - 4;
-				/* invalidate the cache */
-				dma_cache_inv((unsigned long)pkt_buf, pktuncrc_len);
-				
-				/* Malloc up new buffer. */					  
-				skb_new = dev_alloc_skb(RC32434_RBSIZE + 2);					             	
-				
-				if (skb_new != NULL){
-					/* Make room */
-					skb_put(skb, pktuncrc_len);		    
-					
-					skb->protocol = eth_type_trans(skb, dev);
-					
-					/* pass the packet to upper layers */
-#ifdef CONFIG_IDT_USE_NAPI
-					netif_receive_skb(skb);
-#else
-					netif_rx(skb);
-#endif
-					
-					dev->last_rx = jiffies;
-					lp->stats.rx_packets++;
-					lp->stats.rx_bytes += pktuncrc_len;
-					
-					if (IS_RCV_MP(devcs))
-						lp->stats.multicast++;
-					
-					/* 16 bit align */						  
-					skb_reserve(skb_new, 2);	
-					
-					skb_new->dev = dev;
-					lp->rx_skb[lp->rx_next_done] = skb_new;
-				}
-				else {
-					ERR("no memory, dropping rx packet.\n");
-					lp->stats.rx_errors++;		
-					lp->stats.rx_dropped++;					
-				}
-			}
-			
-		}			
-		else {
-			/* This should only happen if we enable accepting broken packets */
-			lp->stats.rx_errors++;
-			lp->stats.rx_dropped++;
-			
-			/* add statistics counters */
-			if (IS_RCV_CRC_ERR(devcs)) {
-				DBG(2, "RX CRC error\n");
-				lp->stats.rx_crc_errors++;
-			} 
-			else if (IS_RCV_LOR_ERR(devcs)) {
-				DBG(2, "RX LOR error\n");
-				lp->stats.rx_length_errors++;
-			}				
-			else if (IS_RCV_LE_ERR(devcs)) {
-				DBG(2, "RX LE error\n");
-				lp->stats.rx_length_errors++;
-			}
-			else if (IS_RCV_OVR_ERR(devcs)) {
-				lp->stats.rx_over_errors++;
-			}
-			else if (IS_RCV_CV_ERR(devcs)) {
-				/* code violation */
-				DBG(2, "RX CV error\n");
-				lp->stats.rx_frame_errors++;
-			}
-			else if (IS_RCV_CES_ERR(devcs)) {
-				DBG(2, "RX Preamble error\n");
-			}
-		}
-		
-		rd->devcs = 0;
-		
-		/* restore descriptor's curr_addr */
-		if(skb_new)
-			rd->ca = CPHYSADDR(skb_new->data); 
-		else
-			rd->ca = CPHYSADDR(skb->data);
-		
-		rd->control = DMA_COUNT(RC32434_RBSIZE) |DMAD_cod_m |DMAD_iod_m;
-		lp->rd_ring[(lp->rx_next_done-1)& RC32434_RDS_MASK].control &=  ~(DMAD_cod_m); 	
-		
-		lp->rx_next_done = (lp->rx_next_done + 1) & RC32434_RDS_MASK;
-		dma_cache_wback((u32)rd, sizeof(*rd));
-		rd = &lp->rd_ring[lp->rx_next_done];
-		__raw_writel( ~DMAS_d_m, &lp->rx_dma_regs->dmas);
-	}	
-#ifdef CONFIG_IDT_USE_NAPI
-        dev->quota -= received;
-        *budget =- received;
-        if(rx_work_limit < 0)
-                goto not_done;
-#endif
-	
-	dmas = __raw_readl(&lp->rx_dma_regs->dmas);
-	
-	if(dmas & DMAS_h_m) {
-		__raw_writel( ~(DMAS_h_m | DMAS_e_m), &lp->rx_dma_regs->dmas);
-#ifdef RC32434_PROC_DEBUG
-		lp->dma_halt_cnt++;
-#endif
-		rd->devcs = 0;
-		skb = lp->rx_skb[lp->rx_next_done];
-		rd->ca = CPHYSADDR(skb->data);
-		dma_cache_wback((u32)rd, sizeof(*rd));
-		rc32434_chain_rx(lp,rd);
-	}
-	
-#ifdef CONFIG_IDT_USE_NAPI
-	netif_rx_complete(dev);
-#endif
-	/* Enable D H E bit in Rx DMA */
-	__raw_writel(__raw_readl(&lp->rx_dma_regs->dmasm) & ~(DMASM_d_m | DMASM_h_m |DMASM_e_m), &lp->rx_dma_regs->dmasm); 
-#ifdef CONFIG_IDT_USE_NAPI
-	return 0;
- not_done:
-	return 1;
-#else
-	spin_unlock_irqrestore(&lp->lock, flags);
-	return;
-#endif
-
-	
-}	
-
-
-
-/* Ethernet Tx DMA interrupt */
-static irqreturn_t
-rc32434_tx_dma_interrupt(int irq, void *dev_id)
-{
-	struct net_device *dev = (struct net_device *)dev_id;
-	struct rc32434_local *lp;
-	volatile u32 dmas,dmasm;
-	irqreturn_t retval;
-	
-	ASSERT(dev != NULL);
-	
-	lp = (struct rc32434_local *)dev->priv;
-	
-	spin_lock(&lp->lock);
-	
-	dmas = __raw_readl(&lp->tx_dma_regs->dmas);
-	
-	if (dmas & (DMAS_f_m | DMAS_e_m)) {
-		dmasm = __raw_readl(&lp->tx_dma_regs->dmasm);
-		/* Mask F E bit in Tx DMA */
-		__raw_writel(dmasm | (DMASM_f_m | DMASM_e_m), &lp->tx_dma_regs->dmasm);
-		
-		tasklet_hi_schedule(lp->tx_tasklet);
-		
-		if(lp->tx_chain_status == filled && (__raw_readl(&(lp->tx_dma_regs->dmandptr)) == 0)) {
-			__raw_writel(CPHYSADDR(&lp->td_ring[lp->tx_chain_head]), &(lp->tx_dma_regs->dmandptr));			
-			lp->tx_chain_status = empty;
-			lp->tx_chain_head = lp->tx_chain_tail;
-			dev->trans_start = jiffies;
-		}
-		
-		if (dmas & DMAS_e_m)
-			ERR(": DMA error\n");
-		
-		retval = IRQ_HANDLED;
-	}
-	else
-		retval = IRQ_NONE;
-	
-	spin_unlock(&lp->lock);
-	
-	return retval;
-}
-
-
-static void rc32434_tx_tasklet(unsigned long tx_data_dev)
-{
-	struct net_device *dev = (struct net_device *)tx_data_dev;	
-	struct rc32434_local* lp = (struct rc32434_local *)dev->priv;
-	volatile DMAD_t td = &lp->td_ring[lp->tx_next_done];
-	u32 devcs;
-	unsigned long 	flags;
-	volatile u32 dmas;
-	
-	spin_lock_irqsave(&lp->lock, flags);
-	
-	/* process all desc that are done */
-	while(IS_DMA_FINISHED(td->control)) {
-		if(lp->tx_full == 1) {
-			netif_wake_queue(dev);
-			lp->tx_full = 0;
-		}
-		
-		devcs = lp->td_ring[lp->tx_next_done].devcs;    
-		if ((devcs & (ETHTX_fd_m | ETHTX_ld_m)) != (ETHTX_fd_m | ETHTX_ld_m)) {
-			lp->stats.tx_errors++;
-			lp->stats.tx_dropped++;				
-			
-			/* should never happen */
-			DBG(1, __FUNCTION__ ": split tx ignored\n");
-		}
-		else if (IS_TX_TOK(devcs)) {
-			lp->stats.tx_packets++;
-			lp->stats.tx_bytes+=lp->tx_skb[lp->tx_next_done]->len;
-		}
-		else {
-			lp->stats.tx_errors++;
-			lp->stats.tx_dropped++;				
-			
-			/* underflow */
-			if (IS_TX_UND_ERR(devcs)) 
-				lp->stats.tx_fifo_errors++;
-			
-			/* oversized frame */
-			if (IS_TX_OF_ERR(devcs))
-				lp->stats.tx_aborted_errors++;
-			
-			/* excessive deferrals */
-			if (IS_TX_ED_ERR(devcs))
-				lp->stats.tx_carrier_errors++;
-			
-			/* collisions: medium busy */
-			if (IS_TX_EC_ERR(devcs))
-				lp->stats.collisions++;
-			
-			/* late collision */
-			if (IS_TX_LC_ERR(devcs))
-				lp->stats.tx_window_errors++;
-			
-		}
-		
-		/* We must always free the original skb */
-		if (lp->tx_skb[lp->tx_next_done] != NULL) {
-			dev_kfree_skb_any(lp->tx_skb[lp->tx_next_done]);
-			lp->tx_skb[lp->tx_next_done] = NULL;
-		}
-		
-		lp->td_ring[lp->tx_next_done].control = DMAD_iof_m;
-		lp->td_ring[lp->tx_next_done].devcs = ETHTX_fd_m | ETHTX_ld_m;	
-		lp->td_ring[lp->tx_next_done].link = 0;
-		lp->td_ring[lp->tx_next_done].ca = 0;
-		lp->tx_count --;
-		
-		/* go on to next transmission */
-		lp->tx_next_done = (lp->tx_next_done + 1) & RC32434_TDS_MASK;
-		td = &lp->td_ring[lp->tx_next_done];
-		
-	}
-	
-	dmas = __raw_readl(&lp->tx_dma_regs->dmas);
-	__raw_writel( ~dmas, &lp->tx_dma_regs->dmas);
-	
-	/* Enable F E bit in Tx DMA */
-	__raw_writel(__raw_readl(&lp->tx_dma_regs->dmasm) & ~(DMASM_f_m | DMASM_e_m), &lp->tx_dma_regs->dmasm); 
-	spin_unlock_irqrestore(&lp->lock, flags);
-	
-}
-
-
-static struct net_device_stats * rc32434_get_stats(struct net_device *dev)
-{
-	struct rc32434_local *lp = (struct rc32434_local *)dev->priv;
-	return &lp->stats;
-}
-
-
-/*
- * Set or clear the multicast filter for this adaptor.
- */
-static void rc32434_multicast_list(struct net_device *dev)
-{   
-	/* listen to broadcasts always and to treat 	*/
-	/*       IFF bits independantly	*/
-	struct rc32434_local *lp = (struct rc32434_local *)dev->priv;
-	unsigned long flags;
-	u32 recognise = ETHARC_ab_m; 		/* always accept broadcasts */
-	
-	if (dev->flags & IFF_PROMISC)         		/* set promiscuous mode */
-		recognise |= ETHARC_pro_m;
-	
-	if ((dev->flags & IFF_ALLMULTI) || (dev->mc_count > 15))
-		recognise |= ETHARC_am_m;    	  	/* all multicast & bcast */
-	else if (dev->mc_count > 0) {
-		DBG(2, __FUNCTION__ ": mc_count %d\n", dev->mc_count);
-		recognise |= ETHARC_am_m;    	  	/* for the time being */
-	}
-	
-	spin_lock_irqsave(&lp->lock, flags);
-	__raw_writel(recognise, &lp->eth_regs->etharc);
-	spin_unlock_irqrestore(&lp->lock, flags);
-}
-
-
-static void rc32434_tx_timeout(struct net_device *dev)
-{
-	struct rc32434_local *lp = (struct rc32434_local *)dev->priv;
-	unsigned long flags;
-	
-	spin_lock_irqsave(&lp->lock, flags);
-	rc32434_restart(dev);
-	spin_unlock_irqrestore(&lp->lock, flags);
-	
-}
-
-
-/*
- * Initialize the RC32434 ethernet controller.
- */
-static int rc32434_init(struct net_device *dev)
-{
-	struct rc32434_local *lp = (struct rc32434_local *)dev->priv;
-	int i, j;
-	
-	/* Disable DMA */       
-	rc32434_abort_tx(dev);
-	rc32434_abort_rx(dev); 
-	
-	/* reset ethernet logic */ 
-	__raw_writel(0, &lp->eth_regs->ethintfc);
-	while((__raw_readl(&lp->eth_regs->ethintfc) & ETHINTFC_rip_m))
-		dev->trans_start = jiffies;	
-	
-	/* Enable Ethernet Interface */ 
-	__raw_writel(ETHINTFC_en_m, &lp->eth_regs->ethintfc); 
-	
-#ifndef CONFIG_IDT_USE_NAPI
-	tasklet_disable(lp->rx_tasklet);
-#endif
-	tasklet_disable(lp->tx_tasklet);
-	
-	/* Initialize the transmit Descriptors */
-	for (i = 0; i < RC32434_NUM_TDS; i++) {
-		lp->td_ring[i].control = DMAD_iof_m;
-		lp->td_ring[i].devcs = ETHTX_fd_m | ETHTX_ld_m;
-		lp->td_ring[i].ca = 0;
-		lp->td_ring[i].link = 0;
-		if (lp->tx_skb[i] != NULL) {
-			dev_kfree_skb_any(lp->tx_skb[i]);
-			lp->tx_skb[i] = NULL;
-		}
-	}
-	lp->tx_next_done = lp->tx_chain_head = lp->tx_chain_tail = 	lp->tx_full = lp->tx_count = 0;
-	lp->	tx_chain_status = empty;
-	
-	/*
-	 * Initialize the receive descriptors so that they
-	 * become a circular linked list, ie. let the last
-	 * descriptor point to the first again.
-	 */
-	for (i=0; i<RC32434_NUM_RDS; i++) {
-		struct sk_buff *skb = lp->rx_skb[i];
-		
-		if (lp->rx_skb[i] == NULL) {
-			skb = dev_alloc_skb(RC32434_RBSIZE + 2);
-			if (skb == NULL) {
-				ERR("No memory in the system\n");
-				for (j = 0; j < RC32434_NUM_RDS; j ++)
-					if (lp->rx_skb[j] != NULL) 
-						dev_kfree_skb_any(lp->rx_skb[j]);
-				
-				return 1;
-			}
-			else {
-				skb->dev = dev;
-				skb_reserve(skb, 2);
-				lp->rx_skb[i] = skb;
-				lp->rd_ring[i].ca = CPHYSADDR(skb->data); 
-				
-			}
-		}
-		lp->rd_ring[i].control =	DMAD_iod_m | DMA_COUNT(RC32434_RBSIZE);
-		lp->rd_ring[i].devcs = 0;
-		lp->rd_ring[i].ca = CPHYSADDR(skb->data);
-		lp->rd_ring[i].link = CPHYSADDR(&lp->rd_ring[i+1]);
-		
-	}
-	/* loop back */
-	lp->rd_ring[RC32434_NUM_RDS-1].link = CPHYSADDR(&lp->rd_ring[0]);
-	lp->rx_next_done   = 0;
-	
-	lp->rd_ring[RC32434_NUM_RDS-1].control |= DMAD_cod_m;
-	lp->rx_chain_head = 0;
-	lp->rx_chain_tail = 0;
-	lp->rx_chain_status = empty;
-	
-	__raw_writel(0, &lp->rx_dma_regs->dmas);
-	/* Start Rx DMA */
-	rc32434_start_rx(lp, &lp->rd_ring[0]);
-	
-	/* Enable F E bit in Tx DMA */
-	__raw_writel(__raw_readl(&lp->tx_dma_regs->dmasm) & ~(DMASM_f_m | DMASM_e_m), &lp->tx_dma_regs->dmasm); 
-	/* Enable D H E bit in Rx DMA */
-	__raw_writel(__raw_readl(&lp->rx_dma_regs->dmasm) & ~(DMASM_d_m | DMASM_h_m | DMASM_e_m), &lp->rx_dma_regs->dmasm); 
-	
-	/* Accept only packets destined for this Ethernet device address */
-	__raw_writel(ETHARC_ab_m, &lp->eth_regs->etharc); 
-	
-	/* Set all Ether station address registers to their initial values */ 
-	__raw_writel(STATION_ADDRESS_LOW(dev), &lp->eth_regs->ethsal0); 
-	__raw_writel(STATION_ADDRESS_HIGH(dev), &lp->eth_regs->ethsah0);
-	
-	__raw_writel(STATION_ADDRESS_LOW(dev), &lp->eth_regs->ethsal1); 
-	__raw_writel(STATION_ADDRESS_HIGH(dev), &lp->eth_regs->ethsah1);
-	
-	__raw_writel(STATION_ADDRESS_LOW(dev), &lp->eth_regs->ethsal2); 
-	__raw_writel(STATION_ADDRESS_HIGH(dev), &lp->eth_regs->ethsah2);
-	
-	__raw_writel(STATION_ADDRESS_LOW(dev), &lp->eth_regs->ethsal3); 
-	__raw_writel(STATION_ADDRESS_HIGH(dev), &lp->eth_regs->ethsah3); 
-	
-	
-	/* Frame Length Checking, Pad Enable, CRC Enable, Full Duplex set */ 
-	__raw_writel(ETHMAC2_pe_m | ETHMAC2_cen_m | ETHMAC2_fd_m, &lp->eth_regs->ethmac2);  
-	//ETHMAC2_flc_m		ETHMAC2_fd_m	lp->duplex_mode
-	
-	/* Back to back inter-packet-gap */ 
-	__raw_writel(0x15, &lp->eth_regs->ethipgt); 
-	/* Non - Back to back inter-packet-gap */ 
-	__raw_writel(0x12, &lp->eth_regs->ethipgr); 
-	
-	/* Management Clock Prescaler Divisor */
-	/* Clock independent setting */
-	__raw_writel(((idt_cpu_freq)/MII_CLOCK+1) & ~1,
-		       &lp->eth_regs->ethmcp);
-	
-	/* don't transmit until fifo contains 48b */
-	__raw_writel(48, &lp->eth_regs->ethfifott);
-	
-	__raw_writel(ETHMAC1_re_m, &lp->eth_regs->ethmac1);
-	
-#ifndef CONFIG_IDT_USE_NAPI
-	tasklet_enable(lp->rx_tasklet);
-#endif
-	tasklet_enable(lp->tx_tasklet);
-	
-	netif_start_queue(dev);
-	
-	return 0; 
-}
-
-static struct platform_driver korina_driver = {
-	.driver.name = "korina",
-	.probe = rc32434_probe,
-	.remove = rc32434_remove,
-};
-
-static int __init rc32434_init_module(void)
-{
-	return platform_driver_register(&korina_driver);
-}
-
-static void rc32434_cleanup_module(void)
-{
-	return platform_driver_unregister(&korina_driver);
-}
-
-module_init(rc32434_init_module);
-module_exit(rc32434_cleanup_module);
diff --git a/target/linux/rb532/files/drivers/net/rc32434_eth.h b/target/linux/rb532/files/drivers/net/rc32434_eth.h
deleted file mode 100644
index eaa0bfe..0000000
--- a/target/linux/rb532/files/drivers/net/rc32434_eth.h
+++ /dev/null
@@ -1,178 +0,0 @@
-/**************************************************************************
- *
- *  BRIEF MODULE DESCRIPTION
- *     Definitions for IDT RC32434 on-chip ethernet controller.
- *
- *  Copyright 2004 IDT Inc. (rischelp@idt.com)
- *         
- *  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  SOFTWARE  IS PROVIDED   ``AS  IS'' AND   ANY  EXPRESS OR IMPLIED
- *  WARRANTIES,   INCLUDING, BUT NOT  LIMITED  TO, THE IMPLIED WARRANTIES OF
- *  MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN
- *  NO  EVENT  SHALL   THE AUTHOR  BE    LIABLE FOR ANY   DIRECT, INDIRECT,
- *  INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
- *  NOT LIMITED   TO, PROCUREMENT OF  SUBSTITUTE GOODS  OR SERVICES; LOSS OF
- *  USE, DATA,  OR PROFITS; OR  BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
- *  ANY THEORY OF LIABILITY, WHETHER IN  CONTRACT, STRICT LIABILITY, OR TORT
- *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
- *  THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- *  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.,
- *  675 Mass Ave, Cambridge, MA 02139, USA.
- *
- *
- **************************************************************************
- * May 2004 rkt, neb
- *
- * Initial Release
- *
- * Aug 2004
- *
- * Added NAPI
- *
- **************************************************************************
- */
-
-
-#include  <asm/rc32434/rc32434.h>
-#include  <asm/rc32434/dma_v.h>
-#include  <asm/rc32434/eth_v.h>
-
-#define CONFIG_IDT_USE_NAPI 1
-#define RC32434_DEBUG	2
-//#define RC32434_PROC_DEBUG
-#undef	RC32434_DEBUG
-
-#ifdef RC32434_DEBUG
-
-/* use 0 for production, 1 for verification, >2 for debug */
-static int rc32434_debug = RC32434_DEBUG;
-#define ASSERT(expr) \
-	if(!(expr)) {	\
-		printk( "Assertion failed! %s,%s,%s,line=%d\n",	\
-		#expr,__FILE__,__FUNCTION__,__LINE__);		}
-#define DBG(lvl, format, arg...) if (rc32434_debug > lvl) printk(KERN_INFO "%s: " format, dev->name , ## arg)
-#else
-#define ASSERT(expr) do {} while (0)
-#define DBG(lvl, format, arg...) do {} while (0)
-#endif
-
-#define INFO(format, arg...) printk(KERN_INFO "%s: " format, dev->name , ## arg)
-#define ERR(format, arg...) printk(KERN_ERR "%s: " format, dev->name , ## arg)
-#define WARN(format, arg...) printk(KERN_WARNING "%s: " format, dev->name , ## arg)		
-
-/* the following must be powers of two */
-#ifdef CONFIG_IDT_USE_NAPI
-#define RC32434_NUM_RDS    64    		/* number of receive descriptors */
-#define RC32434_NUM_TDS    64    		/* number of transmit descriptors */
-#else
-#define RC32434_NUM_RDS    128    		/* number of receive descriptors */
-#define RC32434_NUM_TDS    128    		/* number of transmit descriptors */
-#endif
-
-#define RC32434_RBSIZE     1536  		/* size of one resource buffer = Ether MTU */
-#define RC32434_RDS_MASK   (RC32434_NUM_RDS-1)
-#define RC32434_TDS_MASK   (RC32434_NUM_TDS-1)
-#define RD_RING_SIZE (RC32434_NUM_RDS * sizeof(struct DMAD_s))
-#define TD_RING_SIZE (RC32434_NUM_TDS * sizeof(struct DMAD_s))
-
-#define RC32434_TX_TIMEOUT HZ * 100
-
-#define rc32434_eth0_regs ((ETH_t)(ETH0_VirtualAddress))
-#define rc32434_eth1_regs ((ETH_t)(ETH1_VirtualAddress))
-
-enum status	{ filled,	empty};
-#define IS_DMA_FINISHED(X)   (((X) & (DMAD_f_m)) != 0)
-#define IS_DMA_DONE(X)   (((X) & (DMAD_d_m)) != 0)
-
-
-/* Information that need to be kept for each board. */
-struct rc32434_local {
-	ETH_t  eth_regs;
-	DMA_Chan_t  rx_dma_regs;
-	DMA_Chan_t  tx_dma_regs;
-	volatile DMAD_t   td_ring;			/* transmit descriptor ring */ 
-	volatile DMAD_t   rd_ring;			/* receive descriptor ring  */
-	
-	struct sk_buff* tx_skb[RC32434_NUM_TDS]; 	/* skbuffs for pkt to trans */
-	struct sk_buff* rx_skb[RC32434_NUM_RDS]; 	/* skbuffs for pkt to trans */
-	
-#ifndef CONFIG_IDT_USE_NAPI
-	struct tasklet_struct * rx_tasklet;
-#endif
-	struct tasklet_struct * tx_tasklet;
-	
-	int	rx_next_done;
-	int	rx_chain_head;
-	int	rx_chain_tail;
-	enum status	rx_chain_status;
-	
-	int	tx_next_done;
-	int	tx_chain_head;
-	int	tx_chain_tail;
-	enum status	tx_chain_status;
-	int tx_count;			
-	int	tx_full;
-	
-	struct timer_list    mii_phy_timer;
-	unsigned long duplex_mode;
-	
-	int   	rx_irq;
-	int    tx_irq;
-	int    ovr_irq;
-	int    und_irq;
-	
-	struct net_device_stats stats;
-	spinlock_t lock; 
-	
-	/* debug /proc entry */
-	struct proc_dir_entry *ps;
-	int dma_halt_cnt;  int dma_run_cnt;
-};
-
-extern unsigned int idt_cpu_freq;
-
-/* Index to functions, as function prototypes. */
-static int rc32434_open(struct net_device *dev);
-static int rc32434_send_packet(struct sk_buff *skb, struct net_device *dev);
-static void rc32434_mii_handler(unsigned long data);
-static irqreturn_t  rc32434_und_interrupt(int irq, void *dev_id);
-static irqreturn_t rc32434_rx_dma_interrupt(int irq, void *dev_id);
-static irqreturn_t rc32434_tx_dma_interrupt(int irq, void *dev_id);
-#ifdef	RC32434_REVISION	
-static irqreturn_t rc32434_ovr_interrupt(int irq, void *dev_id);
-#endif
-static int  rc32434_close(struct net_device *dev);
-static struct net_device_stats *rc32434_get_stats(struct net_device *dev);
-static void rc32434_multicast_list(struct net_device *dev);
-static int  rc32434_init(struct net_device *dev);
-static void rc32434_tx_timeout(struct net_device *dev);
-
-static void rc32434_tx_tasklet(unsigned long tx_data_dev);
-#ifdef CONFIG_IDT_USE_NAPI
-static int rc32434_poll(struct net_device *rx_data_dev, int *budget);
-#else
-static void rc32434_rx_tasklet(unsigned long rx_data_dev);
-#endif
-static void rc32434_cleanup_module(void);
-
-
-static inline void rc32434_abort_dma(struct net_device *dev, DMA_Chan_t ch)
-{
-	if (__raw_readl(&ch->dmac) & DMAC_run_m) {
-		__raw_writel(0x10, &ch->dmac); 
-		
-		while (!(__raw_readl(&ch->dmas) & DMAS_h_m))
-			dev->trans_start = jiffies;		
-		
-		__raw_writel(0, &ch->dmas);  
-	}
-	
-	__raw_writel(0, &ch->dmadptr); 
-	__raw_writel(0, &ch->dmandptr); 
-}
diff --git a/target/linux/rb532/files/include/asm-mips/rc32434/ddr.h b/target/linux/rb532/files/include/asm-mips/rc32434/ddr.h
deleted file mode 100644
index 03923a6..0000000
--- a/target/linux/rb532/files/include/asm-mips/rc32434/ddr.h
+++ /dev/null
@@ -1,173 +0,0 @@
-#ifndef __IDT_DDR_H__
-#define __IDT_DDR_H__
-
-/*******************************************************************************
- *
- * Copyright 2002 Integrated Device Technology, Inc.
- *		All rights reserved.
- *
- * DDR register definition.
- *
- * File   : $Id: ddr.h,v 1.2 2002/06/06 18:34:03 astichte Exp $
- *
- * Author : ryan.holmQVist@idt.com
- * Date   : 20011005
- * Update :
- *          $Log: ddr.h,v $
- *          Revision 1.2  2002/06/06 18:34:03  astichte
- *          Added XXX_PhysicalAddress and XXX_VirtualAddress
- *
- *          Revision 1.1  2002/05/29 17:33:21  sysarch
- *          jba File moved from vcode/include/idt/acacia
- *
- *
- ******************************************************************************/
-
-enum
-{
-	DDR0_PhysicalAddress	= 0x18018000,
-	DDR_PhysicalAddress	= DDR0_PhysicalAddress,		// Default
-
-	DDR0_VirtualAddress	= 0xb8018000,
-	DDR_VirtualAddress	= DDR0_VirtualAddress,		// Default
-} ;
-
-typedef struct DDR_s
-{
-	u32	ddrbase ;
-	u32	ddrmask ;
-	u32	res1;
-	u32	res2;
-	u32	ddrc ;
-	u32	ddrabase ;
-	u32	ddramask ;
-	u32	ddramap ;
-	u32	ddrcust;
-	u32	ddrrdc;
-	u32	ddrspare;
-} volatile *DDR_t ;
-
-enum
-{
-	DDR0BASE_baseaddr_b	= 16,
-	DDR0BASE_baseaddr_m	= 0xffff0000,
-
-	DDR0MASK_mask_b		= 16,
-	DDR0MASK_mask_m		= 0xffff0000,
-
-	DDR1BASE_baseaddr_b	= 16,
-	DDR1BASE_baseaddr_m	= 0xffff0000,
-
-	DDR1MASK_mask_b		= 16,
-	DDR1MASK_mask_m		= 0xffff0000,
-
-	DDRC_ata_b		= 5,
-	DDRC_ata_m		= 0x000000E0,
-	DDRC_dbw_b		= 8,
-	DDRC_dbw_m		= 0x00000100,
-	DDRC_wr_b		= 9,
-	DDRC_wr_m		= 0x00000600,
-	DDRC_ps_b		= 11,
-	DDRC_ps_m		= 0x00001800,
-	DDRC_dtype_b		= 13,
-	DDRC_dtype_m		= 0x0000e000,
-	DDRC_rfc_b		= 16,
-	DDRC_rfc_m		= 0x000f0000,
-	DDRC_rp_b		= 20,
-	DDRC_rp_m		= 0x00300000,
-	DDRC_ap_b		= 22,
-	DDRC_ap_m		= 0x00400000,
-	DDRC_rcd_b		= 23,
-	DDRC_rcd_m		= 0x01800000,
-	DDRC_cl_b		= 25,
-	DDRC_cl_m		= 0x06000000,
-	DDRC_dbm_b		= 27,
-	DDRC_dbm_m		= 0x08000000,
-	DDRC_sds_b		= 28,
-	DDRC_sds_m		= 0x10000000,
-	DDRC_atp_b		= 29,
-	DDRC_atp_m		= 0x60000000,
-	DDRC_re_b		= 31,
-	DDRC_re_m		= 0x80000000,
-
-	DDRRDC_ces_b		= 0,
-	DDRRDC_ces_m		= 0x00000001,
-	DDRRDC_ace_b		= 1,
-	DDRRDC_ace_m		= 0x00000002,
-
-	DDRABASE_baseaddr_b	= 16,
-	DDRABASE_baseaddr_m	= 0xffff0000,
-
-	DDRAMASK_mask_b		= 16,
-	DDRAMASK_mask_m		= 0xffff0000,
-
-	DDRAMAP_map_b		= 16,
-	DDRAMAP_map_m		= 0xffff0000,
-
-	DDRCUST_cs_b		= 0,
-	DDRCUST_cs_m		= 0x00000003,
-	DDRCUST_we_b		= 2,
-	DDRCUST_we_m		= 0x00000004,
-	DDRCUST_ras_b		= 3,
-	DDRCUST_ras_m		= 0x00000008,
-	DDRCUST_cas_b		= 4,
-	DDRCUST_cas_m		= 0x00000010,
-	DDRCUST_cke_b		= 5,
-	DDRCUST_cke_m		= 0x00000020,
-	DDRCUST_ba_b		= 6,
-	DDRCUST_ba_m		= 0x000000c0,
-
-	RCOUNT_rcount_b		= 0,
-	RCOUNT_rcount_m		= 0x0000ffff,
-
-	RCOMPARE_rcompare_b	= 0,
-	RCOMPARE_rcompare_m	= 0x0000ffff,
-
-	RTC_ce_b		= 0,
-	RTC_ce_m		= 0x00000001,
-	RTC_to_b		= 1,
-	RTC_to_m		= 0x00000002,
-	RTC_rqe_b		= 2,
-	RTC_rqe_m		= 0x00000004,
-
-	DDRDQSC_dm_b		= 0,
-	DDRDQSC_dm_m		= 0x00000003,
-	DDRDQSC_dqsbs_b		= 2,
-	DDRDQSC_dqsbs_m		= 0x000000fc,
-	DDRDQSC_db_b		= 8,
-	DDRDQSC_db_m		= 0x00000100,
-	DDRDQSC_dbsp_b		= 9,
-	DDRDQSC_dbsp_m		= 0x01fffe00,
-	DDRDQSC_bdp_b		= 25,
-	DDRDQSC_bdp_m		= 0x7e000000,
-
-	DDRDLLC_eao_b		= 0,
-	DDRDLLC_eao_m		= 0x00000001,
-	DDRDLLC_eo_b		= 1,
-	DDRDLLC_eo_m		= 0x0000003e,
-	DDRDLLC_fs_b		= 6,
-	DDRDLLC_fs_m		= 0x000000c0,
-	DDRDLLC_as_b		= 8,
-	DDRDLLC_as_m		= 0x00000700,
-	DDRDLLC_sp_b		= 11,
-	DDRDLLC_sp_m		= 0x001ff800,
-
-	DDRDLLFC_men_b		= 0,
-	DDRDLLFC_men_m		= 0x00000001,
-	DDRDLLFC_aen_b		= 1,
-	DDRDLLFC_aen_m		= 0x00000002,
-	DDRDLLFC_ff_b		= 2,
-	DDRDLLFC_ff_m		= 0x00000004,
-
-	DDRDLLTA_addr_b		= 2,
-	DDRDLLTA_addr_m		= 0xfffffffc,
-
-	DDRDLLED_dbe_b		= 0,
-	DDRDLLED_dbe_m		= 0x00000001,
-	DDRDLLED_dte_b		= 1,
-	DDRDLLED_dte_m		= 0x00000002,
-	
-		
-} ;
-
-#endif	// __IDT_DDR_H__
diff --git a/target/linux/rb532/files/include/asm-mips/rc32434/dma.h b/target/linux/rb532/files/include/asm-mips/rc32434/dma.h
deleted file mode 100644
index 2124f7e..0000000
--- a/target/linux/rb532/files/include/asm-mips/rc32434/dma.h
+++ /dev/null
@@ -1,168 +0,0 @@
-#ifndef __IDT_DMA_H__
-#define __IDT_DMA_H__
-
-/*******************************************************************************
- *
- * Copyright 2002 Integrated Device Technology, Inc.
- *		All rights reserved.
- *
- * DMA register definition.
- *
- * File   : $Id: dma.h,v 1.3 2002/06/06 18:34:03 astichte Exp $
- *
- * 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
- *	
- *
- ******************************************************************************/
-
-enum
-{
-	DMA0_PhysicalAddress	= 0x18040000,
-	DMA_PhysicalAddress	= DMA0_PhysicalAddress,		// Default
-
-	DMA0_VirtualAddress	= 0xb8040000,
-	DMA_VirtualAddress	= DMA0_VirtualAddress,		// Default
-} ;
-
-/*
- * DMA descriptor (in physical memory).
- */
-
-typedef struct DMAD_s
-{
-	u32			control ;	// Control. use DMAD_*
-	u32			ca ;		// Current Address.
-	u32			devcs ; 	// Device control and status.
-	u32			link ;		// Next descriptor in chain.
-} volatile *DMAD_t ;
-
-enum
-{
-	DMAD_size		= sizeof (struct DMAD_s),
-	DMAD_count_b		= 0,		// in DMAD_t -> control
-	DMAD_count_m		= 0x0003ffff,	// in DMAD_t -> control
-	DMAD_ds_b		= 20,		// in DMAD_t -> control
-	DMAD_ds_m		= 0x00300000,	// in DMAD_t -> control
-		DMAD_ds_ethRcv_v	= 0,
-		DMAD_ds_ethXmt_v	= 0,
-		DMAD_ds_memToFifo_v	= 0,
-		DMAD_ds_fifoToMem_v	= 0,
-		DMAD_ds_pciToMem_v	= 0,
-		DMAD_ds_memToPci_v	= 0,
-	
-	DMAD_devcmd_b		= 22,		// in DMAD_t -> control
-	DMAD_devcmd_m		= 0x01c00000,	// in DMAD_t -> control
-		DMAD_devcmd_byte_v	= 0,	//memory-to-memory
-		DMAD_devcmd_halfword_v	= 1,	//memory-to-memory
-		DMAD_devcmd_word_v	= 2,	//memory-to-memory
-		DMAD_devcmd_2words_v	= 3,	//memory-to-memory
-		DMAD_devcmd_4words_v	= 4,	//memory-to-memory
-		DMAD_devcmd_6words_v	= 5,	//memory-to-memory
-		DMAD_devcmd_8words_v	= 6,	//memory-to-memory
-		DMAD_devcmd_16words_v	= 7,	//memory-to-memory
-	DMAD_cof_b		= 25,		// chain on finished
-	DMAD_cof_m		= 0x02000000,	// 
-	DMAD_cod_b		= 26,		// chain on done
-	DMAD_cod_m		= 0x04000000,	// 
-	DMAD_iof_b		= 27,		// interrupt on finished
-	DMAD_iof_m		= 0x08000000,	// 
-	DMAD_iod_b		= 28,		// interrupt on done
-	DMAD_iod_m		= 0x10000000,	// 
-	DMAD_t_b		= 29,		// terminated
-	DMAD_t_m		= 0x20000000,	// 
-	DMAD_d_b		= 30,		// done
-	DMAD_d_m		= 0x40000000,	// 
-	DMAD_f_b		= 31,		// finished
-	DMAD_f_m		= 0x80000000,	// 
-} ;
-
-/*
- * DMA register (within Internal Register Map).
- */
-
-struct DMA_Chan_s
-{
-	u32		dmac ;		// Control.
-	u32		dmas ;		// Status.	
-	u32		dmasm ; 	// Mask.
-	u32		dmadptr ;	// Descriptor pointer.
-	u32		dmandptr ;	// Next descriptor pointer.
-};
-
-typedef struct DMA_Chan_s volatile *DMA_Chan_t ;
-
-//DMA_Channels	  use DMACH_count instead
-
-enum
-{
-	DMAC_run_b	= 0,		// 
-	DMAC_run_m	= 0x00000001,	// 
-	DMAC_dm_b	= 1,		// done mask
-	DMAC_dm_m	= 0x00000002,	// 
-	DMAC_mode_b	= 2,		// 
-	DMAC_mode_m	= 0x0000000c,	// 
-		DMAC_mode_auto_v	= 0,
-		DMAC_mode_burst_v	= 1,
-		DMAC_mode_transfer_v	= 2, //usually used
-		DMAC_mode_reserved_v	= 3,
-	DMAC_a_b	= 4,		// 
-	DMAC_a_m	= 0x00000010,	// 
-
-	DMAS_f_b	= 0,		// finished (sticky) 
-	DMAS_f_m	= 0x00000001,	//		     
-	DMAS_d_b	= 1,		// done (sticky)     
-	DMAS_d_m	= 0x00000002,	//		     
-	DMAS_c_b	= 2,		// chain (sticky)    
-	DMAS_c_m	= 0x00000004,	//		     
-	DMAS_e_b	= 3,		// error (sticky)    
-	DMAS_e_m	= 0x00000008,	//		     
-	DMAS_h_b	= 4,		// halt (sticky)     
-	DMAS_h_m	= 0x00000010,	//		     
-
-	DMASM_f_b	= 0,		// finished (1=mask)
-	DMASM_f_m	= 0x00000001,	// 
-	DMASM_d_b	= 1,		// done (1=mask)
-	DMASM_d_m	= 0x00000002,	// 
-	DMASM_c_b	= 2,		// chain (1=mask)
-	DMASM_c_m	= 0x00000004,	// 
-	DMASM_e_b	= 3,		// error (1=mask)
-	DMASM_e_m	= 0x00000008,	// 
-	DMASM_h_b	= 4,		// halt (1=mask)
-	DMASM_h_m	= 0x00000010,	// 
-} ;
-
-/*
- * DMA channel definitions
- */
-
-enum
-{
-	DMACH_ethRcv = 0,
-	DMACH_ethXmt = 1,
-	DMACH_memToFifo = 2,
-	DMACH_fifoToMem = 3,
-	DMACH_pciToMem = 4,
-	DMACH_memToPci = 5,
-	
-	DMACH_count //must be last
-};
-
-
-typedef struct DMAC_s
-{
-	struct DMA_Chan_s ch [DMACH_count] ; //use ch[DMACH_]
-} volatile *DMA_t ;
-
-#endif	// __IDT_DMA_H__
-
diff --git a/target/linux/rb532/files/include/asm-mips/rc32434/dma_v.h b/target/linux/rb532/files/include/asm-mips/rc32434/dma_v.h
deleted file mode 100644
index 81cb405..0000000
--- a/target/linux/rb532/files/include/asm-mips/rc32434/dma_v.h
+++ /dev/null
@@ -1,72 +0,0 @@
-#ifndef __IDT_DMA_V_H__
-#define __IDT_DMA_V_H__
-
-/*******************************************************************************
- *
- * Copyright 2002 Integrated Device Technology, Inc.
- *		All rights reserved.
- *
- * DMA register definition.
- *
- * File   : $Id: dma.h,v 1.3 2002/06/06 18:34:03 astichte Exp $
- *
- * 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
- *	
- *
- ******************************************************************************/
-#include  <asm/rc32434/dma.h> 
-#include  <asm/rc32434/rc32434.h>
-#define DMA_CHAN_OFFSET  0x14
-#define IS_DMA_USED(X) (((X) & (DMAD_f_m | DMAD_d_m | DMAD_t_m)) != 0)
-#define DMA_COUNT(count)   \
-  ((count) & DMAD_count_m)
-
-#define DMA_HALT_TIMEOUT 500
-
-
-static inline int rc32434_halt_dma(DMA_Chan_t ch)
-{
-	int timeout=1;
-	if (local_readl(&ch->dmac) & DMAC_run_m) {
-		local_writel(0, &ch->dmac); 
-		for (timeout = DMA_HALT_TIMEOUT; timeout > 0; timeout--) {
-			if (local_readl(&ch->dmas) & DMAS_h_m) {
-				local_writel(0, &ch->dmas);  
-				break;
-			}
-		}
-	}
-
-	return timeout ? 0 : 1;
-}
-
-static inline void rc32434_start_dma(DMA_Chan_t ch, u32 dma_addr)
-{
-	local_writel(0, &ch->dmandptr); 
-	local_writel(dma_addr, &ch->dmadptr);
-}
-
-static inline void rc32434_chain_dma(DMA_Chan_t ch, u32 dma_addr)
-{
-	local_writel(dma_addr, &ch->dmandptr);
-}
-
-#endif	// __IDT_DMA_V_H__
-
-
-
-
-
-
-
diff --git a/target/linux/rb532/files/include/asm-mips/rc32434/eth.h b/target/linux/rb532/files/include/asm-mips/rc32434/eth.h
deleted file mode 100644
index 2f42976..0000000
--- a/target/linux/rb532/files/include/asm-mips/rc32434/eth.h
+++ /dev/null
@@ -1,320 +0,0 @@
-#ifndef	__IDT_ETH_H__
-#define	__IDT_ETH_H__
-
-/*******************************************************************************
- *
- * Copyright 2002 Integrated Device Technology, Inc.
- *		All rights reserved.
- *
- * Ethernet register definition.
- *
- * File   : $Id: eth.h,v 1.3 2002/06/06 18:34:04 astichte Exp $
- *
- * Author : Allen.Stichter@idt.com
- * Date   : 20020605
- * Update :
- *	    $Log: eth.h,v $
- *	    Revision 1.3  2002/06/06 18:34:04  astichte
- *	    Added XXX_PhysicalAddress and XXX_VirtualAddress
- *	
- *	    Revision 1.2  2002/06/05 18:19:46  astichte
- *	    Added
- *	
- *	    Revision 1.1  2002/05/29 17:33:22  sysarch
- *	    jba File moved from vcode/include/idt/acacia
- *
- ******************************************************************************/
-
-enum
-{
-	ETH0_PhysicalAddress	= 0x18060000,
-	ETH_PhysicalAddress	= ETH0_PhysicalAddress,		// Default
-
-	ETH0_VirtualAddress	= 0xb8060000,
-	ETH_VirtualAddress	= ETH0_VirtualAddress,		// Default
-} ;
-
-typedef struct
-{
-	u32 ethintfc		;
-	u32 ethfifott		;
-	u32 etharc		;
-	u32 ethhash0		;
-	u32 ethhash1		;
-	u32 ethu0 [4]		;	// Reserved.	
-	u32 ethpfs		;
-	u32 ethmcp		;
-	u32 eth_u1 [10]		;	// Reserved.
-	u32 ethspare		;
-	u32 eth_u2 [42]		;	// Reserved. 
-	u32 ethsal0		;
-	u32 ethsah0		;
-	u32 ethsal1		;
-	u32 ethsah1		;
-	u32 ethsal2		;
-	u32 ethsah2		;
-	u32 ethsal3		;
-	u32 ethsah3		;
-	u32 ethrbc		;
-	u32 ethrpc		;
-	u32 ethrupc		;
-	u32 ethrfc		;
-	u32 ethtbc		;
-	u32 ethgpf		;
-	u32 eth_u9 [50]		;	// Reserved.	
-	u32 ethmac1		;
-	u32 ethmac2		;
-	u32 ethipgt		;
-	u32 ethipgr		;
-	u32 ethclrt		;
-	u32 ethmaxf		;
-	u32 eth_u10		;	// Reserved.	
-	u32 ethmtest		;
-	u32 miimcfg		;
-	u32 miimcmd		;
-	u32 miimaddr		;
-	u32 miimwtd		;
-	u32 miimrdd		;
-	u32 miimind		;
-	u32 eth_u11		;	// Reserved.
-	u32 eth_u12		;	// Reserved.
-	u32 ethcfsa0		;
-	u32 ethcfsa1		;
-	u32 ethcfsa2		;
-} volatile *ETH_t;
-
-enum
-{
-	ETHINTFC_en_b		= 0,
-	ETHINTFC_en_m		= 0x00000001,
-	ETHINTFC_its_b		= 1,
-	ETHINTFC_its_m		= 0x00000002,
-	ETHINTFC_rip_b		= 2,
-	ETHINTFC_rip_m		= 0x00000004,
-	ETHINTFC_jam_b		= 3,
-	ETHINTFC_jam_m		= 0x00000008,
-	ETHINTFC_ovr_b		= 4,
-	ETHINTFC_ovr_m		= 0x00000010,
-	ETHINTFC_und_b		= 5,
-	ETHINTFC_und_m		= 0x00000020,
-	ETHINTFC_iom_b 		= 6,
-	ETHINTFC_iom_m		= 0x000000c0,
-
-	ETHFIFOTT_tth_b		= 0,
-	ETHFIFOTT_tth_m		= 0x0000007f,
-
-	ETHARC_pro_b		= 0,
-	ETHARC_pro_m		= 0x00000001,
-	ETHARC_am_b		= 1,
-	ETHARC_am_m		= 0x00000002,
-	ETHARC_afm_b		= 2,
-	ETHARC_afm_m		= 0x00000004,
-	ETHARC_ab_b		= 3,
-	ETHARC_ab_m		= 0x00000008,
-
-	ETHSAL_byte5_b		= 0,
-	ETHSAL_byte5_m		= 0x000000ff,
-	ETHSAL_byte4_b		= 8,
-	ETHSAL_byte4_m		= 0x0000ff00,
-	ETHSAL_byte3_b		= 16,
-	ETHSAL_byte3_m		= 0x00ff0000,
-	ETHSAL_byte2_b		= 24,
-	ETHSAL_byte2_m		= 0xff000000,
-
-	ETHSAH_byte1_b		= 0,
-	ETHSAH_byte1_m		= 0x000000ff,
-	ETHSAH_byte0_b		= 8,
-	ETHSAH_byte0_m		= 0x0000ff00,
-	
-	ETHGPF_ptv_b		= 0,
-	ETHGPF_ptv_m		= 0x0000ffff,
-
-	ETHPFS_pfd_b		= 0,
-	ETHPFS_pfd_m		= 0x00000001,
-
-	ETHCFSA0_cfsa4_b	= 0,
-	ETHCFSA0_cfsa4_m	= 0x000000ff,
-	ETHCFSA0_cfsa5_b	= 8,
-	ETHCFSA0_cfsa5_m	= 0x0000ff00,
-
-	ETHCFSA1_cfsa2_b	= 0,
-	ETHCFSA1_cfsa2_m	= 0x000000ff,
-	ETHCFSA1_cfsa3_b	= 8,
-	ETHCFSA1_cfsa3_m	= 0x0000ff00,
-
-	ETHCFSA2_cfsa0_b	= 0,
-	ETHCFSA2_cfsa0_m	= 0x000000ff,
-	ETHCFSA2_cfsa1_b	= 8,
-	ETHCFSA2_cfsa1_m	= 0x0000ff00,
-
-	ETHMAC1_re_b		= 0,
-	ETHMAC1_re_m		= 0x00000001,
-	ETHMAC1_paf_b		= 1,
-	ETHMAC1_paf_m		= 0x00000002,
-	ETHMAC1_rfc_b		= 2,
-	ETHMAC1_rfc_m		= 0x00000004,
-	ETHMAC1_tfc_b		= 3,
-	ETHMAC1_tfc_m		= 0x00000008,
-	ETHMAC1_lb_b		= 4,
-	ETHMAC1_lb_m		= 0x00000010,
-	ETHMAC1_mr_b		= 31,
-	ETHMAC1_mr_m		= 0x80000000,
-
-	ETHMAC2_fd_b		= 0,
-	ETHMAC2_fd_m		= 0x00000001,
-	ETHMAC2_flc_b		= 1,
-	ETHMAC2_flc_m		= 0x00000002,
-	ETHMAC2_hfe_b		= 2,
-	ETHMAC2_hfe_m		= 0x00000004,
-	ETHMAC2_dc_b		= 3,
-	ETHMAC2_dc_m		= 0x00000008,
-	ETHMAC2_cen_b		= 4,
-	ETHMAC2_cen_m		= 0x00000010,
-	ETHMAC2_pe_b		= 5,
-	ETHMAC2_pe_m		= 0x00000020,
-	ETHMAC2_vpe_b		= 6,
-	ETHMAC2_vpe_m		= 0x00000040,
-	ETHMAC2_ape_b		= 7,
-	ETHMAC2_ape_m		= 0x00000080,
-	ETHMAC2_ppe_b		= 8,
-	ETHMAC2_ppe_m		= 0x00000100,
-	ETHMAC2_lpe_b		= 9,
-	ETHMAC2_lpe_m		= 0x00000200,
-	ETHMAC2_nb_b		= 12,
-	ETHMAC2_nb_m		= 0x00001000,
-	ETHMAC2_bp_b		= 13,
-	ETHMAC2_bp_m		= 0x00002000,
-	ETHMAC2_ed_b		= 14,
-	ETHMAC2_ed_m		= 0x00004000,
-
-	ETHIPGT_ipgt_b		= 0,
-	ETHIPGT_ipgt_m		= 0x0000007f,
-
-	ETHIPGR_ipgr2_b		= 0,
-	ETHIPGR_ipgr2_m		= 0x0000007f,
-	ETHIPGR_ipgr1_b		= 8,
-	ETHIPGR_ipgr1_m		= 0x00007f00,
-
-	ETHCLRT_maxret_b	= 0,
-	ETHCLRT_maxret_m	= 0x0000000f,
-	ETHCLRT_colwin_b	= 8,
-	ETHCLRT_colwin_m	= 0x00003f00,
-
-	ETHMAXF_maxf_b		= 0,
-	ETHMAXF_maxf_m		= 0x0000ffff,
-
-	ETHMTEST_tb_b		= 2,
-	ETHMTEST_tb_m		= 0x00000004,
-
-	ETHMCP_div_b		= 0,
-	ETHMCP_div_m		= 0x000000ff,
-	
-	MIIMCFG_rsv_b		= 0,
-	MIIMCFG_rsv_m		= 0x0000000c,
-
-	MIIMCMD_rd_b		= 0,
-	MIIMCMD_rd_m		= 0x00000001,
-	MIIMCMD_scn_b		= 1,
-	MIIMCMD_scn_m		= 0x00000002,
-
-	MIIMADDR_regaddr_b	= 0,
-	MIIMADDR_regaddr_m	= 0x0000001f,
-	MIIMADDR_phyaddr_b	= 8,
-	MIIMADDR_phyaddr_m	= 0x00001f00,
-
-	MIIMWTD_wdata_b		= 0,
-	MIIMWTD_wdata_m		= 0x0000ffff,
-
-	MIIMRDD_rdata_b		= 0,
-	MIIMRDD_rdata_m		= 0x0000ffff,
-
-	MIIMIND_bsy_b		= 0,
-	MIIMIND_bsy_m		= 0x00000001,
-	MIIMIND_scn_b		= 1,
-	MIIMIND_scn_m		= 0x00000002,
-	MIIMIND_nv_b		= 2,
-	MIIMIND_nv_m		= 0x00000004,
-
-} ;
-
-/*
- * Values for the DEVCS field of the Ethernet DMA Rx and Tx descriptors.
- */
-enum
-{
-	ETHRX_fd_b		= 0,
-	ETHRX_fd_m		= 0x00000001,
-	ETHRX_ld_b		= 1,
-	ETHRX_ld_m		= 0x00000002,
-	ETHRX_rok_b		= 2,
-	ETHRX_rok_m		= 0x00000004,
-	ETHRX_fm_b		= 3,
-	ETHRX_fm_m		= 0x00000008,
-	ETHRX_mp_b		= 4,
-	ETHRX_mp_m		= 0x00000010,
-	ETHRX_bp_b		= 5,
-	ETHRX_bp_m		= 0x00000020,
-	ETHRX_vlt_b		= 6,
-	ETHRX_vlt_m		= 0x00000040,
-	ETHRX_cf_b		= 7,
-	ETHRX_cf_m		= 0x00000080,
-	ETHRX_ovr_b		= 8,
-	ETHRX_ovr_m		= 0x00000100,
-	ETHRX_crc_b		= 9,
-	ETHRX_crc_m		= 0x00000200,
-	ETHRX_cv_b		= 10,
-	ETHRX_cv_m		= 0x00000400,
-	ETHRX_db_b		= 11,
-	ETHRX_db_m		= 0x00000800,
-	ETHRX_le_b		= 12,
-	ETHRX_le_m		= 0x00001000,
-	ETHRX_lor_b		= 13,
-	ETHRX_lor_m		= 0x00002000,
-	ETHRX_ces_b		= 14,
-	ETHRX_ces_m		= 0x00004000,
-	ETHRX_length_b		= 16,
-	ETHRX_length_m		= 0xffff0000,
-
-	ETHTX_fd_b		= 0,
-	ETHTX_fd_m		= 0x00000001,
-	ETHTX_ld_b		= 1,
-	ETHTX_ld_m		= 0x00000002,
-	ETHTX_oen_b		= 2,
-	ETHTX_oen_m		= 0x00000004,
-	ETHTX_pen_b		= 3,
-	ETHTX_pen_m		= 0x00000008,
-	ETHTX_cen_b		= 4,
-	ETHTX_cen_m		= 0x00000010,
-	ETHTX_hen_b		= 5,
-	ETHTX_hen_m		= 0x00000020,
-	ETHTX_tok_b		= 6,
-	ETHTX_tok_m		= 0x00000040,
-	ETHTX_mp_b		= 7,
-	ETHTX_mp_m		= 0x00000080,
-	ETHTX_bp_b		= 8,
-	ETHTX_bp_m		= 0x00000100,
-	ETHTX_und_b		= 9,
-	ETHTX_und_m		= 0x00000200,
-	ETHTX_of_b		= 10,
-	ETHTX_of_m		= 0x00000400,
-	ETHTX_ed_b		= 11,
-	ETHTX_ed_m		= 0x00000800,
-	ETHTX_ec_b		= 12,
-	ETHTX_ec_m		= 0x00001000,
-	ETHTX_lc_b		= 13,
-	ETHTX_lc_m		= 0x00002000,
-	ETHTX_td_b		= 14,
-	ETHTX_td_m		= 0x00004000,
-	ETHTX_crc_b		= 15,
-	ETHTX_crc_m		= 0x00008000,
-	ETHTX_le_b		= 16,
-	ETHTX_le_m		= 0x00010000,
-	ETHTX_cc_b		= 17,
-	ETHTX_cc_m		= 0x001E0000,
-} ;
-
-#endif	// __IDT_ETH_H__
-
-
-
-
diff --git a/target/linux/rb532/files/include/asm-mips/rc32434/eth_v.h b/target/linux/rb532/files/include/asm-mips/rc32434/eth_v.h
deleted file mode 100644
index 3ea03c6..0000000
--- a/target/linux/rb532/files/include/asm-mips/rc32434/eth_v.h
+++ /dev/null
@@ -1,63 +0,0 @@
-#ifndef	__IDT_ETH_V_H__
-#define	__IDT_ETH_V_H__
-
-/*******************************************************************************
- *
- * Copyright 2002 Integrated Device Technology, Inc.
- *		All rights reserved.
- *
- * Ethernet register definition.
- *
- * File   : $Id: eth.h,v 1.3 2002/06/06 18:34:04 astichte Exp $
- *
- * Author : Allen.Stichter@idt.com
- * Date   : 20020605
- * Update :
- *	    $Log: eth.h,v $
- *	    Revision 1.3  2002/06/06 18:34:04  astichte
- *	    Added XXX_PhysicalAddress and XXX_VirtualAddress
- *	
- *	    Revision 1.2  2002/06/05 18:19:46  astichte
- *	    Added
- *	
- *	    Revision 1.1  2002/05/29 17:33:22  sysarch
- *	    jba File moved from vcode/include/idt/acacia
- *
- ******************************************************************************/
-
-#include  <asm/rc32434/eth.h> 
-
-#define IS_TX_TOK(X)         (((X) & (1<<ETHTX_tok_b)) >> ETHTX_tok_b )   /* Transmit Okay    */
-#define IS_TX_MP(X)          (((X) & (1<<ETHTX_mp_b))  >> ETHTX_mp_b )    /* Multicast        */
-#define IS_TX_BP(X)          (((X) & (1<<ETHTX_bp_b))  >> ETHTX_bp_b )    /* Broadcast        */
-#define IS_TX_UND_ERR(X)     (((X) & (1<<ETHTX_und_b)) >> ETHTX_und_b )   /* Transmit FIFO Underflow */
-#define IS_TX_OF_ERR(X)      (((X) & (1<<ETHTX_of_b))  >> ETHTX_of_b )    /* Oversized frame  */
-#define IS_TX_ED_ERR(X)      (((X) & (1<<ETHTX_ed_b))  >> ETHTX_ed_b )    /* Excessive deferral  */
-#define IS_TX_EC_ERR(X)      (((X) & (1<<ETHTX_ec_b))  >> ETHTX_ec_b)     /* Excessive collisions  */
-#define IS_TX_LC_ERR(X)      (((X) & (1<<ETHTX_lc_b))  >> ETHTX_lc_b )    /* Late Collision   */
-#define IS_TX_TD_ERR(X)      (((X) & (1<<ETHTX_td_b))  >> ETHTX_td_b )    /* Transmit deferred*/
-#define IS_TX_CRC_ERR(X)     (((X) & (1<<ETHTX_crc_b)) >> ETHTX_crc_b )   /* CRC Error        */
-#define IS_TX_LE_ERR(X)      (((X) & (1<<ETHTX_le_b))  >>  ETHTX_le_b )    /* Length Error     */
-
-#define TX_COLLISION_COUNT(X) (((X) & ETHTX_cc_m)>>ETHTX_cc_b)  /* Collision Count  */
-
-#define IS_RCV_ROK(X)        (((X) & (1<<ETHRX_rok_b)) >> ETHRX_rok_b)    /* Receive Okay     */
-#define IS_RCV_FM(X)         (((X) & (1<<ETHRX_fm_b))  >> ETHRX_fm_b)     /* Is Filter Match  */
-#define IS_RCV_MP(X)         (((X) & (1<<ETHRX_mp_b))  >> ETHRX_mp_b)     /* Is it MP         */
-#define IS_RCV_BP(X)         (((X) & (1<<ETHRX_bp_b))  >> ETHRX_bp_b)     /* Is it BP         */
-#define IS_RCV_VLT(X)        (((X) & (1<<ETHRX_vlt_b)) >> ETHRX_vlt_b)    /* VLAN Tag Detect  */
-#define IS_RCV_CF(X)         (((X) & (1<<ETHRX_cf_b))  >> ETHRX_cf_b)     /* Control Frame    */
-#define IS_RCV_OVR_ERR(X)    (((X) & (1<<ETHRX_ovr_b)) >> ETHRX_ovr_b)    /* Receive Overflow */
-#define IS_RCV_CRC_ERR(X)    (((X) & (1<<ETHRX_crc_b)) >> ETHRX_crc_b)    /* CRC Error        */
-#define IS_RCV_CV_ERR(X)     (((X) & (1<<ETHRX_cv_b))  >> ETHRX_cv_b)     /* Code Violation   */
-#define IS_RCV_DB_ERR(X)     (((X) & (1<<ETHRX_db_b))  >> ETHRX_db_b)     /* Dribble Bits     */
-#define IS_RCV_LE_ERR(X)     (((X) & (1<<ETHRX_le_b))  >> ETHRX_le_b)     /* Length error     */
-#define IS_RCV_LOR_ERR(X)    (((X) & (1<<ETHRX_lor_b)) >> ETHRX_lor_b)    /* Length Out of Range */
-#define IS_RCV_CES_ERR(X)    (((X) & (1<<ETHRX_ces_b)) >> ETHRX_ces_b)  /* Preamble error   */
-#define RCVPKT_LENGTH(X)     (((X) & ETHRX_length_m) >> ETHRX_length_b)   /* Length of the received packet */
-#endif	// __IDT_ETH_V_H__
-
-
-
-
-
diff --git a/target/linux/rb532/files/include/asm-mips/rc32434/gpio.h b/target/linux/rb532/files/include/asm-mips/rc32434/gpio.h
deleted file mode 100644
index 859b9c9..0000000
--- a/target/linux/rb532/files/include/asm-mips/rc32434/gpio.h
+++ /dev/null
@@ -1,122 +0,0 @@
-/*
- * Copyright 2002 Integrated Device Technology, Inc.
- *	All rights reserved.
- *
- * GPIO register definition.
- *
- * Author : ryan.holmQVist@idt.com
- * Date   : 20011005
- * Copyright (C) 2001, 2002 Ryan Holm <ryan.holmQVist@idt.com>
- * Copyright (C) 2008 Florian Fainelli <florian@openwrt.org>
- */
-
-#ifndef _RC32434_GPIO_H_
-#define _RC32434_GPIO_H_
-
-#include <linux/types.h>
-
-struct rb500_gpio_reg {
-	u32   gpiofunc;   /* GPIO Function Register
-			   * gpiofunc[x]==0 bit = gpio
-			   * func[x]==1  bit = altfunc
-			   */
-	u32   gpiocfg;	  /* GPIO Configuration Register
-			   * gpiocfg[x]==0 bit = input
-			   * gpiocfg[x]==1 bit = output
-			   */
-	u32   gpiod;	  /* GPIO Data Register
-			   * gpiod[x] read/write gpio pinX status
-			   */
-	u32   gpioilevel; /* GPIO Interrupt Status Register
-			   * interrupt level (see gpioistat)
-			   */
-	u32   gpioistat;  /* Gpio Interrupt Status Register
-			   * istat[x] = (gpiod[x] == level[x])
-			   * cleared in ISR (STICKY bits)
-			   */
-	u32   gpionmien;  /* GPIO Non-maskable Interrupt Enable Register */
-};
-
-/* UART GPIO signals */
-#define RC32434_UART0_SOUT	(1 << 0)
-#define RC32434_UART0_SIN	(1 << 1)
-#define RC32434_UART0_RTS	(1 << 2)
-#define RC32434_UART0_CTS	(1 << 3)
-
-/* M & P bus GPIO signals */
-#define RC32434_MP_BIT_22	(1 << 4)
-#define RC32434_MP_BIT_23	(1 << 5)
-#define RC32434_MP_BIT_24	(1 << 6)
-#define RC32434_MP_BIT_25	(1 << 7)
-
-/* CPU GPIO signals */
-#define RC32434_CPU_GPIO	(1 << 8)
-
-/* Reserved GPIO signals */
-#define RC32434_AF_SPARE_6	(1 << 9)
-#define RC32434_AF_SPARE_4	(1 << 10)
-#define RC32434_AF_SPARE_3	(1 << 11)
-#define RC32434_AF_SPARE_2	(1 << 12)
-
-/* PCI messaging unit */
-#define RC32434_PCI_MSU_GPIO	(1 << 13)
-
-extern int rb500_gpio_get_value(unsigned gpio);
-extern void rb500_gpio_set_value(unsigned gpio, int value);
-extern int rb500_gpio_direction_input(unsigned gpio);
-extern int rb500_gpio_direction_output(unsigned gpio, int value);
-extern void rb500_gpio_set_int_level(unsigned gpio, int value);
-extern int rb500_gpio_get_int_level(unsigned gpio);
-extern void rb500_gpio_set_int_status(unsigned gpio, int value);
-extern int rb500_gpio_get_int_status(unsigned gpio);
-extern void rb500_gpio_set_func(unsigned gpio, int value);
-extern int rb500_gpio_get_func(unsigned gpio);
-
-
-/* Wrappers for the arch-neutral GPIO API */
-
-static inline int gpio_request(unsigned gpio, const char *label)
-{
-	/* Not yet implemented */
-	return 0;
-}
-
-static inline void gpio_free(unsigned gpio)
-{
-	/* Not yet implemented */
-}
-
-static inline int gpio_direction_input(unsigned gpio)
-{
-	return rb500_gpio_direction_input(gpio);
-}
-
-static inline int gpio_direction_output(unsigned gpio, int value)
-{
-	return rb500_gpio_direction_output(gpio, value);
-}
-
-static inline int gpio_get_value(unsigned gpio)
-{
-	return rb500_gpio_get_value(gpio);
-}
-
-static inline void gpio_set_value(unsigned gpio, int value)
-{
-	rb500_gpio_set_value(gpio, value);
-}
-
-static inline int gpio_to_irq(unsigned gpio)
-{
-	return gpio;
-}
-
-static inline int irq_to_gpio(unsigned irq)
-{
-	return irq;
-}
-
-/* For cansleep */
-#include <asm-generic/gpio.h>
-
-#endif /* _RC32434_GPIO_H_ */
diff --git a/target/linux/rb532/files/include/asm-mips/rc32434/integ.h b/target/linux/rb532/files/include/asm-mips/rc32434/integ.h
deleted file mode 100644
index a9e99e4..0000000
--- a/target/linux/rb532/files/include/asm-mips/rc32434/integ.h
+++ /dev/null
@@ -1,76 +0,0 @@
-#ifndef __IDT_INTEG_H__
-#define __IDT_INTEG_H__
-
-/*******************************************************************************
- *
- * Copyright 2002 Integrated Device Technology, Inc.
- *		All rights reserved.
- *
- * System Integrity register definition.
- *
- * File   : $Id: integ.h,v 1.3 2002/06/06 18:34:04 astichte Exp $
- *
- * Author : ryan.holmQVist@idt.com
- * Date   : 20011005
- * Update :
- *	    $Log: integ.h,v $
- *	    Revision 1.3  2002/06/06 18:34:04  astichte
- *	    Added XXX_PhysicalAddress and XXX_VirtualAddress
- *	
- *	    Revision 1.2  2002/06/05 18:32:33  astichte
- *	    Removed IDTField
- *	
- *	    Revision 1.1  2002/05/29 17:33:22  sysarch
- *	    jba File moved from vcode/include/idt/acacia
- *
- ******************************************************************************/
-
-enum
-{
-	INTEG0_PhysicalAddress	= 0x18030000,
-	INTEG_PhysicalAddress	= INTEG0_PhysicalAddress,	// Default
-
-	INTEG0_VirtualAddress	= 0xb8030000,
-	INTEG_VirtualAddress	= INTEG0_VirtualAddress,	// Default
-} ;
-
-// if you are looing for CEA, try rst.h
-typedef struct
-{
-	u32 filler [0xc] ;		// 0x30 bytes unused.
-	u32 errcs ;			// sticky use ERRCS_
-	u32 wtcount ;			// Watchdog timer count reg.
-	u32 wtcompare ;			// Watchdog timer timeout value.
-	u32 wtc ;			// Watchdog timer control. use WTC_
-} volatile *INTEG_t ;
-
-enum
-{
-	ERRCS_wto_b		= 0,		// In INTEG_t -> errcs
-	ERRCS_wto_m		= 0x00000001,
-	ERRCS_wne_b		= 1,		// In INTEG_t -> errcs
-	ERRCS_wne_m		= 0x00000002,
-	ERRCS_ucw_b		= 2,		// In INTEG_t -> errcs
-	ERRCS_ucw_m		= 0x00000004,
-	ERRCS_ucr_b		= 3,		// In INTEG_t -> errcs
-	ERRCS_ucr_m		= 0x00000008,
-	ERRCS_upw_b		= 4,		// In INTEG_t -> errcs
-	ERRCS_upw_m		= 0x00000010,
-	ERRCS_upr_b		= 5,		// In INTEG_t -> errcs
-	ERRCS_upr_m		= 0x00000020,
-	ERRCS_udw_b		= 6,		// In INTEG_t -> errcs
-	ERRCS_udw_m		= 0x00000040,
-	ERRCS_udr_b		= 7,		// In INTEG_t -> errcs
-	ERRCS_udr_m		= 0x00000080,
-	ERRCS_sae_b		= 8,		// In INTEG_t -> errcs
-	ERRCS_sae_m		= 0x00000100,
-	ERRCS_wre_b		= 9,		// In INTEG_t -> errcs
-	ERRCS_wre_m		= 0x00000200,
-
-	WTC_en_b		= 0,		// In INTEG_t -> wtc
-	WTC_en_m		= 0x00000001,
-	WTC_to_b		= 1,		// In INTEG_t -> wtc
-	WTC_to_m		= 0x00000002,
-} ;
-
-#endif	// __IDT_INTEG_H__
diff --git a/target/linux/rb532/files/include/asm-mips/rc32434/irq.h b/target/linux/rb532/files/include/asm-mips/rc32434/irq.h
deleted file mode 100644
index 65cc13c..0000000
--- a/target/linux/rb532/files/include/asm-mips/rc32434/irq.h
+++ /dev/null
@@ -1,7 +0,0 @@
-#ifndef __ASM_MACH_MIPS_IRQ_H
-#define __ASM_MACH_MIPS_IRQ_H
-
-#define NR_IRQS	256
-#include_next <irq.h>
-
-#endif /* __ASM_MACH_MIPS_IRQ_H */
diff --git a/target/linux/rb532/files/include/asm-mips/rc32434/pci.h b/target/linux/rb532/files/include/asm-mips/rc32434/pci.h
deleted file mode 100644
index 585a0ae..0000000
--- a/target/linux/rb532/files/include/asm-mips/rc32434/pci.h
+++ /dev/null
@@ -1,692 +0,0 @@
-/**************************************************************************
- *
- *  BRIEF MODULE DESCRIPTION
- *   PCI register definitio
- *
- *  Copyright 2004 IDT Inc. (rischelp@idt.com)
- *         
- *  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  SOFTWARE  IS PROVIDED   ``AS  IS'' AND   ANY  EXPRESS OR IMPLIED
- *  WARRANTIES,   INCLUDING, BUT NOT  LIMITED  TO, THE IMPLIED WARRANTIES OF
- *  MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN
- *  NO  EVENT  SHALL   THE AUTHOR  BE    LIABLE FOR ANY   DIRECT, INDIRECT,
- *  INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
- *  NOT LIMITED   TO, PROCUREMENT OF  SUBSTITUTE GOODS  OR SERVICES; LOSS OF
- *  USE, DATA,  OR PROFITS; OR  BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
- *  ANY THEORY OF LIABILITY, WHETHER IN  CONTRACT, STRICT LIABILITY, OR TORT
- *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
- *  THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- *  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.,
- *  675 Mass Ave, Cambridge, MA 02139, USA.
- *
- *
- **************************************************************************
- * May 2004 rkt, neb.
- *
- * Initial Release
- *
- * 
- *
- **************************************************************************
- */
-
-#ifndef __IDT_PCI_H__
-#define __IDT_PCI_H__
-
-enum
-{
-	PCI0_PhysicalAddress	= 0x18080000,
-	PCI_PhysicalAddress	= PCI0_PhysicalAddress,
-
-	PCI0_VirtualAddress	= 0xB8080000,
-	PCI_VirtualAddress	= PCI0_VirtualAddress,
-} ;
-
-enum
-{
-	PCI_LbaCount	= 4,		// Local base addresses.
-} ;
-
-typedef struct
-{
-	u32	a ;		// Address.
-	u32	c ;		// Control.
-	u32	m ;		// mapping.
-} PCI_Map_s ;
-
-typedef struct
-{
-	u32		pcic ;
-	u32		pcis ;
-	u32		pcism ;
-	u32		pcicfga ;
-	u32		pcicfgd ;
-	PCI_Map_s	pcilba [PCI_LbaCount] ;
-	u32		pcidac ;
-	u32		pcidas ;
-	u32		pcidasm ;
-	u32		pcidad ;
-	u32		pcidma8c ;
-	u32		pcidma9c ;
-	u32		pcitc ;
-} volatile *PCI_t ;
-
-// PCI messaging unit.
-enum
-{
-	PCIM_Count	= 2,
-} ;
-typedef struct
-{
-	u32		pciim [PCIM_Count] ;
-	u32		pciom [PCIM_Count] ;
-	u32		pciid ;
-	u32		pciiic ;
-	u32		pciiim ;
-	u32		pciiod ;
-	u32		pciioic ;
-	u32		pciioim ;
-} volatile *PCIM_t ;
-
-/*******************************************************************************
- *
- * PCI Control Register
- *
- ******************************************************************************/
-enum
-{
-	PCIC_en_b	= 0,
-	PCIC_en_m	= 0x00000001,
-	PCIC_tnr_b	= 1,
-	PCIC_tnr_m	= 0x00000002,
-	PCIC_sce_b	= 2,
-	PCIC_sce_m	= 0x00000004,
-	PCIC_ien_b	= 3,
-	PCIC_ien_m	= 0x00000008,
-	PCIC_aaa_b	= 4,
-	PCIC_aaa_m	= 0x00000010,
-	PCIC_eap_b	= 5,
-	PCIC_eap_m	= 0x00000020,
-	PCIC_pcim_b	= 6,
-	PCIC_pcim_m	= 0x000001c0,
-		PCIC_pcim_disabled_v	= 0,
-		PCIC_pcim_tnr_v 	= 1,	// Satellite - target not ready
-		PCIC_pcim_suspend_v	= 2,	// Satellite - suspended CPU.
-		PCIC_pcim_extern_v	= 3,	// Host - external arbiter.
-		PCIC_pcim_fixed_v	= 4,	// Host - fixed priority arb.
-		PCIC_pcim_roundrobin_v	= 5,	// Host - round robin priority.
-		PCIC_pcim_reserved6_v	= 6,
-		PCIC_pcim_reserved7_v	= 7,
-	PCIC_igm_b	= 9,
-	PCIC_igm_m	= 0x00000200,
-} ;
-
-/*******************************************************************************
- *
- * PCI Status Register
- *
- ******************************************************************************/
-enum {
-	PCIS_eed_b	= 0,
-	PCIS_eed_m	= 0x00000001,
-	PCIS_wr_b	= 1,
-	PCIS_wr_m	= 0x00000002,
-	PCIS_nmi_b	= 2,
-	PCIS_nmi_m	= 0x00000004,
-	PCIS_ii_b	= 3,
-	PCIS_ii_m	= 0x00000008,
-	PCIS_cwe_b	= 4,
-	PCIS_cwe_m	= 0x00000010,
-	PCIS_cre_b	= 5,
-	PCIS_cre_m	= 0x00000020,
-	PCIS_mdpe_b	= 6,
-	PCIS_mdpe_m	= 0x00000040,
-	PCIS_sta_b	= 7,
-	PCIS_sta_m	= 0x00000080,
-	PCIS_rta_b	= 8,
-	PCIS_rta_m	= 0x00000100,
-	PCIS_rma_b	= 9,
-	PCIS_rma_m	= 0x00000200,
-	PCIS_sse_b	= 10,
-	PCIS_sse_m	= 0x00000400,
-	PCIS_ose_b	= 11,
-	PCIS_ose_m	= 0x00000800,
-	PCIS_pe_b	= 12,
-	PCIS_pe_m	= 0x00001000,
-	PCIS_tae_b	= 13,
-	PCIS_tae_m	= 0x00002000,
-	PCIS_rle_b	= 14,
-	PCIS_rle_m	= 0x00004000,
-	PCIS_bme_b	= 15,
-	PCIS_bme_m	= 0x00008000,
-	PCIS_prd_b	= 16,
-	PCIS_prd_m	= 0x00010000,
-	PCIS_rip_b	= 17,
-	PCIS_rip_m	= 0x00020000,
-} ;
-
-/*******************************************************************************
- *
- * PCI Status Mask Register
- *
- ******************************************************************************/
-enum {
-	PCISM_eed_b		= 0,
-	PCISM_eed_m		= 0x00000001,
-	PCISM_wr_b		= 1,
-	PCISM_wr_m		= 0x00000002,
-	PCISM_nmi_b		= 2,
-	PCISM_nmi_m		= 0x00000004,
-	PCISM_ii_b		= 3,
-	PCISM_ii_m		= 0x00000008,
-	PCISM_cwe_b		= 4,
-	PCISM_cwe_m		= 0x00000010,
-	PCISM_cre_b		= 5,
-	PCISM_cre_m		= 0x00000020,
-	PCISM_mdpe_b		= 6,
-	PCISM_mdpe_m		= 0x00000040,
-	PCISM_sta_b		= 7,
-	PCISM_sta_m		= 0x00000080,
-	PCISM_rta_b		= 8,
-	PCISM_rta_m		= 0x00000100,
-	PCISM_rma_b		= 9,
-	PCISM_rma_m		= 0x00000200,
-	PCISM_sse_b		= 10,
-	PCISM_sse_m		= 0x00000400,
-	PCISM_ose_b		= 11,
-	PCISM_ose_m		= 0x00000800,
-	PCISM_pe_b		= 12,
-	PCISM_pe_m		= 0x00001000,
-	PCISM_tae_b		= 13,
-	PCISM_tae_m		= 0x00002000,
-	PCISM_rle_b		= 14,
-	PCISM_rle_m		= 0x00004000,
-	PCISM_bme_b		= 15,
-	PCISM_bme_m		= 0x00008000,
-	PCISM_prd_b		= 16,
-	PCISM_prd_m		= 0x00010000,
-	PCISM_rip_b		= 17,
-	PCISM_rip_m		= 0x00020000,
-} ;
-
-/*******************************************************************************
- *
- * PCI Configuration Address Register
- *
- ******************************************************************************/
-enum {
-	PCICFGA_reg_b		= 2,
-	PCICFGA_reg_m		= 0x000000fc,
-		PCICFGA_reg_id_v	= 0x00>>2, //use PCFGID_
-		PCICFGA_reg_04_v	= 0x04>>2, //use PCFG04_
-		PCICFGA_reg_08_v	= 0x08>>2, //use PCFG08_
-		PCICFGA_reg_0C_v	= 0x0C>>2, //use PCFG0C_
-		PCICFGA_reg_pba0_v	= 0x10>>2, //use PCIPBA_
-		PCICFGA_reg_pba1_v	= 0x14>>2, //use PCIPBA_
-		PCICFGA_reg_pba2_v	= 0x18>>2, //use PCIPBA_
-		PCICFGA_reg_pba3_v	= 0x1c>>2, //use PCIPBA_
-		PCICFGA_reg_subsystem_v = 0x2c>>2, //use PCFGSS_
-		PCICFGA_reg_3C_v	= 0x3C>>2, //use PCFG3C_
-		PCICFGA_reg_pba0c_v	= 0x44>>2, //use PCIPBAC_
-		PCICFGA_reg_pba0m_v	= 0x48>>2,
-		PCICFGA_reg_pba1c_v	= 0x4c>>2, //use PCIPBAC_
-		PCICFGA_reg_pba1m_v	= 0x50>>2,
-		PCICFGA_reg_pba2c_v	= 0x54>>2, //use PCIPBAC_
-		PCICFGA_reg_pba2m_v	= 0x58>>2,
-		PCICFGA_reg_pba3c_v	= 0x5c>>2, //use PCIPBAC_
-		PCICFGA_reg_pba3m_v	= 0x60>>2,
-		PCICFGA_reg_pmgt_v	= 0x64>>2,
-	PCICFGA_func_b		= 8,
-	PCICFGA_func_m		= 0x00000700,
-	PCICFGA_dev_b		= 11,
-	PCICFGA_dev_m		= 0x0000f800,
-		PCICFGA_dev_internal_v	= 0,
-	PCICFGA_bus_b		= 16,
-	PCICFGA_bus_m		= 0x00ff0000,
-		PCICFGA_bus_type0_v	= 0,	//local bus
-	PCICFGA_en_b		= 31,		// read only
-	PCICFGA_en_m		= 0x80000000,
-} ;
-
-enum {
-	PCFGID_vendor_b 	= 0,
-	PCFGID_vendor_m 	= 0x0000ffff,
-		PCFGID_vendor_IDT_v		= 0x111d,
-	PCFGID_device_b 	= 16,
-	PCFGID_device_m 	= 0xffff0000,
-		PCFGID_device_Korinade_v	= 0x0214,
-
-	PCFG04_command_ioena_b		= 1,
-	PCFG04_command_ioena_m		= 0x00000001,
-	PCFG04_command_memena_b 	= 2,
-	PCFG04_command_memena_m 	= 0x00000002,
-	PCFG04_command_bmena_b		= 3,
-	PCFG04_command_bmena_m		= 0x00000004,
-	PCFG04_command_mwinv_b		= 5,
-	PCFG04_command_mwinv_m		= 0x00000010,
-	PCFG04_command_parena_b 	= 7,
-	PCFG04_command_parena_m 	= 0x00000040,
-	PCFG04_command_serrena_b	= 9,
-	PCFG04_command_serrena_m	= 0x00000100,
-	PCFG04_command_fastbbena_b	= 10,
-	PCFG04_command_fastbbena_m	= 0x00000200,
-	PCFG04_status_b 		= 16,
-	PCFG04_status_m 		= 0xffff0000,
-	PCFG04_status_66MHz_b		= 21,	// 66 MHz enable
-	PCFG04_status_66MHz_m		= 0x00200000,
-	PCFG04_status_fbb_b		= 23,
-	PCFG04_status_fbb_m		= 0x00800000,
-	PCFG04_status_mdpe_b		= 24,
-	PCFG04_status_mdpe_m		= 0x01000000,
-	PCFG04_status_dst_b		= 25,
-	PCFG04_status_dst_m		= 0x06000000,
-	PCFG04_status_sta_b		= 27,
-	PCFG04_status_sta_m		= 0x08000000,
-	PCFG04_status_rta_b		= 28,
-	PCFG04_status_rta_m		= 0x10000000,
-	PCFG04_status_rma_b		= 29,
-	PCFG04_status_rma_m		= 0x20000000,
-	PCFG04_status_sse_b		= 30,
-	PCFG04_status_sse_m		= 0x40000000,
-	PCFG04_status_pe_b		= 31,
-	PCFG04_status_pe_m		= 0x40000000,
-
-	PCFG08_revId_b			= 0,
-	PCFG08_revId_m			= 0x000000ff,
-	PCFG08_classCode_b		= 0,
-	PCFG08_classCode_m		= 0xffffff00,
-		PCFG08_classCode_bridge_v	= 06,
-		PCFG08_classCode_proc_v 	= 0x0b3000, // processor-MIPS
-	PCFG0C_cacheline_b		= 0,
-	PCFG0C_cacheline_m		= 0x000000ff,
-	PCFG0C_masterLatency_b		= 8,
-	PCFG0C_masterLatency_m		= 0x0000ff00,
-	PCFG0C_headerType_b		= 16,
-	PCFG0C_headerType_m		= 0x00ff0000,
-	PCFG0C_bist_b			= 24,
-	PCFG0C_bist_m			= 0xff000000,
-
-	PCIPBA_msi_b			= 0,
-	PCIPBA_msi_m			= 0x00000001,
-	PCIPBA_p_b			= 3,
-	PCIPBA_p_m			= 0x00000004,
-	PCIPBA_baddr_b			= 8,
-	PCIPBA_baddr_m			= 0xffffff00,
-
-	PCFGSS_vendorId_b		= 0,
-	PCFGSS_vendorId_m		= 0x0000ffff,
-	PCFGSS_id_b			= 16,
-	PCFGSS_id_m			= 0xffff0000,
-
-	PCFG3C_interruptLine_b		= 0,
-	PCFG3C_interruptLine_m		= 0x000000ff,
-	PCFG3C_interruptPin_b		= 8,
-	PCFG3C_interruptPin_m		= 0x0000ff00,
-	PCFG3C_minGrant_b		= 16,
-	PCFG3C_minGrant_m		= 0x00ff0000,
-	PCFG3C_maxLat_b 		= 24,
-	PCFG3C_maxLat_m 		= 0xff000000,
-
-	PCIPBAC_msi_b			= 0,
-	PCIPBAC_msi_m			= 0x00000001,
-	PCIPBAC_p_b			= 1,
-	PCIPBAC_p_m			= 0x00000002,
-	PCIPBAC_size_b			= 2,
-	PCIPBAC_size_m			= 0x0000007c,
-	PCIPBAC_sb_b			= 7,
-	PCIPBAC_sb_m			= 0x00000080,
-	PCIPBAC_pp_b			= 8,
-	PCIPBAC_pp_m			= 0x00000100,
-	PCIPBAC_mr_b			= 9,
-	PCIPBAC_mr_m			= 0x00000600,
-		PCIPBAC_mr_read_v	=0,	//no prefetching
-		PCIPBAC_mr_readLine_v	=1,
-		PCIPBAC_mr_readMult_v	=2,
-	PCIPBAC_mrl_b			= 11,
-	PCIPBAC_mrl_m			= 0x00000800,
-	PCIPBAC_mrm_b			= 12,
-	PCIPBAC_mrm_m			= 0x00001000,
-	PCIPBAC_trp_b			= 13,
-	PCIPBAC_trp_m			= 0x00002000,
-
-	PCFG40_trdyTimeout_b		= 0,
-	PCFG40_trdyTimeout_m		= 0x000000ff,
-	PCFG40_retryLim_b		= 8,
-	PCFG40_retryLim_m		= 0x0000ff00,
-};
-
-/*******************************************************************************
- *
- * PCI Local Base Address [0|1|2|3] Register
- *
- ******************************************************************************/
-enum {
-	PCILBA_baddr_b		= 0,		// In PCI_t -> pcilba [] .a
-	PCILBA_baddr_m		= 0xffffff00,
-} ;
-/*******************************************************************************
- *
- * PCI Local Base Address Control Register
- *
- ******************************************************************************/
-enum {
-	PCILBAC_msi_b		= 0,		// In pPci->pcilba[i].c
-	PCILBAC_msi_m		= 0x00000001,
-		PCILBAC_msi_mem_v	= 0,
-		PCILBAC_msi_io_v	= 1,
-	PCILBAC_size_b		= 2,	// In pPci->pcilba[i].c
-	PCILBAC_size_m		= 0x0000007c,
-	PCILBAC_sb_b		= 7,	// In pPci->pcilba[i].c
-	PCILBAC_sb_m		= 0x00000080,
-	PCILBAC_rt_b		= 8,	// In pPci->pcilba[i].c
-	PCILBAC_rt_m		= 0x00000100,
-		PCILBAC_rt_noprefetch_v = 0, // mem read
-		PCILBAC_rt_prefetch_v	= 1, // mem readline
-} ;
-
-/*******************************************************************************
- *
- * PCI Local Base Address [0|1|2|3] Mapping Register
- *
- ******************************************************************************/
-enum {
-	PCILBAM_maddr_b 	= 8,
-	PCILBAM_maddr_m 	= 0xffffff00,
-} ;
-
-/*******************************************************************************
- *
- * PCI Decoupled Access Control Register
- *
- ******************************************************************************/
-enum {
-	PCIDAC_den_b		= 0,
-	PCIDAC_den_m		= 0x00000001,
-} ;
-
-/*******************************************************************************
- *
- * PCI Decoupled Access Status Register
- *
- ******************************************************************************/
-enum {
-	PCIDAS_d_b	= 0,
-	PCIDAS_d_m	= 0x00000001,
-	PCIDAS_b_b	= 1,
-	PCIDAS_b_m	= 0x00000002,
-	PCIDAS_e_b	= 2,
-	PCIDAS_e_m	= 0x00000004,
-	PCIDAS_ofe_b	= 3,
-	PCIDAS_ofe_m	= 0x00000008,
-	PCIDAS_off_b	= 4,
-	PCIDAS_off_m	= 0x00000010,
-	PCIDAS_ife_b	= 5,
-	PCIDAS_ife_m	= 0x00000020,
-	PCIDAS_iff_b	= 6,
-	PCIDAS_iff_m	= 0x00000040,
-} ;
-
-/*******************************************************************************
- *
- * PCI DMA Channel 8 Configuration Register
- *
- ******************************************************************************/
-enum
-{
-	PCIDMA8C_mbs_b	= 0,		// Maximum Burst Size.
-	PCIDMA8C_mbs_m	= 0x00000fff,	// { pcidma8c }
-	PCIDMA8C_our_b	= 12,		// Optimize Unaligned Burst Reads.
-	PCIDMA8C_our_m	= 0x00001000,	// { pcidma8c }
-} ;
-
-/*******************************************************************************
- *
- * PCI DMA Channel 9 Configuration Register
- *
- ******************************************************************************/
-enum
-{
-	PCIDMA9C_mbs_b	= 0,		// Maximum Burst Size.
-	PCIDMA9C_mbs_m	= 0x00000fff, // { pcidma9c }
-} ;
-
-/*******************************************************************************
- *
- * PCI to Memory(DMA Channel 8) AND Memory to PCI DMA(DMA Channel 9)Descriptors
- *
- ******************************************************************************/
-enum {
-	PCIDMAD_pt_b		= 22,		// in DEVCMD field (descriptor)
-	PCIDMAD_pt_m		= 0x00c00000,	// preferred transaction field
-		// These are for reads (DMA channel 8)
-		PCIDMAD_devcmd_mr_v	= 0,	//memory read
-		PCIDMAD_devcmd_mrl_v	= 1,	//memory read line
-		PCIDMAD_devcmd_mrm_v	= 2,	//memory read multiple
-		PCIDMAD_devcmd_ior_v	= 3,	//I/O read
-		// These are for writes (DMA channel 9)
-		PCIDMAD_devcmd_mw_v	= 0,	//memory write
-		PCIDMAD_devcmd_mwi_v	= 1,	//memory write invalidate
-		PCIDMAD_devcmd_iow_v	= 3,	//I/O write
-
-	// Swap byte field applies to both DMA channel 8 and 9
-	PCIDMAD_sb_b		= 24,		// in DEVCMD field (descriptor)
-	PCIDMAD_sb_m		= 0x01000000,	// swap byte field
-} ;
-
-
-/*******************************************************************************
- *
- * PCI Target Control Register
- *
- ******************************************************************************/
-enum
-{
-	PCITC_rtimer_b		= 0,		// In PCITC_t -> pcitc
-	PCITC_rtimer_m		= 0x000000ff,
-	PCITC_dtimer_b		= 8,		// In PCITC_t -> pcitc
-	PCITC_dtimer_m		= 0x0000ff00,
-	PCITC_rdr_b		= 18,		// In PCITC_t -> pcitc
-	PCITC_rdr_m		= 0x00040000,
-	PCITC_ddt_b		= 19,		// In PCITC_t -> pcitc
-	PCITC_ddt_m		= 0x00080000,
-} ;
-/*******************************************************************************
- *
- * PCI messaging unit [applies to both inbound and outbound registers ]
- *
- ******************************************************************************/
-enum
-{
-	PCIM_m0_b	= 0,		// In PCIM_t -> {pci{iic,iim,ioic,ioim}}
-	PCIM_m0_m	= 0x00000001,	// inbound or outbound message 0
-	PCIM_m1_b	= 1,		// In PCIM_t -> {pci{iic,iim,ioic,ioim}}
-	PCIM_m1_m	= 0x00000002,	// inbound or outbound message 1
-	PCIM_db_b	= 2,		// In PCIM_t -> {pci{iic,iim,ioic,ioim}}
-	PCIM_db_m	= 0x00000004,	// inbound or outbound doorbell
-};
-
-
-
-
-
-
-#define PCI_MSG_VirtualAddress	     0xB8088010
-#define rc32434_pci ((volatile PCI_t) PCI0_VirtualAddress)
-#define rc32434_pci_msg ((volatile PCIM_t) PCI_MSG_VirtualAddress)
-
-#define PCIM_SHFT		0x6
-#define PCIM_BIT_LEN		0x7
-#define PCIM_H_EA		0x3
-#define PCIM_H_IA_FIX		0x4
-#define PCIM_H_IA_RR		0x5
-
-#define PCI_ADDR_START		0x50000000
-
-#define CPUTOPCI_MEM_WIN	0x02000000
-#define CPUTOPCI_IO_WIN		0x00100000
-#define PCILBA_SIZE_SHFT	2
-#define PCILBA_SIZE_MASK	0x1F
-#define SIZE_256MB		0x1C
-#define SIZE_128MB		0x1B
-#define SIZE_64MB               0x1A
-#define SIZE_32MB		0x19
-#define SIZE_16MB               0x18
-#define SIZE_4MB		0x16
-#define SIZE_2MB		0x15
-#define SIZE_1MB		0x14
-#define KORINA_CONFIG0_ADDR	0x80000000
-#define KORINA_CONFIG1_ADDR	0x80000004
-#define KORINA_CONFIG2_ADDR	0x80000008
-#define KORINA_CONFIG3_ADDR	0x8000000C
-#define KORINA_CONFIG4_ADDR	0x80000010
-#define KORINA_CONFIG5_ADDR	0x80000014
-#define KORINA_CONFIG6_ADDR	0x80000018
-#define KORINA_CONFIG7_ADDR	0x8000001C
-#define KORINA_CONFIG8_ADDR	0x80000020
-#define KORINA_CONFIG9_ADDR	0x80000024
-#define KORINA_CONFIG10_ADDR	0x80000028
-#define KORINA_CONFIG11_ADDR	0x8000002C
-#define KORINA_CONFIG12_ADDR	0x80000030
-#define KORINA_CONFIG13_ADDR	0x80000034
-#define KORINA_CONFIG14_ADDR	0x80000038
-#define KORINA_CONFIG15_ADDR	0x8000003C
-#define KORINA_CONFIG16_ADDR	0x80000040
-#define KORINA_CONFIG17_ADDR	0x80000044
-#define KORINA_CONFIG18_ADDR	0x80000048
-#define KORINA_CONFIG19_ADDR	0x8000004C
-#define KORINA_CONFIG20_ADDR	0x80000050
-#define KORINA_CONFIG21_ADDR	0x80000054
-#define KORINA_CONFIG22_ADDR	0x80000058
-#define KORINA_CONFIG23_ADDR	0x8000005C
-#define KORINA_CONFIG24_ADDR	0x80000060
-#define KORINA_CONFIG25_ADDR	0x80000064
-#define KORINA_CMD 		(PCFG04_command_ioena_m | \
-				 PCFG04_command_memena_m | \
-				 PCFG04_command_bmena_m | \
-				 PCFG04_command_mwinv_m | \
-				 PCFG04_command_parena_m | \
-				 PCFG04_command_serrena_m )
-
-#define KORINA_STAT		(PCFG04_status_mdpe_m | \
-				 PCFG04_status_sta_m  | \
-				 PCFG04_status_rta_m  | \
-				 PCFG04_status_rma_m  | \
-				 PCFG04_status_sse_m  | \
-				 PCFG04_status_pe_m)
-
-#define KORINA_CNFG1		((KORINA_STAT<<16)|KORINA_CMD)
-
-#define KORINA_REVID		0
-#define KORINA_CLASS_CODE	0
-#define KORINA_CNFG2		((KORINA_CLASS_CODE<<8) | \
-				  KORINA_REVID)
-
-#define KORINA_CACHE_LINE_SIZE	4
-#define KORINA_MASTER_LAT	0x3c
-#define KORINA_HEADER_TYPE	0
-#define KORINA_BIST		0
-
-#define KORINA_CNFG3 ((KORINA_BIST << 24) | \
-		      (KORINA_HEADER_TYPE<<16) | \
-		      (KORINA_MASTER_LAT<<8) | \
-		      KORINA_CACHE_LINE_SIZE )
-
-#define KORINA_BAR0	0x00000008 /* 128 MB Memory */
-#define KORINA_BAR1	0x18800001 /* 1 MB IO */
-#define KORINA_BAR2	0x18000001 /* 2 MB IO window for Korina
-					internal Registers */
-#define KORINA_BAR3	0x48000008 /* Spare 128 MB Memory */
-
-#define KORINA_CNFG4	KORINA_BAR0
-#define KORINA_CNFG5    KORINA_BAR1
-#define KORINA_CNFG6 	KORINA_BAR2
-#define KORINA_CNFG7	KORINA_BAR3
-
-#define KORINA_SUBSYS_VENDOR_ID 0x011d
-#define KORINA_SUBSYSTEM_ID	0x0214
-#define KORINA_CNFG8		0
-#define KORINA_CNFG9		0
-#define KORINA_CNFG10		0
-#define KORINA_CNFG11 	((KORINA_SUBSYS_VENDOR_ID<<16) | \
-			  KORINA_SUBSYSTEM_ID)
-#define KORINA_INT_LINE		1
-#define KORINA_INT_PIN		1
-#define KORINA_MIN_GNT		8
-#define KORINA_MAX_LAT		0x38
-#define KORINA_CNFG12		0
-#define KORINA_CNFG13 		0
-#define KORINA_CNFG14		0
-#define KORINA_CNFG15	((KORINA_MAX_LAT<<24) | \
-			 (KORINA_MIN_GNT<<16) | \
-			 (KORINA_INT_PIN<<8)  | \
-			  KORINA_INT_LINE)
-#define	KORINA_RETRY_LIMIT	0x80
-#define KORINA_TRDY_LIMIT	0x80
-#define KORINA_CNFG16 ((KORINA_RETRY_LIMIT<<8) | \
-			KORINA_TRDY_LIMIT)
-#define PCI_PBAxC_R		0x0
-#define PCI_PBAxC_RL		0x1
-#define PCI_PBAxC_RM		0x2
-#define SIZE_SHFT		2
-
-#if defined(__MIPSEB__)
-#define KORINA_PBA0C	( PCIPBAC_mrl_m | PCIPBAC_sb_m | \
-			  ((PCI_PBAxC_RM &0x3) << PCIPBAC_mr_b) | \
-			  PCIPBAC_pp_m | \
-			  (SIZE_128MB<<SIZE_SHFT) | \
-			   PCIPBAC_p_m)
-#else
-#define KORINA_PBA0C	( PCIPBAC_mrl_m | \
-			  ((PCI_PBAxC_RM &0x3) << PCIPBAC_mr_b) | \
-			  PCIPBAC_pp_m | \
-			  (SIZE_128MB<<SIZE_SHFT) | \
-			   PCIPBAC_p_m)
-#endif
-#define KORINA_CNFG17	KORINA_PBA0C
-#define KORINA_PBA0M	0x0
-#define KORINA_CNFG18	KORINA_PBA0M
-
-#if defined(__MIPSEB__)
-#define KORINA_PBA1C	((SIZE_1MB<<SIZE_SHFT) | PCIPBAC_sb_m | \
-			  PCIPBAC_msi_m)
-#else
-#define KORINA_PBA1C	((SIZE_1MB<<SIZE_SHFT) | \
-			  PCIPBAC_msi_m)
-#endif
-#define KORINA_CNFG19	KORINA_PBA1C
-#define KORINA_PBA1M	0x0
-#define KORINA_CNFG20	KORINA_PBA1M
-
-#if defined(__MIPSEB__)
-#define KORINA_PBA2C	((SIZE_2MB<<SIZE_SHFT) | PCIPBAC_sb_m | \
-			  PCIPBAC_msi_m)
-#else
-#define KORINA_PBA2C	((SIZE_2MB<<SIZE_SHFT) | \
-			  PCIPBAC_msi_m)
-#endif
-#define KORINA_CNFG21	KORINA_PBA2C
-#define KORINA_PBA2M	0x18000000
-#define KORINA_CNFG22	KORINA_PBA2M
-#define KORINA_PBA3C	0
-#define KORINA_CNFG23	KORINA_PBA3C
-#define KORINA_PBA3M	0
-#define KORINA_CNFG24	KORINA_PBA3M
-
-
-
-#define	PCITC_DTIMER_VAL	8
-#define PCITC_RTIMER_VAL	0x10
-
-
-
-
-#endif	// __IDT_PCI_H__
-
-
-
diff --git a/target/linux/rb532/files/include/asm-mips/rc32434/rb.h b/target/linux/rb532/files/include/asm-mips/rc32434/rb.h
deleted file mode 100644
index 6800eb0..0000000
--- a/target/linux/rb532/files/include/asm-mips/rc32434/rb.h
+++ /dev/null
@@ -1,84 +0,0 @@
-/*
- *  Copyright (C) 2004 IDT Inc.
- *  Copyright (C) 2006 Felix Fietkau <nbd@openwrt.org>
- *
- *  This program is free software; you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation; either version 2 of the License, or
- *  (at your option) any later version.
- *
- *  This program is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- *  GNU General Public License for more details.
- *
- */
-#ifndef __MIPS_RB_H__
-#define __MIPS_RB_H__
-#include <linux/genhd.h>
-
-#define IDT434_REG_BASE ((volatile void *) KSEG1ADDR(0x18000000))
-#define DEV0BASE 0x010000
-#define DEV0MASK 0x010004
-#define DEV0C 0x010008
-#define DEV0TC 0x01000C
-#define DEV1BASE 0x010010
-#define DEV1MASK 0x010014
-#define DEV1C 0x010018
-#define DEV1TC 0x01001C
-#define DEV2BASE 0x010020
-#define DEV2MASK 0x010024
-#define DEV2C 0x010028
-#define DEV2TC 0x01002C
-#define DEV3BASE 0x010030
-#define DEV3MASK 0x010034
-#define DEV3C 0x010038
-#define DEV3TC 0x01003C
-#define BTCS 0x010040
-#define BTCOMPARE 0x010044
-#define GPIOFUNC 0x050000
-#define GPIOCFG 0x050004
-#define GPIOD 0x050008
-#define GPIOILEVEL 0x05000C
-#define GPIOISTAT 0x050010
-#define GPIONMIEN 0x050014
-#define IMASK6 0x038038
-
-#define LO_WPX (1 << 0)
-#define LO_ALE (1 << 1)
-#define LO_CLE (1 << 2)
-#define LO_CEX (1 << 3)
-#define LO_FOFF (1 << 5)
-#define LO_SPICS (1 << 6)
-#define LO_ULED (1 << 7)
-
-typedef enum {
-	FUNC = 0x00,
-	CFG = 0x04,
-	DATA = 0x08,
-	ILEVEL = 0x0c,
-	ISTAT = 0x10,
-	NMIEN = 0x14
-} gpio_func;
-
-extern void changeLatchU5(unsigned char orMask, unsigned char nandMask);
-extern unsigned get434Reg(unsigned regOffs);
-extern void set434Reg(unsigned regOffs, unsigned bit, unsigned len, unsigned val);
-extern void gpio_set(gpio_func func, u32 mask, u32 value);
-extern u32 gpio_get(gpio_func func);
-
-#define get434Reg(x) (*(volatile unsigned *) (IDT434_REG_BASE + (x)))
-
-struct korina_device {
-	char *name;
-	unsigned char mac[6];
-	struct net_device *dev;
-};
-
-struct cf_device {
-	int gpio_pin;
-	void *dev;
-	struct gendisk *gd;
-};
-
-#endif
diff --git a/target/linux/rb532/files/include/asm-mips/rc32434/rc32434.h b/target/linux/rb532/files/include/asm-mips/rc32434/rc32434.h
deleted file mode 100644
index f3e53e4..0000000
--- a/target/linux/rb532/files/include/asm-mips/rc32434/rc32434.h
+++ /dev/null
@@ -1,121 +0,0 @@
-/*
- ***************************************************************************
- * Definitions for IDT RC323434 CPU.
- *
- ****************************************************************************
- * Kiran Rao
- * 
- * Original form
- ****************************************************************************
- * P. Sadik   Oct 08, 2003
- *
- * Started revision history
- * Made IDT_BUS_FREQ a kernel configuration parameter
- ****************************************************************************
- * P. Sadik   Oct 10, 2003
- *
- * Removed IDT_BUS_FREQ, since this parameter is no longer required. Instead
- * idt_cpu_freq is used everywhere
- ****************************************************************************
- * P. Sadik   Oct 20, 2003
- *
- * Removed RC32434_BASE_BAUD
- ****************************************************************************
-*/
-#ifndef _RC32434_H_
-#define _RC32434_H_
-
-#include <linux/autoconf.h>
-#include <linux/delay.h>
-#include <asm/io.h>
-
-#define RC32434_REG_BASE   0x18000000
-
-#define interrupt ((volatile INT_t ) INT0_VirtualAddress)
-
-
-#define IDT_CLOCK_MULT 2
-#define MIPS_CPU_TIMER_IRQ 7
-/* Interrupt Controller */
-#define IC_GROUP0_PEND     (RC32434_REG_BASE + 0x38000)
-#define IC_GROUP0_MASK     (RC32434_REG_BASE + 0x38008)
-#define IC_GROUP_OFFSET    0x0C
-
-#define NUM_INTR_GROUPS    5
-/* 16550 UARTs */
-
-#define GROUP0_IRQ_BASE 8		/* GRP2 IRQ numbers start here */
-#define GROUP1_IRQ_BASE (GROUP0_IRQ_BASE + 32) /* GRP3 IRQ numbers start here */
-#define GROUP2_IRQ_BASE (GROUP1_IRQ_BASE + 32) /* GRP4 IRQ numbers start here */
-#define GROUP3_IRQ_BASE (GROUP2_IRQ_BASE + 32)	/* GRP5 IRQ numbers start here */
-#define GROUP4_IRQ_BASE (GROUP3_IRQ_BASE + 32)
-
-
-#ifdef __MIPSEB__
-#define RC32434_UART0_BASE (RC32434_REG_BASE + 0x58003)
-#else
-#define RC32434_UART0_BASE (RC32434_REG_BASE + 0x58000)
-#endif
-
-#define RC32434_UART0_IRQ  GROUP3_IRQ_BASE + 0
-// #define EB434_UART1_IRQ    GROUP4_IRQ_BASE + 11
-
-#define local_readl(addr) __raw_readl(addr)
-#define local_writel(l,addr) __raw_writel(l,addr)
-
-/* cpu pipeline flush */
-static inline void rc32434_sync(void)
-{
-        __asm__ volatile ("sync");
-}
-
-static inline void rc32434_sync_udelay(int us)
-{
-        __asm__ volatile ("sync");
-        udelay(us);
-}
-
-static inline void rc32434_sync_delay(int ms)
-{
-        __asm__ volatile ("sync");
-        mdelay(ms);
-}
-
-/*
- * C access to CLZ and CLO instructions
- * (count leading zeroes/ones).
- */
-static inline int rc32434_clz(unsigned long val)
-{
-	int ret;
-        __asm__ volatile (
-		".set\tnoreorder\n\t"
-		".set\tnoat\n\t"
-		".set\tmips32\n\t"
-		"clz\t%0,%1\n\t"
-                ".set\tmips0\n\t"
-                ".set\tat\n\t"
-                ".set\treorder"
-                : "=r" (ret)
-		: "r" (val));
-
-	return ret;
-}
-static inline int rc32434_clo(unsigned long val)
-{
-	int ret;
-        __asm__ volatile (
-		".set\tnoreorder\n\t"
-		".set\tnoat\n\t"
-		".set\tmips32\n\t"
-		"clo\t%0,%1\n\t"
-                ".set\tmips0\n\t"
-                ".set\tat\n\t"
-                ".set\treorder"
-                : "=r" (ret)
-		: "r" (val));
-
-	return ret;
-}
-
-#endif /* _RC32434_H_ */
diff --git a/target/linux/rb532/files/include/asm-mips/rc32434/war.h b/target/linux/rb532/files/include/asm-mips/rc32434/war.h
deleted file mode 100644
index 3ddf187..0000000
--- a/target/linux/rb532/files/include/asm-mips/rc32434/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) 2002, 2004, 2007 by Ralf Baechle <ralf@linux-mips.org>
- */
-#ifndef __ASM_MIPS_MACH_MIPS_WAR_H
-#define __ASM_MIPS_MACH_MIPS_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	1
-#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_MIPS_WAR_H */