commit dc5bc8f1e96c32f28bddf32a14ef9251fb3071d0
author Russell King <rmk@dyn-67.arm.linux.org.uk> Mon Jul 10 16:33:54 2006 +0100
committer Russell King <rmk+kernel@arm.linux.org.uk> Tue Jul 11 21:10:42 2006 +0100
tree b470bc2c690ee2d62e2aee5849d5732d6d812033
parent 20c4f88b7e4c2cd73bd4276417a9a0d4d22b0d66

[ARM] Allow Versatile to be built for AB and PB

If a configuration was chosen to support both the Versatile
AB and PB boards, the result would write to registers not
available on the PB version of the board.  Resolve this by
using machine_is_xxx().

Also, for the CLCD, despite how the code looks, both the AB
and PB access the same location to control the clock rate -
it's just called something different between the two board
versions.  Invent our own name for this location and use it
unconditionally.

Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>

include/asm-arm/arch-versatile/platform.h

diff --git a/include/asm-arm/arch-versatile/platform.h b/include/asm-arm/arch-versatile/platform.h
index 72ef874..2af9d7c 100644
--- a/include/asm-arm/arch-versatile/platform.h
+++ b/include/asm-arm/arch-versatile/platform.h
@@ -65,6 +65,8 @@
 #define VERSATILE_SYS_OSC1_OFFSET             0x1C
 #endif
 
+#define VERSATILE_SYS_OSCCLCD_OFFSET          0x1c
+
 #define VERSATILE_SYS_LOCK_OFFSET             0x20
 #define VERSATILE_SYS_100HZ_OFFSET            0x24
 #define VERSATILE_SYS_CFGDATA1_OFFSET         0x28