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

Commit 60cf711d authored by Eric Miao's avatar Eric Miao Committed by Russell King
Browse files

[ARM] pxa/corgi: use leds-gpio for led driving and drop leds-corgi 



Now as the scoop pins are covered by the generic gpio API,
we can use leds-gpio driver instead of special leds-corgi

Drop leds-corgi.c and remove the declaration of now un-referenced
corgiscoop_device.

Signed-off-by: default avatarDmitry Baryshkov <dbaryshkov@gmail.com>
Cc: Richard Purdie <rpurdie@rpsys.net>
Signed-off-by: default avatarEric Miao <eric.miao@marvell.com>
Signed-off-by: default avatarRussell King <rmk+kernel@arm.linux.org.uk>
parent 6168cda9

arch/arm/mach-pxa/corgi.c

+22 −2
Original line number Diff line number Diff line
@@ -271,13 +271,33 @@ static struct platform_device corgikbd_device = { 
	.id		= -1,

};





/*

 * Corgi LEDs

 */

static struct gpio_led corgi_gpio_leds[] = {

	{

		.name			= "corgi:amber:charge",

		.default_trigger	= "sharpsl-charge",

		.gpio			= CORGI_GPIO_LED_ORANGE,

	},

	{

		.name			= "corgi:green:mail",

		.default_trigger	= "nand-disk",

		.gpio			= CORGI_GPIO_LED_GREEN,

	},

};



static struct gpio_led_platform_data corgi_gpio_leds_info = {

	.leds		= corgi_gpio_leds,

	.num_leds	= ARRAY_SIZE(corgi_gpio_leds),

};



static struct platform_device corgiled_device = {

	.name		= "corgi-led",

	.name		= "leds-gpio",

	.id		= -1,

	.dev		= {

		.platform_data = &corgi_gpio_leds_info,

	},

};



/*

drivers/leds/Kconfig

+0 −7
Original line number Diff line number Diff line
@@ -24,13 +24,6 @@ config LEDS_ATMEL_PWM 
	  This option enables support for LEDs driven using outputs

	  of the dedicated PWM controller found on newer Atmel SOCs.



config LEDS_CORGI

	tristate "LED Support for the Sharp SL-C7x0 series"

	depends on LEDS_CLASS && PXA_SHARP_C7xx

	help

	  This option enables support for the LEDs on Sharp Zaurus

	  SL-C7x0 series (C700, C750, C760, C860).



config LEDS_LOCOMO

	tristate "LED Support for Locomo device"

	depends on LEDS_CLASS && SHARP_LOCOMO

drivers/leds/Makefile

+0 −1
Original line number Diff line number Diff line
@@ -6,7 +6,6 @@ obj-$(CONFIG_LEDS_TRIGGERS) += led-triggers.o 


# LED Platform Drivers

obj-$(CONFIG_LEDS_ATMEL_PWM)		+= leds-atmel-pwm.o

obj-$(CONFIG_LEDS_CORGI)		+= leds-corgi.o

obj-$(CONFIG_LEDS_LOCOMO)		+= leds-locomo.o

obj-$(CONFIG_LEDS_SPITZ)		+= leds-spitz.o

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

drivers/leds/leds-corgi.c

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

 * LED Triggers Core

 *

 * Copyright 2005-2006 Openedhand Ltd.

 *

 * Author: Richard Purdie <rpurdie@openedhand.com>

 *

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

#include <mach/hardware.h>

#include <mach/pxa-regs.h>

#include <asm/hardware/scoop.h>



static void corgiled_amber_set(struct led_classdev *led_cdev,

			       enum led_brightness value)

{

	if (value)

		GPSR0 = GPIO_bit(CORGI_GPIO_LED_ORANGE);

	else

		GPCR0 = GPIO_bit(CORGI_GPIO_LED_ORANGE);

}



static void corgiled_green_set(struct led_classdev *led_cdev,

			       enum led_brightness value)

{

	if (value)

		set_scoop_gpio(&corgiscoop_device.dev, CORGI_SCP_LED_GREEN);

	else

		reset_scoop_gpio(&corgiscoop_device.dev, CORGI_SCP_LED_GREEN);

}



static struct led_classdev corgi_amber_led = {

	.name			= "corgi:amber:charge",

	.default_trigger	= "sharpsl-charge",

	.brightness_set		= corgiled_amber_set,

};



static struct led_classdev corgi_green_led = {

	.name			= "corgi:green:mail",

	.default_trigger	= "nand-disk",

	.brightness_set		= corgiled_green_set,

};



#ifdef CONFIG_PM

static int corgiled_suspend(struct platform_device *dev, pm_message_t state)

{

#ifdef CONFIG_LEDS_TRIGGERS

	if (corgi_amber_led.trigger &&

	    strcmp(corgi_amber_led.trigger->name, "sharpsl-charge"))

#endif

		led_classdev_suspend(&corgi_amber_led);

	led_classdev_suspend(&corgi_green_led);

	return 0;

}



static int corgiled_resume(struct platform_device *dev)

{

	led_classdev_resume(&corgi_amber_led);

	led_classdev_resume(&corgi_green_led);

	return 0;

}

#endif



static int corgiled_probe(struct platform_device *pdev)

{

	int ret;



	ret = led_classdev_register(&pdev->dev, &corgi_amber_led);

	if (ret < 0)

		return ret;



	ret = led_classdev_register(&pdev->dev, &corgi_green_led);

	if (ret < 0)

		led_classdev_unregister(&corgi_amber_led);



	return ret;

}



static int corgiled_remove(struct platform_device *pdev)

{

	led_classdev_unregister(&corgi_amber_led);

	led_classdev_unregister(&corgi_green_led);

	return 0;

}



static struct platform_driver corgiled_driver = {

	.probe		= corgiled_probe,

	.remove		= corgiled_remove,

#ifdef CONFIG_PM

	.suspend	= corgiled_suspend,

	.resume		= corgiled_resume,

#endif

	.driver		= {

		.name		= "corgi-led",

		.owner		= THIS_MODULE,

	},

};



static int __init corgiled_init(void)

{

	return platform_driver_register(&corgiled_driver);

}



static void __exit corgiled_exit(void)

{

	platform_driver_unregister(&corgiled_driver);

}



module_init(corgiled_init);

module_exit(corgiled_exit);



MODULE_AUTHOR("Richard Purdie <rpurdie@openedhand.com>");

MODULE_DESCRIPTION("Corgi LED driver");

MODULE_LICENSE("GPL");

MODULE_ALIAS("platform:corgi-led");