Blackfin arch: Remove bad and usless code

Signed-off-by: Michael Hennerich <michael.hennerich@analog.com>
Signed-off-by: Bryan Wu <cooloney@kernel.org>

diff --git a/arch/blackfin/mach-bf537/boards/Makefile b/arch/blackfin/mach-bf537/boards/Makefile
index 87e450f..c94f7a5 100644 (file)
--- a/arch/blackfin/mach-bf537/boards/Makefile
+++ b/arch/blackfin/mach-bf537/boards/Makefile
@@ -3,7 +3,7 @@
 #
 
 obj-$(CONFIG_GENERIC_BF537_BOARD)      += generic_board.o
-obj-$(CONFIG_BFIN537_STAMP)            += stamp.o led.o
+obj-$(CONFIG_BFIN537_STAMP)            += stamp.o
 obj-$(CONFIG_BFIN537_BLUETECHNIX_CM)   += cm_bf537.o
 obj-$(CONFIG_PNAV10)                   += pnav10.o
 obj-$(CONFIG_CAMSIG_MINOTAUR)          += minotaur.o

diff --git a/arch/blackfin/mach-bf537/boards/led.S b/arch/blackfin/mach-bf537/boards/led.S
deleted file mode 100644 (file)
index 4e9ea42..0000000
--- a/arch/blackfin/mach-bf537/boards/led.S
+++ /dev/null
@@ -1,183 +0,0 @@
-/****************************************************
- * LED1 ---- PF6        LED2 ---- PF7               *
- * LED3 ---- PF8        LED4 ---- PF9               *
- * LED5 ---- PF10       LED6 ---- PF11              *
- ****************************************************/
-
-#include <linux/linkage.h>
-#include <asm/blackfin.h>
-
-/* All functions in this file save the registers they uses.
-   So there is no need to save any registers before calling them.  */
-
-       .text;
-
-/* Initialize LEDs.  */
-
-ENTRY(_led_init)
-       LINK 12;
-       [--SP] = P0;
-       [--SP] = R0;
-       [--SP] = R1;
-       [--SP] = R2;
-       R1 = PF6|PF7|PF8|PF9|PF10|PF11 (Z);
-       R2 = ~R1;
-
-       P0.H = hi(PORTF_FER);
-       P0.L = lo(PORTF_FER);
-       R0 = W[P0](Z);
-       SSYNC;
-       R0 = R0 & R2;
-       W[P0] = R0.L;
-       SSYNC;
-
-       P0.H = hi(PORTFIO_DIR);
-       P0.L = lo(PORTFIO_DIR);
-       R0 = W[P0](Z);
-       SSYNC;
-       R0 = R0 | R1;
-       W[P0] = R0.L;
-       SSYNC;
-
-       P0.H = hi(PORTFIO_INEN);
-       P0.L = lo(PORTFIO_INEN);
-       R0 = W[P0](Z);
-       SSYNC;
-       R0 = R0 & R2;
-       W[P0] = R0.L;
-       SSYNC;
-
-       R2 = [SP++];
-       R1 = [SP++];
-       R0 = [SP++];
-       P0 = [SP++];
-       UNLINK;
-       RTS;
-       .size   _led_init, .-_led_init
-
-/* Set one LED on. Leave other LEDs unchanged.
-   It expects the LED number passed through R0.  */
-
-ENTRY(_led_on)
-       LINK 12;
-       [--SP] = P0;
-       [--SP] = R1;
-       CALL _led_init;
-       R1 = 1;
-       R0 += 5;
-       R1 <<= R0;
-       P0.H = hi(PORTFIO);
-       P0.L = lo(PORTFIO);
-       R0 = W[P0](Z);
-       SSYNC;
-       R0 = R0 | R1;
-       W[P0] = R0.L;
-       SSYNC;
-       R1 = [SP++];
-       P0 = [SP++];
-       UNLINK;
-       RTS;
-       .size   _led_on, .-_led_on
-
-/* Set one LED off. Leave other LEDs unchanged.  */
-
-ENTRY(_led_off)
-       LINK 12;
-       [--SP] = P0;
-       [--SP] = R1;
-       CALL _led_init;
-       R1 = 1;
-       R0 += 5;
-       R1 <<= R0;
-       R1 = ~R1;
-       P0.H = hi(PORTFIO);
-       P0.L = lo(PORTFIO);
-       R0 = W[P0](Z);
-       SSYNC;
-       R0 = R0 & R1;
-       W[P0] = R0.L;
-       SSYNC;
-       R1 = [SP++];
-       P0 = [SP++];
-       UNLINK;
-       RTS;
-       .size   _led_off, .-_led_off
-
-/* Toggle one LED. Leave other LEDs unchanged.  */
-
-ENTRY(_led_toggle)
-       LINK 12;
-       [--SP] = P0;
-       [--SP] = R1;
-       CALL _led_init;
-       R1 = 1;
-       R0 += 5;
-       R1 <<= R0;
-       P0.H = hi(PORTFIO);
-       P0.L = lo(PORTFIO);
-       R0 = W[P0](Z);
-       SSYNC;
-       R0 = R0 ^ R1;
-       W[P0] = R0.L;
-       SSYNC;
-       R1 = [SP++];
-       P0 = [SP++];
-       UNLINK;
-       RTS;
-       .size   _led_toggle, .-_led_toggle
-
-/* Display the number using LEDs in binary format.  */
-
-ENTRY(_led_disp_num)
-       LINK 12;
-       [--SP] = P0;
-       [--SP] = R1;
-       [--SP] = R2;
-       CALL _led_init;
-       R1 = 0x3f(X);
-       R0 = R0 & R1;
-       R2 = 6(X);
-       R0 <<= R2;
-       R1 <<= R2;
-       P0.H = hi(PORTFIO);
-       P0.L = lo(PORTFIO);
-       R2 = W[P0](Z);
-       SSYNC;
-       R1 = ~R1;
-       R2 = R2 & R1;
-       R2 = R2 | R0;
-       W[P0] = R2.L;
-       SSYNC;
-       R2 = [SP++];
-       R1 = [SP++];
-       P0 = [SP++];
-       UNLINK;
-       RTS;
-       .size   _led_disp_num, .-_led_disp_num
-
-/* Toggle the number using LEDs in binary format.  */
-
-ENTRY(_led_toggle_num)
-       LINK 12;
-       [--SP] = P0;
-       [--SP] = R1;
-       [--SP] = R2;
-       CALL _led_init;
-       R1 = 0x3f(X);
-       R0 = R0 & R1;
-       R1 = 6(X);
-       R0 <<= R1;
-       P0.H = hi(PORTFIO);
-       P0.L = lo(PORTFIO);
-       R1 = W[P0](Z);
-       SSYNC;
-       R1 = R1 ^ R0;
-       W[P0] = R1.L;
-       SSYNC;
-       R2 = [SP++];
-       R1 = [SP++];
-       P0 = [SP++];
-       UNLINK;
-       RTS;
-       .size   _led_toggle_num, .-_led_toggle_num
-

