[xbrust] Fix gpio and irq wakeup irq handling.

[openwrt/svn-archive/archive.git] / target / linux / xburst / files-2.6.32 / arch / mips / jz4740 / irq.c

diff --git a/target/linux/xburst/files-2.6.32/arch/mips/jz4740/irq.c b/target/linux/xburst/files-2.6.32/arch/mips/jz4740/irq.c
index 2167f2d4cd704ae811bbbae1d20c13d967f24a4b..11e5a63f7a4abd64cbf334e361f4781a173bdca1 100644 (file)
--- a/target/linux/xburst/files-2.6.32/arch/mips/jz4740/irq.c
+++ b/target/linux/xburst/files-2.6.32/arch/mips/jz4740/irq.c
@@ -22,6 +22,9 @@
 #include <linux/slab.h>
 #include <linux/delay.h>
 
 #include <linux/slab.h>
 #include <linux/delay.h>
 

+#include <linux/debugfs.h>
+#include <linux/seq_file.h>
+

 #include <asm/io.h>
 #include <asm/mipsregs.h>
 #include <asm/irq_cpu.h>
 #include <asm/io.h>
 #include <asm/mipsregs.h>
 #include <asm/irq_cpu.h>


@@ -76,14 +79,11 @@ static struct irq_chip intc_irq_type = {
 static irqreturn_t jz4740_cascade(int irq, void *data)
 {
        uint32_t irq_reg;
 static irqreturn_t jz4740_cascade(int irq, void *data)
 {
        uint32_t irq_reg;

-       irq_reg = readl(jz_intc_base + JZ_REG_INTC_PENDING);

 
 

-       if (irq_reg) {
-               generic_handle_irq(ffs(irq_reg) - 1 + JZ_IRQ_BASE);
-               return IRQ_HANDLED;
-       }
+       irq_reg = readl(jz_intc_base + JZ_REG_INTC_PENDING);
+       generic_handle_irq(ffs(irq_reg) - 1 + JZ_IRQ_BASE);

 
 

-       return 0;
+       return IRQ_HANDLED;

 }
 
 static struct irqaction jz4740_cascade_action = {
 }
 
 static struct irqaction jz4740_cascade_action = {


@@ -122,9 +122,44 @@ void jz4740_intc_suspend(void)
 {
        jz_intc_saved = readl(jz_intc_base + JZ_REG_INTC_MASK);
        writel(~jz_intc_wakeup, jz_intc_base + JZ_REG_INTC_SET_MASK);
 {
        jz_intc_saved = readl(jz_intc_base + JZ_REG_INTC_MASK);
        writel(~jz_intc_wakeup, jz_intc_base + JZ_REG_INTC_SET_MASK);

+       writel(jz_intc_wakeup, jz_intc_base + JZ_REG_INTC_CLEAR_MASK);

 }
 
 void jz4740_intc_resume(void)
 {
        writel(~jz_intc_saved, jz_intc_base + JZ_REG_INTC_CLEAR_MASK);
 }
 
 void jz4740_intc_resume(void)
 {
        writel(~jz_intc_saved, jz_intc_base + JZ_REG_INTC_CLEAR_MASK);

+       writel(jz_intc_saved, jz_intc_base + JZ_REG_INTC_SET_MASK);
+}
+
+#ifdef CONFIG_DEBUG_FS
+
+static int intc_regs_show(struct seq_file *s, void *unused)
+{
+       seq_printf(s, "Status:\t\t%08x\n", readl(jz_intc_base + JZ_REG_INTC_STATUS));
+       seq_printf(s, "Mask\t\t%08x\n", readl(jz_intc_base + JZ_REG_INTC_MASK));
+       seq_printf(s, "Pending:\t%08x\n", readl(jz_intc_base + JZ_REG_INTC_PENDING));
+
+       return 0;

 }
 }

+
+static int intc_regs_open(struct inode *inode, struct file *file)
+{
+       return single_open(file, intc_regs_show, NULL);
+}
+
+static const struct file_operations intc_regs_operations = {
+       .open           = intc_regs_open,
+       .read           = seq_read,
+       .llseek         = seq_lseek,
+       .release        = single_release,
+};
+
+static int __init intc_debugfs_init(void)
+{
+       (void) debugfs_create_file("jz_regs_intc", S_IFREG | S_IRUGO,
+                               NULL, NULL, &intc_regs_operations);
+       return 0;
+}
+subsys_initcall(intc_debugfs_init);
+
+#endif