diff options
Diffstat (limited to 'arch/arm/mach-mx6')
-rw-r--r-- | arch/arm/mach-mx6/devices.c | 2 | ||||
-rw-r--r-- | arch/arm/mach-mx6/irq.c | 2 | ||||
-rw-r--r-- | arch/arm/mach-mx6/pm.c | 6 |
3 files changed, 6 insertions, 4 deletions
diff --git a/arch/arm/mach-mx6/devices.c b/arch/arm/mach-mx6/devices.c index 996de31d493..3eab54de33c 100644 --- a/arch/arm/mach-mx6/devices.c +++ b/arch/arm/mach-mx6/devices.c @@ -84,7 +84,7 @@ static struct mxc_gpio_port mxc_gpio_ports[] = { }, }; -int __init mx6q_register_gpios(void) +int mx6q_register_gpios(void) { /* 7 ports for Mx6 */ return mxc_gpio_init(mxc_gpio_ports, 7); diff --git a/arch/arm/mach-mx6/irq.c b/arch/arm/mach-mx6/irq.c index 7cc93962de7..4633607c1e8 100644 --- a/arch/arm/mach-mx6/irq.c +++ b/arch/arm/mach-mx6/irq.c @@ -43,7 +43,7 @@ static int mx6_gic_irq_set_wake(struct irq_data *d, unsigned int enable) } return 0; } -void __init mx6_init_irq(void) +void mx6_init_irq(void) { struct irq_desc *desc; unsigned int i; diff --git a/arch/arm/mach-mx6/pm.c b/arch/arm/mach-mx6/pm.c index 4c53bb44d5e..2a94689bbf6 100644 --- a/arch/arm/mach-mx6/pm.c +++ b/arch/arm/mach-mx6/pm.c @@ -61,6 +61,7 @@ static int org_freq; extern int set_cpu_freq(int wp); #endif extern void mx6q_suspend(suspend_state_t state); +extern void mx6_init_irq(void); static struct device *pm_dev; struct clk *gpc_dvfs_clk; @@ -115,6 +116,7 @@ static void mx6_suspend_restore(void) __raw_writel(local_timer[3], local_twd_base + LOCAL_TWD_INT_OFFSET); #endif } + static int mx6_suspend_enter(suspend_state_t state) { mx6_suspend_store(); @@ -147,8 +149,8 @@ static int mx6_suspend_enter(suspend_state_t state) mx6q_suspend(state); if (state == PM_SUSPEND_MEM) { - /* need to re-init gic */ - gic_init(0, 29, gic_dist_base, gic_cpu_base); + /* need to re-init irq */ + mx6_init_irq(); #ifdef CONFIG_LOCAL_TIMERS gic_enable_ppi(IRQ_LOCALTIMER); |