1 files changed, 77 insertions, 18 deletions

diff --git a/drivers/leds/leds-cobalt-qube.c b/drivers/leds/leds-cobalt-qube.c
index d16439ce5da7..d2b54b53d80a 100644
--- a/drivers/leds/leds-cobalt-qube.c
+++ b/drivers/leds/leds-cobalt-qube.c
@@ -3,40 +3,99 @@
  *
  * Control the Cobalt Qube/RaQ front LED
  */
-
+#include <linux/init.h>
+#include <linux/io.h>
+#include <linux/ioport.h>
+#include <linux/leds.h>
 #include <linux/module.h>
+#include <linux/platform_device.h>
 #include <linux/types.h>
-#include <linux/kernel.h>
-#include <linux/device.h>
-#include <linux/leds.h>
-#include <asm/mach-cobalt/cobalt.h>
 
-static void cobalt_led_set(struct led_classdev *led_cdev, enum led_brightness brightness)
+#define LED_FRONT_LEFT  0x01
+#define LED_FRONT_RIGHT 0x02
+
+static void __iomem *led_port;
+static u8 led_value;
+
+static void qube_front_led_set(struct led_classdev *led_cdev,
+                               enum led_brightness brightness)
 {
         if (brightness)
-                COBALT_LED_PORT = COBALT_LED_BAR_LEFT | COBALT_LED_BAR_RIGHT;
+                led_value = LED_FRONT_LEFT | LED_FRONT_RIGHT;
         else
-                COBALT_LED_PORT = 0;
+                led_value = ~(LED_FRONT_LEFT | LED_FRONT_RIGHT);
+        writeb(led_value, led_port);
+}
+
+static struct led_classdev qube_front_led = {
+        .name                   = "qube-front",
+        .brightness             = LED_FULL,
+        .brightness_set         = qube_front_led_set,
+        .default_trigger        = "ide-disk",
+};
+
+static int __devinit cobalt_qube_led_probe(struct platform_device *pdev)
+{
+        struct resource *res;
+        int retval;
+
+        res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
+        if (!res)
+                return -EBUSY;
+
+        led_port = ioremap(res->start, res->end - res->start + 1);
+        if (!led_port)
+                return -ENOMEM;
+
+        led_value = LED_FRONT_LEFT | LED_FRONT_RIGHT;
+        writeb(led_value, led_port);
+
+        retval = led_classdev_register(&pdev->dev, &qube_front_led);
+        if (retval)
+                goto err_iounmap;
+
+        return 0;
+
+err_iounmap:
+        iounmap(led_port);
+        led_port = NULL;
+
+        return retval;
+}
+
+static int __devexit cobalt_qube_led_remove(struct platform_device *pdev)
+{
+        led_classdev_unregister(&qube_front_led);
+
+        if (led_port) {
+                iounmap(led_port);
+                led_port = NULL;
+        }
+
+        return 0;
 }
 
-static struct led_classdev cobalt_led = {
-       .name = "cobalt-front-led",
-       .brightness_set = cobalt_led_set,
-       .default_trigger = "ide-disk",
+static struct platform_driver cobalt_qube_led_driver = {
+        .probe  = cobalt_qube_led_probe,
+        .remove = __devexit_p(cobalt_qube_led_remove),
+        .driver = {
+                .name   = "cobalt-qube-leds",
+                .owner  = THIS_MODULE,
+        },
 };
 
-static int __init cobalt_led_init(void)
+static int __init cobalt_qube_led_init(void)
 {
-        return led_classdev_register(NULL, &cobalt_led);
+        return platform_driver_register(&cobalt_qube_led_driver);
 }
 
-static void __exit cobalt_led_exit(void)
+static void __exit cobalt_qube_led_exit(void)
 {
-        led_classdev_unregister(&cobalt_led);
+        platform_driver_unregister(&cobalt_qube_led_driver);
 }
 
-module_init(cobalt_led_init);
-module_exit(cobalt_led_exit);
+module_init(cobalt_qube_led_init);
+module_exit(cobalt_qube_led_exit);
 
 MODULE_LICENSE("GPL");
 MODULE_DESCRIPTION("Front LED support for Cobalt Server");