diff options
| author | Leonard Crestez <leonard.crestez@nxp.com> | 2018-02-09 16:35:59 +0200 |
|---|---|---|
| committer | Leonard Crestez <leonard.crestez@nxp.com> | 2018-08-24 12:41:33 +0300 |
| commit | 706e443531f97a76f379cfbfa466b25d88df4185 (patch) | |
| tree | fd13c51234c798e1bc0b29fc939d2e6741ab8225 /arch/arm/mach-imx | |
| parent | 242d99b1cebca2afee8ecc9a3166f10f2ff83f38 (diff) | |
MLK-17583-2: arm: imx: Fix imx6sl cpuidle build fail without CONFIG_SOC_IMX6SLL
Fixes commit 91558864ab21 ("MLK-13344-05 ARM: imx: Add cpuidle support on imx6sll")
Signed-off-by: Leonard Crestez <leonard.crestez@nxp.com>
Reviewed-by: Jacky Bai <ping.bai@nxp.com>
Diffstat (limited to 'arch/arm/mach-imx')
| -rw-r--r-- | arch/arm/mach-imx/cpuidle.h | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/arch/arm/mach-imx/cpuidle.h b/arch/arm/mach-imx/cpuidle.h index 14eeb339e76b..762412733a5a 100644 --- a/arch/arm/mach-imx/cpuidle.h +++ b/arch/arm/mach-imx/cpuidle.h @@ -14,7 +14,6 @@ extern int imx5_cpuidle_init(void); extern int imx6q_cpuidle_init(void); extern int imx6sl_cpuidle_init(void); -extern int imx6sll_cpuidle_init(void); extern int imx6sx_cpuidle_init(void); extern int imx6ul_cpuidle_init(void); extern int imx7d_cpuidle_init(void); @@ -33,10 +32,6 @@ static inline int imx6sl_cpuidle_init(void) { return 0; } -static inline int imx6sll_cpuidle_init(void) -{ - return 0; -} static inline int imx6sx_cpuidle_init(void) { return 0; @@ -58,3 +53,9 @@ static inline int imx7ulp_cpuidle_init(void) return 0; } #endif + +#if defined(CONFIG_CPU_IDLE) && defined (CONFIG_SOC_IMX6SLL) +extern int imx6sll_cpuidle_init(void); +#else +static inline int imx6sll_cpuidle_init(void) { return 0; } +#endif |