Commit e51d259e authored by Russell King's avatar Russell King

[ARM] Clean up sa1100 hardware specific headers.

Remove implementation specific header files from arch-sa1100/hardware.h
Move SA1101_[pv]2[vp] into SA-1101.h.
parent 63f89661
...@@ -26,6 +26,14 @@ ...@@ -26,6 +26,14 @@
# endif # endif
#endif #endif
/*
* We have mapped the sa1101 depending on the value of SA1101_BASE.
* It then appears from 0xf4000000.
*/
#define SA1101_p2v( x ) ((x) - SA1101_BASE + 0xf4000000)
#define SA1101_v2p( x ) ((x) - 0xf4000000 + SA1101_BASE)
#ifndef SA1101_p2v #ifndef SA1101_p2v
#define SA1101_p2v(PhAdd) (PhAdd) #define SA1101_p2v(PhAdd) (PhAdd)
#endif #endif
......
...@@ -76,112 +76,8 @@ typedef struct { volatile u32 offset[4096]; } __regbase; ...@@ -76,112 +76,8 @@ typedef struct { volatile u32 offset[4096]; } __regbase;
#include "SA-1100.h" #include "SA-1100.h"
/*
* Implementation specifics.
*
* *** NOTE ***
* Any definitions in these files should be prefixed by an identifier -
* eg, ASSABET_UCB1300_IRQ This will allow us to eleminate these
* ifdefs, and lots of other preprocessor gunk elsewhere.
*/
#include "badge4.h"
#ifdef CONFIG_SA1100_PANGOLIN
#include "pangolin.h"
#endif
#ifdef CONFIG_SA1100_HUW_WEBPANEL
#include "huw_webpanel.h"
#endif
#ifdef CONFIG_SA1100_PFS168
#include "pfs168.h"
#endif
#ifdef CONFIG_SA1100_YOPY
#include "yopy.h"
#endif
#ifdef CONFIG_SA1100_FREEBIRD
#include "freebird.h"
#endif
#ifdef CONFIG_SA1100_CERF
#include "cerf.h"
#endif
#ifdef CONFIG_SA1100_EMPEG
#include "empeg.h"
#endif
#include "h3600.h"
#ifdef CONFIG_SA1100_ITSY
#include "itsy.h"
#endif
#if defined(CONFIG_SA1100_GRAPHICSCLIENT)
#include "graphicsclient.h"
#endif
#if defined(CONFIG_SA1100_OMNIMETER)
#include "omnimeter.h"
#endif
#if defined(CONFIG_SA1100_JORNADA720)
#include "jornada720.h"
#endif
#if defined(CONFIG_SA1100_PLEB)
#include "pleb.h"
#endif
#if defined(CONFIG_SA1100_LART)
#include "lart.h"
#endif
#ifdef CONFIG_SA1100_SIMPAD
#include "simpad.h"
#endif
#if defined(CONFIG_SA1100_GRAPHICSMASTER)
#include "graphicsmaster.h"
#endif
#if defined(CONFIG_SA1100_ADSBITSY)
#include "adsbitsy.h"
#endif
#include "stork.h"
#include "system3.h"
#ifdef CONFIG_SA1101 #ifdef CONFIG_SA1101
/*
* We have mapped the sa1101 depending on the value of SA1101_BASE.
* It then appears from 0xf4000000.
*/
#define SA1101_p2v( x ) ((x) - SA1101_BASE + 0xf4000000)
#define SA1101_v2p( x ) ((x) - 0xf4000000 + SA1101_BASE)
#include "SA-1101.h" #include "SA-1101.h"
#endif
#if defined(CONFIG_SA1100_OMNIMETER)
#include "omnimeter.h"
#endif
#if defined(CONFIG_SA1100_JORNADA720)
#include "jornada720.h"
#endif
#if defined(CONFIG_SA1100_FLEXANET)
#include "flexanet.h"
#endif #endif
#endif /* _ASM_ARCH_HARDWARE_H */ #endif /* _ASM_ARCH_HARDWARE_H */
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