microblaze: Remove !OF_CONTROL code for timer and interrupt
OF_CONTROL is enabled by default that's why this is dead code.
Signed-off-by: Michal Simek <michal.simek@xilinx.com>
diff --git a/arch/microblaze/cpu/interrupts.c b/arch/microblaze/cpu/interrupts.c
index e5d8894..010ca4a 100644
--- a/arch/microblaze/cpu/interrupts.c
+++ b/arch/microblaze/cpu/interrupts.c
@@ -115,8 +115,6 @@
int interrupt_init(void)
{
int i;
-
-#ifdef CONFIG_OF_CONTROL
const void *blob = gd->fdt_blob;
int node = 0;
@@ -136,12 +134,7 @@
} else {
return node;
}
-#else
-#if defined(CONFIG_SYS_INTC_0_ADDR) && defined(CONFIG_SYS_INTC_0_NUM)
- intc = (microblaze_intc_t *)CONFIG_SYS_INTC_0_ADDR;
- irq_no = CONFIG_SYS_INTC_0_NUM;
-#endif
-#endif
+
if (irq_no) {
vecs = calloc(1, sizeof(struct irq_action) * irq_no);
if (vecs == NULL) {
diff --git a/arch/microblaze/cpu/timer.c b/arch/microblaze/cpu/timer.c
index c0fc7c0..8845e07 100644
--- a/arch/microblaze/cpu/timer.c
+++ b/arch/microblaze/cpu/timer.c
@@ -31,11 +31,6 @@
i = get_timer(0);
while ((get_timer(0) - i) < (usec / 1000))
;
- } else {
-#ifndef CONFIG_OF_CONTROL
- for (i = 0; i < (usec * XILINX_CLOCK_FREQ / 10000000); i++)
- ;
-#endif
}
}
@@ -51,8 +46,6 @@
int irq = -1;
u32 preload = 0;
u32 ret = 0;
-
-#ifdef CONFIG_OF_CONTROL
const void *blob = gd->fdt_blob;
int node = 0;
u32 cell[2];
@@ -83,13 +76,6 @@
return node;
}
-#else
-#if defined(CONFIG_SYS_TIMER_0_ADDR) && defined(CONFIG_SYS_INTC_0_NUM)
- preload = XILINX_CLOCK_FREQ / CONFIG_SYS_HZ;
- irq = CONFIG_SYS_TIMER_0_IRQ;
- tmr = (microblaze_timer_t *) (CONFIG_SYS_TIMER_0_ADDR);
-#endif
-#endif
if (tmr && preload && irq >= 0) {
tmr->loadreg = preload;
tmr->control = TIMER_INTERRUPT | TIMER_RESET;