move files, rename defines for ifxmips
authorJohn Crispin <john@openwrt.org>
Sun, 22 Jun 2008 20:40:36 +0000 (20:40 +0000)
committerJohn Crispin <john@openwrt.org>
Sun, 22 Jun 2008 20:40:36 +0000 (20:40 +0000)
SVN-Revision: 11565

target/linux/ifxmips/files/arch/mips/ifxmips/Kconfig
target/linux/ifxmips/files/arch/mips/ifxmips/Makefile
target/linux/ifxmips/files/arch/mips/ifxmips/gpio.c [new file with mode: 0644]
target/linux/ifxmips/files/arch/mips/ifxmips/reset.c
target/linux/ifxmips/files/drivers/char/ifxmips_gpio.c [deleted file]
target/linux/ifxmips/files/drivers/char/ifxmips_mei_core.c
target/linux/ifxmips/patches/110-drivers.patch

index aadbd5c..f01fcd3 100644 (file)
@@ -20,10 +20,6 @@ config IFXMIPS_LED
        bool "IFXMips led"
        default y
 
-config IFXMIPS_GPIO
-       bool "IFXMips gpio"
-       default y
-
 config IFXMIPS_SSC
        bool "IFXMips ssc"
        default y
index d9c8e6a..b221c37 100644 (file)
@@ -1 +1 @@
-obj-y := reset.o prom.o setup.o interrupt.o dma-core.o pmu.o board.o cgu.o gptu.o
+obj-y := reset.o prom.o setup.o interrupt.o dma-core.o pmu.o board.o cgu.o gptu.o gpio.o
diff --git a/target/linux/ifxmips/files/arch/mips/ifxmips/gpio.c b/target/linux/ifxmips/files/arch/mips/ifxmips/gpio.c
new file mode 100644 (file)
index 0000000..8beb0b8
--- /dev/null
@@ -0,0 +1,407 @@
+/*
+ *   This program is free software; you can redistribute it and/or modify
+ *   it under the terms of the GNU General Public License as published by
+ *   the Free Software Foundation; either version 2 of the License, or
+ *   (at your option) any later version.
+ *
+ *   This program is distributed in the hope that it will be useful,
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *   GNU General Public License for more details.
+ *
+ *   You should have received a copy of the GNU General Public License
+ *   along with this program; if not, write to the Free Software
+ *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA.
+ *
+ *   Copyright (C) 2005 infineon
+ *   Copyright (C) 2007 John Crispin <blogic@openwrt.org> 
+ *
+ */
+
+#include <linux/module.h>
+#include <linux/types.h>
+#include <linux/errno.h>
+#include <linux/proc_fs.h>
+#include <linux/init.h>
+#include <linux/ioctl.h>
+#include <linux/timer.h>
+#include <linux/module.h>
+#include <linux/timer.h>
+#include <linux/interrupt.h>
+#include <linux/kobject.h>
+#include <linux/workqueue.h>
+#include <linux/skbuff.h>
+#include <linux/netlink.h>
+#include <linux/platform_device.h>
+#include <net/sock.h>
+#include <asm/uaccess.h>
+#include <asm/semaphore.h>
+#include <asm/uaccess.h>
+#include <asm/ifxmips/ifxmips.h>
+#include <asm/ifxmips/ifxmips_ioctl.h>
+
+#define MAX_PORTS                      2
+#define PINS_PER_PORT          16
+
+#define DRVNAME                                "ifxmips_gpio"
+
+static unsigned int ifxmips_gpio_major = 0;
+
+#ifdef CONFIG_IFXMIPS_GPIO_RST_BTN
+#define IFXMIPS_RST_PIN 15
+#define IFXMIPS_RST_PORT 1
+
+static struct timer_list rst_button_timer;
+
+extern struct sock *uevent_sock;
+extern u64 uevent_next_seqnum(void);
+static unsigned long seen;
+static int pressed = 0;
+
+struct event_t {
+       struct work_struct wq;
+       int set;
+       unsigned long jiffies;
+};
+#endif
+
+/* TODO do we need this ? */
+static struct semaphore port_sem;
+
+/* TODO do we really need this ? return in a define is forbidden by coding style */
+#define IFXMIPS_GPIO_SANITY            {if (port > MAX_PORTS || pin > PINS_PER_PORT) return -EINVAL; }
+
+int
+ifxmips_port_reserve_pin (unsigned int port, unsigned int pin)
+{
+       IFXMIPS_GPIO_SANITY;
+       printk("%s : call to obseleted function\n", __func__);
+
+       return 0;
+}
+EXPORT_SYMBOL(ifxmips_port_reserve_pin);
+
+int
+ifxmips_port_free_pin (unsigned int port, unsigned int pin)
+{
+       IFXMIPS_GPIO_SANITY;
+       printk("%s : call to obseleted function\n", __func__);
+
+       return 0;
+}
+EXPORT_SYMBOL(ifxmips_port_free_pin);
+
+int
+ifxmips_port_set_open_drain (unsigned int port, unsigned int pin)
+{
+       IFXMIPS_GPIO_SANITY;
+       ifxmips_w32(ifxmips_r32(IFXMIPS_GPIO_P0_OD + (port * 0xC)) | (1 << pin), IFXMIPS_GPIO_P0_OD + (port * 0xC));
+
+       return 0;
+}
+EXPORT_SYMBOL(ifxmips_port_set_open_drain);
+
+int
+ifxmips_port_clear_open_drain (unsigned int port, unsigned int pin)
+{
+       IFXMIPS_GPIO_SANITY;
+       ifxmips_w32(ifxmips_r32(IFXMIPS_GPIO_P0_OD + (port * 0xC)) & ~(1 << pin), IFXMIPS_GPIO_P0_OD + (port * 0xC));
+
+       return 0;
+}
+EXPORT_SYMBOL(ifxmips_port_clear_open_drain);
+
+int
+ifxmips_port_set_pudsel (unsigned int port, unsigned int pin)
+{
+    IFXMIPS_GPIO_SANITY;
+       ifxmips_w32(ifxmips_r32(IFXMIPS_GPIO_P0_PUDSEL + (port * 0xC)) | (1 << pin), IFXMIPS_GPIO_P0_PUDSEL + (port * 0xC));
+
+       return 0;
+}
+EXPORT_SYMBOL(ifxmips_port_set_pudsel);
+
+int
+ifxmips_port_clear_pudsel (unsigned int port, unsigned int pin)
+{
+    IFXMIPS_GPIO_SANITY;
+       ifxmips_w32(ifxmips_r32(IFXMIPS_GPIO_P0_PUDSEL + (port * 0xC)) & ~(1 << pin), IFXMIPS_GPIO_P0_PUDSEL + (port * 0xC));
+
+       return 0;
+}
+EXPORT_SYMBOL(ifxmips_port_clear_pudsel);
+
+int
+ifxmips_port_set_puden (unsigned int port, unsigned int pin)
+{
+    IFXMIPS_GPIO_SANITY;
+       ifxmips_w32(ifxmips_r32(IFXMIPS_GPIO_P0_PUDEN + (port * 0xC)) | (1 << pin), IFXMIPS_GPIO_P0_PUDEN + (port * 0xC));
+
+       return 0;
+}
+EXPORT_SYMBOL(ifxmips_port_set_puden);
+
+int
+ifxmips_port_clear_puden (unsigned int port, unsigned int pin)
+{
+    IFXMIPS_GPIO_SANITY;
+       ifxmips_w32(ifxmips_r32(IFXMIPS_GPIO_P0_PUDEN + (port * 0xC)) & ~(1 << pin), IFXMIPS_GPIO_P0_PUDEN + (port * 0xC));
+
+       return 0;
+}
+EXPORT_SYMBOL(ifxmips_port_clear_puden);
+
+int
+ifxmips_port_set_stoff (unsigned int port, unsigned int pin)
+{
+    IFXMIPS_GPIO_SANITY;
+       ifxmips_w32(ifxmips_r32(IFXMIPS_GPIO_P0_STOFF + (port * 0xC)) | (1 << pin), IFXMIPS_GPIO_P0_STOFF + (port * 0xC));
+
+       return 0;
+}
+EXPORT_SYMBOL(ifxmips_port_set_stoff);
+
+int
+ifxmips_port_clear_stoff (unsigned int port, unsigned int pin)
+{
+    IFXMIPS_GPIO_SANITY;
+       ifxmips_w32(ifxmips_r32(IFXMIPS_GPIO_P0_STOFF + (port * 0xC)) & ~(1 << pin), IFXMIPS_GPIO_P0_STOFF + (port * 0xC));
+
+       return 0;
+}
+EXPORT_SYMBOL(ifxmips_port_clear_stoff);
+
+int
+ifxmips_port_set_dir_out (unsigned int port, unsigned int pin)
+{
+    IFXMIPS_GPIO_SANITY;
+       ifxmips_w32(ifxmips_r32(IFXMIPS_GPIO_P0_DIR + (port * 0xC)) | (1 << pin), IFXMIPS_GPIO_P0_DIR + (port * 0xC));
+
+       return 0;
+}
+EXPORT_SYMBOL(ifxmips_port_set_dir_out);
+
+int
+ifxmips_port_set_dir_in (unsigned int port, unsigned int pin)
+{
+    IFXMIPS_GPIO_SANITY;
+       ifxmips_w32(ifxmips_r32(IFXMIPS_GPIO_P0_DIR + (port * 0xC)) & ~(1 << pin), IFXMIPS_GPIO_P0_DIR + (port * 0xC));
+
+       return 0;
+}
+EXPORT_SYMBOL(ifxmips_port_set_dir_in);
+
+int
+ifxmips_port_set_output (unsigned int port, unsigned int pin)
+{
+    IFXMIPS_GPIO_SANITY;
+       ifxmips_w32(ifxmips_r32(IFXMIPS_GPIO_P0_OUT + (port * 0xC)) | (1 << pin), IFXMIPS_GPIO_P0_OUT + (port * 0xC));
+
+       return 0;
+}
+EXPORT_SYMBOL(ifxmips_port_set_output);
+
+int
+ifxmips_port_clear_output (unsigned int port, unsigned int pin)
+{
+    IFXMIPS_GPIO_SANITY;
+       ifxmips_w32(ifxmips_r32(IFXMIPS_GPIO_P0_OUT + (port * 0xC)) & ~(1 << pin), IFXMIPS_GPIO_P0_OUT + (port * 0xC));
+
+       return 0;
+}
+EXPORT_SYMBOL(ifxmips_port_clear_output);
+
+int
+ifxmips_port_get_input (unsigned int port, unsigned int pin)
+{
+    IFXMIPS_GPIO_SANITY;
+
+       if (ifxmips_r32(IFXMIPS_GPIO_P0_IN + (port * 0xC)) & (1 << pin))
+               return 0;
+       else
+               return 1;
+}
+EXPORT_SYMBOL(ifxmips_port_get_input);
+
+int
+ifxmips_port_set_altsel0 (unsigned int port, unsigned int pin)
+{
+    IFXMIPS_GPIO_SANITY;
+       ifxmips_w32(ifxmips_r32(IFXMIPS_GPIO_P0_ALTSEL0 + (port * 0xC)) | (1 << pin), IFXMIPS_GPIO_P0_ALTSEL0 + (port * 0xC));
+
+       return 0;
+}
+EXPORT_SYMBOL(ifxmips_port_set_altsel0);
+
+int
+ifxmips_port_clear_altsel0 (unsigned int port, unsigned int pin)
+{
+    IFXMIPS_GPIO_SANITY;
+       ifxmips_w32(ifxmips_r32(IFXMIPS_GPIO_P0_ALTSEL0 + (port * 0xC)) & ~(1 << pin), IFXMIPS_GPIO_P0_ALTSEL0 + (port * 0xC));
+
+       return 0;
+}
+EXPORT_SYMBOL(ifxmips_port_clear_altsel0);
+
+int
+ifxmips_port_set_altsel1 (unsigned int port, unsigned int pin)
+{
+    IFXMIPS_GPIO_SANITY;
+       ifxmips_w32(ifxmips_r32(IFXMIPS_GPIO_P0_ALTSEL1 + (port * 0xC)) | (1 << pin), IFXMIPS_GPIO_P0_ALTSEL1 + (port * 0xC));
+
+       return 0;
+}
+EXPORT_SYMBOL(ifxmips_port_set_altsel1);
+
+int
+ifxmips_port_clear_altsel1 (unsigned int port, unsigned int pin)
+{
+    IFXMIPS_GPIO_SANITY;
+       ifxmips_w32(ifxmips_r32(IFXMIPS_GPIO_P0_ALTSEL1 + (port * 0xC)) & ~(1 << pin), IFXMIPS_GPIO_P0_ALTSEL1 + (port * 0xC));
+
+       return 0;
+}
+EXPORT_SYMBOL(ifxmips_port_clear_altsel1);
+
+#ifdef CONFIG_IFXMIPS_GPIO_RST_BTN
+static inline void add_msg(struct sk_buff *skb, char *msg)
+{
+       char *scratch;
+       scratch = skb_put(skb, strlen(msg) + 1);
+       sprintf(scratch, msg);
+}
+
+static void hotplug_button(struct work_struct *wq)
+{
+       struct sk_buff *skb;
+       struct event_t *event;
+       size_t len;
+       char *scratch, *s;
+       char buf[128];
+
+       event = container_of(wq, struct event_t, wq);
+       if (!uevent_sock)
+               goto done;
+
+       /* allocate message with the maximum possible size */
+       s = event->set ? "pressed" : "released";
+       len = strlen(s) + 2;
+       skb = alloc_skb(len + 2048, GFP_KERNEL);
+       if (!skb)
+               goto done;
+
+       /* add header */
+       scratch = skb_put(skb, len);
+       sprintf(scratch, "%s@",s);
+
+       /* copy keys to our continuous event payload buffer */
+       add_msg(skb, "HOME=/");
+       add_msg(skb, "PATH=/sbin:/bin:/usr/sbin:/usr/bin");
+       add_msg(skb, "SUBSYSTEM=button");
+       add_msg(skb, "BUTTON=reset");
+       add_msg(skb, (event->set ? "ACTION=pressed" : "ACTION=released"));
+       sprintf(buf, "SEEN=%ld", (event->jiffies - seen)/HZ);
+       add_msg(skb, buf);
+       snprintf(buf, 128, "SEQNUM=%llu", uevent_next_seqnum());
+       add_msg(skb, buf);
+
+       NETLINK_CB(skb).dst_group = 1;
+       netlink_broadcast(uevent_sock, skb, 0, 1, GFP_KERNEL);
+
+done:
+       kfree(event);
+}
+
+static void reset_button_poll(unsigned long unused)
+{
+       struct event_t *event;
+
+       rst_button_timer.expires = jiffies + HZ;
+       add_timer(&rst_button_timer);
+
+       if (pressed != ifxmips_port_get_input(IFXMIPS_RST_PORT, IFXMIPS_RST_PIN))
+       {
+               if(pressed)
+                       pressed = 0;
+               else
+                       pressed = 1;
+               printk("button was %s\n", (pressed ? "pressed" : "released"));
+               event = (struct event_t *) kzalloc(sizeof(struct event_t), GFP_ATOMIC);
+               if (!event)
+               {
+                       printk("Could not alloc hotplug event\n");
+                       return;
+               }
+               event->set = pressed;
+               event->jiffies = jiffies;
+               INIT_WORK(&event->wq, (void *)(void *)hotplug_button);
+               schedule_work(&event->wq);
+               seen = jiffies;
+       }
+}
+#endif
+
+static int
+ifxmips_gpio_probe (struct platform_device *dev)
+{
+       int retval = 0;
+
+       sema_init (&port_sem, 1);
+
+#ifdef CONFIG_IFXMIPS_GPIO_RST_BTN
+       ifxmips_port_set_open_drain(IFXMIPS_RST_PORT, IFXMIPS_RST_PIN);
+       ifxmips_port_clear_altsel0(IFXMIPS_RST_PORT, IFXMIPS_RST_PIN);
+       ifxmips_port_clear_altsel1(IFXMIPS_RST_PORT, IFXMIPS_RST_PIN);
+       ifxmips_port_set_dir_in(IFXMIPS_RST_PORT, IFXMIPS_RST_PIN);
+
+       seen = jiffies;
+
+       init_timer(&rst_button_timer);
+       rst_button_timer.function = reset_button_poll;
+       rst_button_timer.expires = jiffies + HZ;
+       add_timer(&rst_button_timer);
+#endif
+
+       printk(KERN_INFO DRVNAME ": device successfully initialized #%d.\n", ifxmips_gpio_major);
+
+       return retval;
+}
+
+static int
+ifxmips_gpio_remove (struct platform_device *pdev)
+{
+#ifdef CONFIG_IFXMIPS_GPIO_RST_BTN
+       del_timer_sync(&rst_button_timer);
+#endif
+       unregister_chrdev(ifxmips_gpio_major, DRVNAME);
+
+       return 0;
+}
+
+static struct
+platform_driver ifxmips_gpio_driver = {
+       .probe = ifxmips_gpio_probe,
+       .remove = ifxmips_gpio_remove,
+       .driver = {
+               .name = DRVNAME,
+               .owner = THIS_MODULE,
+       },
+};
+
+int __init
+ifxmips_gpio_init (void)
+{
+       int ret = platform_driver_register(&ifxmips_gpio_driver);
+       if (ret)
+               printk(KERN_INFO DRVNAME ": Error registering platfom driver!");
+       return ret;
+}
+
+void __exit
+ifxmips_gpio_exit (void)
+{
+       platform_driver_unregister(&ifxmips_gpio_driver);
+}
+
+module_init(ifxmips_gpio_init);
+module_exit(ifxmips_gpio_exit);
index 4953c60..1b2aef3 100644 (file)
 #include <asm/ifxmips/ifxmips.h>
 
 static void
