X-Git-Url: http://git.ozo.com/?a=blobdiff_plain;f=target%2Flinux%2Far71xx%2Ffiles%2Farch%2Fmips%2Far71xx%2Fmach-generic.c;h=c183ba937cecd4798989d949c2e964bab979fa24;hb=795fed69101b45a28498a7b37f6f0747ffd986ed;hp=4a1200d5247088ed2d502a8f6e0dae3b70cf4961;hpb=546b5ed544503182a9b3e981bc11feebd6042b21;p=openwrt-10.03%2F.git

diff --git a/target/linux/ar71xx/files/arch/mips/ar71xx/mach-generic.c b/target/linux/ar71xx/files/arch/mips/ar71xx/mach-generic.c
index 4a1200d52..c183ba937 100644
--- a/target/linux/ar71xx/files/arch/mips/ar71xx/mach-generic.c
+++ b/target/linux/ar71xx/files/arch/mips/ar71xx/mach-generic.c
@@ -1,5 +1,5 @@
 /*
- *  Generic AR71xx machine setup
+ *  Generic AR71xx machine support
  *
  *  Copyright (C) 2008 Gabor Juhos <juhosg@openwrt.org>
  *  Copyright (C) 2008 Imre Kaloz <kaloz@openwrt.org>
@@ -10,52 +10,13 @@
  */
 
 #include <linux/init.h>
-#include <linux/platform_device.h>
-#include <linux/spi/spi.h>
-#include <linux/spi/flash.h>
 
 #include <asm/mips_machine.h>
 #include <asm/mach-ar71xx/ar71xx.h>
-#include <asm/mach-ar71xx/pci.h>
-#include <asm/mach-ar71xx/platform.h>
-
-static struct spi_board_info ar71xx_generic_spi_info[] = {
-	{
-		.bus_num	= 0,
-		.chip_select	= 0,
-		.max_speed_hz	= 25000000,
-		.modalias	= "m25p80",
-	}
-};
-
-static struct ar71xx_pci_irq ar71xx_generic_pci_irqs[] __initdata = {
-	{
-		.slot	= 0,
-		.pin	= 1,
-		.irq	= AR71XX_PCI_IRQ_DEV0,
-	}, {
-		.slot	= 1,
-		.pin	= 1,
-		.irq	= AR71XX_PCI_IRQ_DEV1,
-	}, {
-		.slot	= 2,
-		.pin	= 1,
-		.irq	= AR71XX_PCI_IRQ_DEV2,
-	}
-};
 
 static void __init ar71xx_generic_init(void)
 {
-	ar71xx_add_device_spi(NULL, ar71xx_generic_spi_info,
-				ARRAY_SIZE(ar71xx_generic_spi_info));
-
-	ar71xx_add_device_eth(0, PHY_INTERFACE_MODE_MII, 0x001f0000);
-	ar71xx_add_device_eth(1, PHY_INTERFACE_MODE_RMII, 0xffffffff);
-
-	ar71xx_add_device_usb();
-
-	ar71xx_pci_init(ARRAY_SIZE(ar71xx_generic_pci_irqs),
-			ar71xx_generic_pci_irqs);
+	/* Nothing to do */
 }
 
-MIPS_MACHINE(MACH_AR71XX_GENERIC, "Generic AR71xx board", ar71xx_generic_init);
+MIPS_MACHINE(AR71XX_MACH_GENERIC, "Generic AR71xx board", ar71xx_generic_init);