[ARM] 4320/1: ixp4xx: cpu type detection stuff cleanup
authorVladimir Barinov <vbarinov@ru.mvista.com>
Wed, 11 Apr 2007 15:32:46 +0000 (16:32 +0100)
committerRussell King <rmk+kernel@arm.linux.org.uk>
Sat, 21 Apr 2007 19:52:01 +0000 (20:52 +0100)
Move IXP4XX cpu detection stuff in a separate include file and remove unused definition.

Signed-off-by: Vladimir Barinov <vbarinov@ru.mvista.com>
Signed-off-by: Ruslan Sushko <rsushko@ru.mvista.com>
Signed-off-by: Deepak Saxena <dsaxena@mvista.com>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
include/asm-arm/arch-ixp4xx/cpu.h [new file with mode: 0644]
include/asm-arm/arch-ixp4xx/hardware.h
include/asm-arm/arch-ixp4xx/ixp4xx-regs.h

diff --git a/include/asm-arm/arch-ixp4xx/cpu.h b/include/asm-arm/arch-ixp4xx/cpu.h
new file mode 100644 (file)
index 0000000..d2523b3
--- /dev/null
@@ -0,0 +1,31 @@
+/*
+ * include/asm-arm/arch-ixp4xx/cpu.h
+ *
+ * IXP4XX cpu type detection
+ *
+ * Copyright (C) 2007 MontaVista Software, Inc.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 as
+ * published by the Free Software Foundation.
+ *
+ */
+
+#ifndef __ASM_ARCH_CPU_H__
+#define __ASM_ARCH_CPU_H__
+
+extern unsigned int processor_id;
+/* Processor id value in CP15 Register 0 */
+#define IXP425_PROCESSOR_ID_VALUE      0x690541c0
+#define IXP435_PROCESSOR_ID_VALUE      0x69054040
+#define IXP465_PROCESSOR_ID_VALUE      0x69054200
+#define IXP4XX_PROCESSOR_ID_MASK       0xfffffff0
+
+#define cpu_is_ixp42x()        ((processor_id & IXP4XX_PROCESSOR_ID_MASK) == \
+                         IXP425_PROCESSOR_ID_VALUE)
+#define cpu_is_ixp43x()        ((processor_id & IXP4XX_PROCESSOR_ID_MASK) == \
+                         IXP435_PROCESSOR_ID_VALUE)
+#define cpu_is_ixp46x()        ((processor_id & IXP4XX_PROCESSOR_ID_MASK) == \
+                         IXP465_PROCESSOR_ID_VALUE)
+
+#endif  /* _ASM_ARCH_CPU_H */
index 24bc5883fa564485d0ed5d0c05f8fcd4ad89d5ef..a0acde3b8862dc2fd6b72fafe8270ab30361f955 100644 (file)
 
 #define pcibios_assign_all_busses()    1
 
-#if defined(CONFIG_CPU_IXP46X) && !defined(__ASSEMBLY__)
-extern unsigned int processor_id;
-#define cpu_is_ixp465() ((processor_id & 0xffffffc0) == 0x69054200)
-#else
-#define        cpu_is_ixp465() (0)
+#ifndef __ASSEMBLER__
+#include <asm/arch/cpu.h>
 #endif
 
 /* Register locations and bits */
index deb989950c52d6bef5c682680257b164386283dc..5d949d763a918810571f46f5b163cb61a740ca2a 100644 (file)
 
 #define DCMD_LENGTH    0x01fff         /* length mask (max = 8K - 1) */
 
-/* Processor id value in CP15 Register 0 */
-#define IXP425_PROCESSOR_ID_VALUE      0x690541c0
-#define IXP435_PROCESSOR_ID_VALUE      0x69054040
-#define IXP465_PROCESSOR_ID_VALUE      0x69054200
-#define IXP4XX_PROCESSOR_ID_MASK       0xfffffff0
-
-#ifndef __ASSEMBLY__
-static inline int cpu_is_ixp42x(void)
-{
-       extern unsigned int processor_id;
-
-       if ((processor_id & IXP4XX_PROCESSOR_ID_MASK) ==
-            IXP425_PROCESSOR_ID_VALUE )
-               return 1;
-
-       return 0;
-}
-
-static inline int cpu_is_ixp43x(void)
-{
-#ifdef CONFIG_CPU_IXP43X
-       extern unsigned int processor_id;
-
-       if ((processor_id & IXP4XX_PROCESSOR_ID_MASK) ==
-            IXP435_PROCESSOR_ID_VALUE )
-               return 1;
-#endif
-       return 0;
-}
-
-static inline int cpu_is_ixp46x(void)
-{
-#ifdef CONFIG_CPU_IXP46X
-       extern unsigned int processor_id;
-
-       if ((processor_id & IXP4XX_PROCESSOR_ID_MASK) ==
-            IXP465_PROCESSOR_ID_VALUE )
-               return 1;
-#endif
-       return 0;
-}
-#endif
-
 #endif