Merge branch 'master' of git://git.denx.de/u-boot-net

[u-boot] / board / atmel / at91sam9263ek / led.c

diff --git a/board/atmel/at91sam9263ek/led.c b/board/atmel/at91sam9263ek/led.c
index eb8d6ca04f699d92f09b37d8d5222be1816ce91c..fa1f05b0de14379643d8580cc5300dedcad1f274 100644 (file)
--- a/board/atmel/at91sam9263ek/led.c
+++ b/board/atmel/at91sam9263ek/led.c
@@ -23,56 +23,25 @@
  */
 
 #include <common.h>
-#include <asm/arch/at91sam9263.h>
+#include <asm/arch/hardware.h>
 #include <asm/arch/at91_pmc.h>
+#include <asm/arch/at91_pio.h>
 #include <asm/arch/gpio.h>
 #include <asm/arch/io.h>
 
-#define        RED_LED         AT91_PIN_PB7    /* this is the power led */
-#define        GREEN_LED       AT91_PIN_PB8    /* this is the user1 led */
-#define        YELLOW_LED      AT91_PIN_PC29   /* this is the user2 led */
-
-void red_LED_on(void)
-{
-       at91_set_gpio_value(RED_LED, 1);
-}
-
-void red_LED_off(void)
-{
-       at91_set_gpio_value(RED_LED, 0);
-}
-
-void green_LED_on(void)
-{
-       at91_set_gpio_value(GREEN_LED, 0);
-}
-
-void green_LED_off(void)
-{
-       at91_set_gpio_value(GREEN_LED, 1);
-}
-
-void yellow_LED_on(void)
-{
-       at91_set_gpio_value(YELLOW_LED, 0);
-}
-
-void yellow_LED_off(void)
-{
-       at91_set_gpio_value(YELLOW_LED, 1);
-}
-
 void coloured_LED_init(void)
 {
        /* Enable clock */
-       at91_sys_write(AT91_PMC_PCER, 1 << AT91SAM9263_ID_PIOB |
-                                     1 << AT91SAM9263_ID_PIOCDE);
+       at91_pmc_t      *pmc    = (at91_pmc_t *) AT91_PMC_BASE;
+
+       writel(1 << AT91SAM9263_ID_PIOB | 1 << AT91SAM9263_ID_PIOCDE,
+               &pmc->pcer);
 
-       at91_set_gpio_output(RED_LED, 1);
-       at91_set_gpio_output(GREEN_LED, 1);
-       at91_set_gpio_output(YELLOW_LED, 1);
+       at91_set_pio_output(CONFIG_RED_LED, 1);
+       at91_set_pio_output(CONFIG_GREEN_LED, 1);
+       at91_set_pio_output(CONFIG_YELLOW_LED, 1);
 
-       at91_set_gpio_value(RED_LED, 0);
-       at91_set_gpio_value(GREEN_LED, 1);
-       at91_set_gpio_value(YELLOW_LED, 1);
+       at91_set_pio_value(CONFIG_RED_LED, 0);
+       at91_set_pio_value(CONFIG_GREEN_LED, 1);
+       at91_set_pio_value(CONFIG_YELLOW_LED, 1);
 }