Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 9becde79 authored by Jonathan McDowell's avatar Jonathan McDowell Committed by Linus Torvalds
Browse files

[PATCH] leds: Amstrad Delta LED support 



Use the new LED infrastructure to support the 6 LEDs present on the Amstrad
Delta.

[akpm@osdl.org: cleanup]
Signed-off-by: default avatarJonathan McDowell <noodles@earth.li>
Ackde-by: default avatarRichard Purdie <rpurdie@rpsys.net>
Cc: Ben Dooks <ben@fluff.org.uk>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent 83d4e6e7

arch/arm/mach-omap1/board-ams-delta.c

+11 −0
Original line number Diff line number Diff line
@@ -84,6 +84,15 @@ static struct omap_board_config_kernel ams_delta_config[] = { 
	{ OMAP_TAG_UART,	&ams_delta_uart_config },

};



static struct platform_device ams_delta_led_device = {

	.name	= "ams-delta-led",

	.id	= -1

};



static struct platform_device *ams_delta_devices[] __initdata = {

	&ams_delta_led_device,

};



static void __init ams_delta_init(void)

{

	iotable_init(ams_delta_io_desc, ARRAY_SIZE(ams_delta_io_desc));
@@ -94,6 +103,8 @@ static void __init ams_delta_init(void) 


	/* Clear latch2 (NAND, LCD, modem enable) */

	ams_delta_latch2_write(~0, 0);



	platform_add_devices(ams_delta_devices, ARRAY_SIZE(ams_delta_devices));

}



static void __init ams_delta_map_io(void)

drivers/leds/Kconfig

+6 −0
Original line number Diff line number Diff line
@@ -63,6 +63,12 @@ config LEDS_S3C24XX 
	  This option enables support for LEDs connected to GPIO lines

	  on Samsung S3C24XX series CPUs, such as the S3C2410 and S3C2440.



config LEDS_AMS_DELTA

	tristate "LED Support for the Amstrad Delta (E3)"

	depends LEDS_CLASS && MACH_AMS_DELTA

	help

	  This option enables support for the LEDs on Amstrad Delta (E3).



comment "LED Triggers"



config LEDS_TRIGGERS

drivers/leds/Makefile

+1 −0
Original line number Diff line number Diff line
@@ -11,6 +11,7 @@ obj-$(CONFIG_LEDS_SPITZ) += leds-spitz.o 
obj-$(CONFIG_LEDS_IXP4XX)		+= leds-ixp4xx-gpio.o

obj-$(CONFIG_LEDS_TOSA)			+= leds-tosa.o

obj-$(CONFIG_LEDS_S3C24XX)		+= leds-s3c24xx.o

obj-$(CONFIG_LEDS_AMS_DELTA)		+= leds-ams-delta.o



# LED Triggers

obj-$(CONFIG_LEDS_TRIGGER_TIMER)	+= ledtrig-timer.o

drivers/leds/leds-ams-delta.c

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

 * LEDs driver for Amstrad Delta (E3)

 *

 * Copyright (C) 2006 Jonathan McDowell <noodles@earth.li>

 *

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

#include <linux/kernel.h>

#include <linux/init.h>

#include <linux/platform_device.h>

#include <linux/leds.h>

#include <asm/arch/board-ams-delta.h>



/*

 * Our context

 */

struct ams_delta_led {

	struct led_classdev	cdev;

	u8			bitmask;

};



static void ams_delta_led_set(struct led_classdev *led_cdev,

		enum led_brightness value)

{

	struct ams_delta_led *led_dev =

		container_of(led_cdev, struct ams_delta_led, cdev);



	if (value)

		ams_delta_latch1_write(led_dev->bitmask, led_dev->bitmask);

	else

		ams_delta_latch1_write(led_dev->bitmask, 0);

}



static struct ams_delta_led ams_delta_leds[] = {

	{

		.cdev		= {

			.name		= "ams-delta:camera",

			.brightness_set = ams_delta_led_set,

		},

		.bitmask	= AMS_DELTA_LATCH1_LED_CAMERA,

	},

	{

		.cdev		= {

			.name		= "ams-delta:advert",

			.brightness_set = ams_delta_led_set,

		},

		.bitmask	= AMS_DELTA_LATCH1_LED_ADVERT,

	},

	{

		.cdev		= {

			.name		= "ams-delta:email",

			.brightness_set = ams_delta_led_set,

		},

		.bitmask	= AMS_DELTA_LATCH1_LED_EMAIL,

	},

	{

		.cdev		= {

			.name		= "ams-delta:handsfree",

			.brightness_set = ams_delta_led_set,

		},

		.bitmask	= AMS_DELTA_LATCH1_LED_HANDSFREE,

	},

	{

		.cdev		= {

			.name		= "ams-delta:voicemail",

			.brightness_set = ams_delta_led_set,

		},

		.bitmask	= AMS_DELTA_LATCH1_LED_VOICEMAIL,

	},

	{

		.cdev		= {

			.name		= "ams-delta:voice",

			.brightness_set = ams_delta_led_set,

		},

		.bitmask	= AMS_DELTA_LATCH1_LED_VOICE,

	},

};



#ifdef CONFIG_PM

static int ams_delta_led_suspend(struct platform_device *dev,

		pm_message_t state)

{

	int i;



	for (i = 0; i < ARRAY_SIZE(ams_delta_leds); i++)

		led_classdev_suspend(&ams_delta_leds[i].cdev);



	return 0;

}



static int ams_delta_led_resume(struct platform_device *dev)

{

	int i;



	for (i = 0; i < ARRAY_SIZE(ams_delta_leds); i++)

		led_classdev_resume(&ams_delta_leds[i].cdev);



	return 0;

}

#else

#define ams_delta_led_suspend NULL

#define ams_delta_led_resume NULL

#endif



static int ams_delta_led_probe(struct platform_device *pdev)

{

	int i;

	int ret;



	for (i = ret = 0; ret >= 0 && i < ARRAY_SIZE(ams_delta_leds); i++) {

		ret = led_classdev_register(&pdev->dev,

				&ams_delta_leds[i].cdev);

	}



	if (ret < 0 && i > 1) {

		for (i = i - 2; i >= 0; i--)

			led_classdev_unregister(&ams_delta_leds[i].cdev);

	}



	return ret;

}



static int ams_delta_led_remove(struct platform_device *pdev)

{

	int i;



	for (i = ARRAY_SIZE(ams_delta_leds) - 1; i >= 0; i--)

		led_classdev_unregister(&ams_delta_leds[i].cdev);



	return 0;

}



static struct platform_driver ams_delta_led_driver = {

	.probe		= ams_delta_led_probe,

	.remove		= ams_delta_led_remove,

	.suspend	= ams_delta_led_suspend,

	.resume		= ams_delta_led_resume,

	.driver		= {

		.name = "ams-delta-led",

	},

};



static int __init ams_delta_led_init(void)

{

	return platform_driver_register(&ams_delta_led_driver);

}



static void __exit ams_delta_led_exit(void)

{

	return platform_driver_unregister(&ams_delta_led_driver);

}



module_init(ams_delta_led_init);

module_exit(ams_delta_led_exit);



MODULE_AUTHOR("Jonathan McDowell <noodles@earth.li>");

MODULE_DESCRIPTION("Amstrad Delta LED driver");

MODULE_LICENSE("GPL");