diff options
author | Linus Torvalds <torvalds@g5.osdl.org> | 2006-09-28 17:40:39 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-09-28 17:40:39 -0400 |
commit | ebdea46fecae40c4d7effcd33f40918a37a1df4b (patch) | |
tree | e4312bf7f1f3d184738963a0ec300aa9fdfd55c1 /arch/arm/mach-s3c2410/pm.h | |
parent | fecf3404f4aba6d0edeba31eeb018cbb6326dff2 (diff) | |
parent | 250d375d1da45a5e08ab8baf5eaa7eb258afd82b (diff) |
Merge branch 'devel' of master.kernel.org:/home/rmk/linux-2.6-arm
* 'devel' of master.kernel.org:/home/rmk/linux-2.6-arm: (130 commits)
[ARM] 3856/1: Add clocksource for Intel IXP4xx platforms
[ARM] 3855/1: Add generic time support
[ARM] 3873/1: S3C24XX: Add irq_chip names
[ARM] 3872/1: S3C24XX: Apply consistant tabbing to irq_chips
[ARM] 3871/1: S3C24XX: Fix ordering of EINT4..23
[ARM] nommu: confirms the CR_V bit in nommu mode
[ARM] nommu: abort handler fixup for !CPU_CP15_MMU cores.
[ARM] 3870/1: AT91: Start removing static memory mappings
[ARM] 3869/1: AT91: NAND support for DK and KB9202 boards
[ARM] 3868/1: AT91 hardware header update
[ARM] 3867/1: AT91 GPIO update
[ARM] 3866/1: AT91 clock update
[ARM] 3865/1: AT91RM9200 header updates
[ARM] 3862/2: S3C2410 - add basic power management support for AML M5900 series
[ARM] kthread: switch arch/arm/kernel/apm.c
[ARM] Off-by-one in arch/arm/common/icst*
[ARM] 3864/1: Refactore sharpsl_pm
[ARM] 3863/1: Add Locomo SPI Device
[ARM] 3847/2: Convert LOMOMO to use struct device for GPIOs
[ARM] Use CPU_CACHE_* where possible in asm/cacheflush.h
...
Diffstat (limited to 'arch/arm/mach-s3c2410/pm.h')
-rw-r--r-- | arch/arm/mach-s3c2410/pm.h | 16 |
1 files changed, 15 insertions, 1 deletions
diff --git a/arch/arm/mach-s3c2410/pm.h b/arch/arm/mach-s3c2410/pm.h index 7a5e714c7386..ffe197a119fb 100644 --- a/arch/arm/mach-s3c2410/pm.h +++ b/arch/arm/mach-s3c2410/pm.h | |||
@@ -34,13 +34,19 @@ extern unsigned long s3c_irqwake_eintmask; | |||
34 | extern unsigned long s3c_irqwake_intallow; | 34 | extern unsigned long s3c_irqwake_intallow; |
35 | extern unsigned long s3c_irqwake_eintallow; | 35 | extern unsigned long s3c_irqwake_eintallow; |
36 | 36 | ||
37 | /* per-cpu sleep functions */ | ||
38 | |||
39 | extern void (*pm_cpu_prep)(void); | ||
40 | extern void (*pm_cpu_sleep)(void); | ||
41 | |||
37 | /* Flags for PM Control */ | 42 | /* Flags for PM Control */ |
38 | 43 | ||
39 | extern unsigned long s3c_pm_flags; | 44 | extern unsigned long s3c_pm_flags; |
40 | 45 | ||
41 | /* from sleep.S */ | 46 | /* from sleep.S */ |
42 | 47 | ||
43 | extern void s3c2410_cpu_suspend(unsigned long *saveblk); | 48 | extern int s3c2410_cpu_save(unsigned long *saveblk); |
49 | extern void s3c2410_cpu_suspend(void); | ||
44 | extern void s3c2410_cpu_resume(void); | 50 | extern void s3c2410_cpu_resume(void); |
45 | 51 | ||
46 | extern unsigned long s3c2410_sleep_save_phys; | 52 | extern unsigned long s3c2410_sleep_save_phys; |
@@ -57,3 +63,11 @@ struct sleep_save { | |||
57 | 63 | ||
58 | extern void s3c2410_pm_do_save(struct sleep_save *ptr, int count); | 64 | extern void s3c2410_pm_do_save(struct sleep_save *ptr, int count); |
59 | extern void s3c2410_pm_do_restore(struct sleep_save *ptr, int count); | 65 | extern void s3c2410_pm_do_restore(struct sleep_save *ptr, int count); |
66 | |||
67 | #ifdef CONFIG_PM | ||
68 | extern int s3c24xx_irq_suspend(struct sys_device *dev, pm_message_t state); | ||
69 | extern int s3c24xx_irq_resume(struct sys_device *dev); | ||
70 | #else | ||
71 | #define s3c24xx_irq_suspend NULL | ||
72 | #define s3c24xx_irq_resume NULL | ||
73 | #endif | ||