diff options
-rw-r--r-- | arch/sh/boards/mach-cayman/irq.c | 15 | ||||
-rw-r--r-- | arch/sh/include/cpu-sh5/cpu/irq.h | 1 | ||||
-rw-r--r-- | arch/sh/kernel/cpu/irq/intc-sh5.c | 22 |
3 files changed, 0 insertions, 38 deletions
diff --git a/arch/sh/boards/mach-cayman/irq.c b/arch/sh/boards/mach-cayman/irq.c index dbb00c991324..33f770856319 100644 --- a/arch/sh/boards/mach-cayman/irq.c +++ b/arch/sh/boards/mach-cayman/irq.c | |||
@@ -142,21 +142,6 @@ int cayman_irq_demux(int evt) | |||
142 | return irq; | 142 | return irq; |
143 | } | 143 | } |
144 | 144 | ||
145 | #if defined(CONFIG_PROC_FS) && defined(CONFIG_SYSCTL) | ||
146 | int cayman_irq_describe(char* p, int irq) | ||
147 | { | ||
148 | if (irq < NR_INTC_IRQS) { | ||
149 | return intc_irq_describe(p, irq); | ||
150 | } else if (irq < NR_INTC_IRQS + 8) { | ||
151 | return sprintf(p, "(SMSC %d)", irq - NR_INTC_IRQS); | ||
152 | } else if ((irq >= NR_INTC_IRQS + 24) && (irq < NR_INTC_IRQS + 32)) { | ||
153 | return sprintf(p, "(PCI2 %d)", irq - (NR_INTC_IRQS + 24)); | ||
154 | } | ||
155 | |||
156 | return 0; | ||
157 | } | ||
158 | #endif | ||
159 | |||
160 | void init_cayman_irq(void) | 145 | void init_cayman_irq(void) |
161 | { | 146 | { |
162 | int i; | 147 | int i; |
diff --git a/arch/sh/include/cpu-sh5/cpu/irq.h b/arch/sh/include/cpu-sh5/cpu/irq.h index f0f0756e6e84..0ccf257a72d1 100644 --- a/arch/sh/include/cpu-sh5/cpu/irq.h +++ b/arch/sh/include/cpu-sh5/cpu/irq.h | |||
@@ -111,7 +111,6 @@ | |||
111 | #define TOP_PRIORITY 15 | 111 | #define TOP_PRIORITY 15 |
112 | 112 | ||
113 | extern int intc_evt_to_irq[(0xE20/0x20)+1]; | 113 | extern int intc_evt_to_irq[(0xE20/0x20)+1]; |
114 | int intc_irq_describe(char* p, int irq); | ||
115 | extern int platform_int_priority[NR_INTC_IRQS]; | 114 | extern int platform_int_priority[NR_INTC_IRQS]; |
116 | 115 | ||
117 | #endif /* __ASM_SH_CPU_SH5_IRQ_H */ | 116 | #endif /* __ASM_SH_CPU_SH5_IRQ_H */ |
diff --git a/arch/sh/kernel/cpu/irq/intc-sh5.c b/arch/sh/kernel/cpu/irq/intc-sh5.c index 02d8137547e8..a619eaf6e6b4 100644 --- a/arch/sh/kernel/cpu/irq/intc-sh5.c +++ b/arch/sh/kernel/cpu/irq/intc-sh5.c | |||
@@ -160,28 +160,6 @@ void make_intc_irq(unsigned int irq) | |||
160 | disable_intc_irq(irq); | 160 | disable_intc_irq(irq); |
161 | } | 161 | } |
162 | 162 | ||
163 | #if defined(CONFIG_PROC_FS) && defined(CONFIG_SYSCTL) | ||
164 | static int IRQ_to_vectorN[NR_INTC_IRQS] = { | ||
165 | 0x12, 0x15, 0x18, 0x1B, 0x40, 0x41, 0x42, 0x43, /* 0- 7 */ | ||
166 | -1, -1, -1, -1, 0x50, 0x51, 0x52, 0x53, /* 8-15 */ | ||
167 | 0x54, 0x55, 0x32, 0x33, 0x34, 0x35, 0x36, -1, /* 16-23 */ | ||
168 | -1, -1, -1, -1, -1, -1, -1, -1, /* 24-31 */ | ||
169 | 0x20, 0x21, 0x22, 0x23, 0x24, 0x25, 0x26, 0x38, /* 32-39 */ | ||
170 | 0x39, 0x3A, 0x3B, -1, -1, -1, -1, -1, /* 40-47 */ | ||
171 | -1, -1, -1, -1, -1, -1, -1, -1, /* 48-55 */ | ||
172 | -1, -1, -1, -1, -1, -1, -1, 0x2B, /* 56-63 */ | ||
173 | |||
174 | }; | ||
175 | |||
176 | int intc_irq_describe(char* p, int irq) | ||
177 | { | ||
178 | if (irq < NR_INTC_IRQS) | ||
179 | return sprintf(p, "(0x%3x)", IRQ_to_vectorN[irq]*0x20); | ||
180 | else | ||
181 | return 0; | ||
182 | } | ||
183 | #endif | ||
184 | |||
185 | void __init plat_irq_setup(void) | 163 | void __init plat_irq_setup(void) |
186 | { | 164 | { |
187 | unsigned long long __dummy0, __dummy1=~0x00000000100000f0; | 165 | unsigned long long __dummy0, __dummy1=~0x00000000100000f0; |