diff options
| author | Alejandro Mery <amery@hanoverdisplays.com> | 2017-06-19 10:48:39 +0100 |
|---|---|---|
| committer | Alejandro Mery <amery@hanoverdisplays.com> | 2017-06-19 16:18:37 +0100 |
| commit | 25a1fee6bf7f1dff303b2d840c9a5634be75b260 (patch) | |
| tree | ae307734f1ed42957f65cbb22eeada393280a567 /arch/arm | |
| parent | 5c7513c4866175f5057fbe1d039e53e00a2dba53 (diff) | |
imx: fix errors when CONFIG_SOC_IMX6SLL is not defined
I'm not exactly sure how to properly fix the cpuidle part as the whole file seems to assume all IMX* are enabled
so this is mostly a "bug-report" instead of a proper patch
arch/arm/mach-imx/built-in.o: In function `init_mmdc_lpddr2_settings':
platform-imx-dma.c:(.text+0x9938): undefined reference to `imx6sll_lpddr2_freq_change'
platform-imx-dma.c:(.text+0x993c): undefined reference to `imx6sll_lpddr2_freq_change'
arch/arm/mach-imx/built-in.o: In function `imx6sl_init_late':
platform-imx-dma.c:(.init.text+0xdef0): undefined reference to `imx6sll_cpuidle_init'
Signed-off-by: Alejandro Mery <amery@hanoverdisplays.com>
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; |