diff options
author | Atsushi Nemoto <anemo@mba.ocn.ne.jp> | 2007-10-19 12:26:25 -0400 |
---|---|---|
committer | Ralf Baechle <ralf@linux-mips.org> | 2007-10-19 13:15:58 -0400 |
commit | 1d9ef3ecd7fa2ca28064f03614f37409100c0527 (patch) | |
tree | 36ec8b13f3544fa6fbaa8333435fd7b9161c5a14 /arch/mips/tx4927 | |
parent | d527eef5b7f151320921f0ff7a88297cefc5be72 (diff) |
[MIPS] Kill duplicated setup_irq() for cp0 timer
Also many plat_timer_setup() can be killed too.
Signed-off-by: Atsushi Nemoto <anemo@mba.ocn.ne.jp>
Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
Diffstat (limited to 'arch/mips/tx4927')
-rw-r--r-- | arch/mips/tx4927/common/tx4927_setup.c | 16 | ||||
-rw-r--r-- | arch/mips/tx4927/toshiba_rbtx4927/toshiba_rbtx4927_setup.c | 10 |
2 files changed, 0 insertions, 26 deletions
diff --git a/arch/mips/tx4927/common/tx4927_setup.c b/arch/mips/tx4927/common/tx4927_setup.c index 8ce0989671d8..36c5f200eb3d 100644 --- a/arch/mips/tx4927/common/tx4927_setup.c +++ b/arch/mips/tx4927/common/tx4927_setup.c | |||
@@ -72,22 +72,6 @@ void __init plat_time_init(void) | |||
72 | #endif | 72 | #endif |
73 | } | 73 | } |
74 | 74 | ||
75 | void __init plat_timer_setup(struct irqaction *irq) | ||
76 | { | ||
77 | setup_irq(TX4927_IRQ_CPU_TIMER, irq); | ||
78 | |||
79 | #ifdef CONFIG_TOSHIBA_RBTX4927 | ||
80 | { | ||
81 | extern void toshiba_rbtx4927_timer_setup(struct irqaction | ||
82 | *irq); | ||
83 | toshiba_rbtx4927_timer_setup(irq); | ||
84 | } | ||
85 | #endif | ||
86 | |||
87 | return; | ||
88 | } | ||
89 | |||
90 | |||
91 | #ifdef DEBUG | 75 | #ifdef DEBUG |
92 | void print_cp0(char *key, int num, char *name, u32 val) | 76 | void print_cp0(char *key, int num, char *name, u32 val) |
93 | { | 77 | { |
diff --git a/arch/mips/tx4927/toshiba_rbtx4927/toshiba_rbtx4927_setup.c b/arch/mips/tx4927/toshiba_rbtx4927/toshiba_rbtx4927_setup.c index b97102a1c635..c7470fba6180 100644 --- a/arch/mips/tx4927/toshiba_rbtx4927/toshiba_rbtx4927_setup.c +++ b/arch/mips/tx4927/toshiba_rbtx4927/toshiba_rbtx4927_setup.c | |||
@@ -94,7 +94,6 @@ | |||
94 | #define TOSHIBA_RBTX4927_SETUP_EFWFU ( 1 << 3 ) | 94 | #define TOSHIBA_RBTX4927_SETUP_EFWFU ( 1 << 3 ) |
95 | #define TOSHIBA_RBTX4927_SETUP_SETUP ( 1 << 4 ) | 95 | #define TOSHIBA_RBTX4927_SETUP_SETUP ( 1 << 4 ) |
96 | #define TOSHIBA_RBTX4927_SETUP_TIME_INIT ( 1 << 5 ) | 96 | #define TOSHIBA_RBTX4927_SETUP_TIME_INIT ( 1 << 5 ) |
97 | #define TOSHIBA_RBTX4927_SETUP_TIMER_SETUP ( 1 << 6 ) | ||
98 | #define TOSHIBA_RBTX4927_SETUP_PCIBIOS ( 1 << 7 ) | 97 | #define TOSHIBA_RBTX4927_SETUP_PCIBIOS ( 1 << 7 ) |
99 | #define TOSHIBA_RBTX4927_SETUP_PCI1 ( 1 << 8 ) | 98 | #define TOSHIBA_RBTX4927_SETUP_PCI1 ( 1 << 8 ) |
100 | #define TOSHIBA_RBTX4927_SETUP_PCI2 ( 1 << 9 ) | 99 | #define TOSHIBA_RBTX4927_SETUP_PCI2 ( 1 << 9 ) |
@@ -108,7 +107,6 @@ static const u32 toshiba_rbtx4927_setup_debug_flag = | |||
108 | (TOSHIBA_RBTX4927_SETUP_NONE | TOSHIBA_RBTX4927_SETUP_INFO | | 107 | (TOSHIBA_RBTX4927_SETUP_NONE | TOSHIBA_RBTX4927_SETUP_INFO | |
109 | TOSHIBA_RBTX4927_SETUP_WARN | TOSHIBA_RBTX4927_SETUP_EROR | | 108 | TOSHIBA_RBTX4927_SETUP_WARN | TOSHIBA_RBTX4927_SETUP_EROR | |
110 | TOSHIBA_RBTX4927_SETUP_EFWFU | TOSHIBA_RBTX4927_SETUP_SETUP | | 109 | TOSHIBA_RBTX4927_SETUP_EFWFU | TOSHIBA_RBTX4927_SETUP_SETUP | |
111 | TOSHIBA_RBTX4927_SETUP_TIME_INIT | TOSHIBA_RBTX4927_SETUP_TIMER_SETUP | ||
112 | | TOSHIBA_RBTX4927_SETUP_PCIBIOS | TOSHIBA_RBTX4927_SETUP_PCI1 | | 110 | | TOSHIBA_RBTX4927_SETUP_PCIBIOS | TOSHIBA_RBTX4927_SETUP_PCI1 | |
113 | TOSHIBA_RBTX4927_SETUP_PCI2 | TOSHIBA_RBTX4927_SETUP_PCI66); | 111 | TOSHIBA_RBTX4927_SETUP_PCI2 | TOSHIBA_RBTX4927_SETUP_PCI66); |
114 | #endif | 112 | #endif |
@@ -947,14 +945,6 @@ toshiba_rbtx4927_time_init(void) | |||
947 | 945 | ||
948 | } | 946 | } |
949 | 947 | ||
950 | void __init toshiba_rbtx4927_timer_setup(struct irqaction *irq) | ||
951 | { | ||
952 | TOSHIBA_RBTX4927_SETUP_DPRINTK(TOSHIBA_RBTX4927_SETUP_TIMER_SETUP, | ||
953 | "-\n"); | ||
954 | TOSHIBA_RBTX4927_SETUP_DPRINTK(TOSHIBA_RBTX4927_SETUP_TIMER_SETUP, | ||
955 | "+\n"); | ||
956 | } | ||
957 | |||
958 | static int __init toshiba_rbtx4927_rtc_init(void) | 948 | static int __init toshiba_rbtx4927_rtc_init(void) |
959 | { | 949 | { |
960 | static struct resource __initdata res = { | 950 | static struct resource __initdata res = { |