summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPetr Štetiar <ynezz@true.cz>2011-06-17 12:09:07 +0200
committerRussell King <rmk+kernel@arm.linux.org.uk>2011-08-15 12:58:59 +0200
commit2a004c686e7997ddb795dbce10b263e241f9bdaf (patch)
tree05fcf8086a9f5165087f6abfb91aaca2093ffd27
parentMerge branch '3.1-fixes-for-rmk' of git://linux-arm.org/linux-2.6-wd into fixes (diff)
downloadlinux-2a004c686e7997ddb795dbce10b263e241f9bdaf.tar.xz
linux-2a004c686e7997ddb795dbce10b263e241f9bdaf.zip
ARM: 6965/1: ep93xx: add model detection for ts-7300 and ts-7400 boards
Cc: Ryan Mallon <ryan@bluewatersys.com> Acked-by: H Hartley Sweeten <hsweeten@visionengravers.com> Signed-off-by: Petr Štetiar <ynezz@true.cz> Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
-rw-r--r--arch/arm/mach-ep93xx/include/mach/ts72xx.h12
1 files changed, 12 insertions, 0 deletions
diff --git a/arch/arm/mach-ep93xx/include/mach/ts72xx.h b/arch/arm/mach-ep93xx/include/mach/ts72xx.h
index 0eabec62cd9d..ee7f87589efa 100644
--- a/arch/arm/mach-ep93xx/include/mach/ts72xx.h
+++ b/arch/arm/mach-ep93xx/include/mach/ts72xx.h
@@ -20,6 +20,8 @@
#define TS72XX_MODEL_TS7200 0x00
#define TS72XX_MODEL_TS7250 0x01
#define TS72XX_MODEL_TS7260 0x02
+#define TS72XX_MODEL_TS7300 0x03
+#define TS72XX_MODEL_TS7400 0x04
#define TS72XX_OPTIONS_PHYS_BASE 0x22400000
@@ -66,6 +68,16 @@ static inline int board_is_ts7260(void)
return __raw_readb(TS72XX_MODEL_VIRT_BASE) == TS72XX_MODEL_TS7260;
}
+static inline int board_is_ts7300(void)
+{
+ return __raw_readb(TS72XX_MODEL_VIRT_BASE) == TS72XX_MODEL_TS7300;
+}
+
+static inline int board_is_ts7400(void)
+{
+ return __raw_readb(TS72XX_MODEL_VIRT_BASE) == TS72XX_MODEL_TS7400;
+}
+
static inline int is_max197_installed(void)
{
return !!(__raw_readb(TS72XX_OPTIONS_VIRT_BASE) &