Merge branch 'for-rmk/samsung3' of git://git.fluff.org/bjdooks/linux into devel-stable

Conflicts:
	arch/arm/Kconfig

1 files changed, 47 insertions, 0 deletions

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 @@
+/* arch/arm/plat-samsung/wakeup-mask.c
+ *
+ * Copyright 2010 Ben Dooks <ben-linux@fluff.org>
+ *
+ * Support for wakeup mask interrupts on newer SoCs
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 as
+ * published by the Free Software Foundation.
+*/
+
+#include <linux/kernel.h>
+#include <linux/spinlock.h>
+#include <linux/sysdev.h>
+#include <linux/types.h>
+#include <linux/irq.h>
+#include <linux/io.h>
+
+#include <plat/wakeup-mask.h>
+#include <plat/pm.h>
+
+void samsung_sync_wakemask(void __iomem *reg,
+                           struct samsung_wakeup_mask *mask, int nr_mask)
+{
+        struct irq_desc *desc;
+        u32 val;
+
+        val = __raw_readl(reg);
+
+        for (; nr_mask > 0; nr_mask--, mask++) {
+                if (mask->irq == NO_WAKEUP_IRQ) {
+                        val |= mask->bit;
+                        continue;
+                }
+
+                desc = irq_to_desc(mask->irq);
+
+                /* bit of a liberty to read this directly from irq_desc. */
+                if (desc->wake_depth > 0)
+                        val &= ~mask->bit;
+                else
+                        val |= mask->bit;
+        }
+
+        printk(KERN_INFO "wakemask %08x => %08x\n", __raw_readl(reg), val);
+        __raw_writel(val, reg);
+}