Gitweb:
http://git.kernel.org/git/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commit;h=5c49218a15188cc036364c4cda325bae3cb138ae
Commit: 5c49218a15188cc036364c4cda325bae3cb138ae
Parent: a14a26aca610bbd09fb62fb9fd5dbf6b41321972
Author: Ben Dooks <[EMAIL PROTECTED]>
AuthorDate: Sun Jul 22 16:14:02 2007 +0100
Committer: Russell King <[EMAIL PROTECTED]>
CommitDate: Sun Jul 22 16:44:36 2007 +0100
[ARM] 4516/1: S3C: Fix uncompressor serial output for ARM926
Ensure we check for ARM926 in the uncompressor, as all current
ARM926s do not have an ID register and all have S3C2440 style
UARTs.
Signed-off-by: Ben Dooks <[EMAIL PROTECTED]>
Signed-off-by: Russell King <[EMAIL PROTECTED]>
---
include/asm-arm/arch-s3c2410/uncompress.h | 11 ++++++++++-
1 files changed, 10 insertions(+), 1 deletions(-)
diff --git a/include/asm-arm/arch-s3c2410/uncompress.h
b/include/asm-arm/arch-s3c2410/uncompress.h
index 22328b7..7058382 100644
--- a/include/asm-arm/arch-s3c2410/uncompress.h
+++ b/include/asm-arm/arch-s3c2410/uncompress.h
@@ -25,6 +25,15 @@
/* how many bytes we allow into the FIFO at a time in FIFO mode */
#define FIFO_MAX (14)
+static inline int is_arm926(void)
+{
+ unsigned int cpuid;
+
+ asm volatile ("mrc p15, 0, %0, c1, c0, 0" : "=r" (cpuid));
+
+ return ((cpuid & 0xff0) == 0x260);
+}
+
static void arch_detect_cpu(void)
{
unsigned int cpuid;
@@ -32,7 +41,7 @@ static void arch_detect_cpu(void)
cpuid = *((volatile unsigned int *)S3C2410_GSTATUS1);
cpuid &= S3C2410_GSTATUS1_IDMASK;
- if (cpuid == S3C2410_GSTATUS1_2440 ||
+ if (is_arm926() || cpuid == S3C2410_GSTATUS1_2440 ||
cpuid == S3C2410_GSTATUS1_2442) {
fifo_mask = S3C2440_UFSTAT_TXMASK;
fifo_max = 63 << S3C2440_UFSTAT_TXSHIFT;
-
To unsubscribe from this list: send the line "unsubscribe git-commits-head" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at http://vger.kernel.org/majordomo-info.html
