aboutsummaryrefslogtreecommitdiffstats
path: root/arch/x86/include/asm/geode.h
diff options
context:
space:
mode:
authorAndres Salomon <dilinger@collabora.co.uk>2009-12-14 21:00:40 -0500
committerLinus Torvalds <torvalds@linux-foundation.org>2009-12-15 11:53:28 -0500
commitf060f27007b393bac6e50ee6fc26d8505acf6fe4 (patch)
treefd83b0c9550814dfb5fc6a726ce7b5eb1baaa6f3 /arch/x86/include/asm/geode.h
parent2e8c12436f540d3c40137ebf10268803dc972f6a (diff)
cs5535: move VSA2 checks into linux/cs5535.h
Signed-off-by: Andres Salomon <dilinger@collabora.co.uk> Cc: Jordan Crouse <jordan@cosmicpenguin.net> Cc: Ingo Molnar <mingo@elte.hu> Cc: Thomas Gleixner <tglx@linutronix.de> Cc: john stultz <johnstul@us.ibm.com> Cc: Chris Ball <cjb@laptop.org> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'arch/x86/include/asm/geode.h')
-rw-r--r--arch/x86/include/asm/geode.h19
1 files changed, 0 insertions, 19 deletions
diff --git a/arch/x86/include/asm/geode.h b/arch/x86/include/asm/geode.h
index 976b3f11c009..df1eaf87426a 100644
--- a/arch/x86/include/asm/geode.h
+++ b/arch/x86/include/asm/geode.h
@@ -95,16 +95,6 @@ extern int geode_get_dev_base(unsigned int dev);
95#define PM_AWKD 0x50 95#define PM_AWKD 0x50
96#define PM_SSC 0x54 96#define PM_SSC 0x54
97 97
98/* VSA2 magic values */
99
100#define VSA_VRC_INDEX 0xAC1C
101#define VSA_VRC_DATA 0xAC1E
102#define VSA_VR_UNLOCK 0xFC53 /* unlock virtual register */
103#define VSA_VR_SIGNATURE 0x0003
104#define VSA_VR_MEM_SIZE 0x0200
105#define AMD_VSA_SIG 0x4132 /* signature is ascii 'VSA2' */
106#define GSW_VSA_SIG 0x534d /* General Software signature */
107
108static inline u32 geode_gpio(unsigned int nr) 98static inline u32 geode_gpio(unsigned int nr)
109{ 99{
110 BUG_ON(nr > 28); 100 BUG_ON(nr > 28);
@@ -148,15 +138,6 @@ static inline int is_geode(void)
148 return (is_geode_gx() || is_geode_lx()); 138 return (is_geode_gx() || is_geode_lx());
149} 139}
150 140
151#ifdef CONFIG_MGEODE_LX
152extern int geode_has_vsa2(void);
153#else
154static inline int geode_has_vsa2(void)
155{
156 return 0;
157}
158#endif
159
160static inline void geode_mfgpt_write(int timer, u16 reg, u16 value) 141static inline void geode_mfgpt_write(int timer, u16 reg, u16 value)
161{ 142{
162 u32 base = geode_get_dev_base(GEODE_DEV_MFGPT); 143 u32 base = geode_get_dev_base(GEODE_DEV_MFGPT);