Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 6a01f230 authored Jan 07, 2009 by Yi Li Committed by Bryan Wu Jan 07, 2009

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>

parent 5105432a

arch/blackfin/configs/BF518F-EZBRD_defconfig

+8 −8

Original line number	Original line	Diff line number	Diff line
	@@ -204,14 +204,14 @@ CONFIG_IRQ_MAC_RX=11
	CONFIG_IRQ_PORTH_INTA=11		CONFIG_IRQ_PORTH_INTA=11
	CONFIG_IRQ_MAC_TX=11		CONFIG_IRQ_MAC_TX=11
	CONFIG_IRQ_PORTH_INTB=11		CONFIG_IRQ_PORTH_INTB=11
	CONFIG_IRQ_TMR0=12		CONFIG_IRQ_TIMER0=12
	CONFIG_IRQ_TMR1=12		CONFIG_IRQ_TIMER1=12
	CONFIG_IRQ_TMR2=12		CONFIG_IRQ_TIMER2=12
	CONFIG_IRQ_TMR3=12		CONFIG_IRQ_TIMER3=12
	CONFIG_IRQ_TMR4=12		CONFIG_IRQ_TIMER4=12
	CONFIG_IRQ_TMR5=12		CONFIG_IRQ_TIMER5=12
	CONFIG_IRQ_TMR6=12		CONFIG_IRQ_TIMER6=12
	CONFIG_IRQ_TMR7=12		CONFIG_IRQ_TIMER7=12
	CONFIG_IRQ_PORTG_INTA=12		CONFIG_IRQ_PORTG_INTA=12
	CONFIG_IRQ_PORTG_INTB=12		CONFIG_IRQ_PORTG_INTB=12
	CONFIG_IRQ_MEM_DMA0=13		CONFIG_IRQ_MEM_DMA0=13

arch/blackfin/configs/BF526-EZBRD_defconfig

+8 −8

Original line number	Original line	Diff line number	Diff line
	@@ -199,14 +199,14 @@ CONFIG_IRQ_MAC_RX=11
	CONFIG_IRQ_PORTH_INTA=11		CONFIG_IRQ_PORTH_INTA=11
	CONFIG_IRQ_MAC_TX=11		CONFIG_IRQ_MAC_TX=11
	CONFIG_IRQ_PORTH_INTB=11		CONFIG_IRQ_PORTH_INTB=11
	CONFIG_IRQ_TMR0=12		CONFIG_IRQ_TIMER0=12
	CONFIG_IRQ_TMR1=12		CONFIG_IRQ_TIMER1=12
	CONFIG_IRQ_TMR2=12		CONFIG_IRQ_TIMER2=12
	CONFIG_IRQ_TMR3=12		CONFIG_IRQ_TIMER3=12
	CONFIG_IRQ_TMR4=12		CONFIG_IRQ_TIMER4=12
	CONFIG_IRQ_TMR5=12		CONFIG_IRQ_TIMER5=12
	CONFIG_IRQ_TMR6=12		CONFIG_IRQ_TIMER6=12
	CONFIG_IRQ_TMR7=12		CONFIG_IRQ_TIMER7=12
	CONFIG_IRQ_PORTG_INTA=12		CONFIG_IRQ_PORTG_INTA=12
	CONFIG_IRQ_PORTG_INTB=12		CONFIG_IRQ_PORTG_INTB=12
	CONFIG_IRQ_MEM_DMA0=13		CONFIG_IRQ_MEM_DMA0=13

arch/blackfin/configs/BF527-EZKIT_defconfig

+8 −8

