summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorArnd Bergmann2015-05-21 14:06:30 +0200
committerShawn Guo2015-06-03 08:51:44 +0200
commite20d7b5208c86111ead338ded8b25a0970eee661 (patch)
tree3debbf366b64eb00af43f0da3081ab24078bec8e
parentARM: clk-imx6q: refine sata's parent (diff)
downloadkernel-qcow2-linux-e20d7b5208c86111ead338ded8b25a0970eee661.tar.gz
kernel-qcow2-linux-e20d7b5208c86111ead338ded8b25a0970eee661.tar.xz
kernel-qcow2-linux-e20d7b5208c86111ead338ded8b25a0970eee661.zip
ARM: imx: make imx51/3 suspend optional
A recent change to the imx53 power management caused a build regression when CONFIG_SOC_IMX53 is disabled: mach-imx/built-in.o:(.init.rodata+0x60): undefined reference to `imx53_suspend' mach-imx/built-in.o:(.init.rodata+0x64): undefined reference to `imx53_suspend_sz' This avoids the problem by compiling the code in question conditionally on the presence of CONFIG_SOC_IMX53. For consistency, I'm also changing the same thing for CONFIG_SOC_IMX51. An additional benefit of this approach is reduced code size for kernels that only include support for one of the two SoCs. Signed-off-by: Arnd Bergmann <arnd@arndb.de> Fixes: 1579c7b9fe01 ("ARM: imx53: Set DDR pins to high impedance when in suspend to RAM.") Signed-off-by: Shawn Guo <shawn.guo@linaro.org>
-rw-r--r--arch/arm/mach-imx/pm-imx5.c6
1 files changed, 4 insertions, 2 deletions
diff --git a/arch/arm/mach-imx/pm-imx5.c b/arch/arm/mach-imx/pm-imx5.c
index a8d00b9c9236..0309ccda36a9 100644
--- a/arch/arm/mach-imx/pm-imx5.c
+++ b/arch/arm/mach-imx/pm-imx5.c
@@ -413,10 +413,12 @@ static int __init imx5_pm_common_init(const struct imx5_pm_data *data)
void __init imx51_pm_init(void)
{
- imx5_pm_common_init(&imx51_pm_data);
+ if (IS_ENABLED(CONFIG_SOC_IMX51))
+ imx5_pm_common_init(&imx51_pm_data);
}
void __init imx53_pm_init(void)
{
- imx5_pm_common_init(&imx53_pm_data);
+ if (IS_ENABLED(CONFIG_SOC_IMX53))
+ imx5_pm_common_init(&imx53_pm_data);
}