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

Commit cfc6a554 authored by Eric Miao's avatar Eric Miao Committed by Eric Miao
Browse files

ARM: pxa: fix cpu_is_pxa*() not expanding to zero when not configured 



When CONFIG_PXA3xx is not selected, cpu_is_pxa3xx() doesn't expand to
zero, which in some places doesn't result in correct optimization.

Signed-off-by: default avatarEric Miao <eric.y.miao@gmail.com>
Reported-and-tested-by: default avatarMarek Vasut <marek.vasut@gmail.com>
parent 32c4dad8

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

+12 −0
Original line number Diff line number Diff line
@@ -264,23 +264,35 @@ 
 * <= 0x2 for pxa21x/pxa25x/pxa26x/pxa27x

 * == 0x3 for pxa300/pxa310/pxa320

 */

#if defined(CONFIG_PXA25x) || defined(CONFIG_PXA27x)

#define __cpu_is_pxa2xx(id)				\

	({						\

		unsigned int _id = (id) >> 13 & 0x7;	\

		_id <= 0x2;				\

	 })

#else

#define __cpu_is_pxa2xx(id)	(0)

#endif



#ifdef CONFIG_PXA3xx

#define __cpu_is_pxa3xx(id)				\

	({						\

		unsigned int _id = (id) >> 13 & 0x7;	\

		_id == 0x3;				\

	 })

#else

#define __cpu_is_pxa3xx(id)	(0)

#endif



#if defined(CONFIG_CPU_PXA930) || defined(CONFIG_CPU_PXA935)

#define __cpu_is_pxa93x(id)				\

	({						\

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

		_id == 0x683 || _id == 0x693;		\

	 })

#else

#define __cpu_is_pxa93x(id)	(0)

#endif



#define cpu_is_pxa2xx()					\

	({						\