-ifxmips_machine_restart (char *command)
+ifxmips_machine_restart(char *command)
 {
-       printk (KERN_NOTICE "System restart\n");
-       local_irq_disable ();
+       printk(KERN_NOTICE "System restart\n");
+       local_irq_disable();
 
-       ifxmips_w32(ifxmips_r32(IFXMIPS_RCU_REQ) | IFXMIPS_RST_ALL, IFXMIPS_RCU_REQ);
-       for (;;);
+       ifxmips_w32(ifxmips_r32(IFXMIPS_RCU_RST) | IFXMIPS_RCU_RST_ALL, IFXMIPS_RCU_RST);
+       for(;;);
 }
 
 static void
-ifxmips_machine_halt (void)
+ifxmips_machine_halt(void)
 {
-       printk (KERN_NOTICE "System halted.\n");
-       local_irq_disable ();
-       for (;;);
+       printk(KERN_NOTICE "System halted.\n");
+       local_irq_disable();
+       for(;;);
 }
 
 static void
-ifxmips_machine_power_off (void)
+ifxmips_machine_power_off(void)
 {
        printk (KERN_NOTICE "Please turn off the power now.\n");
-       local_irq_disable ();
-       for (;;);
+       local_irq_disable();
+       for(;;);
 }
 
 void
