Blackfin arch: merge adeos blackfin part to arch/blackfin/

[Mike Frysinger <vapier.adi@gmail.com>:
 - handle bf531/bf532/bf534/bf536 variants in ipipe.h
 - cleanup IPIPE logic for bfin_set_irq_handler()
 - cleanup ipipe asm code a bit and add missing ENDPROC()
 - simplify IPIPE code in trap_c
 - unify some of the IPIPE code and fix style
 - simplify DO_IRQ_L1 handling with ipipe code
 - revert IRQ_SW_INT# addition from ipipe merge
 - remove duplicate get_{c,s}clk() prototypes
]

Signed-off-by: Yi Li <yi.li@analog.com>
Signed-off-by: Mike Frysinger <vapier.adi@gmail.com>
Signed-off-by: Bryan Wu <cooloney@kernel.org>

1 files changed, 17 insertions, 17 deletions

diff --git a/arch/blackfin/mach-bf527/Kconfig b/arch/blackfin/mach-bf527/Kconfig
index 3cde4beeb214..8438ec6d6679 100644
--- a/arch/blackfin/mach-bf527/Kconfig
+++ b/arch/blackfin/mach-bf527/Kconfig
@@ -168,29 +168,29 @@ config IRQ_MAC_TX
 config IRQ_PORTH_INTB
         int "IRQ_PORTH_INTB"
         default 11
-config IRQ_TMR0
-        int "IRQ_TMR0"
-        default 12
-config IRQ_TMR1
-        int "IRQ_TMR1"
+config IRQ_TIMER0
+        int "IRQ_TIMER0"
+        default 8
+config IRQ_TIMER1
+        int "IRQ_TIMER1"
         default 12
-config IRQ_TMR2
-        int "IRQ_TMR2"
+config IRQ_TIMER2
+        int "IRQ_TIMER2"
         default 12
-config IRQ_TMR3
-        int "IRQ_TMR3"
+config IRQ_TIMER3
+        int "IRQ_TIMER3"
         default 12
-config IRQ_TMR4
-        int "IRQ_TMR4"
+config IRQ_TIMER4
+        int "IRQ_TIMER4"
         default 12
-config IRQ_TMR5
-        int "IRQ_TMR5"
+config IRQ_TIMER5
+        int "IRQ_TIMER5"
         default 12
-config IRQ_TMR6
-        int "IRQ_TMR6"
+config IRQ_TIMER6
+        int "IRQ_TIMER6"
         default 12
-config IRQ_TMR7
-        int "IRQ_TMR7"
+config IRQ_TIMER7
+        int "IRQ_TIMER7"
         default 12
 config IRQ_PORTG_INTA
         int "IRQ_PORTG_INTA"