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

Commit f3441945 authored by David Howells's avatar David Howells
Browse files

Blackfin: Split the BF532 BFIN_*_FIO_FLAG() functions to their own header 



Split the BF532 machine type BFIN_*_FIO_FLAG() functions to their own header
file to avoid circular #include problems as these functions require IRQ flag
handling, which requires asm/blackfin.h, which otherwise requires the header
file that defines these functions.

For good measure, also get rid of the inclusion of asm/blackfin.h from
mach/cdefBF532.h (which is circular) and defBF532.h (which is included by
asm/blackfin.h before including this header).

Signed-off-by: default avatarDavid Howells <dhowells@redhat.com>
parent 3dcc1e7f

arch/blackfin/mach-bf533/boards/blackstamp.c

+1 −0
Original line number Diff line number Diff line
@@ -25,6 +25,7 @@ 
#include <asm/bfin5xx_spi.h>

#include <asm/portmux.h>

#include <asm/dpmc.h>

#include <mach/fio_flag.h>



/*

 * Name the Board for the /proc/cpuinfo

arch/blackfin/mach-bf533/boards/ip0x.c

+1 −0
Original line number Diff line number Diff line
@@ -22,6 +22,7 @@ 
#include <asm/dma.h>

#include <asm/bfin5xx_spi.h>

#include <asm/portmux.h>

#include <mach/fio_flag.h>



/*

 * Name the Board for the /proc/cpuinfo

arch/blackfin/mach-bf533/boards/stamp.c

+1 −0
Original line number Diff line number Diff line
@@ -24,6 +24,7 @@ 
#include <asm/reboot.h>

#include <asm/portmux.h>

#include <asm/dpmc.h>

#include <mach/fio_flag.h>



/*

 * Name the Board for the /proc/cpuinfo

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

+0 −47
Original line number Diff line number Diff line
@@ -7,11 +7,6 @@ 
#ifndef _CDEF_BF532_H

#define _CDEF_BF532_H



#include <asm/blackfin.h>



/*include all Core registers and bit definitions*/

#include "defBF532.h"



/*include core specific register pointer definitions*/

#include <asm/cdef_LPBlackfin.h>
@@ -655,46 +650,4 @@ 
/* These need to be last due to the cdef/linux inter-dependencies */

#include <asm/irq.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_hw(flags); \

	bfin_write16(FIO_FLAG_##name, val); \

	bfin_read_CHIPID(); \

	local_irq_restore_hw(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_hw(flags); \

	ret = bfin_read16(FIO_FLAG_##name); \

	bfin_read_CHIPID(); \

	local_irq_restore_hw(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



#endif				/* _CDEF_BF532_H */

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

0 → 100644
+55 −0
Original line number Diff line number Diff line 
/*

 * Copyright 2005-2008 Analog Devices Inc.

 *

 * Licensed under the GPL-2 or later

 */



#ifndef _MACH_FIO_FLAG_H

#define _MACH_FIO_FLAG_H



#include <asm/blackfin.h>

#include <asm/irqflags.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_hw(flags); \

	bfin_write16(FIO_FLAG_##name, val); \

	bfin_read_CHIPID(); \

	local_irq_restore_hw(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_hw(flags); \

	ret = bfin_read16(FIO_FLAG_##name); \

	bfin_read_CHIPID(); \

	local_irq_restore_hw(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



#endif /* _MACH_FIO_FLAG_H */