X-Git-Url: http://git.openwrt.org/?p=openwrt%2Fsvn-archive%2Farchive.git;a=blobdiff_plain;f=target%2Flinux%2Far71xx%2Ffiles%2Farch%2Fmips%2Far71xx%2Fmach-tl-wr941nd.c;h=35ab8ba7217856870dfe4ffc7c294630f169bf15;hp=580ae19d9240ab9a0fe30248f14037880b946602;hb=be46c5e0d0d73a24f0e8f635b31966cc6f12f74f;hpb=71953568c171178b57c2cd1f93b024a2f7eb0783

diff --git a/target/linux/ar71xx/files/arch/mips/ar71xx/mach-tl-wr941nd.c b/target/linux/ar71xx/files/arch/mips/ar71xx/mach-tl-wr941nd.c
index 580ae19d92..35ab8ba721 100644
--- a/target/linux/ar71xx/files/arch/mips/ar71xx/mach-tl-wr941nd.c
+++ b/target/linux/ar71xx/files/arch/mips/ar71xx/mach-tl-wr941nd.c
@@ -8,18 +8,17 @@
  *  by the Free Software Foundation.
  */
 
-#include <linux/platform_device.h>
 #include <linux/mtd/mtd.h>
 #include <linux/mtd/partitions.h>
-#include <linux/spi/spi.h>
-#include <linux/spi/flash.h>
-#include <linux/input.h>
 
 #include <asm/mips_machine.h>
-
 #include <asm/mach-ar71xx/ar71xx.h>
 
 #include "devices.h"
+#include "dev-m25p80.h"
+#include "dev-ar913x-wmac.h"
+#include "dev-gpio-buttons.h"
+#include "dev-leds-gpio.h"
 
 #define TL_WR941ND_GPIO_LED_SYSTEM	2
 #define TL_WR941ND_GPIO_LED_QSS		5
@@ -64,16 +63,6 @@ static struct flash_platform_data tl_wr941nd_flash_data = {
 #endif
 };
 
-static struct spi_board_info tl_wr941nd_spi_info[] = {
-	{
-		.bus_num	= 0,
-		.chip_select	= 0,
-		.max_speed_hz	= 25000000,
-		.modalias	= "m25p80",
-		.platform_data  = &tl_wr941nd_flash_data,
-	}
-};
-
 static struct gpio_led tl_wr941nd_leds_gpio[] __initdata = {
 	{
 		.name		= "tl-wr941nd:green:system",
@@ -134,8 +123,7 @@ static void __init tl_wr941nd_setup(void)
 	ar71xx_add_device_eth(0);
 	ar71xx_add_device_dsa(0, &tl_wr941nd_dsa_data);
 
-	ar71xx_add_device_spi(NULL, tl_wr941nd_spi_info,
-					ARRAY_SIZE(tl_wr941nd_spi_info));
+	ar71xx_add_device_m25p80(&tl_wr941nd_flash_data);
 
 	ar71xx_add_device_leds_gpio(-1, ARRAY_SIZE(tl_wr941nd_leds_gpio),
 					tl_wr941nd_leds_gpio);
@@ -143,7 +131,7 @@ static void __init tl_wr941nd_setup(void)
 	ar71xx_add_device_gpio_buttons(-1, TL_WR941ND_BUTTONS_POLL_INTERVAL,
 					ARRAY_SIZE(tl_wr941nd_gpio_buttons),
 					tl_wr941nd_gpio_buttons);
-	ar91xx_add_device_wmac();
+	ar913x_add_device_wmac();
 }
 
 MIPS_MACHINE(AR71XX_MACH_TL_WR941ND, "TP-LINK TL-WR941ND", tl_wr941nd_setup);