diff --git a/arch/blackfin/mach-bf548/boards/Makefile b/arch/blackfin/mach-bf548/boards/Makefile
index eed161d..319ef54 100644 (file)
--- a/arch/blackfin/mach-bf548/boards/Makefile
+++ b/arch/blackfin/mach-bf548/boards/Makefile
@@ -2,5 +2,5 @@
 # arch/blackfin/mach-bf548/boards/Makefile
 #
 
-obj-$(CONFIG_BFIN548_EZKIT)            += ezkit.o led.o
+obj-$(CONFIG_BFIN548_EZKIT)            += ezkit.o
 obj-$(CONFIG_BFIN548_BLUETECHNIX_CM)   += cm_bf548.o

diff --git a/arch/blackfin/mach-bf548/boards/led.S b/arch/blackfin/mach-bf548/boards/led.S
deleted file mode 100644 (file)
index f47daf3..0000000
--- a/arch/blackfin/mach-bf548/boards/led.S
+++ /dev/null
@@ -1,172 +0,0 @@
-/****************************************************
- * LED1 ---- PG6        LED2 ---- PG7               *
- * LED3 ---- PG8        LED4 ---- PG9               *
- * LED5 ---- PG10       LED6 ---- PG11              *
- ****************************************************/
-
-#include <linux/linkage.h>
-#include <asm/blackfin.h>
-
-/* All functions in this file save the registers they uses.
-   So there is no need to save any registers before calling them.  */
-
-       .text;
-
-/* Initialize LEDs.  */
-
-ENTRY(_led_init)
-       LINK 0;
-       [--SP] = P0;
-       [--SP] = R0;
-       [--SP] = R1;
-       [--SP] = R2;
-       R1 = (PG6|PG7|PG8|PG9|PG10|PG11)(Z);
-       R2 = ~R1;
-
-       P0.H = hi(PORTG_FER);
-       P0.L = lo(PORTG_FER);
-       R0 = W[P0](Z);
-       SSYNC;
-       R0 = R0 & R2;
-       W[P0] = R0.L;
-       SSYNC;
-
-       P0.H = hi(PORTG_DIR_SET);
-       P0.L = lo(PORTG_DIR_SET);
-       W[P0] = R1.L;
-       SSYNC;
-
-       P0.H = hi(PORTG_INEN);
-       P0.L = lo(PORTG_INEN);
-       R0 = W[P0](Z);
-       SSYNC;
-       R0 = R0 & R2;
-       W[P0] = R0.L;
-       SSYNC;
-
-       R2 = [SP++];
-       R1 = [SP++];
-       R0 = [SP++];
-       P0 = [SP++];
-       RTS;
-       .size   _led_init, .-_led_init
-
-/* Set one LED on. Leave other LEDs unchanged.
-   It expects the LED number passed through R0.  */
-
-ENTRY(_led_on)
-       LINK 0;
-       [--SP] = P0;
-       [--SP] = R1;
-       CALL _led_init;
-       R1 = 1;
-       R0 += 5;
-       R1 <<= R0;
-       P0.H = hi(PORTG_SET);
-       P0.L = lo(PORTG_SET);
-       W[P0] = R1.L;
-       SSYNC;
-       R1 = [SP++];
-       P0 = [SP++];
-       UNLINK;
-       RTS;
-       .size   _led_on, .-_led_on
-
-/* Set one LED off. Leave other LEDs unchanged.  */
-
-ENTRY(_led_off)
-       LINK 0;
-       [--SP] = P0;
-       [--SP] = R1;
-       CALL _led_init;
-       R1 = 1;
-       R0 += 5;
-       R1 <<= R0;
-       P0.H = hi(PORTG_CLEAR);
-       P0.L = lo(PORTG_CLEAR);
-       W[P0] = R1.L;
-       SSYNC;
-       R1 = [SP++];
-       P0 = [SP++];
-       UNLINK;
-       RTS;
-       .size   _led_off, .-_led_off
-
-/* Toggle one LED. Leave other LEDs unchanged.  */
-
-ENTRY(_led_toggle)
-       LINK 0;
-       [--SP] = P0;
-       [--SP] = R1;
-       CALL _led_init;
-       R1 = 1;
-       R0 += 5;
-       R1 <<= R0;
-       P0.H = hi(PORTG);
-       P0.L = lo(PORTG);
-       R0 = W[P0](Z);
-       SSYNC;
-       R0 = R0 ^ R1;
-       W[P0] = R0.L;
-       SSYNC;
-       R1 = [SP++];
-       P0 = [SP++];
-       UNLINK;
-       RTS;
-       .size   _led_toggle, .-_led_toggle
-
-/* Display the number using LEDs in binary format.  */
-
-ENTRY(_led_disp_num)
-       LINK 0;
-       [--SP] = P0;
-       [--SP] = R1;
-       [--SP] = R2;
-       CALL _led_init;
-       R1 = 0x3f(X);
-       R0 = R0 & R1;
-       R2 = 6(X);
-       R0 <<= R2;
-       R1 <<= R2;
-       P0.H = hi(PORTG);
-       P0.L = lo(PORTG);
-       R2 = W[P0](Z);
-       SSYNC;
-       R1 = ~R1;
-       R2 = R2 & R1;
-       R2 = R2 | R0;
-       W[P0] = R2.L;
-       SSYNC;
-       R2 = [SP++];
-       R1 = [SP++];
-       P0 = [SP++];
-       UNLINK;
-       RTS;
-       .size   _led_disp_num, .-_led_disp_num
-
-/* Toggle the number using LEDs in binary format.  */
-
-ENTRY(_led_toggle_num)
-       LINK 0;
-       [--SP] = P0;
-       [--SP] = R1;
-       [--SP] = R2;
-       CALL _led_init;
-       R1 = 0x3f(X);
-       R0 = R0 & R1;
-       R1 = 6(X);
-       R0 <<= R1;
-       P0.H = hi(PORTG);
-       P0.L = lo(PORTG);
-       R1 = W[P0](Z);
-       SSYNC;
-       R1 = R1 ^ R0;
-       W[P0] = R1.L;
-       SSYNC;
-       R2 = [SP++];
-       R1 = [SP++];
-       P0 = [SP++];
-       UNLINK;
-       RTS;
-       .size   _led_toggle_num, .-_led_toggle_num
-

diff --git a/include/asm-blackfin/bfin-global.h b/include/asm-blackfin/bfin-global.h
index a9248d8..7603383 100644 (file)
--- a/include/asm-blackfin/bfin-global.h
+++ b/include/asm-blackfin/bfin-global.h
@@ -105,13 +105,6 @@ extern int sram_free(const void*);
 extern void *sram_alloc_with_lsl(size_t, unsigned long);
 extern int sram_free_with_lsl(const void*);
 
-extern void led_on(int);
-extern void led_off(int);
-extern void led_toggle(int);
-extern void led_disp_num(int);
-extern void led_toggle_num(int);
-extern void init_leds(void);
-
 extern const char bfin_board_name[];
 extern unsigned long wall_jiffies;