Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
tjh.dev
kernel
os
linux
[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 <ben-linux@fluff.org>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
authored by Ben Dooks and committed by Russell King 5c49218a a14a26ac
+10
-1
include/asm-arm/arch-s3c2410/uncompress.h
+10
-1
include/asm-arm/arch-s3c2410/uncompress.h
···
25
25
/* how many bytes we allow into the FIFO at a time in FIFO mode */
26
26
#define FIFO_MAX (14)
27
27
28
+
static inline int is_arm926(void)
29
+
{
30
+
unsigned int cpuid;
31
+
32
+
asm volatile ("mrc p15, 0, %0, c1, c0, 0" : "=r" (cpuid));
33
+
34
+
return ((cpuid & 0xff0) == 0x260);
35
+
}
36
+
28
37
static void arch_detect_cpu(void)
29
38
{
30
39
unsigned int cpuid;
···
41
32
cpuid = *((volatile unsigned int *)S3C2410_GSTATUS1);
42
33
cpuid &= S3C2410_GSTATUS1_IDMASK;
43
34
44
-
if (cpuid == S3C2410_GSTATUS1_2440 ||
35
+
if (is_arm926() || cpuid == S3C2410_GSTATUS1_2440 ||
45
36
cpuid == S3C2410_GSTATUS1_2442) {
46
37
fifo_mask = S3C2440_UFSTAT_TXMASK;
47
38
fifo_max = 63 << S3C2440_UFSTAT_TXSHIFT;