From 85ebd1e849875fe323e03fedb85f030aefa07cb6 Mon Sep 17 00:00:00 2001 From: Juha Yrjola Date: Mon, 20 Mar 2006 15:43:00 -0400 Subject: [PATCH] ARM: OMAP: Move SleepX signal masking code to board-nokia770.c On Nokia 770, the SleepX signal is masked with an MPUIO. Unmasking SleepX was previously done in mach-omap1/pm.c, but it belongs to the board-specific file. Signed-off-by: Juha Yrjola --- arch/arm/mach-omap1/board-nokia770.c | 9 +++++++++ arch/arm/mach-omap1/pm.c | 9 --------- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/arch/arm/mach-omap1/board-nokia770.c b/arch/arm/mach-omap1/board-nokia770.c index 8133b5944ab..4d09f676496 100644 --- a/arch/arm/mach-omap1/board-nokia770.c +++ b/arch/arm/mach-omap1/board-nokia770.c @@ -34,6 +34,15 @@ static void __init omap_nokia770_init_irq(void) { + /* On Nokia 770, the SleepX signal is masked with an + * MPUIO line by default. It has to be unmasked for it + * to become functional */ + + /* SleepX mask direction */ + omap_writew((omap_readw(0xfffb5008) & ~2), 0xfffb5008); + /* Unmask SleepX signal */ + omap_writew((omap_readw(0xfffb5004) & ~2), 0xfffb5004); + omap1_init_common_hw(); omap_init_irq(); } diff --git a/arch/arm/mach-omap1/pm.c b/arch/arm/mach-omap1/pm.c index be0d6b7b6e9..ddf6b07dc9c 100644 --- a/arch/arm/mach-omap1/pm.c +++ b/arch/arm/mach-omap1/pm.c @@ -738,15 +738,6 @@ static int __init omap_pm_init(void) else if (cpu_is_omap16xx()) setup_irq(INT_1610_WAKE_UP_REQ, &omap_wakeup_irq); -#if 0 - /* --- BEGIN BOARD-DEPENDENT CODE --- */ - /* Sleepx mask direction */ - omap_writew((omap_readw(0xfffb5008) & ~2), 0xfffb5008); - /* Unmask sleepx signal */ - omap_writew((omap_readw(0xfffb5004) & ~2), 0xfffb5004); - /* --- END BOARD-DEPENDENT CODE --- */ -#endif - /* Program new power ramp-up time * (0 for most boards since we don't lower voltage when in deep sleep) */ -- 2.41.1