ARM: mach-realview and mach-versatile: retire custom LED code

This replaces the custom LED trigger code in mach-realview with
some overarching platform code for the plat-versatile family that
will lock down LEDs 2 thru 5 for CPU activity indication. The
day we have 8 core ARM systems the plat-versatile code will have
to become more elaborate.

Tested on RealView PB11MPCore by invoking four different CPU
hogs (yes > /dev/null&) and see the LEDs go on one at a time.
They all go off as the hogs are killed. Tested on the PB1176
as well - just one activity led (led 2) goes on and off with
CPU activity.

(bryan.wu@canonical.com: use ledtrig-cpu instead of ledtrig-arm-cpu)

Cc: Richard Purdie <rpurdie@rpsys.net>
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
Signed-off-by: Bryan Wu <bryan.wu@canonical.com>
Acked-by: Pawel Moll <pawel.moll@arm.com>

2 files changed, 7 insertions, 5 deletions

diff --git a/arch/arm/plat-versatile/Kconfig b/arch/arm/plat-versatile/Kconfig
index 81ee7cc34457..5c73e31c1e14 100644
--- a/arch/arm/plat-versatile/Kconfig
+++ b/arch/arm/plat-versatile/Kconfig
@@ -13,8 +13,10 @@ config PLAT_VERSATILE_FPGA_IRQ_NR
        depends on PLAT_VERSATILE_FPGA_IRQ
 
 config PLAT_VERSATILE_LEDS
-        def_bool y if LEDS_CLASS
+        def_bool y if NEW_LEDS
         depends on ARCH_REALVIEW || ARCH_VERSATILE
+        select LEDS_CLASS
+        select LEDS_TRIGGER
 
 config PLAT_VERSATILE_SCHED_CLOCK
         def_bool y
diff --git a/arch/arm/plat-versatile/leds.c b/arch/arm/plat-versatile/leds.c
index 3169fa555ea6..d2490d00b46c 100644
--- a/arch/arm/plat-versatile/leds.c
+++ b/arch/arm/plat-versatile/leds.c
@@ -37,10 +37,10 @@ static const struct {
 } versatile_leds[] = {
         { "versatile:0", "heartbeat", },
         { "versatile:1", "mmc0", },
-        { "versatile:2", },
-        { "versatile:3", },
-        { "versatile:4", },
-        { "versatile:5", },
+        { "versatile:2", "cpu0" },
+        { "versatile:3", "cpu1" },
+        { "versatile:4", "cpu2" },
+        { "versatile:5", "cpu3" },
         { "versatile:6", },
         { "versatile:7", },
 };