Merge git://git.infradead.org/hdrinstall-2.6

[linux-2.6-omap-h63xx.git] / arch / sparc64 / kernel / power.c

diff --git a/arch/sparc64/kernel/power.c b/arch/sparc64/kernel/power.c
index 946cee0257ea2dc34fe25350fc71910b235dfc7c..e55466c77b61efaf0a8c13172e0dc100bcf3a2a1 100644 (file)
--- a/arch/sparc64/kernel/power.c
+++ b/arch/sparc64/kernel/power.c
@@ -6,7 +6,6 @@
 
 #define __KERNEL_SYSCALLS__
 
-#include <linux/config.h>
 #include <linux/kernel.h>
 #include <linux/module.h>
 #include <linux/init.h>
@@ -14,10 +13,13 @@
 #include <linux/signal.h>
 #include <linux/delay.h>
 #include <linux/interrupt.h>
+#include <linux/pm.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 <linux/unistd.h>
 
@@ -28,6 +30,7 @@
 int scons_pwroff = 1; 
 
 #ifdef CONFIG_PCI
+#include <linux/pci.h>
 static void __iomem *power_reg;
 
 static DECLARE_WAIT_QUEUE_HEAD(powerd_wait);
@@ -69,6 +72,9 @@ void machine_power_off(void)
        machine_halt();
 }
 
+void (*pm_power_off)(void) = machine_power_off;
+EXPORT_SYMBOL(pm_power_off);
+
 #ifdef CONFIG_PCI
 static int powerd(void *__unused)
 {
@@ -100,50 +106,61 @@ again:
        return 0;
 }
 
-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 == PCI_IRQ_NONE)
                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("%s: Control reg at %lx ... ",
+              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 (has_button_interrupt(irq, op->node)) {
                if (kernel_thread(powerd, NULL, CLONE_FS) < 0) {
                        printk("Failed to start power daemon.\n");
-                       return;
+                       return 0;
                }
                printk("powerd running.\n");
 
-               if (request_irq(edev->irqs[0],
-                               power_handler, SA_SHIRQ, "power", NULL) < 0)
+               if (request_irq(irq,
+                               power_handler, 0, "power", NULL) < 0)
                        printk("power: Error, cannot register IRQ handler.\n");
        } else {
                printk("not using powerd.\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_bus_type);
+       return;
 }
 #endif /* CONFIG_PCI */