From: Mike Frysinger Date: Mon, 21 May 2007 10:09:24 +0000 (+0800) Subject: Blackfin arch: finish removing p* volatile defines for MMRs X-Git-Tag: v2.6.22-rc3~141 X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=95e493c00ac0d2371c3f627fdb99d776d29a8166;p=linux-2.6 Blackfin arch: finish removing p* volatile defines for MMRs Signed-off-by: Mike Frysinger Signed-off-by: Bryan Wu Signed-off-by: Linus Torvalds --- diff --git a/include/asm-blackfin/mach-bf537/cdefBF534.h b/include/asm-blackfin/mach-bf537/cdefBF534.h index 9a167f3b22..d4d3663c11 100644 --- a/include/asm-blackfin/mach-bf537/cdefBF534.h +++ b/include/asm-blackfin/mach-bf537/cdefBF534.h @@ -75,7 +75,6 @@ static __inline__ void bfin_write_VR_CTL(unsigned int val) #define bfin_write_SWRST(val) bfin_write16(SWRST,val) #define bfin_read_SYSCR() bfin_read16(SYSCR) #define bfin_write_SYSCR(val) bfin_write16(SYSCR,val) -#define pSIC_RVECT ((void * volatile *)SIC_RVECT) #define bfin_read_SIC_RVECT() bfin_read32(SIC_RVECT) #define bfin_write_SIC_RVECT(val) bfin_write32(SIC_RVECT,val) #define bfin_read_SIC_IMASK() bfin_read32(SIC_IMASK) @@ -400,10 +399,8 @@ static __inline__ void bfin_write_VR_CTL(unsigned int val) #define bfin_write_EBIU_SDSTAT(val) bfin_write16(EBIU_SDSTAT,val) /* DMA Traffic Control Registers */ -#define pDMA_TCPER ((volatile unsigned short *)DMA_TCPER) #define bfin_read_DMA_TCPER() bfin_read16(DMA_TCPER) #define bfin_write_DMA_TCPER(val) bfin_write16(DMA_TCPER,val) -#define pDMA_TCCNT ((volatile unsigned short *)DMA_TCCNT) #define bfin_read_DMA_TCCNT() bfin_read16(DMA_TCCNT) #define bfin_write_DMA_TCCNT(val) bfin_write16(DMA_TCCNT,val) diff --git a/include/asm-blackfin/mach-bf537/cdefBF537.h b/include/asm-blackfin/mach-bf537/cdefBF537.h index 932a1b6b5d..b8fc949a99 100644 --- a/include/asm-blackfin/mach-bf537/cdefBF537.h +++ b/include/asm-blackfin/mach-bf537/cdefBF537.h @@ -40,7 +40,6 @@ /* Include Macro "Defines" For EMAC (Unique to BF536/BF537 */ /* 10/100 Ethernet Controller (0xFFC03000 - 0xFFC031FF) */ -#define pEMAC_OPMODE ((volatile unsigned long *)EMAC_OPMODE) #define bfin_read_EMAC_OPMODE() bfin_read32(EMAC_OPMODE) #define bfin_write_EMAC_OPMODE(val) bfin_write32(EMAC_OPMODE,val) #define bfin_read_EMAC_ADDRLO() bfin_read32(EMAC_ADDRLO) @@ -80,7 +79,6 @@ #define bfin_read_EMAC_WKUP_FFCRC1() bfin_read32(EMAC_WKUP_FFCRC1) #define bfin_write_EMAC_WKUP_FFCRC1(val) bfin_write32(EMAC_WKUP_FFCRC1,val) -#define pEMAC_SYSCTL ((volatile unsigned long *)EMAC_SYSCTL) #define bfin_read_EMAC_SYSCTL() bfin_read32(EMAC_SYSCTL) #define bfin_write_EMAC_SYSCTL(val) bfin_write32(EMAC_SYSCTL,val) #define bfin_read_EMAC_SYSTAT() bfin_read32(EMAC_SYSTAT) @@ -147,7 +145,6 @@ #define bfin_write_EMAC_RXC_SHORT(val) bfin_write32(EMAC_RXC_SHORT,val) #define bfin_read_EMAC_RXC_EQ64() bfin_read32(EMAC_RXC_EQ64) #define bfin_write_EMAC_RXC_EQ64(val) bfin_write32(EMAC_RXC_EQ64,val) -#define pEMAC_RXC_LT128 ((volatile unsigned long *)EMAC_RXC_LT128) #define bfin_read_EMAC_RXC_LT128() bfin_read32(EMAC_RXC_LT128) #define bfin_write_EMAC_RXC_LT128(val) bfin_write32(EMAC_RXC_LT128,val) #define bfin_read_EMAC_RXC_LT256() bfin_read32(EMAC_RXC_LT256) diff --git a/include/asm-blackfin/mach-common/cdef_LPBlackfin.h b/include/asm-blackfin/mach-common/cdef_LPBlackfin.h index 22aa5e6379..d39c396f85 100644 --- a/include/asm-blackfin/mach-common/cdef_LPBlackfin.h +++ b/include/asm-blackfin/mach-common/cdef_LPBlackfin.h @@ -36,417 +36,288 @@ #include /*Cache & SRAM Memory*/ -#define pSRAM_BASE_ADDRESS ((volatile void **)SRAM_BASE_ADDRESS) #define bfin_read_SRAM_BASE_ADDRESS() bfin_read32(SRAM_BASE_ADDRESS) #define bfin_write_SRAM_BASE_ADDRESS(val) bfin_write32(SRAM_BASE_ADDRESS,val) -#define pDMEM_CONTROL ((volatile unsigned long *)DMEM_CONTROL) #define bfin_read_DMEM_CONTROL() bfin_read32(DMEM_CONTROL) #define bfin_write_DMEM_CONTROL(val) bfin_write32(DMEM_CONTROL,val) -#define pDCPLB_STATUS ((volatile unsigned long *)DCPLB_STATUS) #define bfin_read_DCPLB_STATUS() bfin_read32(DCPLB_STATUS) #define bfin_write_DCPLB_STATUS(val) bfin_write32(DCPLB_STATUS,val) -#define pDCPLB_FAULT_ADDR ((volatile void **)DCPLB_FAULT_ADDR) #define bfin_read_DCPLB_FAULT_ADDR() bfin_read32(DCPLB_FAULT_ADDR) #define bfin_write_DCPLB_FAULT_ADDR(val) bfin_write32(DCPLB_FAULT_ADDR,val) /* #define MMR_TIMEOUT 0xFFE00010 */ -#define pDCPLB_ADDR0 ((volatile void **)DCPLB_ADDR0) #define bfin_read_DCPLB_ADDR0() bfin_read32(DCPLB_ADDR0) #define bfin_write_DCPLB_ADDR0(val) bfin_write32(DCPLB_ADDR0,val) -#define pDCPLB_ADDR1 ((volatile void **)DCPLB_ADDR1) #define bfin_read_DCPLB_ADDR1() bfin_read32(DCPLB_ADDR1) #define bfin_write_DCPLB_ADDR1(val) bfin_write32(DCPLB_ADDR1,val) -#define pDCPLB_ADDR2 ((volatile void **)DCPLB_ADDR2) #define bfin_read_DCPLB_ADDR2() bfin_read32(DCPLB_ADDR2) #define bfin_write_DCPLB_ADDR2(val) bfin_write32(DCPLB_ADDR2,val) -#define pDCPLB_ADDR3 ((volatile void **)DCPLB_ADDR3) #define bfin_read_DCPLB_ADDR3() bfin_read32(DCPLB_ADDR3) #define bfin_write_DCPLB_ADDR3(val) bfin_write32(DCPLB_ADDR3,val) -#define pDCPLB_ADDR4 ((volatile void **)DCPLB_ADDR4) #define bfin_read_DCPLB_ADDR4() bfin_read32(DCPLB_ADDR4) #define bfin_write_DCPLB_ADDR4(val) bfin_write32(DCPLB_ADDR4,val) -#define pDCPLB_ADDR5 ((volatile void **)DCPLB_ADDR5) #define bfin_read_DCPLB_ADDR5() bfin_read32(DCPLB_ADDR5) #define bfin_write_DCPLB_ADDR5(val) bfin_write32(DCPLB_ADDR5,val) -#define pDCPLB_ADDR6 ((volatile void **)DCPLB_ADDR6) #define bfin_read_DCPLB_ADDR6() bfin_read32(DCPLB_ADDR6) #define bfin_write_DCPLB_ADDR6(val) bfin_write32(DCPLB_ADDR6,val) -#define pDCPLB_ADDR7 ((volatile void **)DCPLB_ADDR7) #define bfin_read_DCPLB_ADDR7() bfin_read32(DCPLB_ADDR7) #define bfin_write_DCPLB_ADDR7(val) bfin_write32(DCPLB_ADDR7,val) -#define pDCPLB_ADDR8 ((volatile void **)DCPLB_ADDR8) #define bfin_read_DCPLB_ADDR8() bfin_read32(DCPLB_ADDR8) #define bfin_write_DCPLB_ADDR8(val) bfin_write32(DCPLB_ADDR8,val) -#define pDCPLB_ADDR9 ((volatile void **)DCPLB_ADDR9) #define bfin_read_DCPLB_ADDR9() bfin_read32(DCPLB_ADDR9) #define bfin_write_DCPLB_ADDR9(val) bfin_write32(DCPLB_ADDR9,val) -#define pDCPLB_ADDR10 ((volatile void **)DCPLB_ADDR10) #define bfin_read_DCPLB_ADDR10() bfin_read32(DCPLB_ADDR10) #define bfin_write_DCPLB_ADDR10(val) bfin_write32(DCPLB_ADDR10,val) -#define pDCPLB_ADDR11 ((volatile void **)DCPLB_ADDR11) #define bfin_read_DCPLB_ADDR11() bfin_read32(DCPLB_ADDR11) #define bfin_write_DCPLB_ADDR11(val) bfin_write32(DCPLB_ADDR11,val) -#define pDCPLB_ADDR12 ((volatile void **)DCPLB_ADDR12) #define bfin_read_DCPLB_ADDR12() bfin_read32(DCPLB_ADDR12) #define bfin_write_DCPLB_ADDR12(val) bfin_write32(DCPLB_ADDR12,val) -#define pDCPLB_ADDR13 ((volatile void **)DCPLB_ADDR13) #define bfin_read_DCPLB_ADDR13() bfin_read32(DCPLB_ADDR13) #define bfin_write_DCPLB_ADDR13(val) bfin_write32(DCPLB_ADDR13,val) -#define pDCPLB_ADDR14 ((volatile void **)DCPLB_ADDR14) #define bfin_read_DCPLB_ADDR14() bfin_read32(DCPLB_ADDR14) #define bfin_write_DCPLB_ADDR14(val) bfin_write32(DCPLB_ADDR14,val) -#define pDCPLB_ADDR15 ((volatile void **)DCPLB_ADDR15) #define bfin_read_DCPLB_ADDR15() bfin_read32(DCPLB_ADDR15) #define bfin_write_DCPLB_ADDR15(val) bfin_write32(DCPLB_ADDR15,val) -#define pDCPLB_DATA0 ((volatile unsigned long *)DCPLB_DATA0) #define bfin_read_DCPLB_DATA0() bfin_read32(DCPLB_DATA0) #define bfin_write_DCPLB_DATA0(val) bfin_write32(DCPLB_DATA0,val) -#define pDCPLB_DATA1 ((volatile unsigned long *)DCPLB_DATA1) #define bfin_read_DCPLB_DATA1() bfin_read32(DCPLB_DATA1) #define bfin_write_DCPLB_DATA1(val) bfin_write32(DCPLB_DATA1,val) -#define pDCPLB_DATA2 ((volatile unsigned long *)DCPLB_DATA2) #define bfin_read_DCPLB_DATA2() bfin_read32(DCPLB_DATA2) #define bfin_write_DCPLB_DATA2(val) bfin_write32(DCPLB_DATA2,val) -#define pDCPLB_DATA3 ((volatile unsigned long *)DCPLB_DATA3) #define bfin_read_DCPLB_DATA3() bfin_read32(DCPLB_DATA3) #define bfin_write_DCPLB_DATA3(val) bfin_write32(DCPLB_DATA3,val) -#define pDCPLB_DATA4 ((volatile unsigned long *)DCPLB_DATA4) #define bfin_read_DCPLB_DATA4() bfin_read32(DCPLB_DATA4) #define bfin_write_DCPLB_DATA4(val) bfin_write32(DCPLB_DATA4,val) -#define pDCPLB_DATA5 ((volatile unsigned long *)DCPLB_DATA5) #define bfin_read_DCPLB_DATA5() bfin_read32(DCPLB_DATA5) #define bfin_write_DCPLB_DATA5(val) bfin_write32(DCPLB_DATA5,val) -#define pDCPLB_DATA6 ((volatile unsigned long *)DCPLB_DATA6) #define bfin_read_DCPLB_DATA6() bfin_read32(DCPLB_DATA6) #define bfin_write_DCPLB_DATA6(val) bfin_write32(DCPLB_DATA6,val) -#define pDCPLB_DATA7 ((volatile unsigned long *)DCPLB_DATA7) #define bfin_read_DCPLB_DATA7() bfin_read32(DCPLB_DATA7) #define bfin_write_DCPLB_DATA7(val) bfin_write32(DCPLB_DATA7,val) -#define pDCPLB_DATA8 ((volatile unsigned long *)DCPLB_DATA8) #define bfin_read_DCPLB_DATA8() bfin_read32(DCPLB_DATA8) #define bfin_write_DCPLB_DATA8(val) bfin_write32(DCPLB_DATA8,val) -#define pDCPLB_DATA9 ((volatile unsigned long *)DCPLB_DATA9) #define bfin_read_DCPLB_DATA9() bfin_read32(DCPLB_DATA9) #define bfin_write_DCPLB_DATA9(val) bfin_write32(DCPLB_DATA9,val) -#define pDCPLB_DATA10 ((volatile unsigned long *)DCPLB_DATA10) #define bfin_read_DCPLB_DATA10() bfin_read32(DCPLB_DATA10) #define bfin_write_DCPLB_DATA10(val) bfin_write32(DCPLB_DATA10,val) -#define pDCPLB_DATA11 ((volatile unsigned long *)DCPLB_DATA11) #define bfin_read_DCPLB_DATA11() bfin_read32(DCPLB_DATA11) #define bfin_write_DCPLB_DATA11(val) bfin_write32(DCPLB_DATA11,val) -#define pDCPLB_DATA12 ((volatile unsigned long *)DCPLB_DATA12) #define bfin_read_DCPLB_DATA12() bfin_read32(DCPLB_DATA12) #define bfin_write_DCPLB_DATA12(val) bfin_write32(DCPLB_DATA12,val) -#define pDCPLB_DATA13 ((volatile unsigned long *)DCPLB_DATA13) #define bfin_read_DCPLB_DATA13() bfin_read32(DCPLB_DATA13) #define bfin_write_DCPLB_DATA13(val) bfin_write32(DCPLB_DATA13,val) -#define pDCPLB_DATA14 ((volatile unsigned long *)DCPLB_DATA14) #define bfin_read_DCPLB_DATA14() bfin_read32(DCPLB_DATA14) #define bfin_write_DCPLB_DATA14(val) bfin_write32(DCPLB_DATA14,val) -#define pDCPLB_DATA15 ((volatile unsigned long *)DCPLB_DATA15) #define bfin_read_DCPLB_DATA15() bfin_read32(DCPLB_DATA15) #define bfin_write_DCPLB_DATA15(val) bfin_write32(DCPLB_DATA15,val) -#define pDTEST_COMMAND ((volatile unsigned long *)DTEST_COMMAND) #define bfin_read_DTEST_COMMAND() bfin_read32(DTEST_COMMAND) #define bfin_write_DTEST_COMMAND(val) bfin_write32(DTEST_COMMAND,val) /* #define DTEST_INDEX 0xFFE00304 */ -#define pDTEST_DATA0 ((volatile unsigned long *)DTEST_DATA0) #define bfin_read_DTEST_DATA0() bfin_read32(DTEST_DATA0) #define bfin_write_DTEST_DATA0(val) bfin_write32(DTEST_DATA0,val) -#define pDTEST_DATA1 ((volatile unsigned long *)DTEST_DATA1) #define bfin_read_DTEST_DATA1() bfin_read32(DTEST_DATA1) #define bfin_write_DTEST_DATA1(val) bfin_write32(DTEST_DATA1,val) /* #define DTEST_DATA2 0xFFE00408 #define DTEST_DATA3 0xFFE0040C */ -#define pIMEM_CONTROL ((volatile unsigned long *)IMEM_CONTROL) #define bfin_read_IMEM_CONTROL() bfin_read32(IMEM_CONTROL) #define bfin_write_IMEM_CONTROL(val) bfin_write32(IMEM_CONTROL,val) -#define pICPLB_STATUS ((volatile unsigned long *)ICPLB_STATUS) #define bfin_read_ICPLB_STATUS() bfin_read32(ICPLB_STATUS) #define bfin_write_ICPLB_STATUS(val) bfin_write32(ICPLB_STATUS,val) -#define pICPLB_FAULT_ADDR ((volatile void **)ICPLB_FAULT_ADDR) #define bfin_read_ICPLB_FAULT_ADDR() bfin_read32(ICPLB_FAULT_ADDR) #define bfin_write_ICPLB_FAULT_ADDR(val) bfin_write32(ICPLB_FAULT_ADDR,val) -#define pICPLB_ADDR0 ((volatile void **)ICPLB_ADDR0) #define bfin_read_ICPLB_ADDR0() bfin_read32(ICPLB_ADDR0) #define bfin_write_ICPLB_ADDR0(val) bfin_write32(ICPLB_ADDR0,val) -#define pICPLB_ADDR1 ((volatile void **)ICPLB_ADDR1) #define bfin_read_ICPLB_ADDR1() bfin_read32(ICPLB_ADDR1) #define bfin_write_ICPLB_ADDR1(val) bfin_write32(ICPLB_ADDR1,val) -#define pICPLB_ADDR2 ((volatile void **)ICPLB_ADDR2) #define bfin_read_ICPLB_ADDR2() bfin_read32(ICPLB_ADDR2) #define bfin_write_ICPLB_ADDR2(val) bfin_write32(ICPLB_ADDR2,val) -#define pICPLB_ADDR3 ((volatile void **)ICPLB_ADDR3) #define bfin_read_ICPLB_ADDR3() bfin_read32(ICPLB_ADDR3) #define bfin_write_ICPLB_ADDR3(val) bfin_write32(ICPLB_ADDR3,val) -#define pICPLB_ADDR4 ((volatile void **)ICPLB_ADDR4) #define bfin_read_ICPLB_ADDR4() bfin_read32(ICPLB_ADDR4) #define bfin_write_ICPLB_ADDR4(val) bfin_write32(ICPLB_ADDR4,val) -#define pICPLB_ADDR5 ((volatile void **)ICPLB_ADDR5) #define bfin_read_ICPLB_ADDR5() bfin_read32(ICPLB_ADDR5) #define bfin_write_ICPLB_ADDR5(val) bfin_write32(ICPLB_ADDR5,val) -#define pICPLB_ADDR6 ((volatile void **)ICPLB_ADDR6) #define bfin_read_ICPLB_ADDR6() bfin_read32(ICPLB_ADDR6) #define bfin_write_ICPLB_ADDR6(val) bfin_write32(ICPLB_ADDR6,val) -#define pICPLB_ADDR7 ((volatile void **)ICPLB_ADDR7) #define bfin_read_ICPLB_ADDR7() bfin_read32(ICPLB_ADDR7) #define bfin_write_ICPLB_ADDR7(val) bfin_write32(ICPLB_ADDR7,val) -#define pICPLB_ADDR8 ((volatile void **)ICPLB_ADDR8) #define bfin_read_ICPLB_ADDR8() bfin_read32(ICPLB_ADDR8) #define bfin_write_ICPLB_ADDR8(val) bfin_write32(ICPLB_ADDR8,val) -#define pICPLB_ADDR9 ((volatile void **)ICPLB_ADDR9) #define bfin_read_ICPLB_ADDR9() bfin_read32(ICPLB_ADDR9) #define bfin_write_ICPLB_ADDR9(val) bfin_write32(ICPLB_ADDR9,val) -#define pICPLB_ADDR10 ((volatile void **)ICPLB_ADDR10) #define bfin_read_ICPLB_ADDR10() bfin_read32(ICPLB_ADDR10) #define bfin_write_ICPLB_ADDR10(val) bfin_write32(ICPLB_ADDR10,val) -#define pICPLB_ADDR11 ((volatile void **)ICPLB_ADDR11) #define bfin_read_ICPLB_ADDR11() bfin_read32(ICPLB_ADDR11) #define bfin_write_ICPLB_ADDR11(val) bfin_write32(ICPLB_ADDR11,val) -#define pICPLB_ADDR12 ((volatile void **)ICPLB_ADDR12) #define bfin_read_ICPLB_ADDR12() bfin_read32(ICPLB_ADDR12) #define bfin_write_ICPLB_ADDR12(val) bfin_write32(ICPLB_ADDR12,val) -#define pICPLB_ADDR13 ((volatile void **)ICPLB_ADDR13) #define bfin_read_ICPLB_ADDR13() bfin_read32(ICPLB_ADDR13) #define bfin_write_ICPLB_ADDR13(val) bfin_write32(ICPLB_ADDR13,val) -#define pICPLB_ADDR14 ((volatile void **)ICPLB_ADDR14) #define bfin_read_ICPLB_ADDR14() bfin_read32(ICPLB_ADDR14) #define bfin_write_ICPLB_ADDR14(val) bfin_write32(ICPLB_ADDR14,val) -#define pICPLB_ADDR15 ((volatile void **)ICPLB_ADDR15) #define bfin_read_ICPLB_ADDR15() bfin_read32(ICPLB_ADDR15) #define bfin_write_ICPLB_ADDR15(val) bfin_write32(ICPLB_ADDR15,val) -#define pICPLB_DATA0 ((volatile unsigned long *)ICPLB_DATA0) #define bfin_read_ICPLB_DATA0() bfin_read32(ICPLB_DATA0) #define bfin_write_ICPLB_DATA0(val) bfin_write32(ICPLB_DATA0,val) -#define pICPLB_DATA1 ((volatile unsigned long *)ICPLB_DATA1) #define bfin_read_ICPLB_DATA1() bfin_read32(ICPLB_DATA1) #define bfin_write_ICPLB_DATA1(val) bfin_write32(ICPLB_DATA1,val) -#define pICPLB_DATA2 ((volatile unsigned long *)ICPLB_DATA2) #define bfin_read_ICPLB_DATA2() bfin_read32(ICPLB_DATA2) #define bfin_write_ICPLB_DATA2(val) bfin_write32(ICPLB_DATA2,val) -#define pICPLB_DATA3 ((volatile unsigned long *)ICPLB_DATA3) #define bfin_read_ICPLB_DATA3() bfin_read32(ICPLB_DATA3) #define bfin_write_ICPLB_DATA3(val) bfin_write32(ICPLB_DATA3,val) -#define pICPLB_DATA4 ((volatile unsigned long *)ICPLB_DATA4) #define bfin_read_ICPLB_DATA4() bfin_read32(ICPLB_DATA4) #define bfin_write_ICPLB_DATA4(val) bfin_write32(ICPLB_DATA4,val) -#define pICPLB_DATA5 ((volatile unsigned long *)ICPLB_DATA5) #define bfin_read_ICPLB_DATA5() bfin_read32(ICPLB_DATA5) #define bfin_write_ICPLB_DATA5(val) bfin_write32(ICPLB_DATA5,val) -#define pICPLB_DATA6 ((volatile unsigned long *)ICPLB_DATA6) #define bfin_read_ICPLB_DATA6() bfin_read32(ICPLB_DATA6) #define bfin_write_ICPLB_DATA6(val) bfin_write32(ICPLB_DATA6,val) -#define pICPLB_DATA7 ((volatile unsigned long *)ICPLB_DATA7) #define bfin_read_ICPLB_DATA7() bfin_read32(ICPLB_DATA7) #define bfin_write_ICPLB_DATA7(val) bfin_write32(ICPLB_DATA7,val) -#define pICPLB_DATA8 ((volatile unsigned long *)ICPLB_DATA8) #define bfin_read_ICPLB_DATA8() bfin_read32(ICPLB_DATA8) #define bfin_write_ICPLB_DATA8(val) bfin_write32(ICPLB_DATA8,val) -#define pICPLB_DATA9 ((volatile unsigned long *)ICPLB_DATA9) #define bfin_read_ICPLB_DATA9() bfin_read32(ICPLB_DATA9) #define bfin_write_ICPLB_DATA9(val) bfin_write32(ICPLB_DATA9,val) -#define pICPLB_DATA10 ((volatile unsigned long *)ICPLB_DATA10) #define bfin_read_ICPLB_DATA10() bfin_read32(ICPLB_DATA10) #define bfin_write_ICPLB_DATA10(val) bfin_write32(ICPLB_DATA10,val) -#define pICPLB_DATA11 ((volatile unsigned long *)ICPLB_DATA11) #define bfin_read_ICPLB_DATA11() bfin_read32(ICPLB_DATA11) #define bfin_write_ICPLB_DATA11(val) bfin_write32(ICPLB_DATA11,val) -#define pICPLB_DATA12 ((volatile unsigned long *)ICPLB_DATA12) #define bfin_read_ICPLB_DATA12() bfin_read32(ICPLB_DATA12) #define bfin_write_ICPLB_DATA12(val) bfin_write32(ICPLB_DATA12,val) -#define pICPLB_DATA13 ((volatile unsigned long *)ICPLB_DATA13) #define bfin_read_ICPLB_DATA13() bfin_read32(ICPLB_DATA13) #define bfin_write_ICPLB_DATA13(val) bfin_write32(ICPLB_DATA13,val) -#define pICPLB_DATA14 ((volatile unsigned long *)ICPLB_DATA14) #define bfin_read_ICPLB_DATA14() bfin_read32(ICPLB_DATA14) #define bfin_write_ICPLB_DATA14(val) bfin_write32(ICPLB_DATA14,val) -#define pICPLB_DATA15 ((volatile unsigned long *)ICPLB_DATA15) #define bfin_read_ICPLB_DATA15() bfin_read32(ICPLB_DATA15) #define bfin_write_ICPLB_DATA15(val) bfin_write32(ICPLB_DATA15,val) -#define pITEST_COMMAND ((volatile unsigned long *)ITEST_COMMAND) #define bfin_read_ITEST_COMMAND() bfin_read32(ITEST_COMMAND) #define bfin_write_ITEST_COMMAND(val) bfin_write32(ITEST_COMMAND,val) #if 0 #define ITEST_INDEX 0xFFE01304 /* Instruction Test Index Register */ #endif -#define pITEST_DATA0 ((volatile unsigned long *)ITEST_DATA0) #define bfin_read_ITEST_DATA0() bfin_read32(ITEST_DATA0) #define bfin_write_ITEST_DATA0(val) bfin_write32(ITEST_DATA0,val) -#define pITEST_DATA1 ((volatile unsigned long *)ITEST_DATA1) #define bfin_read_ITEST_DATA1() bfin_read32(ITEST_DATA1) #define bfin_write_ITEST_DATA1(val) bfin_write32(ITEST_DATA1,val) /* Event/Interrupt Registers*/ -#define pEVT0 ((volatile void **)EVT0) #define bfin_read_EVT0() bfin_read32(EVT0) #define bfin_write_EVT0(val) bfin_write32(EVT0,val) -#define pEVT1 ((volatile void **)EVT1) #define bfin_read_EVT1() bfin_read32(EVT1) #define bfin_write_EVT1(val) bfin_write32(EVT1,val) -#define pEVT2 ((volatile void **)EVT2) #define bfin_read_EVT2() bfin_read32(EVT2) #define bfin_write_EVT2(val) bfin_write32(EVT2,val) -#define pEVT3 ((volatile void **)EVT3) #define bfin_read_EVT3() bfin_read32(EVT3) #define bfin_write_EVT3(val) bfin_write32(EVT3,val) -#define pEVT4 ((volatile void **)EVT4) #define bfin_read_EVT4() bfin_read32(EVT4) #define bfin_write_EVT4(val) bfin_write32(EVT4,val) -#define pEVT5 ((volatile void **)EVT5) #define bfin_read_EVT5() bfin_read32(EVT5) #define bfin_write_EVT5(val) bfin_write32(EVT5,val) -#define pEVT6 ((volatile void **)EVT6) #define bfin_read_EVT6() bfin_read32(EVT6) #define bfin_write_EVT6(val) bfin_write32(EVT6,val) -#define pEVT7 ((volatile void **)EVT7) #define bfin_read_EVT7() bfin_read32(EVT7) #define bfin_write_EVT7(val) bfin_write32(EVT7,val) -#define pEVT8 ((volatile void **)EVT8) #define bfin_read_EVT8() bfin_read32(EVT8) #define bfin_write_EVT8(val) bfin_write32(EVT8,val) -#define pEVT9 ((volatile void **)EVT9) #define bfin_read_EVT9() bfin_read32(EVT9) #define bfin_write_EVT9(val) bfin_write32(EVT9,val) -#define pEVT10 ((volatile void **)EVT10) #define bfin_read_EVT10() bfin_read32(EVT10) #define bfin_write_EVT10(val) bfin_write32(EVT10,val) -#define pEVT11 ((volatile void **)EVT11) #define bfin_read_EVT11() bfin_read32(EVT11) #define bfin_write_EVT11(val) bfin_write32(EVT11,val) -#define pEVT12 ((volatile void **)EVT12) #define bfin_read_EVT12() bfin_read32(EVT12) #define bfin_write_EVT12(val) bfin_write32(EVT12,val) -#define pEVT13 ((volatile void **)EVT13) #define bfin_read_EVT13() bfin_read32(EVT13) #define bfin_write_EVT13(val) bfin_write32(EVT13,val) -#define pEVT14 ((volatile void **)EVT14) #define bfin_read_EVT14() bfin_read32(EVT14) #define bfin_write_EVT14(val) bfin_write32(EVT14,val) -#define pEVT15 ((volatile void **)EVT15) #define bfin_read_EVT15() bfin_read32(EVT15) #define bfin_write_EVT15(val) bfin_write32(EVT15,val) -#define pIMASK ((volatile unsigned long *)IMASK) #define bfin_read_IMASK() bfin_read32(IMASK) #define bfin_write_IMASK(val) bfin_write32(IMASK,val) -#define pIPEND ((volatile unsigned long *)IPEND) #define bfin_read_IPEND() bfin_read32(IPEND) #define bfin_write_IPEND(val) bfin_write32(IPEND,val) -#define pILAT ((volatile unsigned long *)ILAT) #define bfin_read_ILAT() bfin_read32(ILAT) #define bfin_write_ILAT(val) bfin_write32(ILAT,val) /*Core Timer Registers*/ -#define pTCNTL ((volatile unsigned long *)TCNTL) #define bfin_read_TCNTL() bfin_read32(TCNTL) #define bfin_write_TCNTL(val) bfin_write32(TCNTL,val) -#define pTPERIOD ((volatile unsigned long *)TPERIOD) #define bfin_read_TPERIOD() bfin_read32(TPERIOD) #define bfin_write_TPERIOD(val) bfin_write32(TPERIOD,val) -#define pTSCALE ((volatile unsigned long *)TSCALE) #define bfin_read_TSCALE() bfin_read32(TSCALE) #define bfin_write_TSCALE(val) bfin_write32(TSCALE,val) -#define pTCOUNT ((volatile unsigned long *)TCOUNT) #define bfin_read_TCOUNT() bfin_read32(TCOUNT) #define bfin_write_TCOUNT(val) bfin_write32(TCOUNT,val) /*Debug/MP/Emulation Registers*/ -#define pDSPID ((volatile unsigned long *)DSPID) #define bfin_read_DSPID() bfin_read32(DSPID) #define bfin_write_DSPID(val) bfin_write32(DSPID,val) -#define pDBGCTL ((volatile unsigned long *)DBGCTL) #define bfin_read_DBGCTL() bfin_read32(DBGCTL) #define bfin_write_DBGCTL(val) bfin_write32(DBGCTL,val) -#define pDBGSTAT ((volatile unsigned long *)DBGSTAT) #define bfin_read_DBGSTAT() bfin_read32(DBGSTAT) #define bfin_write_DBGSTAT(val) bfin_write32(DBGSTAT,val) -#define pEMUDAT ((volatile unsigned long *)EMUDAT) #define bfin_read_EMUDAT() bfin_read32(EMUDAT) #define bfin_write_EMUDAT(val) bfin_write32(EMUDAT,val) /*Trace Buffer Registers*/ -#define pTBUFCTL ((volatile unsigned long *)TBUFCTL) #define bfin_read_TBUFCTL() bfin_read32(TBUFCTL) #define bfin_write_TBUFCTL(val) bfin_write32(TBUFCTL,val) -#define pTBUFSTAT ((volatile unsigned long *)TBUFSTAT) #define bfin_read_TBUFSTAT() bfin_read32(TBUFSTAT) #define bfin_write_TBUFSTAT(val) bfin_write32(TBUFSTAT,val) -#define pTBUF ((volatile void **)TBUF) #define bfin_read_TBUF() bfin_read32(TBUF) #define bfin_write_TBUF(val) bfin_write32(TBUF,val) /*Watch Point Control Registers*/ -#define pWPIACTL ((volatile unsigned long *)WPIACTL) #define bfin_read_WPIACTL() bfin_read32(WPIACTL) #define bfin_write_WPIACTL(val) bfin_write32(WPIACTL,val) -#define pWPIA0 ((volatile void **)WPIA0) #define bfin_read_WPIA0() bfin_read32(WPIA0) #define bfin_write_WPIA0(val) bfin_write32(WPIA0,val) -#define pWPIA1 ((volatile void **)WPIA1) #define bfin_read_WPIA1() bfin_read32(WPIA1) #define bfin_write_WPIA1(val) bfin_write32(WPIA1,val) -#define pWPIA2 ((volatile void **)WPIA2) #define bfin_read_WPIA2() bfin_read32(WPIA2) #define bfin_write_WPIA2(val) bfin_write32(WPIA2,val) -#define pWPIA3 ((volatile void **)WPIA3) #define bfin_read_WPIA3() bfin_read32(WPIA3) #define bfin_write_WPIA3(val) bfin_write32(WPIA3,val) -#define pWPIA4 ((volatile void **)WPIA4) #define bfin_read_WPIA4() bfin_read32(WPIA4) #define bfin_write_WPIA4(val) bfin_write32(WPIA4,val) -#define pWPIA5 ((volatile void **)WPIA5) #define bfin_read_WPIA5() bfin_read32(WPIA5) #define bfin_write_WPIA5(val) bfin_write32(WPIA5,val) -#define pWPIACNT0 ((volatile unsigned long *)WPIACNT0) #define bfin_read_WPIACNT0() bfin_read32(WPIACNT0) #define bfin_write_WPIACNT0(val) bfin_write32(WPIACNT0,val) -#define pWPIACNT1 ((volatile unsigned long *)WPIACNT1) #define bfin_read_WPIACNT1() bfin_read32(WPIACNT1) #define bfin_write_WPIACNT1(val) bfin_write32(WPIACNT1,val) -#define pWPIACNT2 ((volatile unsigned long *)WPIACNT2) #define bfin_read_WPIACNT2() bfin_read32(WPIACNT2) #define bfin_write_WPIACNT2(val) bfin_write32(WPIACNT2,val) -#define pWPIACNT3 ((volatile unsigned long *)WPIACNT3) #define bfin_read_WPIACNT3() bfin_read32(WPIACNT3) #define bfin_write_WPIACNT3(val) bfin_write32(WPIACNT3,val) -#define pWPIACNT4 ((volatile unsigned long *)WPIACNT4) #define bfin_read_WPIACNT4() bfin_read32(WPIACNT4) #define bfin_write_WPIACNT4(val) bfin_write32(WPIACNT4,val) -#define pWPIACNT5 ((volatile unsigned long *)WPIACNT5) #define bfin_read_WPIACNT5() bfin_read32(WPIACNT5) #define bfin_write_WPIACNT5(val) bfin_write32(WPIACNT5,val) -#define pWPDACTL ((volatile unsigned long *)WPDACTL) #define bfin_read_WPDACTL() bfin_read32(WPDACTL) #define bfin_write_WPDACTL(val) bfin_write32(WPDACTL,val) -#define pWPDA0 ((volatile void **)WPDA0) #define bfin_read_WPDA0() bfin_read32(WPDA0) #define bfin_write_WPDA0(val) bfin_write32(WPDA0,val) -#define pWPDA1 ((volatile void **)WPDA1) #define bfin_read_WPDA1() bfin_read32(WPDA1) #define bfin_write_WPDA1(val) bfin_write32(WPDA1,val) -#define pWPDACNT0 ((volatile unsigned long *)WPDACNT0) #define bfin_read_WPDACNT0() bfin_read32(WPDACNT0) #define bfin_write_WPDACNT0(val) bfin_write32(WPDACNT0,val) -#define pWPDACNT1 ((volatile unsigned long *)WPDACNT1) #define bfin_read_WPDACNT1() bfin_read32(WPDACNT1) #define bfin_write_WPDACNT1(val) bfin_write32(WPDACNT1,val) -#define pWPSTAT ((volatile unsigned long *)WPSTAT) #define bfin_read_WPSTAT() bfin_read32(WPSTAT) #define bfin_write_WPSTAT(val) bfin_write32(WPSTAT,val) /*Performance Monitor Registers*/ -#define pPFCTL ((volatile unsigned long *)PFCTL) #define bfin_read_PFCTL() bfin_read32(PFCTL) #define bfin_write_PFCTL(val) bfin_write32(PFCTL,val) -#define pPFCNTR0 ((volatile unsigned long *)PFCNTR0) #define bfin_read_PFCNTR0() bfin_read32(PFCNTR0) #define bfin_write_PFCNTR0(val) bfin_write32(PFCNTR0,val) -#define pPFCNTR1 ((volatile unsigned long *)PFCNTR1) #define bfin_read_PFCNTR1() bfin_read32(PFCNTR1) #define bfin_write_PFCNTR1(val) bfin_write32(PFCNTR1,val) @@ -454,18 +325,4 @@ #define IPRIO 0xFFE02110 */ -#if defined(CONFIG_BFIN_ALIVE_LED) -#define pCONFIG_BFIN_ALIVE_LED_DPORT \ - (volatile unsigned short *)CONFIG_BFIN_ALIVE_LED_DPORT -#define pCONFIG_BFIN_ALIVE_LED_PORT \ - (volatile unsigned short *)CONFIG_BFIN_ALIVE_LED_PORT -#endif - -#if defined(CONFIG_BFIN_IDLE_LED) -#define pCONFIG_BFIN_IDLE_LED_DPORT \ - (volatile unsigned short *)CONFIG_BFIN_IDLE_LED_DPORT -#define pCONFIG_BFIN_IDLE_LED_PORT \ - (volatile unsigned short *)CONFIG_BFIN_IDLE_LED_PORT -#endif - #endif /* _CDEF_LPBLACKFIN_H */