Original line number	Original line	Diff line number	Diff line
	@@ -188,14 +188,14 @@ CONFIG_IRQ_MAC_RX=11
	CONFIG_IRQ_PORTH_INTA=11		CONFIG_IRQ_PORTH_INTA=11
	CONFIG_IRQ_MAC_TX=11		CONFIG_IRQ_MAC_TX=11
	CONFIG_IRQ_PORTH_INTB=11		CONFIG_IRQ_PORTH_INTB=11
	CONFIG_IRQ_TMR0=12		CONFIG_IRQ_TIMER0=8
	CONFIG_IRQ_TMR1=12		CONFIG_IRQ_TIMER1=12
	CONFIG_IRQ_TMR2=12		CONFIG_IRQ_TIMER2=12
	CONFIG_IRQ_TMR3=12		CONFIG_IRQ_TIMER3=12
	CONFIG_IRQ_TMR4=12		CONFIG_IRQ_TIMER4=12
	CONFIG_IRQ_TMR5=12		CONFIG_IRQ_TIMER5=12
	CONFIG_IRQ_TMR6=12		CONFIG_IRQ_TIMER6=12
	CONFIG_IRQ_TMR7=12		CONFIG_IRQ_TIMER7=12
	CONFIG_IRQ_PORTG_INTA=12		CONFIG_IRQ_PORTG_INTA=12
	CONFIG_IRQ_PORTG_INTB=12		CONFIG_IRQ_PORTG_INTB=12
	CONFIG_IRQ_MEM_DMA0=13		CONFIG_IRQ_MEM_DMA0=13

arch/blackfin/configs/BF537-STAMP_defconfig

+8 −8

Original line number	Original line	Diff line number	Diff line
	@@ -148,14 +148,14 @@ CONFIG_IRQ_UART1_RX=10
	CONFIG_IRQ_UART1_TX=10		CONFIG_IRQ_UART1_TX=10
	CONFIG_IRQ_MAC_RX=11		CONFIG_IRQ_MAC_RX=11
	CONFIG_IRQ_MAC_TX=11		CONFIG_IRQ_MAC_TX=11
	CONFIG_IRQ_TMR0=12		CONFIG_IRQ_TIMER0=8
	CONFIG_IRQ_TMR1=12		CONFIG_IRQ_TIMER1=12
	CONFIG_IRQ_TMR2=12		CONFIG_IRQ_TIMER2=12
	CONFIG_IRQ_TMR3=12		CONFIG_IRQ_TIMER3=12
	CONFIG_IRQ_TMR4=12		CONFIG_IRQ_TIMER4=12
	CONFIG_IRQ_TMR5=12		CONFIG_IRQ_TIMER5=12
	CONFIG_IRQ_TMR6=12		CONFIG_IRQ_TIMER6=12
	CONFIG_IRQ_TMR7=12		CONFIG_IRQ_TIMER7=12
	CONFIG_IRQ_PORTG_INTB=12		CONFIG_IRQ_PORTG_INTB=12
	CONFIG_IRQ_MEM_DMA0=13		CONFIG_IRQ_MEM_DMA0=13
	CONFIG_IRQ_MEM_DMA1=13		CONFIG_IRQ_MEM_DMA1=13

arch/blackfin/configs/BF538-EZKIT_defconfig

+3 −3

Original line number	Original line	Diff line number	Diff line
	@@ -163,9 +163,9 @@ CONFIG_IRQ_UART0_RX=10
	CONFIG_IRQ_UART0_TX=10		CONFIG_IRQ_UART0_TX=10
	CONFIG_IRQ_UART1_RX=10		CONFIG_IRQ_UART1_RX=10
	CONFIG_IRQ_UART1_TX=10		CONFIG_IRQ_UART1_TX=10
	CONFIG_IRQ_TMR0=12		CONFIG_IRQ_TIMER0=12
	CONFIG_IRQ_TMR1=12		CONFIG_IRQ_TIMER1=12
	CONFIG_IRQ_TMR2=12		CONFIG_IRQ_TIMER2=12
	CONFIG_IRQ_WATCH=13		CONFIG_IRQ_WATCH=13
	CONFIG_IRQ_PORTF_INTA=12		CONFIG_IRQ_PORTF_INTA=12
	CONFIG_IRQ_PORTF_INTB=12		CONFIG_IRQ_PORTF_INTB=12