Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 53b2e01b authored by Vladimir Barinov's avatar Vladimir Barinov Committed by Russell King
Browse files

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



Move IXP4XX cpu detection stuff in a separate include file and remove unused definition.

Signed-off-by: default avatarVladimir Barinov <vbarinov@ru.mvista.com>
Signed-off-by: default avatarRuslan Sushko <rsushko@ru.mvista.com>
Signed-off-by: default avatarDeepak Saxena <dsaxena@mvista.com>
Signed-off-by: default avatarRussell King <rmk+kernel@arm.linux.org.uk>
parent 45fba084

include/asm-arm/arch-ixp4xx/cpu.h

0 → 100644
+31 −0
Original line number Original line Diff line number Diff line 
/*

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

include/asm-arm/arch-ixp4xx/hardware.h

+2 −5
Original line number Original line Diff line number Diff line
@@ -27,11 +27,8 @@ 




#define pcibios_assign_all_busses()	1

#define pcibios_assign_all_busses()	1





#if defined(CONFIG_CPU_IXP46X) && !defined(__ASSEMBLY__)

#ifndef __ASSEMBLER__

extern unsigned int processor_id;

#include <asm/arch/cpu.h>

#define cpu_is_ixp465() ((processor_id & 0xffffffc0) == 0x69054200)

#else

#define	cpu_is_ixp465()	(0)

#endif

#endif





/* Register locations and bits */

/* Register locations and bits */

include/asm-arm/arch-ixp4xx/ixp4xx-regs.h

+0 −43
Original line number Original line Diff line number Diff line
@@ -607,47 +607,4 @@ 




#define DCMD_LENGTH	0x01fff		/* length mask (max = 8K - 1) */

#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
 
#endif