1 files changed, 2 insertions, 62 deletions

diff --git a/arch/avr32/boards/atstk1000/atstk1002.c b/arch/avr32/boards/atstk1000/atstk1002.c
index 5be0d13f4b03..2481d2389873 100644
--- a/arch/avr32/boards/atstk1000/atstk1002.c
+++ b/arch/avr32/boards/atstk1000/atstk1002.c
@@ -11,7 +11,6 @@
 #include <linux/etherdevice.h>
 #include <linux/init.h>
 #include <linux/kernel.h>
-#include <linux/leds.h>
 #include <linux/platform_device.h>
 #include <linux/string.h>
 #include <linux/types.h>
@@ -22,7 +21,7 @@
 
 #include <asm/io.h>
 #include <asm/setup.h>
-#include <asm/arch/at32ap7000.h>
+#include <asm/arch/at32ap700x.h>
 #include <asm/arch/board.h>
 #include <asm/arch/init.h>
 #include <asm/arch/portmux.h>
@@ -141,65 +140,6 @@ static void __init set_hw_addr(struct platform_device *pdev)
         clk_put(pclk);
 }
 
-#ifdef CONFIG_BOARD_ATSTK1002_J2_LED
-
-static struct gpio_led stk_j2_led[] = {
-#ifdef CONFIG_BOARD_ATSTK1002_J2_LED8
-#define LEDSTRING "J2 jumpered to LED8"
-        { .name = "led0:amber", .gpio = GPIO_PIN_PB( 8), },
-        { .name = "led1:amber", .gpio = GPIO_PIN_PB( 9), },
-        { .name = "led2:amber", .gpio = GPIO_PIN_PB(10), },
-        { .name = "led3:amber", .gpio = GPIO_PIN_PB(13), },
-        { .name = "led4:amber", .gpio = GPIO_PIN_PB(14), },
-        { .name = "led5:amber", .gpio = GPIO_PIN_PB(15), },
-        { .name = "led6:amber", .gpio = GPIO_PIN_PB(16), },
-        { .name = "led7:amber", .gpio = GPIO_PIN_PB(30),
-                        .default_trigger = "heartbeat", },
-#else   /* RGB */
-#define LEDSTRING "J2 jumpered to RGB LEDs"
-        { .name = "r1:red",     .gpio = GPIO_PIN_PB( 8), },
-        { .name = "g1:green",   .gpio = GPIO_PIN_PB(10), },
-        { .name = "b1:blue",    .gpio = GPIO_PIN_PB(14), },
-
-        { .name = "r2:red",     .gpio = GPIO_PIN_PB( 9),
-                        .default_trigger = "heartbeat", },
-        { .name = "g2:green",   .gpio = GPIO_PIN_PB(13), },
-        { .name = "b2:blue",    .gpio = GPIO_PIN_PB(15),
-                        .default_trigger = "heartbeat", },
-        /* PB16, PB30 unused */
-#endif
-};
-
-static struct gpio_led_platform_data stk_j2_led_data = {
-        .num_leds       = ARRAY_SIZE(stk_j2_led),
-        .leds           = stk_j2_led,
-};
-
-static struct platform_device stk_j2_led_dev = {
-        .name           = "leds-gpio",
-        .id             = 2,    /* gpio block J2 */
-        .dev            = {
-                .platform_data  = &stk_j2_led_data,
-        },
-};
-
-static void setup_j2_leds(void)
-{
-        unsigned        i;
-
-        for (i = 0; i < ARRAY_SIZE(stk_j2_led); i++)
-                at32_select_gpio(stk_j2_led[i].gpio, AT32_GPIOF_OUTPUT);
-
-        printk("STK1002: " LEDSTRING "\n");
-        platform_device_register(&stk_j2_led_dev);
-}
-
-#else
-static void setup_j2_leds(void)
-{
-}
-#endif
-
 #ifndef CONFIG_BOARD_ATSTK1002_SW1_CUSTOM
 #ifndef CONFIG_BOARD_ATSTK1002_SW3_CUSTOM
 static void __init at73c213_set_clk(struct at73c213_board_info *info)
@@ -298,7 +238,7 @@ static int __init atstk1002_init(void)
         at32_add_device_ssc(0, ATMEL_SSC_TX);
 #endif
 
-        setup_j2_leds();
+        atstk1000_setup_j2_leds();
 
 #ifndef CONFIG_BOARD_ATSTK1002_SW3_CUSTOM
 #ifndef CONFIG_BOARD_ATSTK1002_SW1_CUSTOM