c19f53234b
commit 512a928affd51c2dc631401e56ad5ee5d5dd68b6 upstream.
This function is not only needed by the platform suspend code, but is also
reused as the CPU resume function when the ARM cores can be powered down
completely in deep idle, which is the case on i.MX6SX and i.MX6UL(L).
Providing the static inline stub whenever CONFIG_SUSPEND is disabled means
that those platforms will hang on resume from cpuidle if suspend is disabled.
So there are two problems:
- The static inline stub masks the linker error
- The function is not available where needed
Fix both by just building the function unconditionally, when
CONFIG_SOC_IMX6 is enabled. The actual code is three instructions long,
so it's arguably ok to just leave it in for all i.MX6 kernel configurations.
Fixes: 05136f0897 ("ARM: imx: support arm power off in cpuidle for i.mx6sx")
Signed-off-by: Lucas Stach <l.stach@pengutronix.de>
Signed-off-by: Ahmad Fatoum <a.fatoum@pengutronix.de>
Signed-off-by: Rouven Czerwinski <r.czerwinski@pengutronix.de>
Signed-off-by: Shawn Guo <shawnguo@kernel.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
147 lines
4.2 KiB
C
147 lines
4.2 KiB
C
/*
|
|
* Copyright 2004-2014 Freescale Semiconductor, Inc. All Rights Reserved.
|
|
*/
|
|
|
|
/*
|
|
* This program is free software; you can redistribute it and/or modify
|
|
* it under the terms of the GNU General Public License version 2 as
|
|
* published by the Free Software Foundation.
|
|
*/
|
|
|
|
#ifndef __ASM_ARCH_MXC_COMMON_H__
|
|
#define __ASM_ARCH_MXC_COMMON_H__
|
|
|
|
#include <linux/reboot.h>
|
|
|
|
struct irq_data;
|
|
struct platform_device;
|
|
struct pt_regs;
|
|
struct clk;
|
|
struct device_node;
|
|
enum mxc_cpu_pwr_mode;
|
|
struct of_device_id;
|
|
|
|
void mx21_map_io(void);
|
|
void mx27_map_io(void);
|
|
void mx31_map_io(void);
|
|
void mx35_map_io(void);
|
|
void imx21_init_early(void);
|
|
void imx27_init_early(void);
|
|
void imx31_init_early(void);
|
|
void imx35_init_early(void);
|
|
void mxc_init_irq(void __iomem *);
|
|
void mx21_init_irq(void);
|
|
void mx27_init_irq(void);
|
|
void mx31_init_irq(void);
|
|
void mx35_init_irq(void);
|
|
void imx21_soc_init(void);
|
|
void imx27_soc_init(void);
|
|
void imx31_soc_init(void);
|
|
void imx35_soc_init(void);
|
|
int mx21_clocks_init(unsigned long lref, unsigned long fref);
|
|
int mx27_clocks_init(unsigned long fref);
|
|
int mx31_clocks_init(unsigned long fref);
|
|
int mx35_clocks_init(void);
|
|
struct platform_device *mxc_register_gpio(char *name, int id,
|
|
resource_size_t iobase, resource_size_t iosize, int irq, int irq_high);
|
|
void mxc_set_cpu_type(unsigned int type);
|
|
void mxc_restart(enum reboot_mode, const char *);
|
|
void mxc_arch_reset_init(void __iomem *);
|
|
void imx1_reset_init(void __iomem *);
|
|
void imx_set_aips(void __iomem *);
|
|
void imx_aips_allow_unprivileged_access(const char *compat);
|
|
int mxc_device_init(void);
|
|
void imx_set_soc_revision(unsigned int rev);
|
|
void imx_init_revision_from_anatop(void);
|
|
struct device *imx_soc_device_init(void);
|
|
void imx6_enable_rbc(bool enable);
|
|
void imx_gpc_check_dt(void);
|
|
void imx_gpc_set_arm_power_in_lpm(bool power_off);
|
|
void imx_gpc_set_l2_mem_power_in_lpm(bool power_off);
|
|
void imx_gpc_set_arm_power_up_timing(u32 sw2iso, u32 sw);
|
|
void imx_gpc_set_arm_power_down_timing(u32 sw2iso, u32 sw);
|
|
void imx25_pm_init(void);
|
|
void imx27_pm_init(void);
|
|
void imx5_pmu_init(void);
|
|
|
|
enum mxc_cpu_pwr_mode {
|
|
WAIT_CLOCKED, /* wfi only */
|
|
WAIT_UNCLOCKED, /* WAIT */
|
|
WAIT_UNCLOCKED_POWER_OFF, /* WAIT + SRPG */
|
|
STOP_POWER_ON, /* just STOP */
|
|
STOP_POWER_OFF, /* STOP + SRPG */
|
|
};
|
|
|
|
void imx_enable_cpu(int cpu, bool enable);
|
|
void imx_set_cpu_jump(int cpu, void *jump_addr);
|
|
u32 imx_get_cpu_arg(int cpu);
|
|
void imx_set_cpu_arg(int cpu, u32 arg);
|
|
#ifdef CONFIG_SMP
|
|
void v7_secondary_startup(void);
|
|
void imx_scu_map_io(void);
|
|
void imx_smp_prepare(void);
|
|
#else
|
|
static inline void imx_scu_map_io(void) {}
|
|
static inline void imx_smp_prepare(void) {}
|
|
#endif
|
|
void imx_src_init(void);
|
|
void imx_gpc_pre_suspend(bool arm_power_off);
|
|
void imx_gpc_post_resume(void);
|
|
void imx_gpc_mask_all(void);
|
|
void imx_gpc_restore_all(void);
|
|
void imx_gpc_hwirq_mask(unsigned int hwirq);
|
|
void imx_gpc_hwirq_unmask(unsigned int hwirq);
|
|
void imx_anatop_init(void);
|
|
void imx_anatop_pre_suspend(void);
|
|
void imx_anatop_post_resume(void);
|
|
int imx6_set_lpm(enum mxc_cpu_pwr_mode mode);
|
|
void imx6_set_int_mem_clk_lpm(bool enable);
|
|
void imx6sl_set_wait_clk(bool enter);
|
|
int imx_mmdc_get_ddr_type(void);
|
|
|
|
void imx_cpu_die(unsigned int cpu);
|
|
int imx_cpu_kill(unsigned int cpu);
|
|
|
|
#ifdef CONFIG_SUSPEND
|
|
void imx53_suspend(void __iomem *ocram_vbase);
|
|
extern const u32 imx53_suspend_sz;
|
|
void imx6_suspend(void __iomem *ocram_vbase);
|
|
#else
|
|
static inline void imx53_suspend(void __iomem *ocram_vbase) {}
|
|
static const u32 imx53_suspend_sz;
|
|
static inline void imx6_suspend(void __iomem *ocram_vbase) {}
|
|
#endif
|
|
|
|
void v7_cpu_resume(void);
|
|
|
|
void imx6_pm_ccm_init(const char *ccm_compat);
|
|
void imx6q_pm_init(void);
|
|
void imx6dl_pm_init(void);
|
|
void imx6sl_pm_init(void);
|
|
void imx6sx_pm_init(void);
|
|
void imx6ul_pm_init(void);
|
|
|
|
#ifdef CONFIG_PM
|
|
void imx51_pm_init(void);
|
|
void imx53_pm_init(void);
|
|
#else
|
|
static inline void imx51_pm_init(void) {}
|
|
static inline void imx53_pm_init(void) {}
|
|
#endif
|
|
|
|
#ifdef CONFIG_NEON
|
|
int mx51_neon_fixup(void);
|
|
#else
|
|
static inline int mx51_neon_fixup(void) { return 0; }
|
|
#endif
|
|
|
|
#ifdef CONFIG_CACHE_L2X0
|
|
void imx_init_l2cache(void);
|
|
#else
|
|
static inline void imx_init_l2cache(void) {}
|
|
#endif
|
|
|
|
extern const struct smp_operations imx_smp_ops;
|
|
extern const struct smp_operations ls1021a_smp_ops;
|
|
|
|
#endif
|