diff options
Diffstat (limited to 'arch/arm')
| -rw-r--r-- | arch/arm/mach-imx/common.c | 2 | ||||
| -rw-r--r-- | arch/arm/mach-imx/cpuidle.h | 14 |
2 files changed, 10 insertions, 6 deletions
diff --git a/arch/arm/mach-imx/common.c b/arch/arm/mach-imx/common.c index 3016f60ce141..2f644c6b2c28 100644 --- a/arch/arm/mach-imx/common.c +++ b/arch/arm/mach-imx/common.c @@ -132,7 +132,7 @@ u32 imx6_lpddr2_freq_change_start, imx6_lpddr2_freq_change_end; void mx6_lpddr2_freq_change(u32 freq, int bus_freq_mode) {} #endif -#if !defined(CONFIG_SOC_IMX6SL) +#if !defined(CONFIG_SOC_IMX6SLL) void imx6sll_lpddr2_freq_change(u32 freq, int bus_freq_mode) {} #endif diff --git a/arch/arm/mach-imx/cpuidle.h b/arch/arm/mach-imx/cpuidle.h index 8e0c1aa2daf6..592724811607 100644 --- a/arch/arm/mach-imx/cpuidle.h +++ b/arch/arm/mach-imx/cpuidle.h @@ -10,11 +10,19 @@ * http://www.gnu.org/copyleft/gpl.html */ +#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 + #ifdef CONFIG_CPU_IDLE 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); @@ -32,10 +40,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; |