Update Cobalt Qube front LED support. Signed-off-by: Yoichi Yuasa <[EMAIL PROTECTED]>
diff -pruN -X mips/Documentation/dontdiff mips-orig/drivers/leds/leds-cobalt-qube.c mips/drivers/leds/leds-cobalt-qube.c --- mips-orig/drivers/leds/leds-cobalt-qube.c 2007-08-24 19:35:51.689587500 +0900 +++ mips/drivers/leds/leds-cobalt-qube.c 2007-08-24 19:57:45.391688750 +0900 @@ -1,43 +1,103 @@ /* * Copyright 2006 - Florian Fainelli <[EMAIL PROTECTED]> * - * Control the Cobalt Qube/RaQ front LED + * Control the Cobalt Qube/Qube2 front LED */ - +#include <linux/init.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) +#include <asm/io.h> + +#define LED_BAR_LEFT 0x01 +#define LED_BAR_RIGHT 0x02 + +static void __iomem *led_port; +static u8 led_value; + +static void qube_bar_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_BAR_LEFT | LED_BAR_RIGHT; else - COBALT_LED_PORT = 0; + led_value = ~(LED_BAR_LEFT | LED_BAR_RIGHT); + writeb(led_value, led_port); +} + +static struct led_classdev qube_bar_led = { + .name = "qube-bar-led", + .brightness = LED_FULL, + .brightness_set = qube_bar_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_BAR_LEFT | LED_BAR_RIGHT; + writeb(led_value, led_port); + + retval = led_classdev_register(&pdev->dev, &qube_bar_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) +{ + if (led_port) { + iounmap(led_port); + led_port = NULL; + } + + led_classdev_unregister(&qube_bar_led); + + 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"); +MODULE_DESCRIPTION("Front LED support for Cobalt Qube"); MODULE_AUTHOR("Florian Fainelli <[EMAIL PROTECTED]>"); - To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to [EMAIL PROTECTED] More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/