summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--arch/arm/cpu/arm1176/start.S2
-rw-r--r--arch/arm/cpu/arm720t/start.S2
-rw-r--r--arch/arm/cpu/arm920t/ep93xx/led.c24
-rw-r--r--arch/arm/cpu/arm920t/ep93xx/lowlevel_init.S10
-rw-r--r--arch/arm/cpu/arm920t/start.S2
-rw-r--r--arch/arm/cpu/arm925t/start.S2
-rw-r--r--arch/arm/cpu/arm926ejs/at91/led.c12
-rw-r--r--arch/arm/cpu/arm926ejs/start.S2
-rw-r--r--arch/arm/cpu/arm_intcm/start.S2
-rw-r--r--arch/arm/cpu/ixp/start.S2
-rw-r--r--arch/arm/cpu/s3c44b0/start.S2
-rw-r--r--arch/arm/lib/board.c32
-rw-r--r--board/atmel/at91rm9200ek/led.c12
-rw-r--r--board/eukrea/cpu9260/led.c48
-rw-r--r--board/logicpd/zoom2/led.c28
-rw-r--r--board/ti/beagle/led.c4
-rw-r--r--common/cmd_led.c8
-rw-r--r--include/status_led.h32
18 files changed, 113 insertions, 113 deletions
diff --git a/arch/arm/cpu/arm1176/start.S b/arch/arm/cpu/arm1176/start.S
index 0aa613d2af..848144a851 100644
--- a/arch/arm/cpu/arm1176/start.S
+++ b/arch/arm/cpu/arm1176/start.S
@@ -358,7 +358,7 @@ clbss_l:str r2, [r0] /* clear loop... */
#ifndef CONFIG_NAND_SPL
bl coloured_LED_init
- bl red_LED_on
+ bl red_led_on
#endif
#endif
diff --git a/arch/arm/cpu/arm720t/start.S b/arch/arm/cpu/arm720t/start.S
index 00fa8c95ea..540e3c2f72 100644
--- a/arch/arm/cpu/arm720t/start.S
+++ b/arch/arm/cpu/arm720t/start.S
@@ -234,7 +234,7 @@ clbss_l:str r2, [r0] /* clear loop... */
bne clbss_l
bl coloured_LED_init
- bl red_LED_on
+ bl red_led_on
#endif
/*
diff --git a/arch/arm/cpu/arm920t/ep93xx/led.c b/arch/arm/cpu/arm920t/ep93xx/led.c
index 7e2c897757..0aefa7f1e5 100644
--- a/arch/arm/cpu/arm920t/ep93xx/led.c
+++ b/arch/arm/cpu/arm920t/ep93xx/led.c
@@ -45,22 +45,22 @@ inline void switch_LED_off(uint8_t led)
saved_state[led] = STATUS_LED_OFF;
}
-void red_LED_on(void)
+void red_led_on(void)
{
switch_LED_on(STATUS_LED_RED);
}
-void red_LED_off(void)
+void red_led_off(void)
{
switch_LED_off(STATUS_LED_RED);
}
-void green_LED_on(void)
+void green_led_on(void)
{
switch_LED_on(STATUS_LED_GREEN);
}
-void green_LED_off(void)
+void green_led_off(void)
{
switch_LED_off(STATUS_LED_GREEN);
}
@@ -74,14 +74,14 @@ void __led_toggle(led_id_t mask)
{
if (STATUS_LED_RED == mask) {
if (STATUS_LED_ON == saved_state[STATUS_LED_RED])
- red_LED_off();
+ red_led_off();
else
- red_LED_on();
+ red_led_on();
} else if (STATUS_LED_GREEN == mask) {
if (STATUS_LED_ON == saved_state[STATUS_LED_GREEN])
- green_LED_off();
+ green_led_off();
else
- green_LED_on();
+ green_led_on();
}
}
@@ -89,13 +89,13 @@ void __led_set(led_id_t mask, int state)
{
if (STATUS_LED_RED == mask) {
if (STATUS_LED_ON == state)
- red_LED_on();
+ red_led_on();
else
- red_LED_off();
+ red_led_off();
} else if (STATUS_LED_GREEN == mask) {
if (STATUS_LED_ON == state)
- green_LED_on();
+ green_led_on();
else
- green_LED_off();
+ green_led_off();
}
}
diff --git a/arch/arm/cpu/arm920t/ep93xx/lowlevel_init.S b/arch/arm/cpu/arm920t/ep93xx/lowlevel_init.S
index a20ec894be..f21e2372ed 100644
--- a/arch/arm/cpu/arm920t/ep93xx/lowlevel_init.S
+++ b/arch/arm/cpu/arm920t/ep93xx/lowlevel_init.S
@@ -34,8 +34,8 @@ lowlevel_init:
str lr, [r1]
/* Turn on both LEDs */
- bl red_LED_on
- bl green_LED_on
+ bl red_led_on
+ bl green_led_on
/* Configure flash wait states before we switch to the PLL */
bl flash_cfg
@@ -44,14 +44,14 @@ lowlevel_init:
bl pll_cfg
/* Turn off the Green LED and leave the Red LED on */
- bl green_LED_off
+ bl green_led_off
/* Setup SDRAM */
bl sdram_cfg
/* Turn on Green LED, Turn off the Red LED */
- bl green_LED_on
- bl red_LED_off
+ bl green_led_on
+ bl red_led_off
/* FIXME: we use async mode for now */
mrc p15, 0, r0, c1, c0, 0
diff --git a/arch/arm/cpu/arm920t/start.S b/arch/arm/cpu/arm920t/start.S
index c3084208e1..8c5612c31e 100644
--- a/arch/arm/cpu/arm920t/start.S
+++ b/arch/arm/cpu/arm920t/start.S
@@ -277,7 +277,7 @@ clbss_l:str r2, [r0] /* clear loop... */
bne clbss_l
bl coloured_LED_init
- bl red_LED_on
+ bl red_led_on
#endif
/*
diff --git a/arch/arm/cpu/arm925t/start.S b/arch/arm/cpu/arm925t/start.S
index 17cf5dcae6..dbb93ef09f 100644
--- a/arch/arm/cpu/arm925t/start.S
+++ b/arch/arm/cpu/arm925t/start.S
@@ -271,7 +271,7 @@ clbss_l:str r2, [r0] /* clear loop... */
bne clbss_l
bl coloured_LED_init
- bl red_LED_on
+ bl red_led_on
#endif
/*
diff --git a/arch/arm/cpu/arm926ejs/at91/led.c b/arch/arm/cpu/arm926ejs/at91/led.c
index 6bcfa7f2fd..6e59c86675 100644
--- a/arch/arm/cpu/arm926ejs/at91/led.c
+++ b/arch/arm/cpu/arm926ejs/at91/led.c
@@ -29,36 +29,36 @@
#include <asm/arch/gpio.h>
#ifdef CONFIG_RED_LED
-void red_LED_on(void)
+void red_led_on(void)
{
at91_set_gpio_value(CONFIG_RED_LED, 1);
}
-void red_LED_off(void)
+void red_led_off(void)
{
at91_set_gpio_value(CONFIG_RED_LED, 0);
}
#endif
#ifdef CONFIG_GREEN_LED
-void green_LED_on(void)
+void green_led_on(void)
{
at91_set_gpio_value(CONFIG_GREEN_LED, 0);
}
-void green_LED_off(void)
+void green_led_off(void)
{
at91_set_gpio_value(CONFIG_GREEN_LED, 1);
}
#endif
#ifdef CONFIG_YELLOW_LED
-void yellow_LED_on(void)
+void yellow_led_on(void)
{
at91_set_gpio_value(CONFIG_YELLOW_LED, 0);
}
-void yellow_LED_off(void)
+void yellow_led_off(void)
{
at91_set_gpio_value(CONFIG_YELLOW_LED, 1);
}
diff --git a/arch/arm/cpu/arm926ejs/start.S b/arch/arm/cpu/arm926ejs/start.S
index 16e35c288c..d164d6d6ca 100644
--- a/arch/arm/cpu/arm926ejs/start.S
+++ b/arch/arm/cpu/arm926ejs/start.S
@@ -270,7 +270,7 @@ clbss_l:str r2, [r0] /* clear loop... */
bne clbss_l
bl coloured_LED_init
- bl red_LED_on
+ bl red_led_on
#endif
/*
diff --git a/arch/arm/cpu/arm_intcm/start.S b/arch/arm/cpu/arm_intcm/start.S
index ba96208c63..2033b362f7 100644
--- a/arch/arm/cpu/arm_intcm/start.S
+++ b/arch/arm/cpu/arm_intcm/start.S
@@ -238,7 +238,7 @@ clbss_l:str r2, [r0] /* clear loop... */
bne clbss_l
bl coloured_LED_init
- bl red_LED_on
+ bl red_led_on
#endif
/*
diff --git a/arch/arm/cpu/ixp/start.S b/arch/arm/cpu/ixp/start.S
index b17d267ea0..cb32121a07 100644
--- a/arch/arm/cpu/ixp/start.S
+++ b/arch/arm/cpu/ixp/start.S
@@ -340,7 +340,7 @@ clbss_l:str r2, [r0] /* clear loop... */
bne clbss_l
bl coloured_LED_init
- bl red_LED_on
+ bl red_led_on
#endif
/*
diff --git a/arch/arm/cpu/s3c44b0/start.S b/arch/arm/cpu/s3c44b0/start.S
index 2545cf6b1a..a29d5b4964 100644
--- a/arch/arm/cpu/s3c44b0/start.S
+++ b/arch/arm/cpu/s3c44b0/start.S
@@ -223,7 +223,7 @@ clbss_l:str r2, [r0] /* clear loop... */
bne clbss_l
bl coloured_LED_init
- bl red_LED_on
+ bl red_led_on
#endif
/*
diff --git a/arch/arm/lib/board.c b/arch/arm/lib/board.c
index a7fb251aa7..85320bc190 100644
--- a/arch/arm/lib/board.c
+++ b/arch/arm/lib/board.c
@@ -87,22 +87,22 @@ extern void rtl8019_get_enetaddr (uchar * addr);
inline void __coloured_LED_init(void) {}
void coloured_LED_init(void)
__attribute__((weak, alias("__coloured_LED_init")));
-inline void __red_LED_on(void) {}
-void red_LED_on(void) __attribute__((weak, alias("__red_LED_on")));
-inline void __red_LED_off(void) {}
-void red_LED_off(void) __attribute__((weak, alias("__red_LED_off")));
-inline void __green_LED_on(void) {}
-void green_LED_on(void) __attribute__((weak, alias("__green_LED_on")));
-inline void __green_LED_off(void) {}
-void green_LED_off(void) __attribute__((weak, alias("__green_LED_off")));
-inline void __yellow_LED_on(void) {}
-void yellow_LED_on(void) __attribute__((weak, alias("__yellow_LED_on")));
-inline void __yellow_LED_off(void) {}
-void yellow_LED_off(void) __attribute__((weak, alias("__yellow_LED_off")));
-inline void __blue_LED_on(void) {}
-void blue_LED_on(void) __attribute__((weak, alias("__blue_LED_on")));
-inline void __blue_LED_off(void) {}
-void blue_LED_off(void) __attribute__((weak, alias("__blue_LED_off")));
+inline void __red_led_on(void) {}
+void red_led_on(void) __attribute__((weak, alias("__red_led_on")));
+inline void __red_led_off(void) {}
+void red_led_off(void) __attribute__((weak, alias("__red_led_off")));
+inline void __green_led_on(void) {}
+void green_led_on(void) __attribute__((weak, alias("__green_led_on")));
+inline void __green_led_off(void) {}
+void green_led_off(void) __attribute__((weak, alias("__green_led_off")));
+inline void __yellow_led_on(void) {}
+void yellow_led_on(void) __attribute__((weak, alias("__yellow_led_on")));
+inline void __yellow_led_off(void) {}
+void yellow_led_off(void) __attribute__((weak, alias("__yellow_led_off")));
+inline void __blue_led_on(void) {}
+void blue_led_on(void) __attribute__((weak, alias("__blue_led_on")));
+inline void __blue_led_off(void) {}
+void blue_led_off(void) __attribute__((weak, alias("__blue_led_off")));
/*
************************************************************************
diff --git a/board/atmel/at91rm9200ek/led.c b/board/atmel/at91rm9200ek/led.c
index 1766ddf68a..facba2488d 100644
--- a/board/atmel/at91rm9200ek/led.c
+++ b/board/atmel/at91rm9200ek/led.c
@@ -36,37 +36,37 @@
#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 *)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 *)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 *)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 *)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 *)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 *)ATMEL_BASE_PIO;
writel(RED_LED, &pio->piob.sodr);
diff --git a/board/eukrea/cpu9260/led.c b/board/eukrea/cpu9260/led.c
index 8d865eb870..434cffbd26 100644
--- a/board/eukrea/cpu9260/led.c
+++ b/board/eukrea/cpu9260/led.c
@@ -51,49 +51,49 @@ void coloured_LED_init(void)
at91_set_pio_value(CONFIG_BLUE_LED, 1);
}
-void red_LED_off(void)
+void red_led_off(void)
{
at91_set_pio_value(CONFIG_RED_LED, 1);
saved_state[STATUS_LED_RED] = STATUS_LED_OFF;
}
-void green_LED_off(void)
+void green_led_off(void)
{
at91_set_pio_value(CONFIG_GREEN_LED, 1);
saved_state[STATUS_LED_GREEN] = STATUS_LED_OFF;
}
-void yellow_LED_off(void)
+void yellow_led_off(void)
{
at91_set_pio_value(CONFIG_YELLOW_LED, 1);
saved_state[STATUS_LED_YELLOW] = STATUS_LED_OFF;
}
-void blue_LED_off(void)
+void blue_led_off(void)
{
at91_set_pio_value(CONFIG_BLUE_LED, 1);
saved_state[STATUS_LED_BLUE] = STATUS_LED_OFF;
}
-void red_LED_on(void)
+void red_led_on(void)
{
at91_set_pio_value(CONFIG_RED_LED, 0);
saved_state[STATUS_LED_RED] = STATUS_LED_ON;
}
-void green_LED_on(void)
+void green_led_on(void)
{
at91_set_pio_value(CONFIG_GREEN_LED, 0);
saved_state[STATUS_LED_GREEN] = STATUS_LED_ON;
}
-void yellow_LED_on(void)
+void yellow_led_on(void)
{
at91_set_pio_value(CONFIG_YELLOW_LED, 0);
saved_state[STATUS_LED_YELLOW] = STATUS_LED_ON;
}
-void blue_LED_on(void)
+void blue_led_on(void)
{
at91_set_pio_value(CONFIG_BLUE_LED, 0);
saved_state[STATUS_LED_BLUE] = STATUS_LED_ON;
@@ -108,24 +108,24 @@ void __led_toggle(led_id_t mask)
{
if (STATUS_LED_BLUE == mask) {
if (STATUS_LED_ON == saved_state[STATUS_LED_BLUE])
- blue_LED_off();
+ blue_led_off();
else
- blue_LED_on();
+ blue_led_on();
} else if (STATUS_LED_RED == mask) {
if (STATUS_LED_ON == saved_state[STATUS_LED_RED])
- red_LED_off();
+ red_led_off();
else
- red_LED_on();
+ red_led_on();
} else if (STATUS_LED_GREEN == mask) {
if (STATUS_LED_ON == saved_state[STATUS_LED_GREEN])
- green_LED_off();
+ green_led_off();
else
- green_LED_on();
+ green_led_on();
} else if (STATUS_LED_YELLOW == mask) {
if (STATUS_LED_ON == saved_state[STATUS_LED_YELLOW])
- yellow_LED_off();
+ yellow_led_off();
else
- yellow_LED_on();
+ yellow_led_on();
}
}
@@ -133,23 +133,23 @@ void __led_set(led_id_t mask, int state)
{
if (STATUS_LED_BLUE == mask) {
if (STATUS_LED_ON == state)
- blue_LED_on();
+ blue_led_on();
else
- blue_LED_off();
+ blue_led_off();
} else if (STATUS_LED_RED == mask) {
if (STATUS_LED_ON == state)
- red_LED_on();
+ red_led_on();
else
- red_LED_off();
+ red_led_off();
} else if (STATUS_LED_GREEN == mask) {
if (STATUS_LED_ON == state)
- green_LED_on();
+ green_led_on();
else
- green_LED_off();
+ green_led_off();
} else if (STATUS_LED_YELLOW == mask) {
if (STATUS_LED_ON == state)
- yellow_LED_on();
+ yellow_led_on();
else
- yellow_LED_off();
+ yellow_led_off();
}
}
diff --git a/board/logicpd/zoom2/led.c b/board/logicpd/zoom2/led.c
index 42553727e4..528844efcf 100644
--- a/board/logicpd/zoom2/led.c
+++ b/board/logicpd/zoom2/led.c
@@ -36,7 +36,7 @@ static unsigned int saved_state[2] = {STATUS_LED_OFF, STATUS_LED_OFF};
#define ZOOM2_LED_BLUE 154
#define ZOOM2_LED_BLUE2 61
-void red_LED_off (void)
+void red_led_off(void)
{
/* red */
if (!gpio_request(ZOOM2_LED_RED, "")) {
@@ -46,7 +46,7 @@ void red_LED_off (void)
saved_state[STATUS_LED_RED] = STATUS_LED_OFF;
}
-void blue_LED_off (void)
+void blue_led_off(void)
{
/* blue */
if (!gpio_request(ZOOM2_LED_BLUE, "")) {
@@ -62,9 +62,9 @@ void blue_LED_off (void)
saved_state[STATUS_LED_BLUE] = STATUS_LED_OFF;
}
-void red_LED_on (void)
+void red_led_on(void)
{
- blue_LED_off ();
+ blue_led_off();
/* red */
if (!gpio_request(ZOOM2_LED_RED, "")) {
@@ -74,9 +74,9 @@ void red_LED_on (void)
saved_state[STATUS_LED_RED] = STATUS_LED_ON;
}
-void blue_LED_on (void)
+void blue_led_on(void)
{
- red_LED_off ();
+ red_led_off();
/* blue */
if (!gpio_request(ZOOM2_LED_BLUE, "")) {
@@ -102,14 +102,14 @@ void __led_toggle (led_id_t mask)
{
if (STATUS_LED_BLUE == mask) {
if (STATUS_LED_ON == saved_state[STATUS_LED_BLUE])
- blue_LED_off ();
+ blue_led_off();
else
- blue_LED_on ();
+ blue_led_on();
} else if (STATUS_LED_RED == mask) {
if (STATUS_LED_ON == saved_state[STATUS_LED_RED])
- red_LED_off ();
+ red_led_off();
else
- red_LED_on ();
+ red_led_on();
}
}
@@ -117,13 +117,13 @@ void __led_set (led_id_t mask, int state)
{
if (STATUS_LED_BLUE == mask) {
if (STATUS_LED_ON == state)
- blue_LED_on ();
+ blue_led_on();
else
- blue_LED_off ();
+ blue_led_off();
} else if (STATUS_LED_RED == mask) {
if (STATUS_LED_ON == state)
- red_LED_on ();
+ red_led_on();
else
- red_LED_off ();
+ red_led_off();
}
}
diff --git a/board/ti/beagle/led.c b/board/ti/beagle/led.c
index 1779242a01..ac21a95732 100644
--- a/board/ti/beagle/led.c
+++ b/board/ti/beagle/led.c
@@ -29,12 +29,12 @@
#define BEAGLE_LED_USR1 149
#ifdef STATUS_LED_GREEN
-void green_LED_off (void)
+void green_led_off(void)
{
__led_set (STATUS_LED_GREEN, 0);
}
-void green_LED_on (void)
+void green_led_on(void)
{
__led_set (STATUS_LED_GREEN, 1);
}
diff --git a/common/cmd_led.c b/common/cmd_led.c
index 0e4ebc59c0..f55f94c903 100644
--- a/common/cmd_led.c
+++ b/common/cmd_led.c
@@ -57,16 +57,16 @@ static const led_tbl_t led_commands[] = {
#endif
#endif
#ifdef STATUS_LED_GREEN
- { "green", STATUS_LED_GREEN, green_LED_off, green_LED_on, NULL },
+ { "green", STATUS_LED_GREEN, green_led_off, green_led_on, NULL },
#endif
#ifdef STATUS_LED_YELLOW
- { "yellow", STATUS_LED_YELLOW, yellow_LED_off, yellow_LED_on, NULL },
+ { "yellow", STATUS_LED_YELLOW, yellow_led_off, yellow_led_on, NULL },
#endif
#ifdef STATUS_LED_RED
- { "red", STATUS_LED_RED, red_LED_off, red_LED_on, NULL },
+ { "red", STATUS_LED_RED, red_led_off, red_led_on, NULL },
#endif
#ifdef STATUS_LED_BLUE
- { "blue", STATUS_LED_BLUE, blue_LED_off, blue_LED_on, NULL },
+ { "blue", STATUS_LED_BLUE, blue_led_off, blue_led_on, NULL },
#endif
{ NULL, 0, NULL, NULL, NULL }
};
diff --git a/include/status_led.h b/include/status_led.h
index 360195c961..59143296c3 100644
--- a/include/status_led.h
+++ b/include/status_led.h
@@ -357,24 +357,24 @@ extern void __led_set (led_id_t mask, int state);
*/
#ifndef __ASSEMBLY__
extern void coloured_LED_init (void);
-extern void red_LED_on(void);
-extern void red_LED_off(void);
-extern void green_LED_on(void);
-extern void green_LED_off(void);
-extern void yellow_LED_on(void);
-extern void yellow_LED_off(void);
-extern void blue_LED_on(void);
-extern void blue_LED_off(void);
+extern void red_led_on(void);
+extern void red_led_off(void);
+extern void green_led_on(void);
+extern void green_led_off(void);
+extern void yellow_led_on(void);
+extern void yellow_led_off(void);
+extern void blue_led_on(void);
+extern void blue_led_off(void);
#else
.extern LED_init
- .extern red_LED_on
- .extern red_LED_off
- .extern yellow_LED_on
- .extern yellow_LED_off
- .extern green_LED_on
- .extern green_LED_off
- .extern blue_LED_on
- .extern blue_LED_off
+ .extern red_led_on
+ .extern red_led_off
+ .extern yellow_led_on
+ .extern yellow_led_off
+ .extern green_led_on
+ .extern green_led_off
+ .extern blue_led_on
+ .extern blue_led_off
#endif
#endif /* CONFIG_STATUS_LED */
OpenPOWER on IntegriCloud