Commit a82eb09f authored Jul 03, 2014 by Arnd Bergmann Committed by Shawn Guo Jul 18, 2014

ARM: imx: build cpu_is_imx6sl function conditionally



imx6q_pm_enter calls imx6sl_set_wait_clk when run on an imx6sl
based machine. However if support for imx6sl is not enabled
at compile time, this prevents us from building the kernel and
we get this link error instead:

arch/arm/mach-imx/built-in.o: In function `imx6q_pm_enter':
:(.text+0x4b84): undefined reference to `imx6sl_set_wait_clk'

This makes the cpu_is_imx6sl function conditionally return false
if imx6sl is disabled at compile-time, which matches what the
older cpu_is_mx* macros did. We have similar inline functions for
the other imx6 variants, but so far I have not run into a case
where the extra #ifdef is necessary.

Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Signed-off-by: Shawn Guo <shawn.guo@freescale.com>

parent 918fb15d

arch/arm/mach-imx/mxc.h

+7 −0

Original line number	Diff line number	Diff line
		@@ -154,10 +154,17 @@ extern unsigned int __mxc_cpu_type;
		#endif

		#ifndef __ASSEMBLY__
		#ifdef CONFIG_SOC_IMX6SL
		static inline bool cpu_is_imx6sl(void)
		{
		return __mxc_cpu_type == MXC_CPU_IMX6SL;
		}
		#else
		static inline bool cpu_is_imx6sl(void)
		{
		return false;
		}
		#endif

		static inline bool cpu_is_imx6dl(void)
		{

Admin message