diff options
-rw-r--r-- | arch/arm/plat-samsung/Kconfig | 8 | ||||
-rw-r--r-- | arch/arm/plat-samsung/Makefile | 2 | ||||
-rw-r--r-- | arch/arm/plat-samsung/include/plat/wakeup-mask.h | 44 | ||||
-rw-r--r-- | arch/arm/plat-samsung/wakeup-mask.c | 47 |
4 files changed, 101 insertions, 0 deletions
diff --git a/arch/arm/plat-samsung/Kconfig b/arch/arm/plat-samsung/Kconfig index d663078253de..2753fb3e4f73 100644 --- a/arch/arm/plat-samsung/Kconfig +++ b/arch/arm/plat-samsung/Kconfig | |||
@@ -285,4 +285,12 @@ config SAMSUNG_PM_CHECK_CHUNKSIZE | |||
285 | 285 | ||
286 | See <file:Documentation/arm/Samsung-S3C24XX/Suspend.txt> | 286 | See <file:Documentation/arm/Samsung-S3C24XX/Suspend.txt> |
287 | 287 | ||
288 | config SAMSUNG_WAKEMASK | ||
289 | bool | ||
290 | depends on PM | ||
291 | help | ||
292 | Compile support for wakeup-mask controls found on the S3C6400 | ||
293 | and above. This code allows a set of interrupt to wakeup-mask | ||
294 | mappings. See <plat/wakeup-mask.h> | ||
295 | |||
288 | endif | 296 | endif |
diff --git a/arch/arm/plat-samsung/Makefile b/arch/arm/plat-samsung/Makefile index d98316b30c26..b1d82cc5e716 100644 --- a/arch/arm/plat-samsung/Makefile +++ b/arch/arm/plat-samsung/Makefile | |||
@@ -61,6 +61,8 @@ obj-$(CONFIG_PM) += pm.o | |||
61 | obj-$(CONFIG_PM) += pm-gpio.o | 61 | obj-$(CONFIG_PM) += pm-gpio.o |
62 | obj-$(CONFIG_SAMSUNG_PM_CHECK) += pm-check.o | 62 | obj-$(CONFIG_SAMSUNG_PM_CHECK) += pm-check.o |
63 | 63 | ||
64 | obj-$(CONFIG_SAMSUNG_WAKEMASK) += wakeup-mask.o | ||
65 | |||
64 | # PWM support | 66 | # PWM support |
65 | 67 | ||
66 | obj-$(CONFIG_HAVE_PWM) += pwm.o | 68 | obj-$(CONFIG_HAVE_PWM) += pwm.o |
diff --git a/arch/arm/plat-samsung/include/plat/wakeup-mask.h b/arch/arm/plat-samsung/include/plat/wakeup-mask.h new file mode 100644 index 000000000000..43e4acd2e1c6 --- /dev/null +++ b/arch/arm/plat-samsung/include/plat/wakeup-mask.h | |||
@@ -0,0 +1,44 @@ | |||
1 | /* arch/arm/plat-samsung/include/plat/wakeup-mask.h | ||
2 | * | ||
3 | * Copyright 2010 Ben Dooks <ben-linux@fluff.org> | ||
4 | * | ||
5 | * Support for wakeup mask interrupts on newer SoCs | ||
6 | * | ||
7 | * This program is free software; you can redistribute it and/or modify | ||
8 | * it under the terms of the GNU General Public License version 2 as | ||
9 | * published by the Free Software Foundation. | ||
10 | * | ||
11 | */ | ||
12 | |||
13 | #ifndef __PLAT_WAKEUP_MASK_H | ||
14 | #define __PLAT_WAKEUP_MASK_H __file__ | ||
15 | |||
16 | /* if no irq yet defined, but still want to mask */ | ||
17 | #define NO_WAKEUP_IRQ (0x90000000) | ||
18 | |||
19 | /** | ||
20 | * struct samsung_wakeup_mask - wakeup mask information | ||
21 | * @irq: The interrupt associated with this wakeup. | ||
22 | * @bit: The bit, as a (1 << bitno) controlling this source. | ||
23 | */ | ||
24 | struct samsung_wakeup_mask { | ||
25 | unsigned int irq; | ||
26 | u32 bit; | ||
27 | }; | ||
28 | |||
29 | /** | ||
30 | * samsung_sync_wakemask - sync wakeup mask information for pm | ||
31 | * @reg: The register that is used. | ||
32 | * @masks: The list of masks to use. | ||
33 | * @nr_masks: The number of entries pointed to buy @masks. | ||
34 | * | ||
35 | * Synchronise the wakeup mask information at suspend time from the list | ||
36 | * of interrupts and control bits in @masks. We do this at suspend time | ||
37 | * as overriding the relevant irq chips is harder and the register is only | ||
38 | * required to be correct before we enter sleep. | ||
39 | */ | ||
40 | extern void samsung_sync_wakemask(void __iomem *reg, | ||
41 | struct samsung_wakeup_mask *masks, | ||
42 | int nr_masks); | ||
43 | |||
44 | #endif /* __PLAT_WAKEUP_MASK_H */ | ||
diff --git a/arch/arm/plat-samsung/wakeup-mask.c b/arch/arm/plat-samsung/wakeup-mask.c new file mode 100644 index 000000000000..2e09b6ad84ca --- /dev/null +++ b/arch/arm/plat-samsung/wakeup-mask.c | |||
@@ -0,0 +1,47 @@ | |||
1 | /* arch/arm/plat-samsung/wakeup-mask.c | ||
2 | * | ||
3 | * Copyright 2010 Ben Dooks <ben-linux@fluff.org> | ||
4 | * | ||
5 | * Support for wakeup mask interrupts on newer SoCs | ||
6 | * | ||
7 | * This program is free software; you can redistribute it and/or modify | ||
8 | * it under the terms of the GNU General Public License version 2 as | ||
9 | * published by the Free Software Foundation. | ||
10 | */ | ||
11 | |||
12 | #include <linux/kernel.h> | ||
13 | #include <linux/spinlock.h> | ||
14 | #include <linux/sysdev.h> | ||
15 | #include <linux/types.h> | ||
16 | #include <linux/irq.h> | ||
17 | #include <linux/io.h> | ||
18 | |||
19 | #include <plat/wakeup-mask.h> | ||
20 | #include <plat/pm.h> | ||
21 | |||
22 | void samsung_sync_wakemask(void __iomem *reg, | ||
23 | struct samsung_wakeup_mask *mask, int nr_mask) | ||
24 | { | ||
25 | struct irq_desc *desc; | ||
26 | u32 val; | ||
27 | |||
28 | val = __raw_readl(reg); | ||
29 | |||
30 | for (; nr_mask > 0; nr_mask--, mask++) { | ||
31 | if (mask->irq == NO_WAKEUP_IRQ) { | ||
32 | val |= mask->bit; | ||
33 | continue; | ||
34 | } | ||
35 | |||
36 | desc = irq_to_desc(mask->irq); | ||
37 | |||
38 | /* bit of a liberty to read this directly from irq_desc. */ | ||
39 | if (desc->wake_depth > 0) | ||
40 | val &= ~mask->bit; | ||
41 | else | ||
42 | val |= mask->bit; | ||
43 | } | ||
44 | |||
45 | printk(KERN_INFO "wakemask %08x => %08x\n", __raw_readl(reg), val); | ||
46 | __raw_writel(val, reg); | ||
47 | } | ||