summaryrefslogtreecommitdiffstats
path: root/include/asm-arm
diff options
context:
space:
mode:
authorIan Molton <spyro@f2s.com>2008-06-25 22:17:16 +0100
committerIan Molton <spyro@f2s.com>2008-07-10 10:28:36 +0100
commitaa9ae8eb1a917c8794bceef0a8e6ff1f4d7c46de (patch)
treed3628cce8f72609640c952f4eeddc19a464a6141 /include/asm-arm
parentc0b8556f2f8146bd38324b14b1ce00f249ba8ed9 (diff)
downloadlinux-stable-aa9ae8eb1a917c8794bceef0a8e6ff1f4d7c46de.tar.gz
linux-stable-aa9ae8eb1a917c8794bceef0a8e6ff1f4d7c46de.tar.bz2
linux-stable-aa9ae8eb1a917c8794bceef0a8e6ff1f4d7c46de.zip
Fix serial broken-ness on PXA250
PXA255 and 26x are the only PXA CPUs with HWUART. This patch prevents bogus initialisation on other models. Signed-off-by: Ian Molton <spyro@f2s.com>
Diffstat (limited to 'include/asm-arm')
-rw-r--r--include/asm-arm/arch-pxa/hardware.h12
1 files changed, 12 insertions, 0 deletions
diff --git a/include/asm-arm/arch-pxa/hardware.h b/include/asm-arm/arch-pxa/hardware.h
index d9af6dabc899..b6a8317c2ec4 100644
--- a/include/asm-arm/arch-pxa/hardware.h
+++ b/include/asm-arm/arch-pxa/hardware.h
@@ -69,6 +69,12 @@
_id == 0x212; \
})
+#define __cpu_is_pxa255(id) \
+ ({ \
+ unsigned int _id = (id) >> 4 & 0xfff; \
+ _id == 0x2d0; \
+ })
+
#define __cpu_is_pxa25x(id) \
({ \
unsigned int _id = (id) >> 4 & 0xfff; \
@@ -76,6 +82,7 @@
})
#else
#define __cpu_is_pxa21x(id) (0)
+#define __cpu_is_pxa255(id) (0)
#define __cpu_is_pxa25x(id) (0)
#endif
@@ -124,6 +131,11 @@
__cpu_is_pxa21x(read_cpuid_id()); \
})
+#define cpu_is_pxa255() \
+ ({ \
+ __cpu_is_pxa255(read_cpuid_id()); \
+ })
+
#define cpu_is_pxa25x() \
({ \
__cpu_is_pxa25x(read_cpuid_id()); \