Commit b1271d31 authored by Mike Frysinger's avatar Mike Frysinger Committed by Bryan Wu
Browse files

Blackfin arch: move the PORT registers down 



Move the PORT registers down as well since they may utilize
asm/system.h code

Signed-off-by: default avatarMike Frysinger <vapier.adi@gmail.com>
Signed-off-by: default avatarBryan Wu <cooloney@kernel.org>
parent 31fba6e7

arch/blackfin/mach-bf533/include/mach/cdefBF532.h

+42 −44
Original line number Diff line number Diff line
@@ -134,50 +134,6 @@ 
#define bfin_read_FIO_MASKB_T()              bfin_read16(FIO_MASKB_T)

#define bfin_write_FIO_MASKB_T(val)          bfin_write16(FIO_MASKB_T,val)





#if ANOMALY_05000311

#define BFIN_WRITE_FIO_FLAG(name) \

static __inline__ void bfin_write_FIO_FLAG_ ## name (unsigned short val)\

{\

	unsigned long flags;\

	local_irq_save(flags);\

	bfin_write16(FIO_FLAG_ ## name,val);\

	bfin_read_CHIPID();\

	local_irq_restore(flags);\

}

BFIN_WRITE_FIO_FLAG(D)

BFIN_WRITE_FIO_FLAG(C)

BFIN_WRITE_FIO_FLAG(S)

BFIN_WRITE_FIO_FLAG(T)



#define BFIN_READ_FIO_FLAG(name) \

static __inline__ unsigned short bfin_read_FIO_FLAG_ ## name (void)\

{\

	unsigned long flags;\

	unsigned short ret;\

	local_irq_save(flags);\

	ret = bfin_read16(FIO_FLAG_ ## name);\

	bfin_read_CHIPID();\

	local_irq_restore(flags);\

	return ret;\

}

BFIN_READ_FIO_FLAG(D)

BFIN_READ_FIO_FLAG(C)

BFIN_READ_FIO_FLAG(S)

BFIN_READ_FIO_FLAG(T)



#else

#define bfin_write_FIO_FLAG_D(val)           bfin_write16(FIO_FLAG_D,val)

#define bfin_write_FIO_FLAG_C(val)           bfin_write16(FIO_FLAG_C,val)

#define bfin_write_FIO_FLAG_S(val)           bfin_write16(FIO_FLAG_S,val)

#define bfin_write_FIO_FLAG_T(val)           bfin_write16(FIO_FLAG_T,val)

#define bfin_read_FIO_FLAG_T()               bfin_read16(FIO_FLAG_T)

#define bfin_read_FIO_FLAG_C()               bfin_read16(FIO_FLAG_C)

#define bfin_read_FIO_FLAG_S()               bfin_read16(FIO_FLAG_S)

#define bfin_read_FIO_FLAG_D()               bfin_read16(FIO_FLAG_D)

#endif





/* DMA Controller */

#define bfin_read_DMA0_CONFIG()              bfin_read16(DMA0_CONFIG)

#define bfin_write_DMA0_CONFIG(val)          bfin_write16(DMA0_CONFIG,val)
@@ -723,6 +679,48 @@ BFIN_READ_FIO_FLAG(T) 
/* These need to be last due to the cdef/linux inter-dependencies */

#include <asm/system.h>



#if ANOMALY_05000311

#define BFIN_WRITE_FIO_FLAG(name) \

static inline void bfin_write_FIO_FLAG_##name(unsigned short val) \

{ \

	unsigned long flags; \

	local_irq_save(flags); \

	bfin_write16(FIO_FLAG_##name, val); \

	bfin_read_CHIPID(); \

	local_irq_restore(flags); \

}

BFIN_WRITE_FIO_FLAG(D)

BFIN_WRITE_FIO_FLAG(C)

BFIN_WRITE_FIO_FLAG(S)

BFIN_WRITE_FIO_FLAG(T)



#define BFIN_READ_FIO_FLAG(name) \

static inline u16 bfin_read_FIO_FLAG_##name(void) \

{ \

	unsigned long flags; \

	u16 ret; \

	local_irq_save(flags); \

	ret = bfin_read16(FIO_FLAG_##name); \

	bfin_read_CHIPID(); \

	local_irq_restore(flags); \

	return ret; \

}

BFIN_READ_FIO_FLAG(D)

BFIN_READ_FIO_FLAG(C)

BFIN_READ_FIO_FLAG(S)

BFIN_READ_FIO_FLAG(T)



#else

#define bfin_write_FIO_FLAG_D(val)           bfin_write16(FIO_FLAG_D, val)

#define bfin_write_FIO_FLAG_C(val)           bfin_write16(FIO_FLAG_C, val)

#define bfin_write_FIO_FLAG_S(val)           bfin_write16(FIO_FLAG_S, val)

#define bfin_write_FIO_FLAG_T(val)           bfin_write16(FIO_FLAG_T, val)

#define bfin_read_FIO_FLAG_T()               bfin_read16(FIO_FLAG_T)

#define bfin_read_FIO_FLAG_C()               bfin_read16(FIO_FLAG_C)

#define bfin_read_FIO_FLAG_S()               bfin_read16(FIO_FLAG_S)

#define bfin_read_FIO_FLAG_D()               bfin_read16(FIO_FLAG_D)

#endif



/* Writing to PLL_CTL initiates a PLL relock sequence. */

static __inline__ void bfin_write_PLL_CTL(unsigned int val)

{