[PATCH 14/62] ARM: imx: imx6q_set_lpm is only defined for CONFIG_PM=y

Arnd Bergmann
2014-03-19T19:29:11Z

This ensures that we only call imx6q_set_lpm if CONFIG_PM
is enabled and we are building the pm-imx6q.c file.

Another fix that has been suggested for this is to always
build this file conditionally build only the parts of it
that are relevant only to CONFIG_PM.

Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Cc: Shawn Guo <shawn.guo@freescale.com>
Cc: Sascha Hauer <kernel@pengutronix.de>
---
arch/arm/mach-imx/clk-imx6q.c | 3 ++-
arch/arm/mach-imx/clk-imx6sl.c | 3 ++-
arch/arm/mach-imx/cpuidle-imx6sl.c | 3 +++
3 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/arch/arm/mach-imx/clk-imx6q.c b/arch/arm/mach-imx/clk-imx6q.c
index b0e7f9d..133b23e 100644
--- a/arch/arm/mach-imx/clk-imx6q.c
+++ b/arch/arm/mach-imx/clk-imx6q.c
@@ -478,7 +478,8 @@ static void __init imx6q_clocks_init(struct device_node *ccm_node)
clk_set_parent(clk[lvds1_sel], clk[sata_ref]);

/* Set initial power mode */
- imx6q_set_lpm(WAIT_CLOCKED);
+ if (IS_ENABLED(CONFIG_PM))
+ imx6q_set_lpm(WAIT_CLOCKED);

np = of_find_compatible_node(NULL, NULL, "fsl,imx6q-gpt");
base = of_iomap(np, 0);
diff --git a/arch/arm/mach-imx/clk-imx6sl.c b/arch/arm/mach-imx/clk-imx6sl.c
index f7073c0..a882bdf 100644
--- a/arch/arm/mach-imx/clk-imx6sl.c
+++ b/arch/arm/mach-imx/clk-imx6sl.c
@@ -382,7 +382,8 @@ static void __init imx6sl_clocks_init(struct device_node *ccm_node)
clk_set_parent(clks[IMX6SL_CLK_SPDIF0_SEL], clks[IMX6SL_CLK_PLL3_PFD3]);

/* Set initial power mode */
- imx6q_set_lpm(WAIT_CLOCKED);
+ if (IS_ENABLED(CONFIG_PM))
+ imx6q_set_lpm(WAIT_CLOCKED);

np = of_find_compatible_node(NULL, NULL, "fsl,imx6sl-gpt");
base = of_iomap(np, 0);
diff --git a/arch/arm/mach-imx/cpuidle-imx6sl.c b/arch/arm/mach-imx/cpuidle-imx6sl.c
index d4b6b81..c9a6aa8 100644
--- a/arch/arm/mach-imx/cpuidle-imx6sl.c
+++ b/arch/arm/mach-imx/cpuidle-imx6sl.c
@@ -53,5 +53,8 @@ static struct cpuidle_driver imx6sl_cpuidle_driver = {

int __init imx6sl_cpuidle_init(void)
{
+ if (!IS_ENABLED(CONFIG_PM))
+ return -ENOSYS;
+
return cpuidle_register(&imx6sl_cpuidle_driver, NULL);
}
--
1.8.3.2