From f3b6b6cd00d294d50e1c3eee85964c69d898de45 Mon Sep 17 00:00:00 2001 From: Yoichi Yuasa Date: Fri, 21 Sep 2007 00:02:47 +0100 Subject: [PATCH 1/3] leds: Rename leds-cobalt driver The leds-cobalt driver only supports the Coable Qube series (not included in Cobalt Raq series). Rename the driver and update Kconfig/Makefile. Signed-off-by: Yoichi Yuasa Acked-by: Florian Fainelli Signed-off-by: Richard Purdie --- drivers/leds/Kconfig | 6 +++--- drivers/leds/Makefile | 2 +- drivers/leds/{leds-cobalt.c => leds-cobalt-qube.c} | 0 3 files changed, 4 insertions(+), 4 deletions(-) rename drivers/leds/{leds-cobalt.c => leds-cobalt-qube.c} (100%) diff --git a/drivers/leds/Kconfig b/drivers/leds/Kconfig index 4468cb3a8d24..9b79bcd9bf11 100644 --- a/drivers/leds/Kconfig +++ b/drivers/leds/Kconfig @@ -87,11 +87,11 @@ config LEDS_H1940 help This option enables support for the LEDs on the h1940. -config LEDS_COBALT - tristate "LED Support for Cobalt Server front LED" +config LEDS_COBALT_QUBE + tristate "LED Support for the Cobalt Qube series front LED" depends on LEDS_CLASS && MIPS_COBALT help - This option enables support for the front LED on Cobalt Server + This option enables support for the front LED on Cobalt Qube series config LEDS_GPIO tristate "LED Support for GPIO connected LEDs" diff --git a/drivers/leds/Makefile b/drivers/leds/Makefile index f8995c9bc2ea..9b2684a20888 100644 --- a/drivers/leds/Makefile +++ b/drivers/leds/Makefile @@ -15,7 +15,7 @@ obj-$(CONFIG_LEDS_AMS_DELTA) += leds-ams-delta.o obj-$(CONFIG_LEDS_NET48XX) += leds-net48xx.o obj-$(CONFIG_LEDS_WRAP) += leds-wrap.o obj-$(CONFIG_LEDS_H1940) += leds-h1940.o -obj-$(CONFIG_LEDS_COBALT) += leds-cobalt.o +obj-$(CONFIG_LEDS_COBALT_QUBE) += leds-cobalt-qube.o obj-$(CONFIG_LEDS_GPIO) += leds-gpio.o # LED Triggers diff --git a/drivers/leds/leds-cobalt.c b/drivers/leds/leds-cobalt-qube.c similarity index 100% rename from drivers/leds/leds-cobalt.c rename to drivers/leds/leds-cobalt-qube.c From 97da7aaf46fedcf1a38a88e5ffc2c40df23e8013 Mon Sep 17 00:00:00 2001 From: Yoichi Yuasa Date: Thu, 27 Sep 2007 17:51:05 +0900 Subject: [PATCH 2/3] leds: Add Cobalt Raq series LEDs support Add Cobalt Raq series LEDs support. Signed-off-by: Yoichi Yuasa Acked-by: Ralf Baechle Signed-off-by: Richard Purdie --- drivers/leds/Kconfig | 7 ++ drivers/leds/Makefile | 1 + drivers/leds/leds-cobalt-raq.c | 138 +++++++++++++++++++++++++++++++++ 3 files changed, 146 insertions(+) create mode 100644 drivers/leds/leds-cobalt-raq.c diff --git a/drivers/leds/Kconfig b/drivers/leds/Kconfig index 9b79bcd9bf11..3cb23210b912 100644 --- a/drivers/leds/Kconfig +++ b/drivers/leds/Kconfig @@ -93,6 +93,13 @@ config LEDS_COBALT_QUBE help This option enables support for the front LED on Cobalt Qube series +config LEDS_COBALT_RAQ + bool "LED Support for the Cobalt Raq series" + depends on LEDS_CLASS && MIPS_COBALT + select LEDS_TRIGGERS + help + This option enables support for the Cobalt Raq series LEDs. + config LEDS_GPIO tristate "LED Support for GPIO connected LEDs" depends on LEDS_CLASS && GENERIC_GPIO diff --git a/drivers/leds/Makefile b/drivers/leds/Makefile index 9b2684a20888..d2ca1abbc3d2 100644 --- a/drivers/leds/Makefile +++ b/drivers/leds/Makefile @@ -16,6 +16,7 @@ obj-$(CONFIG_LEDS_NET48XX) += leds-net48xx.o obj-$(CONFIG_LEDS_WRAP) += leds-wrap.o obj-$(CONFIG_LEDS_H1940) += leds-h1940.o obj-$(CONFIG_LEDS_COBALT_QUBE) += leds-cobalt-qube.o +obj-$(CONFIG_LEDS_COBALT_RAQ) += leds-cobalt-raq.o obj-$(CONFIG_LEDS_GPIO) += leds-gpio.o # LED Triggers diff --git a/drivers/leds/leds-cobalt-raq.c b/drivers/leds/leds-cobalt-raq.c new file mode 100644 index 000000000000..6ebfff341e6c --- /dev/null +++ b/drivers/leds/leds-cobalt-raq.c @@ -0,0 +1,138 @@ +/* + * LEDs driver for the Cobalt Raq series. + * + * Copyright (C) 2007 Yoichi Yuasa + * + * 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 +#include +#include +#include +#include +#include +#include + +#define LED_WEB 0x04 +#define LED_POWER_OFF 0x08 + +static void __iomem *led_port; +static u8 led_value; +static DEFINE_SPINLOCK(led_value_lock); + +static void raq_web_led_set(struct led_classdev *led_cdev, + enum led_brightness brightness) +{ + unsigned long flags; + + spin_lock_irqsave(&led_value_lock, flags); + + if (brightness) + led_value |= LED_WEB; + else + led_value &= ~LED_WEB; + writeb(led_value, led_port); + + spin_unlock_irqrestore(&led_value_lock, flags); +} + +static struct led_classdev raq_web_led = { + .name = "raq-web", + .brightness_set = raq_web_led_set, +}; + +static void raq_power_off_led_set(struct led_classdev *led_cdev, + enum led_brightness brightness) +{ + unsigned long flags; + + spin_lock_irqsave(&led_value_lock, flags); + + if (brightness) + led_value |= LED_POWER_OFF; + else + led_value &= ~LED_POWER_OFF; + writeb(led_value, led_port); + + spin_unlock_irqrestore(&led_value_lock, flags); +} + +static struct led_classdev raq_power_off_led = { + .name = "raq-power-off", + .brightness_set = raq_power_off_led_set, + .default_trigger = "power-off", +}; + +static int __devinit cobalt_raq_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; + + retval = led_classdev_register(&pdev->dev, &raq_power_off_led); + if (retval) + goto err_iounmap; + + retval = led_classdev_register(&pdev->dev, &raq_web_led); + if (retval) + goto err_unregister; + + return 0; + +err_unregister: + led_classdev_unregister(&raq_power_off_led); + +err_iounmap: + iounmap(led_port); + led_port = NULL; + + return retval; +} + +static int __devexit cobalt_raq_led_remove(struct platform_device *pdev) +{ + led_classdev_unregister(&raq_power_off_led); + led_classdev_unregister(&raq_web_led); + + if (led_port) { + iounmap(led_port); + led_port = NULL; + } + + return 0; +} + +static struct platform_driver cobalt_raq_led_driver = { + .probe = cobalt_raq_led_probe, + .remove = __devexit_p(cobalt_raq_led_remove), + .driver = { + .name = "cobalt-raq-leds", + .owner = THIS_MODULE, + }, +}; + +static int __init cobalt_raq_led_init(void) +{ + return platform_driver_register(&cobalt_raq_led_driver); +} + +module_init(cobalt_raq_led_init); From 4276fd7349bfd4f557d9777100fdcf1140771b4e Mon Sep 17 00:00:00 2001 From: Yoichi Yuasa Date: Thu, 27 Sep 2007 17:51:17 +0900 Subject: [PATCH 3/3] leds: Update Cobalt Qube series front LED support Update Cobalt Qube series front LED support. Signed-off-by: Yoichi Yuasa Acked-by: Ralf Baechle Signed-off-by: Richard Purdie --- drivers/leds/leds-cobalt-qube.c | 97 ++++++++++++++++++++++++++------- 1 file changed, 78 insertions(+), 19 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 -#include -#include -#include +#include +#include +#include #include -#include +#include +#include +#include -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 cobalt_led = { - .name = "cobalt-front-led", - .brightness_set = cobalt_led_set, - .default_trigger = "ide-disk", +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 __init cobalt_led_init(void) +static int __devinit cobalt_qube_led_probe(struct platform_device *pdev) { - return led_classdev_register(NULL, &cobalt_led); + 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 void __exit cobalt_led_exit(void) +static int __devexit cobalt_qube_led_remove(struct platform_device *pdev) { - led_classdev_unregister(&cobalt_led); + led_classdev_unregister(&qube_front_led); + + if (led_port) { + iounmap(led_port); + led_port = NULL; + } + + return 0; } -module_init(cobalt_led_init); -module_exit(cobalt_led_exit); +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_qube_led_init(void) +{ + return platform_driver_register(&cobalt_qube_led_driver); +} + +static void __exit cobalt_qube_led_exit(void) +{ + platform_driver_unregister(&cobalt_qube_led_driver); +} + +module_init(cobalt_qube_led_init); +module_exit(cobalt_qube_led_exit); MODULE_LICENSE("GPL"); MODULE_DESCRIPTION("Front LED support for Cobalt Server");