[SPARC]: Fix serial console device detection.
[safe/jmp/linux-2.6] / arch / sparc64 / kernel / power.c
index 946cee0..881a09e 100644 (file)
@@ -1,12 +1,8 @@
-/* $Id: power.c,v 1.10 2001/12/11 01:57:16 davem Exp $
- * power.c: Power management driver.
+/* power.c: Power management driver.
  *
- * Copyright (C) 1999 David S. Miller (davem@redhat.com)
+ * Copyright (C) 1999, 2007 David S. Miller (davem@davemloft.net)
  */
 
-#define __KERNEL_SYSCALLS__
-
-#include <linux/config.h>
 #include <linux/kernel.h>
 #include <linux/module.h>
 #include <linux/init.h>
 #include <linux/signal.h>
 #include <linux/delay.h>
 #include <linux/interrupt.h>
+#include <linux/pm.h>
+#include <linux/syscalls.h>
+#include <linux/reboot.h>
 
 #include <asm/system.h>
-#include <asm/ebus.h>
 #include <asm/auxio.h>
+#include <asm/prom.h>
+#include <asm/of_device.h>
+#include <asm/io.h>
+#include <asm/sstate.h>
 
 #include <linux/unistd.h>
 
  */
 int scons_pwroff = 1; 
 
-#ifdef CONFIG_PCI
 static void __iomem *power_reg;
 
-static DECLARE_WAIT_QUEUE_HEAD(powerd_wait);
-static int button_pressed;
-
-static irqreturn_t power_handler(int irq, void *dev_id, struct pt_regs *regs)
+static irqreturn_t power_handler(int irq, void *dev_id)
 {
-       if (button_pressed == 0) {
-               button_pressed = 1;
-               wake_up(&powerd_wait);
-       }
+       orderly_poweroff(true);
 
        /* FIXME: Check registers for status... */
        return IRQ_HANDLED;
 }
-#endif /* CONFIG_PCI */
 
 extern void machine_halt(void);
 extern void machine_alt_power_off(void);
@@ -51,99 +45,73 @@ static void (*poweroff_method)(void) = machine_alt_power_off;
 
 void machine_power_off(void)
 {
-       if (!serial_console || scons_pwroff) {
-#ifdef CONFIG_PCI
+       sstate_poweroff();
+       if (strcmp(of_console_device->type, "serial") || scons_pwroff) {
                if (power_reg) {
                        /* Both register bits seem to have the
                         * same effect, so until I figure out
                         * what the difference is...
                         */
                        writel(AUXIO_PCIO_CPWR_OFF | AUXIO_PCIO_SPWR_OFF, power_reg);
-               } else
-#endif /* CONFIG_PCI */
+               } else {
                        if (poweroff_method != NULL) {
                                poweroff_method();
                                /* not reached */
                        }
+               }
        }
        machine_halt();
 }
 
-#ifdef CONFIG_PCI
-static int powerd(void *__unused)
-{
-       static char *envp[] = { "HOME=/", "TERM=linux", "PATH=/sbin:/usr/sbin:/bin:/usr/bin", NULL };
-       char *argv[] = { "/sbin/shutdown", "-h", "now", NULL };
-       DECLARE_WAITQUEUE(wait, current);
-
-       daemonize("powerd");
-
-       add_wait_queue(&powerd_wait, &wait);
-again:
-       for (;;) {
-               set_task_state(current, TASK_INTERRUPTIBLE);
-               if (button_pressed)
-                       break;
-               flush_signals(current);
-               schedule();
-       }
-       __set_current_state(TASK_RUNNING);
-       remove_wait_queue(&powerd_wait, &wait);
-
-       /* Ok, down we go... */
-       button_pressed = 0;
-       if (execve("/sbin/shutdown", argv, envp) < 0) {
-               printk("powerd: shutdown execution failed\n");
-               add_wait_queue(&powerd_wait, &wait);
-               goto again;
-       }
-       return 0;
-}
+void (*pm_power_off)(void) = machine_power_off;
+EXPORT_SYMBOL(pm_power_off);
 
-static int __init has_button_interrupt(struct linux_ebus_device *edev)
+static int __init has_button_interrupt(unsigned int irq, struct device_node *dp)
 {
-       if (edev->irqs[0] == PCI_IRQ_NONE)
+       if (irq == 0xffffffff)
                return 0;
-       if (!prom_node_has_property(edev->prom_node, "button"))
+       if (!of_find_property(dp, "button", NULL))
                return 0;
 
        return 1;
 }
 
-void __init power_init(void)
+static int __devinit power_probe(struct of_device *op, const struct of_device_id *match)
 {
-       struct linux_ebus *ebus;
-       struct linux_ebus_device *edev;
-       static int invoked;
-
-       if (invoked)
-               return;
-       invoked = 1;
-
-       for_each_ebus(ebus) {
-               for_each_ebusdev(edev, ebus) {
-                       if (!strcmp(edev->prom_name, "power"))
-                               goto found;
-               }
-       }
-       return;
+       struct resource *res = &op->resource[0];
+       unsigned int irq= op->irqs[0];
+
+       power_reg = of_ioremap(res, 0, 0x4, "power");
+
+       printk(KERN_INFO "%s: Control reg at %lx\n",
+              op->node->name, res->start);
 
-found:
-       power_reg = ioremap(edev->resource[0].start, 0x4);
-       printk("power: Control reg at %p ... ", power_reg);
        poweroff_method = machine_halt;  /* able to use the standard halt */
-       if (has_button_interrupt(edev)) {
-               if (kernel_thread(powerd, NULL, CLONE_FS) < 0) {
-                       printk("Failed to start power daemon.\n");
-                       return;
-               }
-               printk("powerd running.\n");
 
-               if (request_irq(edev->irqs[0],
-                               power_handler, SA_SHIRQ, "power", NULL) < 0)
-                       printk("power: Error, cannot register IRQ handler.\n");
-       } else {
-               printk("not using powerd.\n");
+       if (has_button_interrupt(irq, op->node)) {
+               if (request_irq(irq,
+                               power_handler, 0, "power", NULL) < 0)
+                       printk(KERN_ERR "power: Cannot setup IRQ handler.\n");
        }
+
+       return 0;
+}
+
+static struct of_device_id power_match[] = {
+       {
+               .name = "power",
+       },
+       {},
+};
+
+static struct of_platform_driver power_driver = {
+       .name           = "power",
+       .match_table    = power_match,
+       .probe          = power_probe,
+};
+
+void __init power_init(void)
+{
+       of_register_driver(&power_driver, &of_platform_bus_type);
+       return;
 }
-#endif /* CONFIG_PCI */