The patch titled LED Class support for Soekris net48xx has been added to the -mm tree. Its filename is led-class-support-for-soekris-net48xx.patch See http://www.zip.com.au/~akpm/linux/patches/stuff/added-to-mm.txt to find out what to do about this ------------------------------------------------------ Subject: LED Class support for Soekris net48xx From: Chris Boot <bootc@xxxxxxxxx> Add LED Class device support for the Soekris net48xx Error LED. Tested only on a net4801, but should work on a net4826 as well. I'd love to find a way of detecting a Soekris net48xx device but there is no DMI or any Soekris-specific PCI devices. Cc: Ben Dooks <ben-linux@xxxxxxxxx> Cc: Richard Purdie <rpurdie@xxxxxxxxx> Signed-off-by: Andrew Morton <akpm@xxxxxxxx> --- MAINTAINERS | 5 + drivers/leds/Kconfig | 7 ++ drivers/leds/Makefile | 1 drivers/leds/leds-net48xx.c | 116 ++++++++++++++++++++++++++++++++++ 4 files changed, 129 insertions(+) diff -puN drivers/leds/Kconfig~led-class-support-for-soekris-net48xx drivers/leds/Kconfig --- a/drivers/leds/Kconfig~led-class-support-for-soekris-net48xx +++ a/drivers/leds/Kconfig @@ -69,6 +69,13 @@ config LEDS_AMS_DELTA help This option enables support for the LEDs on Amstrad Delta (E3). +config LEDS_NET48XX + tristate "LED Support for Soekris net48xx series Error LED" + depends on LEDS_CLASS && SCx200_GPIO + help + This option enables support for the Soekris net4801 and net4826 error + LED. + comment "LED Triggers" config LEDS_TRIGGERS diff -puN /dev/null drivers/leds/leds-net48xx.c --- /dev/null +++ a/drivers/leds/leds-net48xx.c @@ -0,0 +1,116 @@ +/* + * LEDs driver for Soekris net48xx + * + * Copyright (C) 2006 Chris Boot <bootc@xxxxxxxxx> + * + * Based on leds-ams-delta.c + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License version 2 as + * published by the Free Software Foundation. + */ + +#include <linux/kernel.h> +#include <linux/init.h> +#include <linux/platform_device.h> +#include <linux/leds.h> +#include <linux/err.h> +#include <asm/io.h> +#include <linux/scx200_gpio.h> + +#define NET48XX_ERROR_LED_GPIO 20 + +static struct platform_device *pdev; + +static void net48xx_error_led_set(struct led_classdev *led_cdev, + enum led_brightness value) +{ + if (value) + scx200_gpio_set_high(NET48XX_ERROR_LED_GPIO); + else + scx200_gpio_set_low(NET48XX_ERROR_LED_GPIO); +} + +static struct led_classdev net48xx_error_led = { + .name = "net48xx:error", + .brightness_set = net48xx_error_led_set, +}; + +#ifdef CONFIG_PM +static int net48xx_led_suspend(struct platform_device *dev, + pm_message_t state) +{ + return led_classdev_suspend(&net48xx_error_led); +} + +static int net48xx_led_resume(struct platform_device *dev) +{ + return led_classdev_resume(&net48xx_error_led); +} +#else +#define net48xx_led_suspend NULL +#define net48xx_led_resume NULL +#endif + +static int net48xx_led_probe(struct platform_device *pdev) +{ + if (!scx200_gpio_present()) + return ENODEV; + + return led_classdev_register(&pdev->dev, + &net48xx_error_led); +} + +static int net48xx_led_remove(struct platform_device *pdev) +{ + led_classdev_unregister(&net48xx_error_led); + return 0; +} + +static struct platform_driver net48xx_led_driver = { + .probe = net48xx_led_probe, + .remove = net48xx_led_remove, + .suspend = net48xx_led_suspend, + .resume = net48xx_led_resume, + .driver = { + .name = "net48xx-led", + }, +}; + +static int __init net48xx_led_init(void) +{ + int ret; + + if (!scx200_gpio_present()) { + ret = ENODEV; + goto out; + } + + ret = platform_driver_register(&net48xx_led_driver); + if (ret < 0) + goto out; + + pdev = platform_device_register_simple("net48xx-led", -1, NULL, 0); + if (IS_ERR(pdev)) { + ret = PTR_ERR(pdev); + platform_driver_unregister(&net48xx_led_driver); + goto out; + } + +out: + return ret; +} + +static void __exit net48xx_led_exit(void) +{ + platform_device_unregister(pdev); + platform_driver_unregister(&net48xx_led_driver); +} + +module_init(net48xx_led_init); +module_exit(net48xx_led_exit); + +MODULE_AUTHOR("Chris Boot <bootc@xxxxxxxxx>"); +MODULE_DESCRIPTION("Soekris net48xx LED driver"); +MODULE_LICENSE("GPL"); + diff -puN drivers/leds/Makefile~led-class-support-for-soekris-net48xx drivers/leds/Makefile --- a/drivers/leds/Makefile~led-class-support-for-soekris-net48xx +++ a/drivers/leds/Makefile @@ -12,6 +12,7 @@ obj-$(CONFIG_LEDS_IXP4XX) += leds-ixp4x obj-$(CONFIG_LEDS_TOSA) += leds-tosa.o obj-$(CONFIG_LEDS_S3C24XX) += leds-s3c24xx.o obj-$(CONFIG_LEDS_AMS_DELTA) += leds-ams-delta.o +obj-$(CONFIG_LEDS_NET48XX) += leds-net48xx.o # LED Triggers obj-$(CONFIG_LEDS_TRIGGER_TIMER) += ledtrig-timer.o diff -puN MAINTAINERS~led-class-support-for-soekris-net48xx MAINTAINERS --- a/MAINTAINERS~led-class-support-for-soekris-net48xx +++ a/MAINTAINERS @@ -2706,6 +2706,11 @@ M: shemminger@xxxxxxxx L: netdev@xxxxxxxxxxxxxxx S: Maintained +SOEKRIS NET48XX LED SUPPORT +P: Chris Boot +M: bootc@xxxxxxxxx +S: Maintained + SPARC (sparc32): P: William L. Irwin M: wli@xxxxxxxxxxxxxx _ Patches currently in -mm which might be from bootc@xxxxxxxxx are led-class-support-for-soekris-net48xx.patch - To unsubscribe from this list: send the line "unsubscribe mm-commits" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html