3 files changed, 71 insertions, 9 deletions

diff --git a/arch/mips/cobalt/Makefile b/arch/mips/cobalt/Makefile
index a043f93f7d08..6b83f4ddc8fc 100644
--- a/arch/mips/cobalt/Makefile
+++ b/arch/mips/cobalt/Makefile
@@ -2,7 +2,7 @@
 # Makefile for the Cobalt micro systems family specific parts of the kernel
 #
 
-obj-y := buttons.o irq.o reset.o rtc.o serial.o setup.o
+obj-y := buttons.o irq.o led.o reset.o rtc.o serial.o setup.o
 
 obj-$(CONFIG_PCI)               += pci.o
 obj-$(CONFIG_EARLY_PRINTK)      += console.o
diff --git a/arch/mips/cobalt/led.c b/arch/mips/cobalt/led.c
new file mode 100644
index 000000000000..8150af3abb8e
--- /dev/null
+++ b/arch/mips/cobalt/led.c
@@ -0,0 +1,56 @@
+/*
+ *  Registration of Cobalt LED platform device.
+ *
+ *  Copyright (C) 2007  Yoichi Yuasa <yoichi_yuasa@tripeaks.co.jp>
+ *
+ *  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., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+ */
+#include <linux/errno.h>
+#include <linux/init.h>
+#include <linux/ioport.h>
+#include <linux/platform_device.h>
+
+static struct resource cobalt_led_resource __initdata = {
+        .start  = 0x1c000000,
+        .end    = 0x1c000000,
+        .flags  = IORESOURCE_MEM,
+};
+
+static __init int cobalt_led_add(void)
+{
+        struct platform_device *pdev;
+        int retval;
+
+        pdev = platform_device_alloc("cobalt-raq-leds", -1);
+
+        if (!pdev)
+                return -ENOMEM;
+
+        retval = platform_device_add_resources(pdev, &cobalt_led_resource, 1);
+        if (retval)
+                goto err_free_device;
+
+        retval = platform_device_add(pdev);
+        if (retval)
+                goto err_free_device;
+
+        return 0;
+
+err_free_device:
+        platform_device_put(pdev);
+
+        return retval;
+}
+device_initcall(cobalt_led_add);
diff --git a/arch/mips/cobalt/reset.c b/arch/mips/cobalt/reset.c
index 43cca21fdbc0..f503a0d04b3b 100644
--- a/arch/mips/cobalt/reset.c
+++ b/arch/mips/cobalt/reset.c
@@ -8,31 +8,37 @@
  * Copyright (C) 1995, 1996, 1997 by Ralf Baechle
  * Copyright (C) 2001 by Liam Davies (ldavies@agile.tv)
  */
+#include <linux/init.h>
 #include <linux/jiffies.h>
-
-#include <asm/io.h>
-#include <asm/reboot.h>
+#include <linux/leds.h>
 
 #include <cobalt.h>
 
+DEFINE_LED_TRIGGER(power_off_led_trigger);
+
+static int __init ledtrig_power_off_init(void)
+{
+        led_trigger_register_simple("power-off", &power_off_led_trigger);
+        return 0;
+}
+device_initcall(ledtrig_power_off_init);
+
 void cobalt_machine_halt(void)
 {
         int state, last, diff;
         unsigned long mark;
 
         /*
-         * turn off bar on Qube, flash power off LED on RaQ (0.5Hz)
+         * turn on power off LED on RaQ
          *
          * restart if ENTER and SELECT are pressed
          */
 
         last = COBALT_KEY_PORT;
 
-        for (state = 0;;) {
-
-                state ^= COBALT_LED_POWER_OFF;
-                COBALT_LED_PORT = state;
+        led_trigger_event(power_off_led_trigger, LED_FULL);
 
+        for (state = 0;;) {
                 diff = COBALT_KEY_PORT ^ last;
                 last ^= diff;