-ifxmips_reboot_setup (void)
+ifxmips_reboot_setup(void)
 {
        _machine_restart = ifxmips_machine_restart;
        _machine_halt = ifxmips_machine_halt;
diff --git a/target/linux/ifxmips/files/drivers/char/ifxmips_gpio.c b/target/linux/ifxmips/files/drivers/char/ifxmips_gpio.c
deleted file mode 100644 (file)
index 8beb0b8..0000000
+++ /dev/null
@@ -1,407 +0,0 @@
-/*
- *   This program is free software; you can redistribute it and/or modify
- *   it under the terms of the GNU General Public License as published by
- *   the Free Software Foundation; either version 2 of the License, or
- *   (at your option) any later version.
- *
- *   This program is distributed in the hope that it will be useful,
- *   but WITHOUT ANY WARRANTY; without even the implied warranty of
- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *   GNU General Public License for more details.
- *
- *   You should have received a copy of the GNU General Public License
- *   along with this program; if not, write to the Free Software
- *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA.
- *
- *   Copyright (C) 2005 infineon
- *   Copyright (C) 2007 John Crispin <blogic@openwrt.org> 
- *
- */
-
-#include <linux/module.h>
-#include <linux/types.h>
-#include <linux/errno.h>
-#include <linux/proc_fs.h>
-#include <linux/init.h>
-#include <linux/ioctl.h>
-#include <linux/timer.h>
-#include <linux/module.h>
-#include <linux/timer.h>
-#include <linux/interrupt.h>
-#include <linux/kobject.h>
-#include <linux/workqueue.h>
-#include <linux/skbuff.h>
-#include <linux/netlink.h>
-#include <linux/platform_device.h>
-#include <net/sock.h>
-#include <asm/uaccess.h>
-#include <asm/semaphore.h>
-#include <asm/uaccess.h>
-#include <asm/ifxmips/ifxmips.h>
-#include <asm/ifxmips/ifxmips_ioctl.h>
-
-#define MAX_PORTS                      2
-#define PINS_PER_PORT          16
-
-#define DRVNAME                                "ifxmips_gpio"
-
-static unsigned int ifxmips_gpio_major = 0;
-
-#ifdef CONFIG_IFXMIPS_GPIO_RST_BTN
-#define IFXMIPS_RST_PIN 15
-#define IFXMIPS_RST_PORT 1
-
-static struct timer_list rst_button_timer;
-
-extern struct sock *uevent_sock;
-extern u64 uevent_next_seqnum(void);
-static unsigned long seen;
-static int pressed = 0;
-
-struct event_t {
-       struct work_struct wq;
-       int set;
-       unsigned long jiffies;
-};
-#endif
-
-/* TODO do we need this ? */
-static struct semaphore port_sem;
-
-/* TODO do we really need this ? return in a define is forbidden by coding style */
-#define IFXMIPS_GPIO_SANITY            {if (port > MAX_PORTS || pin > PINS_PER_PORT) return -EINVAL; }
-
-int
-ifxmips_port_reserve_pin (unsigned int port, unsigned int pin)
-{
-       IFXMIPS_GPIO_SANITY;
-       printk("%s : call to obseleted function\n", __func__);
-
-       return 0;
-}
-EXPORT_SYMBOL(ifxmips_port_reserve_pin);
-
-int
-ifxmips_port_free_pin (unsigned int port, unsigned int pin)
-{
-       IFXMIPS_GPIO_SANITY;
-       printk("%s : call to obseleted function\n", __func__);
-
-       return 0;
-}
-EXPORT_SYMBOL(ifxmips_port_free_pin);
-
-int
-ifxmips_port_set_open_drain (unsigned int port, unsigned int pin)
-{
-       IFXMIPS_GPIO_SANITY;
-       ifxmips_w32(ifxmips_r32(IFXMIPS_GPIO_P0_OD + (port * 0xC)) | (1 << pin), IFXMIPS_GPIO_P0_OD + (port * 0xC));
-
-       return 0;
-}
-EXPORT_SYMBOL(ifxmips_port_set_open_drain);
-
-int
-ifxmips_port_clear_open_drain (unsigned int port, unsigned int pin)
-{
-       IFXMIPS_GPIO_SANITY;
-       ifxmips_w32(ifxmips_r32(IFXMIPS_GPIO_P0_OD + (port * 0xC)) & ~(1 << pin), IFXMIPS_GPIO_P0_OD + (port * 0xC));
-
-       return 0;
-}
-EXPORT_SYMBOL(ifxmips_port_clear_open_drain);
-
-int
-ifxmips_port_set_pudsel (unsigned int port, unsigned int pin)
-{
-    IFXMIPS_GPIO_SANITY;
-       ifxmips_w32(ifxmips_r32(IFXMIPS_GPIO_P0_PUDSEL + (port * 0xC)) | (1 << pin), IFXMIPS_GPIO_P0_PUDSEL + (port * 0xC));
-
-       return 0;
-}
-EXPORT_SYMBOL(ifxmips_port_set_pudsel);
-
-int
-ifxmips_port_clear_pudsel (unsigned int port, unsigned int pin)
-{
-    IFXMIPS_GPIO_SANITY;
-       ifxmips_w32(ifxmips_r32(IFXMIPS_GPIO_P0_PUDSEL + (port * 0xC)) & ~(1 << pin), IFXMIPS_GPIO_P0_PUDSEL + (port * 0xC));
-
-       return 0;
-}
-EXPORT_SYMBOL(ifxmips_port_clear_pudsel);
-
-int
-ifxmips_port_set_puden (unsigned int port, unsigned int pin)
-{
-    IFXMIPS_GPIO_SANITY;
-       ifxmips_w32(ifxmips_r32(IFXMIPS_GPIO_P0_PUDEN + (port * 0xC)) | (1 << pin), IFXMIPS_GPIO_P0_PUDEN + (port * 0xC));
-
-       return 0;
-}
-EXPORT_SYMBOL(ifxmips_port_set_puden);
-
-int
-ifxmips_port_clear_puden (unsigned int port, unsigned int pin)
-{
-    IFXMIPS_GPIO_SANITY;
-       ifxmips_w32(ifxmips_r32(IFXMIPS_GPIO_P0_PUDEN + (port * 0xC)) & ~(1 << pin), IFXMIPS_GPIO_P0_PUDEN + (port * 0xC));
-
-       return 0;
-}
-EXPORT_SYMBOL(ifxmips_port_clear_puden);
-
-int
-ifxmips_port_set_stoff (unsigned int port, unsigned int pin)
-{
-    IFXMIPS_GPIO_SANITY;
-       ifxmips_w32(ifxmips_r32(IFXMIPS_GPIO_P0_STOFF + (port * 0xC)) | (1 << pin), IFXMIPS_GPIO_P0_STOFF + (port * 0xC));
-
-       return 0;
-}
-EXPORT_SYMBOL(ifxmips_port_set_stoff);
-
-int
-ifxmips_port_clear_stoff (unsigned int port, unsigned int pin)
-{
-    IFXMIPS_GPIO_SANITY;
-       ifxmips_w32(ifxmips_r32(IFXMIPS_GPIO_P0_STOFF + (port * 0xC)) & ~(1 << pin), IFXMIPS_GPIO_P0_STOFF + (port * 0xC));
-
-       return 0;
-}
-EXPORT_SYMBOL(ifxmips_port_clear_stoff);
-
-int
-ifxmips_port_set_dir_out (unsigned int port, unsigned int pin)
-{
-    IFXMIPS_GPIO_SANITY;
-       ifxmips_w32(ifxmips_r32(IFXMIPS_GPIO_P0_DIR + (port * 0xC)) | (1 << pin), IFXMIPS_GPIO_P0_DIR + (port * 0xC));
-
-       return 0;
-}
-EXPORT_SYMBOL(ifxmips_port_set_dir_out);
-
-int
-ifxmips_port_set_dir_in (unsigned int port, unsigned int pin)
-{
-    IFXMIPS_GPIO_SANITY;
-       ifxmips_w32(ifxmips_r32(IFXMIPS_GPIO_P0_DIR + (port * 0xC)) & ~(1 << pin), IFXMIPS_GPIO_P0_DIR + (port * 0xC));
-
-       return 0;
-}
-EXPORT_SYMBOL(ifxmips_port_set_dir_in);
-
-int
-ifxmips_port_set_output (unsigned int port, unsigned int pin)
-{
-    IFXMIPS_GPIO_SANITY;
-       ifxmips_w32(ifxmips_r32(IFXMIPS_GPIO_P0_OUT + (port * 0xC)) | (1 << pin), IFXMIPS_GPIO_P0_OUT + (port * 0xC));
-
-       return 0;
-}
-EXPORT_SYMBOL(ifxmips_port_set_output);
-
-int
-ifxmips_port_clear_output (unsigned int port, unsigned int pin)
-{
-    IFXMIPS_GPIO_SANITY;
-       ifxmips_w32(ifxmips_r32(IFXMIPS_GPIO_P0_OUT + (port * 0xC)) & ~(1 << pin), IFXMIPS_GPIO_P0_OUT + (port * 0xC));
-
-       return 0;
-}
-EXPORT_SYMBOL(ifxmips_port_clear_output);
-
-int
-ifxmips_port_get_input (unsigned int port, unsigned int pin)
-{
-    IFXMIPS_GPIO_SANITY;
-
-       if (ifxmips_r32(IFXMIPS_GPIO_P0_IN + (port * 0xC)) & (1 << pin))
-               return 0;
-       else
-               return 1;
-}
-EXPORT_SYMBOL(ifxmips_port_get_input);
-
-int
-ifxmips_port_set_altsel0 (unsigned int port, unsigned int pin)
-{
-    IFXMIPS_GPIO_SANITY;
-       ifxmips_w32(ifxmips_r32(IFXMIPS_GPIO_P0_ALTSEL0 + (port * 0xC)) | (1 << pin), IFXMIPS_GPIO_P0_ALTSEL0 + (port * 0xC));
-
-       return 0;
-}
-EXPORT_SYMBOL(ifxmips_port_set_altsel0);
-
-int
-ifxmips_port_clear_altsel0 (unsigned int port, unsigned int pin)
-{
-    IFXMIPS_GPIO_SANITY;
-       ifxmips_w32(ifxmips_r32(IFXMIPS_GPIO_P0_ALTSEL0 + (port * 0xC)) & ~(1 << pin), IFXMIPS_GPIO_P0_ALTSEL0 + (port * 0xC));
-
-       return 0;
-}
-EXPORT_SYMBOL(ifxmips_port_clear_altsel0);
-
-int
-ifxmips_port_set_altsel1 (unsigned int port, unsigned int pin)
-{
-    IFXMIPS_GPIO_SANITY;
-       ifxmips_w32(ifxmips_r32(IFXMIPS_GPIO_P0_ALTSEL1 + (port * 0xC)) | (1 << pin), IFXMIPS_GPIO_P0_ALTSEL1 + (port * 0xC));
-
-       return 0;
-}
-EXPORT_SYMBOL(ifxmips_port_set_altsel1);
-
-int
-ifxmips_port_clear_altsel1 (unsigned int port, unsigned int pin)
-{
-    IFXMIPS_GPIO_SANITY;
-       ifxmips_w32(ifxmips_r32(IFXMIPS_GPIO_P0_ALTSEL1 + (port * 0xC)) & ~(1 << pin), IFXMIPS_GPIO_P0_ALTSEL1 + (port * 0xC));
-
-       return 0;
-}
-EXPORT_SYMBOL(ifxmips_port_clear_altsel1);
-
-#ifdef CONFIG_IFXMIPS_GPIO_RST_BTN
-static inline void add_msg(struct sk_buff *skb, char *msg)
-{
-       char *scratch;
-       scratch = skb_put(skb, strlen(msg) + 1);
-       sprintf(scratch, msg);
-}
-
-static void hotplug_button(struct work_struct *wq)
-{
-       struct sk_buff *skb;
-       struct event_t *event;
-       size_t len;
-       char *scratch, *s;
-       char buf[128];
-
-       event = container_of(wq, struct event_t, wq);
-       if (!uevent_sock)
-               goto done;
-
-       /* allocate message with the maximum possible size */
-       s = event->set ? "pressed" : "released";
-       len = strlen(s) + 2;
-       skb = alloc_skb(len + 2048, GFP_KERNEL);
-       if (!skb)
-               goto done;
-
-       /* add header */
-       scratch = skb_put(skb, len);
-       sprintf(scratch, "%s@",s);
-
-       /* copy keys to our continuous event payload buffer */
-       add_msg(skb, "HOME=/");
-       add_msg(skb, "PATH=/sbin:/bin:/usr/sbin:/usr/bin");
-       add_msg(skb, "SUBSYSTEM=button");
-       add_msg(skb, "BUTTON=reset");
-       add_msg(skb, (event->set ? "ACTION=pressed" : "ACTION=released"));
-       sprintf(buf, "SEEN=%ld", (event->jiffies - seen)/HZ);
-       add_msg(skb, buf);
-       snprintf(buf, 128, "SEQNUM=%llu", uevent_next_seqnum());
-       add_msg(skb, buf);
-
-       NETLINK_CB(skb).dst_group = 1;
-       netlink_broadcast(uevent_sock, skb, 0, 1, GFP_KERNEL);
-
-done:
-       kfree(event);
-}
-
-static void reset_button_poll(unsigned long unused)
-{
-       struct event_t *event;
-
-       rst_button_timer.expires = jiffies + HZ;
-       add_timer(&rst_button_timer);
-
-       if (pressed != ifxmips_port_get_input(IFXMIPS_RST_PORT, IFXMIPS_RST_PIN))
-       {
-               if(pressed)
-                       pressed = 0;
-               else
-                       pressed = 1;
-               printk("button was %s\n", (pressed ? "pressed" : "released"));
-               event = (struct event_t *) kzalloc(sizeof(struct event_t), GFP_ATOMIC);
-               if (!event)
-               {
-                       printk("Could not alloc hotplug event\n");
-                       return;
-               }
-               event->set = pressed;
-               event->jiffies = jiffies;
-               INIT_WORK(&event->wq, (void *)(void *)hotplug_button);
-               schedule_work(&event->wq);
-               seen = jiffies;
-       }
-}
-#endif
-
-static int
-ifxmips_gpio_probe (struct platform_device *dev)
-{
-       int retval = 0;
-
-       sema_init (&port_sem, 1);
-
-#ifdef CONFIG_IFXMIPS_GPIO_RST_BTN
-       ifxmips_port_set_open_drain(IFXMIPS_RST_PORT, IFXMIPS_RST_PIN);
-       ifxmips_port_clear_altsel0(IFXMIPS_RST_PORT, IFXMIPS_RST_PIN);
-       ifxmips_port_clear_altsel1(IFXMIPS_RST_PORT, IFXMIPS_RST_PIN);
-       ifxmips_port_set_dir_in(IFXMIPS_RST_PORT, IFXMIPS_RST_PIN);
-
-       seen = jiffies;
-
-       init_timer(&rst_button_timer);
-       rst_button_timer.function = reset_button_poll;
-       rst_button_timer.expires = jiffies + HZ;
-       add_timer(&rst_button_timer);
-#endif
-
-       printk(KERN_INFO DRVNAME ": device successfully initialized #%d.\n", ifxmips_gpio_major);
-
-       return retval;
-}
-
-static int
-ifxmips_gpio_remove (struct platform_device *pdev)
-{
-#ifdef CONFIG_IFXMIPS_GPIO_RST_BTN
-       del_timer_sync(&rst_button_timer);
-#endif
-       unregister_chrdev(ifxmips_gpio_major, DRVNAME);
-
-       return 0;
-}
-
-static struct
-platform_driver ifxmips_gpio_driver = {
-       .probe = ifxmips_gpio_probe,
-       .remove = ifxmips_gpio_remove,
-       .driver = {
-               .name = DRVNAME,
-               .owner = THIS_MODULE,
-       },
-};
-
-int __init
-ifxmips_gpio_init (void)
-{
-       int ret = platform_driver_register(&ifxmips_gpio_driver);
-       if (ret)
-               printk(KERN_INFO DRVNAME ": Error registering platfom driver!");
-       return ret;
-}
-
-void __exit
-ifxmips_gpio_exit (void)
-{
-       platform_driver_unregister(&ifxmips_gpio_driver);
-}
-
-module_init(ifxmips_gpio_init);
-module_exit(ifxmips_gpio_exit);
index 91e17a9..e8787c5 100644 (file)
@@ -725,9 +725,9 @@ mei_fuse_prg (void)
 {
        u32 reg_data, fuse_value;
        int i = 0;
-       meiLongwordRead ( IFXMIPS_RCU_REQ, &reg_data);
+       meiLongwordRead ( IFXMIPS_RCU_RST, &reg_data);
        while ((reg_data & 0x10000000) == 0) {
-               meiLongwordRead ( IFXMIPS_RCU_REQ, &reg_data);
+               meiLongwordRead ( IFXMIPS_RCU_RST, &reg_data);
                //add a watchdog
                i++;
                /* 0x4000 translate to  about 16 ms@111M, so should be enough */
@@ -736,8 +736,8 @@ mei_fuse_prg (void)
        }
        // STEP a: Prepare memory for external accesses
        // Write fuse_en bit24
-       meiLongwordRead (IFXMIPS_RCU_REQ, &reg_data);
-       meiLongwordWrite (IFXMIPS_RCU_REQ, reg_data | (1 << 24));
+       meiLongwordRead (IFXMIPS_RCU_RST, &reg_data);
+       meiLongwordWrite (IFXMIPS_RCU_RST, reg_data | (1 << 24));
 
        mei_fuse_rar_init ();
        for (i = 0; i < 4; i++) {
@@ -795,8 +795,8 @@ mei_fuse_prg (void)
                        break;
                }
        }
-       meiLongwordRead (IFXMIPS_RCU_REQ, &reg_data);
-       meiLongwordWrite (IFXMIPS_RCU_REQ, reg_data & 0xF7FFFFFF);
+       meiLongwordRead (IFXMIPS_RCU_RST, &reg_data);
+       meiLongwordWrite (IFXMIPS_RCU_RST, reg_data & 0xF7FFFFFF);
 }
 
 /**
@@ -912,11 +912,11 @@ meiResetARC (void)
 
        meiHaltArc ();
 
-       meiLongwordRead (IFXMIPS_RCU_REQ, &arc_debug_data);
-       meiLongwordWrite (IFXMIPS_RCU_REQ,
+       meiLongwordRead (IFXMIPS_RCU_RST, &arc_debug_data);
+       meiLongwordWrite (IFXMIPS_RCU_RST,
                          arc_debug_data | IFXMIPS_RCU_RST_REQ_DFE |
                          IFXMIPS_RCU_RST_REQ_AFE);
-       meiLongwordWrite (IFXMIPS_RCU_REQ, arc_debug_data);
+       meiLongwordWrite (IFXMIPS_RCU_RST, arc_debug_data);
        // reset ARC
        meiLongwordWrite(MEI_RST_CONTROL, MEI_SOFT_RESET);
        meiLongwordWrite(MEI_RST_CONTROL, 0);
@@ -2769,8 +2769,8 @@ mei_ioctl (MEI_inode_t * ino, MEI_file_t * fil, unsigned int command,
                        *IFXMIPS_GPIO_P0_OD = (*IFXMIPS_GPIO_P0_OD) | 0x800;
 
                        //enable ARC JTAG
-                       meiLongwordRead(IFXMIPS_RCU_REQ, &reg_data);
-                       meiLongwordWrite(IFXMIPS_RCU_REQ, reg_data | IFXMIPS_RCU_RST_REQ_ARC_JTAG);
+                       meiLongwordRead(IFXMIPS_RCU_RST, &reg_data);
+                       meiLongwordWrite(IFXMIPS_RCU_RST, reg_data | IFXMIPS_RCU_RST_REQ_ARC_JTAG);
                        break;
 
                case GET_ADSL_LOOP_DIAGNOSTICS_MODE:
index a2fba85..7091081 100644 (file)
@@ -1,11 +1,12 @@
---- a/drivers/char/Makefile
-+++ b/drivers/char/Makefile
-@@ -113,6 +113,12 @@
+Index: linux-2.6.25.7/drivers/char/Makefile
+===================================================================
+--- linux-2.6.25.7.orig/drivers/char/Makefile  2008-06-18 00:34:41.000000000 +0200
++++ linux-2.6.25.7/drivers/char/Makefile       2008-06-18 00:36:56.000000000 +0200
+@@ -113,6 +113,11 @@
  obj-$(CONFIG_JS_RTC)          += js-rtc.o
  js-rtc-y = rtc.o
  
 +obj-$(CONFIG_IFXMIPS_LED)  += ifxmips_led.o
-+obj-$(CONFIG_IFXMIPS_GPIO) += ifxmips_gpio.o
 +obj-$(CONFIG_IFXMIPS_SSC)  += ifxmips_ssc.o
 +obj-$(CONFIG_IFXMIPS_EEPROM)   += ifxmips_eeprom.o
 +obj-$(CONFIG_IFXMIPS_MEI)  += ifxmips_mei_core.o
  # Files generated that shall be removed upon make clean
  clean-files := consolemap_deftbl.c defkeymap.c
  
---- a/drivers/mtd/maps/Makefile
-+++ b/drivers/mtd/maps/Makefile
+Index: linux-2.6.25.7/drivers/mtd/maps/Makefile
+===================================================================
+--- linux-2.6.25.7.orig/drivers/mtd/maps/Makefile      2008-06-18 00:34:41.000000000 +0200
++++ linux-2.6.25.7/drivers/mtd/maps/Makefile   2008-06-18 00:36:56.000000000 +0200
 @@ -68,3 +68,4 @@
  obj-$(CONFIG_MTD_OMAP_NOR)    += omap_nor.o
  obj-$(CONFIG_MTD_MTX1)                += mtx-1_flash.o
  obj-$(CONFIG_MTD_INTEL_VR_NOR)        += intel_vr_nor.o
 +obj-$(CONFIG_MTD_IFXMIPS)  += ifxmips.o
---- a/drivers/net/Kconfig
-+++ b/drivers/net/Kconfig
+Index: linux-2.6.25.7/drivers/net/Kconfig
+===================================================================
+--- linux-2.6.25.7.orig/drivers/net/Kconfig    2008-06-18 00:34:41.000000000 +0200
++++ linux-2.6.25.7/drivers/net/Kconfig 2008-06-18 00:36:56.000000000 +0200
 @@ -351,6 +351,12 @@
  
  source "drivers/net/arm/Kconfig"
  config AX88796
        tristate "ASIX AX88796 NE2000 clone support"
        depends on ARM || MIPS || SUPERH
---- a/drivers/serial/Kconfig
-+++ b/drivers/serial/Kconfig
+Index: linux-2.6.25.7/drivers/serial/Kconfig
+===================================================================
+--- linux-2.6.25.7.orig/drivers/serial/Kconfig 2008-06-18 00:34:41.000000000 +0200
++++ linux-2.6.25.7/drivers/serial/Kconfig      2008-06-18 00:36:56.000000000 +0200
 @@ -1327,6 +1327,14 @@
          Currently, only 8250 compatible ports are supported, but
          others can easily be added.
  config SERIAL_QE
        tristate "Freescale QUICC Engine serial port support"
        depends on QUICC_ENGINE
---- a/drivers/serial/Makefile
-+++ b/drivers/serial/Makefile
+Index: linux-2.6.25.7/drivers/serial/Makefile
+===================================================================
+--- linux-2.6.25.7.orig/drivers/serial/Makefile        2008-06-18 00:34:41.000000000 +0200
++++ linux-2.6.25.7/drivers/serial/Makefile     2008-06-18 00:36:56.000000000 +0200
 @@ -66,4 +66,5 @@
  obj-$(CONFIG_SERIAL_NETX) += netx-serial.o
  obj-$(CONFIG_SERIAL_OF_PLATFORM) += of_serial.o
  obj-$(CONFIG_SERIAL_KS8695) += serial_ks8695.o
 +obj-$(CONFIG_SERIAL_IFXMIPS) += ifxmips_asc.o
  obj-$(CONFIG_SERIAL_QE) += ucc_uart.o
---- a/drivers/watchdog/Makefile
-+++ b/drivers/watchdog/Makefile
+Index: linux-2.6.25.7/drivers/watchdog/Makefile
+===================================================================
+--- linux-2.6.25.7.orig/drivers/watchdog/Makefile      2008-06-18 00:34:41.000000000 +0200
++++ linux-2.6.25.7/drivers/watchdog/Makefile   2008-06-18 00:36:56.000000000 +0200
 @@ -96,6 +96,7 @@
  obj-$(CONFIG_SIBYTE_WDOG) += sb_wdog.o
  obj-$(CONFIG_AR7_WDT) += ar7_wdt.o
  
  # PARISC Architecture
  
---- a/drivers/net/Makefile
-+++ b/drivers/net/Makefile
+Index: linux-2.6.25.7/drivers/net/Makefile
+===================================================================
+--- linux-2.6.25.7.orig/drivers/net/Makefile   2008-06-18 00:34:41.000000000 +0200
++++ linux-2.6.25.7/drivers/net/Makefile        2008-06-18 00:36:56.000000000 +0200
 @@ -254,3 +254,4 @@
  obj-$(CONFIG_NETXEN_NIC) += netxen/
  obj-$(CONFIG_NIU) += niu.o
  obj-$(CONFIG_VIRTIO_NET) += virtio_net.o
 +obj-$(CONFIG_IFXMIPS_MII0) += ifxmips_mii0.o
+Index: linux-2.6.25.7/drivers/crypto/Kconfig
+===================================================================
+--- linux-2.6.25.7.orig/drivers/crypto/Kconfig 2008-06-18 18:10:24.000000000 +0200
++++ linux-2.6.25.7/drivers/crypto/Kconfig      2008-06-18 18:11:46.000000000 +0200
+@@ -9,6 +9,9 @@
+         If you say N, all options in this submenu will be skipped and disabled.
+ if CRYPTO_HW
++config CRYPTO_DEV_IFXMIPS
++      tristate "Support for IFXMIPS Data Encryption Unit"
++      depends on IFXMIPS
+ config CRYPTO_DEV_PADLOCK
+       tristate "Support for VIA PadLock ACE"
+Index: linux-2.6.25.7/drivers/crypto/Makefile
+===================================================================
+--- linux-2.6.25.7.orig/drivers/crypto/Makefile        2008-06-18 18:09:30.000000000 +0200
++++ linux-2.6.25.7/drivers/crypto/Makefile     2008-06-18 18:10:18.000000000 +0200
+@@ -2,3 +2,4 @@
+ obj-$(CONFIG_CRYPTO_DEV_PADLOCK_SHA) += padlock-sha.o
+ obj-$(CONFIG_CRYPTO_DEV_GEODE) += geode-aes.o
+ obj-$(CONFIG_CRYPTO_DEV_HIFN_795X) += hifn_795x.o
++obj-$(CONFIG_CRYPTO_DEV_IFXMIPS) += ifxdeu-aes.o ifxdeu-des.o ifxdeu-dma.o ifxdeu-generic.o ifxdeu-md5.o ifxdeu-sha1.o