[04/17] mach-versatile: retire custom LED code

Commit Message

Bryan Wu July 6, 2011, 12:34 p.m. UTC

From: Linus Walleij <[e-mail]>

The CPU activity LED is now handled by the trigger in the leds
subsystem, retire this old CONFIG_LEDS-based code.

Cc: Richard Purdie <[e-mail]>
Signed-off-by: Linus Walleij <[e-mail]>
Signed-off-by: Bryan Wu <[e-mail]>
Acked-by: Pawel Moll <[e-mail]>
---
 arch/arm/mach-versatile/core.c |   42 ----------------------------------------
 1 files changed, 0 insertions(+), 42 deletions(-)

Comments

Russell King - ARM Linux July 10, 2011, 9:28 a.m. UTC | #1

On Wed, Jul 06, 2011 at 08:34:34PM +0800, Bryan Wu wrote:
> From: Linus Walleij <[e-mail]>
> 
> The CPU activity LED is now handled by the trigger in the leds
> subsystem, retire this old CONFIG_LEDS-based code.

Shouldn't this be part of the previous patch?  The previous patch changes
both Realview and Versatile by touching plat-versatile.

Bryan Wu July 11, 2011, 2:02 p.m. UTC | #2

On Sun, Jul 10, 2011 at 5:28 PM, Russell King - ARM Linux
<[e-mail]> wrote:
> On Wed, Jul 06, 2011 at 08:34:34PM +0800, Bryan Wu wrote:
>> From: Linus Walleij <[e-mail]>
>>
>> The CPU activity LED is now handled by the trigger in the leds
>> subsystem, retire this old CONFIG_LEDS-based code.
>
> Shouldn't this be part of the previous patch?  The previous patch changes
> both Realview and Versatile by touching plat-versatile.
>

I will fold them together, if Linus has no problem about it.

Thanks,

Linus Walleij July 12, 2011, 11:12 a.m. UTC | #3

On Mon, Jul 11, 2011 at 4:02 PM, Bryan Wu <[e-mail]> wrote:
> On Sun, Jul 10, 2011 at 5:28 PM, Russell King - ARM Linux
> <[e-mail]> wrote:
>>
>> Shouldn't this be part of the previous patch?  The previous patch changes
>> both Realview and Versatile by touching plat-versatile.
>>
>
> I will fold them together, if Linus has no problem about it.

I have no problems with anything, and I'm not one bit picky about
SoB:s and Author: tags, I'm more concerned about the LED code
getting cleaned up. Just do whatever it takes to make good patches
out of this!

Thanks,
Linus Walleij

Patch

diff --git a/arch/arm/mach-versatile/core.c b/arch/arm/mach-versatile/core.c
index 0c99cf0..b9ff8ff 100644
--- a/arch/arm/mach-versatile/core.c
+++ b/arch/arm/mach-versatile/core.c
@@ -36,7 +36,6 @@ 
 
 #include <asm/system.h>
 #include <asm/irq.h>
-#include <asm/leds.h>
 #include <asm/hardware/arm_timer.h>
 #include <asm/hardware/icst.h>
 #include <asm/hardware/vic.h>
@@ -646,43 +645,6 @@  static struct amba_device *amba_devs[] __initdata = {
 	&kmi1_device,
 };
 
-#ifdef CONFIG_LEDS
-#define VA_LEDS_BASE (__io_address(VERSATILE_SYS_BASE) + VERSATILE_SYS_LED_OFFSET)
-
-static void versatile_leds_event(led_event_t ledevt)
-{
-	unsigned long flags;
-	u32 val;
-
-	local_irq_save(flags);
-	val = readl(VA_LEDS_BASE);
-
-	switch (ledevt) {
-	case led_idle_start:
-		val = val & ~VERSATILE_SYS_LED0;
-		break;
-
-	case led_idle_end:
-		val = val | VERSATILE_SYS_LED0;
-		break;
-
-	case led_timer:
-		val = val ^ VERSATILE_SYS_LED1;
-		break;
-
-	case led_halted:
-		val = 0;
-		break;
-
-	default:
-		break;
-	}
-
-	writel(val, VA_LEDS_BASE);
-	local_irq_restore(flags);
-}
-#endif	/* CONFIG_LEDS */
-
 /* Early initializations */
 void __init versatile_init_early(void)
 {
@@ -707,10 +669,6 @@  void __init versatile_init(void)
 		struct amba_device *d = amba_devs[i];
 		amba_device_register(d, &iomem_resource);
 	}
-
-#ifdef CONFIG_LEDS
-	leds_event = versatile_leds_event;
-#endif
 }
 
 /*