added option to atheros kernel to be able to disable reset button from inside the...

SVN-Revision: 8969

diff --git a/package/fonera-mp3-drv/src/mp3_drv.c b/package/fonera-mp3-drv/src/mp3_drv.c
index a2d8c79ae64a330152d604376e8b04a7ab43c481..82863ac41163218126ca0135abef8b8fabcf6124 100644 (file)
--- a/package/fonera-mp3-drv/src/mp3_drv.c
+++ b/package/fonera-mp3-drv/src/mp3_drv.c
@@ -31,6 +31,7 @@
 #include <linux/init.h>
 #include <linux/genhd.h>
 #include <linux/device.h> 
+#include <asm-mips/mach-atheros/reset.h>
 
 // do we want debuging info ?
 #if 0
@@ -282,6 +283,10 @@ static int __init mod_init(void){
        printk("mp3_drv.ko : Made by John '2B|!2B' Crispin (john@phrozen.org)\n");
        printk("mp3_drv.ko : Starting ...\n");
        
+       printk("disabling atheros reset button irq\n");
+
+       ar531x_disable_reset_button();
+
        if(register_chrdev(DEV_MAJOR, DEV_NAME, &modulemp3_fops)) {
                printk( "mp3_drv.ko : Error whilst opening %s (%d)\n", DEV_NAME, DEV_MAJOR);
                return( -ENODEV );

diff --git a/target/linux/atheros/files/arch/mips/atheros/reset.c b/target/linux/atheros/files/arch/mips/atheros/reset.c
index d62c5e1c4efe0a1ee7c49a8e07b2f4c07f4cc9af..cc2fb251a19fb3e9bad188dcc679b21fd367eb5c 100644 (file)
--- a/target/linux/atheros/files/arch/mips/atheros/reset.c
+++ b/target/linux/atheros/files/arch/mips/atheros/reset.c
@@ -10,12 +10,16 @@
 #include "ar531x.h"
 #include "ar5315/ar5315.h"
 
+#define AR531X_RESET_GPIO_IRQ  (AR531X_GPIO_IRQ_BASE + bcfg->resetConfigGpio)
+
 struct event_t {
        struct work_struct wq;
        int set;
        long int jiffies;
 };
 
+static struct ar531x_boarddata *bcfg;
+
 extern struct sock *uevent_sock;
 extern u64 uevent_next_seqnum(void);
 static int seen;
@@ -94,15 +98,24 @@ static irqreturn_t button_handler(int irq, void *dev_id)
        return IRQ_HANDLED;
 }
 
+void ar531x_disable_reset_button(void)
+{
+       disable_irq(AR531X_RESET_GPIO_IRQ);     
+}
+
+EXPORT_SYMBOL(ar531x_disable_reset_button);
+
 int __init ar531x_init_reset(void)
 {
-       struct ar531x_boarddata *bcfg;
        bcfg = (struct ar531x_boarddata *) board_config;
 
        seen = jiffies;
-       request_irq(AR531X_GPIO_IRQ_BASE + bcfg->resetConfigGpio, &button_handler, IRQF_SAMPLE_RANDOM, "ar531x_reset", NULL);
+       
+       request_irq(AR531X_RESET_GPIO_IRQ, &button_handler, IRQF_SAMPLE_RANDOM, "ar531x_reset", NULL);
 
        return 0;
 }
 
+
+
 module_init(ar531x_init_reset);

diff --git a/target/linux/atheros/files/include/asm-mips/mach-atheros/reset.h b/target/linux/atheros/files/include/asm-mips/mach-atheros/reset.h
new file mode 100644 (file)
index 0000000..e9fa4c5
--- /dev/null
+++ b/target/linux/atheros/files/include/asm-mips/mach-atheros/reset.h
@@ -0,0 +1,6 @@
+#ifndef __AR531X_RESET_H
+#define __AR531X_RESET_H
+
+void ar531x_disable_reset_button(void);
+
+#endif /* __AR531X_RESET_H */