Skip to content

L
linux
Commit 39c99969 authored by Mike Frysinger's avatar Mike Frysinger
Browse files
Options

Blackfin: bf561: rewrite SICA_xxx to just SIC_xxx 

This matches all the other Blackfin ports and keep us from having to write
bf561-specific code in many places.
Signed-off-by: default avatarMike Frysinger <vapier@gentoo.org>
parent 9ebcaa47
Hide whitespace changes
Inline Side-by-side
Showing with 87 additions and 157 deletions
arch/blackfin/mach-bf561/coreb.c
View file @ 39c99969
...@@ -29,10 +29,10 @@ coreb_ioctl(struct file *file, unsigned int cmd, unsigned long arg) ...@@ -29,10 +29,10 @@ coreb_ioctl(struct file *file, unsigned int cmd, unsigned long arg)
switch (cmd) { switch (cmd) {
case CMD_COREB_START: case CMD_COREB_START:
bfin_write_SICA_SYSCR(bfin_read_SICA_SYSCR() & ~0x0020); bfin_write_SYSCR(bfin_read_SYSCR() & ~0x0020);
break; break;
case CMD_COREB_STOP: case CMD_COREB_STOP:
bfin_write_SICA_SYSCR(bfin_read_SICA_SYSCR() | 0x0020); bfin_write_SYSCR(bfin_read_SYSCR() | 0x0020);
bfin_write_SICB_SYSCR(bfin_read_SICB_SYSCR() | 0x0080); bfin_write_SICB_SYSCR(bfin_read_SICB_SYSCR() | 0x0080);
break; break;
case CMD_COREB_RESET: case CMD_COREB_RESET:
......
arch/blackfin/mach-bf561/include/mach/blackfin.h
View file @ 39c99969
...@@ -24,29 +24,16 @@ ...@@ -24,29 +24,16 @@
#define bfin_read_FIO_INEN() bfin_read_FIO0_INEN() #define bfin_read_FIO_INEN() bfin_read_FIO0_INEN()
#define bfin_write_FIO_INEN(val) bfin_write_FIO0_INEN(val) #define bfin_write_FIO_INEN(val) bfin_write_FIO0_INEN(val)
#define SIC_IWR0 SICA_IWR0 /* Weird muxer funcs which pick SIC regs from IMASK base */
#define SIC_IWR1 SICA_IWR1 #define __SIC_MUX(base, x) ((base) + ((x) << 2))
#define SIC_IAR0 SICA_IAR0 #define bfin_read_SIC_IMASK(x) bfin_read32(__SIC_MUX(SIC_IMASK0, x))
#define bfin_write_SIC_IMASK0 bfin_write_SICA_IMASK0 #define bfin_write_SIC_IMASK(x, val) bfin_write32(__SIC_MUX(SIC_IMASK0, x), val)
#define bfin_write_SIC_IMASK1 bfin_write_SICA_IMASK1 #define bfin_read_SICB_IMASK(x) bfin_read32(__SIC_MUX(SICB_IMASK0, x))
#define bfin_write_SIC_IWR0 bfin_write_SICA_IWR0 #define bfin_write_SICB_IMASK(x, val) bfin_write32(__SIC_MUX(SICB_IMASK0, x), val)
#define bfin_write_SIC_IWR1 bfin_write_SICA_IWR1 #define bfin_read_SIC_ISR(x) bfin_read32(__SIC_MUX(SIC_ISR0, x))
#define bfin_write_SIC_ISR(x, val) bfin_write32(__SIC_MUX(SIC_ISR0, x), val)
#define bfin_read_SIC_IMASK0 bfin_read_SICA_IMASK0 #define bfin_read_SICB_ISR(x) bfin_read32(__SIC_MUX(SICB_ISR0, x))
#define bfin_read_SIC_IMASK1 bfin_read_SICA_IMASK1 #define bfin_write_SICB_ISR(x, val) bfin_write32(__SIC_MUX(SICB_ISR0, x), val)
#define bfin_read_SIC_IWR0 bfin_read_SICA_IWR0
#define bfin_read_SIC_IWR1 bfin_read_SICA_IWR1
#define bfin_read_SIC_ISR0 bfin_read_SICA_ISR0
#define bfin_read_SIC_ISR1 bfin_read_SICA_ISR1
#define bfin_read_SIC_IMASK(x) bfin_read32(SICA_IMASK0 + (x << 2))
#define bfin_write_SIC_IMASK(x, val) bfin_write32((SICA_IMASK0 + (x << 2)), val)
#define bfin_read_SICB_IMASK(x) bfin_read32(SICB_IMASK0 + (x << 2))
#define bfin_write_SICB_IMASK(x, val) bfin_write32((SICB_IMASK0 + (x << 2)), val)
#define bfin_read_SIC_ISR(x) bfin_read32(SICA_ISR0 + (x << 2))
#define bfin_write_SIC_ISR(x, val) bfin_write32((SICA_ISR0 + (x << 2)), val)
#define bfin_read_SICB_ISR(x) bfin_read32(SICB_ISR0 + (x << 2))
#define bfin_write_SICB_ISR(x, val) bfin_write32((SICB_ISR0 + (x << 2)), val)
#define BFIN_UART_NR_PORTS 1 #define BFIN_UART_NR_PORTS 1
......
arch/blackfin/mach-bf561/include/mach/cdefBF561.h
View file @ 39c99969
...@@ -30,49 +30,41 @@ ...@@ -30,49 +30,41 @@
#define bfin_write_PLL_LOCKCNT(val) bfin_write16(PLL_LOCKCNT,val) #define bfin_write_PLL_LOCKCNT(val) bfin_write16(PLL_LOCKCNT,val)
#define bfin_read_CHIPID() bfin_read32(CHIPID) #define bfin_read_CHIPID() bfin_read32(CHIPID)
/* For MMR's that are reserved on Core B, set up defines to better integrate with other ports */
#define bfin_read_SWRST() bfin_read_SICA_SWRST()
#define bfin_write_SWRST(val) bfin_write_SICA_SWRST(val)
#define bfin_read_SYSCR() bfin_read_SICA_SYSCR()
#define bfin_write_SYSCR(val) bfin_write_SICA_SYSCR(val)
/* System Reset and Interrupt Controller registers for core A (0xFFC0 0100-0xFFC0 01FF) */ /* System Reset and Interrupt Controller registers for core A (0xFFC0 0100-0xFFC0 01FF) */
#define bfin_read_SICA_SWRST() bfin_read16(SICA_SWRST) #define bfin_read_SWRST() bfin_read16(SWRST)
#define bfin_write_SICA_SWRST(val) bfin_write16(SICA_SWRST,val) #define bfin_write_SWRST(val) bfin_write16(SWRST,val)
#define bfin_read_SICA_SYSCR() bfin_read16(SICA_SYSCR) #define bfin_read_SYSCR() bfin_read16(SYSCR)
#define bfin_write_SICA_SYSCR(val) bfin_write16(SICA_SYSCR,val) #define bfin_write_SYSCR(val) bfin_write16(SYSCR,val)
#define bfin_read_SICA_RVECT() bfin_read16(SICA_RVECT) #define bfin_read_SIC_RVECT() bfin_read16(SIC_RVECT)
#define bfin_write_SICA_RVECT(val) bfin_write16(SICA_RVECT,val) #define bfin_write_SIC_RVECT(val) bfin_write16(SIC_RVECT,val)
#define bfin_read_SICA_IMASK() bfin_read32(SICA_IMASK) #define bfin_read_SIC_IMASK0() bfin_read32(SIC_IMASK0)
#define bfin_write_SICA_IMASK(val) bfin_write32(SICA_IMASK,val) #define bfin_write_SIC_IMASK0(val) bfin_write32(SIC_IMASK0,val)
#define bfin_read_SICA_IMASK0() bfin_read32(SICA_IMASK0) #define bfin_read_SIC_IMASK1() bfin_read32(SIC_IMASK1)
#define bfin_write_SICA_IMASK0(val) bfin_write32(SICA_IMASK0,val) #define bfin_write_SIC_IMASK1(val) bfin_write32(SIC_IMASK1,val)
#define bfin_read_SICA_IMASK1() bfin_read32(SICA_IMASK1) #define bfin_read_SIC_IAR0() bfin_read32(SIC_IAR0)
#define bfin_write_SICA_IMASK1(val) bfin_write32(SICA_IMASK1,val) #define bfin_write_SIC_IAR0(val) bfin_write32(SIC_IAR0,val)
#define bfin_read_SICA_IAR0() bfin_read32(SICA_IAR0) #define bfin_read_SIC_IAR1() bfin_read32(SIC_IAR1)
#define bfin_write_SICA_IAR0(val) bfin_write32(SICA_IAR0,val) #define bfin_write_SIC_IAR1(val) bfin_write32(SIC_IAR1,val)
#define bfin_read_SICA_IAR1() bfin_read32(SICA_IAR1) #define bfin_read_SIC_IAR2() bfin_read32(SIC_IAR2)
#define bfin_write_SICA_IAR1(val) bfin_write32(SICA_IAR1,val) #define bfin_write_SIC_IAR2(val) bfin_write32(SIC_IAR2,val)
#define bfin_read_SICA_IAR2() bfin_read32(SICA_IAR2) #define bfin_read_SIC_IAR3() bfin_read32(SIC_IAR3)
#define bfin_write_SICA_IAR2(val) bfin_write32(SICA_IAR2,val) #define bfin_write_SIC_IAR3(val) bfin_write32(SIC_IAR3,val)
#define bfin_read_SICA_IAR3() bfin_read32(SICA_IAR3) #define bfin_read_SIC_IAR4() bfin_read32(SIC_IAR4)
#define bfin_write_SICA_IAR3(val) bfin_write32(SICA_IAR3,val) #define bfin_write_SIC_IAR4(val) bfin_write32(SIC_IAR4,val)
#define bfin_read_SICA_IAR4() bfin_read32(SICA_IAR4) #define bfin_read_SIC_IAR5() bfin_read32(SIC_IAR5)
#define bfin_write_SICA_IAR4(val) bfin_write32(SICA_IAR4,val) #define bfin_write_SIC_IAR5(val) bfin_write32(SIC_IAR5,val)
#define bfin_read_SICA_IAR5() bfin_read32(SICA_IAR5) #define bfin_read_SIC_IAR6() bfin_read32(SIC_IAR6)
#define bfin_write_SICA_IAR5(val) bfin_write32(SICA_IAR5,val) #define bfin_write_SIC_IAR6(val) bfin_write32(SIC_IAR6,val)
#define bfin_read_SICA_IAR6() bfin_read32(SICA_IAR6) #define bfin_read_SIC_IAR7() bfin_read32(SIC_IAR7)
#define bfin_write_SICA_IAR6(val) bfin_write32(SICA_IAR6,val) #define bfin_write_SIC_IAR7(val) bfin_write32(SIC_IAR7,val)
#define bfin_read_SICA_IAR7() bfin_read32(SICA_IAR7) #define bfin_read_SIC_ISR0() bfin_read32(SIC_ISR0)
#define bfin_write_SICA_IAR7(val) bfin_write32(SICA_IAR7,val) #define bfin_write_SIC_ISR0(val) bfin_write32(SIC_ISR0,val)
#define bfin_read_SICA_ISR0() bfin_read32(SICA_ISR0) #define bfin_read_SIC_ISR1() bfin_read32(SIC_ISR1)
#define bfin_write_SICA_ISR0(val) bfin_write32(SICA_ISR0,val) #define bfin_write_SIC_ISR1(val) bfin_write32(SIC_ISR1,val)
#define bfin_read_SICA_ISR1() bfin_read32(SICA_ISR1) #define bfin_read_SIC_IWR0() bfin_read32(SIC_IWR0)
#define bfin_write_SICA_ISR1(val) bfin_write32(SICA_ISR1,val) #define bfin_write_SIC_IWR0(val) bfin_write32(SIC_IWR0,val)
#define bfin_read_SICA_IWR0() bfin_read32(SICA_IWR0) #define bfin_read_SIC_IWR1() bfin_read32(SIC_IWR1)
#define bfin_write_SICA_IWR0(val) bfin_write32(SICA_IWR0,val) #define bfin_write_SIC_IWR1(val) bfin_write32(SIC_IWR1,val)
#define bfin_read_SICA_IWR1() bfin_read32(SICA_IWR1)
#define bfin_write_SICA_IWR1(val) bfin_write32(SICA_IWR1,val)
/* System Reset and Interrupt Controller registers for Core B (0xFFC0 1100-0xFFC0 11FF) */ /* System Reset and Interrupt Controller registers for Core B (0xFFC0 1100-0xFFC0 11FF) */
#define bfin_read_SICB_SWRST() bfin_read16(SICB_SWRST) #define bfin_read_SICB_SWRST() bfin_read16(SICB_SWRST)
......
arch/blackfin/mach-bf561/include/mach/defBF561.h
View file @ 39c99969
...@@ -28,32 +28,29 @@ ...@@ -28,32 +28,29 @@
#define CHIPID 0xFFC00014 /* Chip ID Register */ #define CHIPID 0xFFC00014 /* Chip ID Register */
/* For MMR's that are reserved on Core B, set up defines to better integrate with other ports */ /* For MMR's that are reserved on Core B, set up defines to better integrate with other ports */
#define SWRST SICA_SWRST
#define SYSCR SICA_SYSCR
#define DOUBLE_FAULT (DOUBLE_FAULT_B|DOUBLE_FAULT_A) #define DOUBLE_FAULT (DOUBLE_FAULT_B|DOUBLE_FAULT_A)
#define RESET_DOUBLE (SWRST_DBL_FAULT_B|SWRST_DBL_FAULT_A) #define RESET_DOUBLE (SWRST_DBL_FAULT_B|SWRST_DBL_FAULT_A)
#define RESET_WDOG (SWRST_WDT_B|SWRST_WDT_A) #define RESET_WDOG (SWRST_WDT_B|SWRST_WDT_A)
#define RESET_SOFTWARE (SWRST_OCCURRED) #define RESET_SOFTWARE (SWRST_OCCURRED)
/* System Reset and Interrupt Controller registers for core A (0xFFC0 0100-0xFFC0 01FF) */ /* System Reset and Interrupt Controller registers for core A (0xFFC0 0100-0xFFC0 01FF) */
#define SICA_SWRST 0xFFC00100 /* Software Reset register */ #define SWRST 0xFFC00100 /* Software Reset register */
#define SICA_SYSCR 0xFFC00104 /* System Reset Configuration register */ #define SYSCR 0xFFC00104 /* System Reset Configuration register */
#define SICA_RVECT 0xFFC00108 /* SIC Reset Vector Address Register */ #define SIC_RVECT 0xFFC00108 /* SIC Reset Vector Address Register */
#define SICA_IMASK 0xFFC0010C /* SIC Interrupt Mask register 0 - hack to fix old tests */ #define SIC_IMASK0 0xFFC0010C /* SIC Interrupt Mask register 0 */
#define SICA_IMASK0 0xFFC0010C /* SIC Interrupt Mask register 0 */ #define SIC_IMASK1 0xFFC00110 /* SIC Interrupt Mask register 1 */
#define SICA_IMASK1 0xFFC00110 /* SIC Interrupt Mask register 1 */ #define SIC_IAR0 0xFFC00124 /* SIC Interrupt Assignment Register 0 */
#define SICA_IAR0 0xFFC00124 /* SIC Interrupt Assignment Register 0 */ #define SIC_IAR1 0xFFC00128 /* SIC Interrupt Assignment Register 1 */
#define SICA_IAR1 0xFFC00128 /* SIC Interrupt Assignment Register 1 */ #define SIC_IAR2 0xFFC0012C /* SIC Interrupt Assignment Register 2 */
#define SICA_IAR2 0xFFC0012C /* SIC Interrupt Assignment Register 2 */ #define SIC_IAR3 0xFFC00130 /* SIC Interrupt Assignment Register 3 */
#define SICA_IAR3 0xFFC00130 /* SIC Interrupt Assignment Register 3 */ #define SIC_IAR4 0xFFC00134 /* SIC Interrupt Assignment Register 4 */
#define SICA_IAR4 0xFFC00134 /* SIC Interrupt Assignment Register 4 */ #define SIC_IAR5 0xFFC00138 /* SIC Interrupt Assignment Register 5 */
#define SICA_IAR5 0xFFC00138 /* SIC Interrupt Assignment Register 5 */ #define SIC_IAR6 0xFFC0013C /* SIC Interrupt Assignment Register 6 */
#define SICA_IAR6 0xFFC0013C /* SIC Interrupt Assignment Register 6 */ #define SIC_IAR7 0xFFC00140 /* SIC Interrupt Assignment Register 7 */
#define SICA_IAR7 0xFFC00140 /* SIC Interrupt Assignment Register 7 */ #define SIC_ISR0 0xFFC00114 /* SIC Interrupt Status register 0 */
#define SICA_ISR0 0xFFC00114 /* SIC Interrupt Status register 0 */ #define SIC_ISR1 0xFFC00118 /* SIC Interrupt Status register 1 */
#define SICA_ISR1 0xFFC00118 /* SIC Interrupt Status register 1 */ #define SIC_IWR0 0xFFC0011C /* SIC Interrupt Wakeup-Enable register 0 */
#define SICA_IWR0 0xFFC0011C /* SIC Interrupt Wakeup-Enable register 0 */ #define SIC_IWR1 0xFFC00120 /* SIC Interrupt Wakeup-Enable register 1 */
#define SICA_IWR1 0xFFC00120 /* SIC Interrupt Wakeup-Enable register 1 */
/* System Reset and Interrupt Controller registers for Core B (0xFFC0 1100-0xFFC0 11FF) */ /* System Reset and Interrupt Controller registers for Core B (0xFFC0 1100-0xFFC0 11FF) */
#define SICB_SWRST 0xFFC01100 /* reserved */ #define SICB_SWRST 0xFFC01100 /* reserved */
......
arch/blackfin/mach-bf561/ints-priority.c
View file @ 39c99969
...@@ -13,7 +13,7 @@ ...@@ -13,7 +13,7 @@
void __init program_IAR(void) void __init program_IAR(void)
{ {
/* Program the IAR0 Register with the configured priority */ /* Program the IAR0 Register with the configured priority */
bfin_write_SICA_IAR0(((CONFIG_IRQ_PLL_WAKEUP - 7) << IRQ_PLL_WAKEUP_POS) | bfin_write_SIC_IAR0(((CONFIG_IRQ_PLL_WAKEUP - 7) << IRQ_PLL_WAKEUP_POS) |
((CONFIG_IRQ_DMA1_ERROR - 7) << IRQ_DMA1_ERROR_POS) | ((CONFIG_IRQ_DMA1_ERROR - 7) << IRQ_DMA1_ERROR_POS) |
((CONFIG_IRQ_DMA2_ERROR - 7) << IRQ_DMA2_ERROR_POS) | ((CONFIG_IRQ_DMA2_ERROR - 7) << IRQ_DMA2_ERROR_POS) |
((CONFIG_IRQ_IMDMA_ERROR - 7) << IRQ_IMDMA_ERROR_POS) | ((CONFIG_IRQ_IMDMA_ERROR - 7) << IRQ_IMDMA_ERROR_POS) |
...@@ -22,7 +22,7 @@ void __init program_IAR(void) ...@@ -22,7 +22,7 @@ void __init program_IAR(void)
((CONFIG_IRQ_SPORT0_ERROR - 7) << IRQ_SPORT0_ERROR_POS) | ((CONFIG_IRQ_SPORT0_ERROR - 7) << IRQ_SPORT0_ERROR_POS) |
((CONFIG_IRQ_SPORT1_ERROR - 7) << IRQ_SPORT1_ERROR_POS)); ((CONFIG_IRQ_SPORT1_ERROR - 7) << IRQ_SPORT1_ERROR_POS));
bfin_write_SICA_IAR1(((CONFIG_IRQ_SPI_ERROR - 7) << IRQ_SPI_ERROR_POS) | bfin_write_SIC_IAR1(((CONFIG_IRQ_SPI_ERROR - 7) << IRQ_SPI_ERROR_POS) |
((CONFIG_IRQ_UART_ERROR - 7) << IRQ_UART_ERROR_POS) | ((CONFIG_IRQ_UART_ERROR - 7) << IRQ_UART_ERROR_POS) |
((CONFIG_IRQ_RESERVED_ERROR - 7) << IRQ_RESERVED_ERROR_POS) | ((CONFIG_IRQ_RESERVED_ERROR - 7) << IRQ_RESERVED_ERROR_POS) |
((CONFIG_IRQ_DMA1_0 - 7) << IRQ_DMA1_0_POS) | ((CONFIG_IRQ_DMA1_0 - 7) << IRQ_DMA1_0_POS) |
...@@ -31,7 +31,7 @@ void __init program_IAR(void) ...@@ -31,7 +31,7 @@ void __init program_IAR(void)
((CONFIG_IRQ_DMA1_3 - 7) << IRQ_DMA1_3_POS) | ((CONFIG_IRQ_DMA1_3 - 7) << IRQ_DMA1_3_POS) |
((CONFIG_IRQ_DMA1_4 - 7) << IRQ_DMA1_4_POS)); ((CONFIG_IRQ_DMA1_4 - 7) << IRQ_DMA1_4_POS));
bfin_write_SICA_IAR2(((CONFIG_IRQ_DMA1_5 - 7) << IRQ_DMA1_5_POS) | bfin_write_SIC_IAR2(((CONFIG_IRQ_DMA1_5 - 7) << IRQ_DMA1_5_POS) |
((CONFIG_IRQ_DMA1_6 - 7) << IRQ_DMA1_6_POS) | ((CONFIG_IRQ_DMA1_6 - 7) << IRQ_DMA1_6_POS) |
((CONFIG_IRQ_DMA1_7 - 7) << IRQ_DMA1_7_POS) | ((CONFIG_IRQ_DMA1_7 - 7) << IRQ_DMA1_7_POS) |
((CONFIG_IRQ_DMA1_8 - 7) << IRQ_DMA1_8_POS) | ((CONFIG_IRQ_DMA1_8 - 7) << IRQ_DMA1_8_POS) |
...@@ -40,7 +40,7 @@ void __init program_IAR(void) ...@@ -40,7 +40,7 @@ void __init program_IAR(void)
((CONFIG_IRQ_DMA1_11 - 7) << IRQ_DMA1_11_POS) | ((CONFIG_IRQ_DMA1_11 - 7) << IRQ_DMA1_11_POS) |
((CONFIG_IRQ_DMA2_0 - 7) << IRQ_DMA2_0_POS)); ((CONFIG_IRQ_DMA2_0 - 7) << IRQ_DMA2_0_POS));
bfin_write_SICA_IAR3(((CONFIG_IRQ_DMA2_1 - 7) << IRQ_DMA2_1_POS) | bfin_write_SIC_IAR3(((CONFIG_IRQ_DMA2_1 - 7) << IRQ_DMA2_1_POS) |
((CONFIG_IRQ_DMA2_2 - 7) << IRQ_DMA2_2_POS) | ((CONFIG_IRQ_DMA2_2 - 7) << IRQ_DMA2_2_POS) |
((CONFIG_IRQ_DMA2_3 - 7) << IRQ_DMA2_3_POS) | ((CONFIG_IRQ_DMA2_3 - 7) << IRQ_DMA2_3_POS) |
((CONFIG_IRQ_DMA2_4 - 7) << IRQ_DMA2_4_POS) | ((CONFIG_IRQ_DMA2_4 - 7) << IRQ_DMA2_4_POS) |
...@@ -49,7 +49,7 @@ void __init program_IAR(void) ...@@ -49,7 +49,7 @@ void __init program_IAR(void)
((CONFIG_IRQ_DMA2_7 - 7) << IRQ_DMA2_7_POS) | ((CONFIG_IRQ_DMA2_7 - 7) << IRQ_DMA2_7_POS) |
((CONFIG_IRQ_DMA2_8 - 7) << IRQ_DMA2_8_POS)); ((CONFIG_IRQ_DMA2_8 - 7) << IRQ_DMA2_8_POS));
bfin_write_SICA_IAR4(((CONFIG_IRQ_DMA2_9 - 7) << IRQ_DMA2_9_POS) | bfin_write_SIC_IAR4(((CONFIG_IRQ_DMA2_9 - 7) << IRQ_DMA2_9_POS) |
((CONFIG_IRQ_DMA2_10 - 7) << IRQ_DMA2_10_POS) | ((CONFIG_IRQ_DMA2_10 - 7) << IRQ_DMA2_10_POS) |
((CONFIG_IRQ_DMA2_11 - 7) << IRQ_DMA2_11_POS) | ((CONFIG_IRQ_DMA2_11 - 7) << IRQ_DMA2_11_POS) |
((CONFIG_IRQ_TIMER0 - 7) << IRQ_TIMER0_POS) | ((CONFIG_IRQ_TIMER0 - 7) << IRQ_TIMER0_POS) |
...@@ -58,7 +58,7 @@ void __init program_IAR(void) ...@@ -58,7 +58,7 @@ void __init program_IAR(void)
((CONFIG_IRQ_TIMER3 - 7) << IRQ_TIMER3_POS) | ((CONFIG_IRQ_TIMER3 - 7) << IRQ_TIMER3_POS) |
((CONFIG_IRQ_TIMER4 - 7) << IRQ_TIMER4_POS)); ((CONFIG_IRQ_TIMER4 - 7) << IRQ_TIMER4_POS));
bfin_write_SICA_IAR5(((CONFIG_IRQ_TIMER5 - 7) << IRQ_TIMER5_POS) | bfin_write_SIC_IAR5(((CONFIG_IRQ_TIMER5 - 7) << IRQ_TIMER5_POS) |
((CONFIG_IRQ_TIMER6 - 7) << IRQ_TIMER6_POS) | ((CONFIG_IRQ_TIMER6 - 7) << IRQ_TIMER6_POS) |
((CONFIG_IRQ_TIMER7 - 7) << IRQ_TIMER7_POS) | ((CONFIG_IRQ_TIMER7 - 7) << IRQ_TIMER7_POS) |
((CONFIG_IRQ_TIMER8 - 7) << IRQ_TIMER8_POS) | ((CONFIG_IRQ_TIMER8 - 7) << IRQ_TIMER8_POS) |
...@@ -67,7 +67,7 @@ void __init program_IAR(void) ...@@ -67,7 +67,7 @@ void __init program_IAR(void)
((CONFIG_IRQ_TIMER11 - 7) << IRQ_TIMER11_POS) | ((CONFIG_IRQ_TIMER11 - 7) << IRQ_TIMER11_POS) |
((CONFIG_IRQ_PROG0_INTA - 7) << IRQ_PROG0_INTA_POS)); ((CONFIG_IRQ_PROG0_INTA - 7) << IRQ_PROG0_INTA_POS));
bfin_write_SICA_IAR6(((CONFIG_IRQ_PROG0_INTB - 7) << IRQ_PROG0_INTB_POS) | bfin_write_SIC_IAR6(((CONFIG_IRQ_PROG0_INTB - 7) << IRQ_PROG0_INTB_POS) |
((CONFIG_IRQ_PROG1_INTA - 7) << IRQ_PROG1_INTA_POS) | ((CONFIG_IRQ_PROG1_INTA - 7) << IRQ_PROG1_INTA_POS) |
((CONFIG_IRQ_PROG1_INTB - 7) << IRQ_PROG1_INTB_POS) | ((CONFIG_IRQ_PROG1_INTB - 7) << IRQ_PROG1_INTB_POS) |
((CONFIG_IRQ_PROG2_INTA - 7) << IRQ_PROG2_INTA_POS) | ((CONFIG_IRQ_PROG2_INTA - 7) << IRQ_PROG2_INTA_POS) |
...@@ -76,7 +76,7 @@ void __init program_IAR(void) ...@@ -76,7 +76,7 @@ void __init program_IAR(void)
((CONFIG_IRQ_DMA1_WRRD1 - 7) << IRQ_DMA1_WRRD1_POS) | ((CONFIG_IRQ_DMA1_WRRD1 - 7) << IRQ_DMA1_WRRD1_POS) |
((CONFIG_IRQ_DMA2_WRRD0 - 7) << IRQ_DMA2_WRRD0_POS)); ((CONFIG_IRQ_DMA2_WRRD0 - 7) << IRQ_DMA2_WRRD0_POS));
bfin_write_SICA_IAR7(((CONFIG_IRQ_DMA2_WRRD1 - 7) << IRQ_DMA2_WRRD1_POS) | bfin_write_SIC_IAR7(((CONFIG_IRQ_DMA2_WRRD1 - 7) << IRQ_DMA2_WRRD1_POS) |
((CONFIG_IRQ_IMDMA_WRRD0 - 7) << IRQ_IMDMA_WRRD0_POS) | ((CONFIG_IRQ_IMDMA_WRRD0 - 7) << IRQ_IMDMA_WRRD0_POS) |
((CONFIG_IRQ_IMDMA_WRRD1 - 7) << IRQ_IMDMA_WRRD1_POS) | ((CONFIG_IRQ_IMDMA_WRRD1 - 7) << IRQ_IMDMA_WRRD1_POS) |
((CONFIG_IRQ_WDTIMER - 7) << IRQ_WDTIMER_POS) | ((CONFIG_IRQ_WDTIMER - 7) << IRQ_WDTIMER_POS) |
......
arch/blackfin/mach-bf561/smp.c
View file @ 39c99969
...@@ -52,19 +52,19 @@ int __init setup_profiling_timer(unsigned int multiplier) /* not supported */ ...@@ -52,19 +52,19 @@ int __init setup_profiling_timer(unsigned int multiplier) /* not supported */
void __cpuinit platform_secondary_init(unsigned int cpu) void __cpuinit platform_secondary_init(unsigned int cpu)
{ {
/* Clone setup for peripheral interrupt sources from CoreA. */ /* Clone setup for peripheral interrupt sources from CoreA. */
bfin_write_SICB_IMASK0(bfin_read_SICA_IMASK0()); bfin_write_SICB_IMASK0(bfin_read_SIC_IMASK0());
bfin_write_SICB_IMASK1(bfin_read_SICA_IMASK1()); bfin_write_SICB_IMASK1(bfin_read_SIC_IMASK1());
SSYNC(); SSYNC();
/* Clone setup for IARs from CoreA. */ /* Clone setup for IARs from CoreA. */
bfin_write_SICB_IAR0(bfin_read_SICA_IAR0()); bfin_write_SICB_IAR0(bfin_read_SIC_IAR0());
bfin_write_SICB_IAR1(bfin_read_SICA_IAR1()); bfin_write_SICB_IAR1(bfin_read_SIC_IAR1());
bfin_write_SICB_IAR2(bfin_read_SICA_IAR2()); bfin_write_SICB_IAR2(bfin_read_SIC_IAR2());
bfin_write_SICB_IAR3(bfin_read_SICA_IAR3()); bfin_write_SICB_IAR3(bfin_read_SIC_IAR3());
bfin_write_SICB_IAR4(bfin_read_SICA_IAR4()); bfin_write_SICB_IAR4(bfin_read_SIC_IAR4());
bfin_write_SICB_IAR5(bfin_read_SICA_IAR5()); bfin_write_SICB_IAR5(bfin_read_SIC_IAR5());
bfin_write_SICB_IAR6(bfin_read_SICA_IAR6()); bfin_write_SICB_IAR6(bfin_read_SIC_IAR6());
bfin_write_SICB_IAR7(bfin_read_SICA_IAR7()); bfin_write_SICB_IAR7(bfin_read_SIC_IAR7());
bfin_write_SICB_IWR0(IWR_DISABLE_ALL); bfin_write_SICB_IWR0(IWR_DISABLE_ALL);
bfin_write_SICB_IWR1(IWR_DISABLE_ALL); bfin_write_SICB_IWR1(IWR_DISABLE_ALL);
SSYNC(); SSYNC();
...@@ -86,12 +86,12 @@ int __cpuinit platform_boot_secondary(unsigned int cpu, struct task_struct *idle ...@@ -86,12 +86,12 @@ int __cpuinit platform_boot_secondary(unsigned int cpu, struct task_struct *idle
spin_lock(&boot_lock); spin_lock(&boot_lock);
if ((bfin_read_SICA_SYSCR() & COREB_SRAM_INIT) == 0) { if ((bfin_read_SIC_SYSCR() & COREB_SRAM_INIT) == 0) {
/* CoreB already running, sending ipi to wakeup it */ /* CoreB already running, sending ipi to wakeup it */
platform_send_ipi_cpu(cpu, IRQ_SUPPLE_0); platform_send_ipi_cpu(cpu, IRQ_SUPPLE_0);
} else { } else {
/* Kick CoreB, which should start execution from CORE_SRAM_BASE. */ /* Kick CoreB, which should start execution from CORE_SRAM_BASE. */
bfin_write_SICA_SYSCR(bfin_read_SICA_SYSCR() & ~COREB_SRAM_INIT); bfin_write_SIC_SYSCR(bfin_read_SIC_SYSCR() & ~COREB_SRAM_INIT);
SSYNC(); SSYNC();
} }
......
arch/blackfin/mach-common/dpmc_modes.S
View file @ 39c99969
...@@ -292,13 +292,7 @@ ENTRY(_do_hibernate) ...@@ -292,13 +292,7 @@ ENTRY(_do_hibernate)
#ifdef SIC_IMASK #ifdef SIC_IMASK
PM_SYS_PUSH(SIC_IMASK) PM_SYS_PUSH(SIC_IMASK)
#endif #endif
#ifdef SICA_IMASK0 #ifdef SIC_IAR0
PM_SYS_PUSH(SICA_IMASK0)
#endif
#ifdef SICA_IMASK1
PM_SYS_PUSH(SICA_IMASK1)
#endif
#ifdef SIC_IAR2
PM_SYS_PUSH(SIC_IAR0) PM_SYS_PUSH(SIC_IAR0)
PM_SYS_PUSH(SIC_IAR1) PM_SYS_PUSH(SIC_IAR1)
PM_SYS_PUSH(SIC_IAR2) PM_SYS_PUSH(SIC_IAR2)
...@@ -321,17 +315,6 @@ ENTRY(_do_hibernate) ...@@ -321,17 +315,6 @@ ENTRY(_do_hibernate)
PM_SYS_PUSH(SIC_IAR11) PM_SYS_PUSH(SIC_IAR11)
#endif #endif
#ifdef SICA_IAR0
PM_SYS_PUSH(SICA_IAR0)
PM_SYS_PUSH(SICA_IAR1)
PM_SYS_PUSH(SICA_IAR2)
PM_SYS_PUSH(SICA_IAR3)
PM_SYS_PUSH(SICA_IAR4)
PM_SYS_PUSH(SICA_IAR5)
PM_SYS_PUSH(SICA_IAR6)
PM_SYS_PUSH(SICA_IAR7)
#endif
#ifdef SIC_IWR #ifdef SIC_IWR
PM_SYS_PUSH(SIC_IWR) PM_SYS_PUSH(SIC_IWR)
#endif #endif
...@@ -344,12 +327,6 @@ ENTRY(_do_hibernate) ...@@ -344,12 +327,6 @@ ENTRY(_do_hibernate)
#ifdef SIC_IWR2 #ifdef SIC_IWR2
PM_SYS_PUSH(SIC_IWR2) PM_SYS_PUSH(SIC_IWR2)
#endif #endif
#ifdef SICA_IWR0
PM_SYS_PUSH(SICA_IWR0)
#endif
#ifdef SICA_IWR1
PM_SYS_PUSH(SICA_IWR1)
#endif
#ifdef PINT0_ASSIGN #ifdef PINT0_ASSIGN
PM_SYS_PUSH(PINT0_MASK_SET) PM_SYS_PUSH(PINT0_MASK_SET)
...@@ -750,12 +727,6 @@ ENTRY(_do_hibernate) ...@@ -750,12 +727,6 @@ ENTRY(_do_hibernate)
PM_SYS_POP(PINT0_MASK_SET) PM_SYS_POP(PINT0_MASK_SET)
#endif #endif
#ifdef SICA_IWR1
PM_SYS_POP(SICA_IWR1)
#endif
#ifdef SICA_IWR0
PM_SYS_POP(SICA_IWR0)
#endif
#ifdef SIC_IWR2 #ifdef SIC_IWR2
PM_SYS_POP(SIC_IWR2) PM_SYS_POP(SIC_IWR2)
#endif #endif
...@@ -769,17 +740,6 @@ ENTRY(_do_hibernate) ...@@ -769,17 +740,6 @@ ENTRY(_do_hibernate)
PM_SYS_POP(SIC_IWR) PM_SYS_POP(SIC_IWR)
#endif #endif
#ifdef SICA_IAR0
PM_SYS_POP(SICA_IAR7)
PM_SYS_POP(SICA_IAR6)
PM_SYS_POP(SICA_IAR5)
PM_SYS_POP(SICA_IAR4)
PM_SYS_POP(SICA_IAR3)
PM_SYS_POP(SICA_IAR2)
PM_SYS_POP(SICA_IAR1)
PM_SYS_POP(SICA_IAR0)
#endif
#ifdef SIC_IAR8 #ifdef SIC_IAR8
PM_SYS_POP(SIC_IAR11) PM_SYS_POP(SIC_IAR11)
PM_SYS_POP(SIC_IAR10) PM_SYS_POP(SIC_IAR10)
...@@ -797,17 +757,11 @@ ENTRY(_do_hibernate) ...@@ -797,17 +757,11 @@ ENTRY(_do_hibernate)
#ifdef SIC_IAR3 #ifdef SIC_IAR3
PM_SYS_POP(SIC_IAR3) PM_SYS_POP(SIC_IAR3)
#endif #endif
#ifdef SIC_IAR2 #ifdef SIC_IAR0
PM_SYS_POP(SIC_IAR2) PM_SYS_POP(SIC_IAR2)
PM_SYS_POP(SIC_IAR1) PM_SYS_POP(SIC_IAR1)
PM_SYS_POP(SIC_IAR0) PM_SYS_POP(SIC_IAR0)
#endif #endif
#ifdef SICA_IMASK1
PM_SYS_POP(SICA_IMASK1)
#endif
#ifdef SICA_IMASK0
PM_SYS_POP(SICA_IMASK0)
#endif
#ifdef SIC_IMASK #ifdef SIC_IMASK
PM_SYS_POP(SIC_IMASK) PM_SYS_POP(SIC_IMASK)
#endif #endif
......
arch/blackfin/mach-common/ints-priority.c
View file @ 39c99969
...@@ -1299,7 +1299,7 @@ void do_irq(int vec, struct pt_regs *fp) ...@@ -1299,7 +1299,7 @@ void do_irq(int vec, struct pt_regs *fp)
} else { } else {
struct ivgx *ivg = ivg7_13[vec - IVG7].ifirst; struct ivgx *ivg = ivg7_13[vec - IVG7].ifirst;
struct ivgx *ivg_stop = ivg7_13[vec - IVG7].istop; struct ivgx *ivg_stop = ivg7_13[vec - IVG7].istop;
#if defined(SIC_ISR0) || defined(SICA_ISR0) #if defined(SIC_ISR0)
unsigned long sic_status[3]; unsigned long sic_status[3];
if (smp_processor_id()) { if (smp_processor_id()) {
...@@ -1379,7 +1379,7 @@ asmlinkage int __ipipe_grab_irq(int vec, struct pt_regs *regs) ...@@ -1379,7 +1379,7 @@ asmlinkage int __ipipe_grab_irq(int vec, struct pt_regs *regs)
if (likely(vec == EVT_IVTMR_P)) if (likely(vec == EVT_IVTMR_P))
irq = IRQ_CORETMR; irq = IRQ_CORETMR;
else { else {
#if defined(SIC_ISR0) || defined(SICA_ISR0) #if defined(SIC_ISR0)
unsigned long sic_status[3]; unsigned long sic_status[3];
sic_status[0] = bfin_read_SIC_ISR0() & bfin_read_SIC_IMASK0(); sic_status[0] = bfin_read_SIC_ISR0() & bfin_read_SIC_IMASK0();
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7