Commit e6005a85 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'for-linus' of git://git.o-hand.com/linux-rpurdie-leds 

* 'for-linus' of git://git.o-hand.com/linux-rpurdie-leds:
  leds: Update Cobalt Qube series front LED support
  leds: Add Cobalt Raq series LEDs support
  leds: Rename leds-cobalt driver
parents 6f35308c 4276fd73

drivers/leds/Kconfig

+10 −3
Original line number Diff line number Diff line
@@ -87,11 +87,18 @@ 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_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"

drivers/leds/Makefile

+2 −1
Original line number Diff line number Diff line
@@ -15,7 +15,8 @@ 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_COBALT_RAQ)		+= leds-cobalt-raq.o

obj-$(CONFIG_LEDS_GPIO)			+= leds-gpio.o



# LED Triggers

drivers/leds/leds-cobalt-qube.c

0 → 100644
+102 −0
Original line number Diff line number Diff line 
/*

 * Copyright 2006 - Florian Fainelli <florian@openwrt.org>

 *

 * 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>



#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)

		led_value = LED_FRONT_LEFT | LED_FRONT_RIGHT;

	else

		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 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");

MODULE_AUTHOR("Florian Fainelli <florian@openwrt.org>");

drivers/leds/leds-cobalt-raq.c

0 → 100644
+138 −0
Original line number Diff line number Diff line 
/*

 *  LEDs driver for the Cobalt Raq series.

 *

 *  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/init.h>

#include <linux/io.h>

#include <linux/ioport.h>

#include <linux/leds.h>

#include <linux/platform_device.h>

#include <linux/spinlock.h>

#include <linux/types.h>



#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);

drivers/leds/leds-cobalt.c

deleted100644 → 0
+0 −43
Original line number Diff line number Diff line 
/*

 * Copyright 2006 - Florian Fainelli <florian@openwrt.org>

 *

 * Control the Cobalt Qube/RaQ front LED

 */



#include <linux/module.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)

{

	if (brightness)

		COBALT_LED_PORT = COBALT_LED_BAR_LEFT | COBALT_LED_BAR_RIGHT;

	else

		COBALT_LED_PORT = 0;

}



static struct led_classdev cobalt_led = {

       .name = "cobalt-front-led",

       .brightness_set = cobalt_led_set,

       .default_trigger = "ide-disk",

};



static int __init cobalt_led_init(void)

{

	return led_classdev_register(NULL, &cobalt_led);

}



static void __exit cobalt_led_exit(void)

{

	led_classdev_unregister(&cobalt_led);

}



module_init(cobalt_led_init);

module_exit(cobalt_led_exit);



MODULE_LICENSE("GPL");

MODULE_DESCRIPTION("Front LED support for Cobalt Server");

MODULE_AUTHOR("Florian Fainelli <florian@openwrt.org>");

CRA Git | Maintained and supported by SUSTech CRA and CCSE