genesi/linux-legacy
1
0
Fork 0
mirror of https://github.com/genesi/linux-legacy.git synced 2026-09-24 15:44:22 +00:00
Code Issues Packages Projects Releases Wiki Activity

ENGR00118898 mx35: fix error when disable pseudo irq

Browse Source 
avoid i2c access of pseudo irq ops while suspending

Signed-off-by: Zhou Jingyu <Jingyu.Zhou@freescale.com>
This commit is contained in:
Zhou Jingyu
2009-12-03 13:37:38 +08:00
committed by Matt Sealey
parent f44d879824
commit 4d5dab2ecf
3 changed files with 12 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
arch/arm/mach-mx35/board-mx35_3stack.h
View File

@@ -195,6 +195,7 @@ extern void gpio_can_inactive(int id);
extern struct flexcan_platform_data flexcan_data[];
extern int __init mx35_3stack_init_mc13892(void);
extern int __init mx35_3stack_init_mc9s08dz60(void);
extern int is_suspend_ops_started(void);
#endif /* CONFIG_MACH_MX35_3DS */
#endif /* __ASM_ARCH_MXC_BOARD_MX35_3STACK_H__ */

3
arch/arm/mach-mx35/mx35_3stack_irq.c
View File

@@ -276,6 +276,9 @@ static void mcu_state_handler(struct work_struct *work)
event1 = pseudo_irq_enable & ((1 << MCU_INT_RTC) - 1);
event2 = pseudo_irq_enable >> MCU_INT_RTC;
if (is_suspend_ops_started())
return;
for (i = 0; i < 3; i++) {
err = mcu_pmic_write_reg(REG_MCU_INT_ENABLE_1, event1, 0xFF);
err |= mcu_pmic_write_reg(REG_MCU_INT_ENABLE_2, event2, 0xFF);

9
arch/arm/mach-mx35/pm.c
View File

@@ -1,5 +1,5 @@
/*
* Copyright 2008 Freescale Semiconductor, Inc. All Rights Reserved.
* Copyright 2008-2009 Freescale Semiconductor, Inc. All Rights Reserved.
*/
/*
@@ -19,6 +19,11 @@
* @defgroup MSL_MX35 i.MX35 Machine Specific Layer (MSL)
*/
int suspend_ops_started;
int is_suspend_ops_started(void)
{
return suspend_ops_started;
}
/*!
* @file mach-mx35/pm.c
* @brief This file contains suspend operations
@@ -47,6 +52,7 @@ static int mx35_suspend_enter(suspend_state_t state)
*/
static int mx35_suspend_prepare(void)
{
suspend_ops_started = 1;
return 0;
}
@@ -55,6 +61,7 @@ static int mx35_suspend_prepare(void)
*/
static void mx35_suspend_finish(void)
{
suspend_ops_started = 0;
}
static int mx35_pm_valid(suspend_state_t state)