Merge branch 'next' of git://git.denx.de/u-boot-mpc83xx

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

diff --git a/board/atmel/at91rm9200ek/led.c b/board/atmel/at91rm9200ek/led.c
index 8d512e0329ce05ef7b6460fad4d3245ebab9b2da..2298e3619c4ee0d4e2ff9b9aebc4ed7f785ecac5 100644 (file)
--- a/board/atmel/at91rm9200ek/led.c
+++ b/board/atmel/at91rm9200ek/led.c
@@ -6,77 +6,63 @@
  * (C) Copyright 2010
  * Andreas Bießmann <andreas.devel@gmail.com>
  *
- * See file CREDITS for list of people who contributed to this
- * project.
- *
- * 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.
- *
- * 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
+ * SPDX-License-Identifier:    GPL-2.0+
  */
 
 #include <common.h>
-#include <asm/arch/gpio.h>
+#include <asm/io.h>
+#include <asm/arch/hardware.h>
 #include <asm/arch/at91_pmc.h>
+#include <asm/arch/at91_pio.h>
 
 /* bit mask in PIO port B */
 #define        GREEN_LED       (1<<0)
 #define        YELLOW_LED      (1<<1)
 #define        RED_LED         (1<<2)
 
-void   green_LED_on(void)
+void   green_led_on(void)
 {
-       at91_pio_t *pio = (at91_pio_t *)AT91_PIO_BASE;
+       at91_pio_t *pio = (at91_pio_t *)ATMEL_BASE_PIO;
        writel(GREEN_LED, &pio->piob.codr);
 }
 
-void    yellow_LED_on(void)
+void    yellow_led_on(void)
 {
-       at91_pio_t *pio = (at91_pio_t *)AT91_PIO_BASE;
+       at91_pio_t *pio = (at91_pio_t *)ATMEL_BASE_PIO;
        writel(YELLOW_LED, &pio->piob.codr);
 }
 
-void    red_LED_on(void)
+void    red_led_on(void)
 {
-       at91_pio_t *pio = (at91_pio_t *)AT91_PIO_BASE;
+       at91_pio_t *pio = (at91_pio_t *)ATMEL_BASE_PIO;
        writel(RED_LED, &pio->piob.codr);
 }
 
-void   green_LED_off(void)
+void   green_led_off(void)
 {
-       at91_pio_t *pio = (at91_pio_t *)AT91_PIO_BASE;
+       at91_pio_t *pio = (at91_pio_t *)ATMEL_BASE_PIO;
        writel(GREEN_LED, &pio->piob.sodr);
 }
 
-void   yellow_LED_off(void)
+void   yellow_led_off(void)
 {
-       at91_pio_t *pio = (at91_pio_t *)AT91_PIO_BASE;
+       at91_pio_t *pio = (at91_pio_t *)ATMEL_BASE_PIO;
        writel(YELLOW_LED, &pio->piob.sodr);
 }
 
-void   red_LED_off(void)
+void   red_led_off(void)
 {
-       at91_pio_t *pio = (at91_pio_t *)AT91_PIO_BASE;
+       at91_pio_t *pio = (at91_pio_t *)ATMEL_BASE_PIO;
        writel(RED_LED, &pio->piob.sodr);
 }
 
 void coloured_LED_init (void)
 {
-       at91_pmc_t *pmc = (at91_pmc_t *)AT91_PMC_BASE;
-       at91_pio_t *pio = (at91_pio_t *)AT91_PIO_BASE;
+       at91_pmc_t *pmc = (at91_pmc_t *)ATMEL_BASE_PMC;
+       at91_pio_t *pio = (at91_pio_t *)ATMEL_BASE_PIO;
 
        /* Enable PIOB clock */
-       writel(1 << AT91_ID_PIOB, &pmc->pcer);
+       writel(1 << ATMEL_ID_PIOB, &pmc->pcer);
 
        /* Disable peripherals on LEDs */
        writel(GREEN_LED | YELLOW_LED | RED_LED, &pio->piob.per);