Minki/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2024-11-02 02:01:29 +00:00
Code Issues Packages Projects Releases Wiki Activity

[ARM] 4320/1: ixp4xx: cpu type detection stuff cleanup

Browse Source 
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>
This commit is contained in:
Vladimir Barinov 2007-04-11 16:32:46 +01:00 committed by Russell King
parent 45fba0846f
commit 53b2e01be5
3 changed files with 33 additions and 48 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
include/asm-arm/arch-ixp4xx/cpu.h Normal file
View File

@ -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 */

7
include/asm-arm/arch-ixp4xx/hardware.h
View File

@ -27,11 +27,8 @@
#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 */

43
include/asm-arm/arch-ixp4xx/ixp4xx-regs.h
View File

@ -607,47 +607,4 @@
#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