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

Commit 61333c63 authored by Haojian Zhuang's avatar Haojian Zhuang Committed by Eric Miao
Browse files

[ARM] pxa: rename macro from pxa9xx to pxa93x 



Because original macro can only judge whether current CPU is pxa93x,
rename the macro to correct name.

Signed-off-by: default avatarHaojian Zhuang <haojian.zhuang@marvell.com>
Signed-off-by: default avatarEric Miao <eric.y.miao@gmail.com>
parent bf293aec

arch/arm/mach-pxa/include/mach/hardware.h

+4 −3
Original line number Diff line number Diff line
@@ -105,6 +105,7 @@ 
 *

 *  PXA935	A0	0x56056931	0x1E653013

 *  PXA935	B0	0x56056936	0x6E653013

 *  PXA935	B1	0x56056938	0x8E653013

 */

#ifdef CONFIG_PXA25x

#define __cpu_is_pxa210(id)				\
@@ -283,7 +284,7 @@ 
		_id == 0x3;				\

	 })



#define __cpu_is_pxa9xx(id)				\

#define __cpu_is_pxa93x(id)				\

	({						\

		unsigned int _id = (id) >> 4 & 0xfff;	\

		_id == 0x683 || _id == 0x693;		\
@@ -299,9 +300,9 @@ 
		__cpu_is_pxa3xx(read_cpuid_id());	\

	 })



#define cpu_is_pxa9xx()					\

#define cpu_is_pxa93x()					\

	({						\

		__cpu_is_pxa9xx(read_cpuid_id());	\

		__cpu_is_pxa93x(read_cpuid_id());	\

	 })

/*

 * return current memory and LCD clock frequency in units of 10kHz