Commit 95e493c0 authored by Mike Frysinger's avatar Mike Frysinger Committed by Linus Torvalds
Browse files

Blackfin arch: finish removing p* volatile defines for MMRs 



Signed-off-by: default avatarMike Frysinger <michael.frysinger@analog.com>
Signed-off-by: default avatarBryan Wu <bryan.wu@analog.com>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 30870b93

include/asm-blackfin/mach-bf537/cdefBF534.h

+0 −3
Original line number Diff line number Diff line
@@ -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)

include/asm-blackfin/mach-bf537/cdefBF537.h

+0 −3
Original line number Diff line number Diff line
@@ -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)

include/asm-blackfin/mach-common/cdef_LPBlackfin.h

+0 −143

File changed.

Preview size limit exceeded, changes collapsed.