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

Commit e031cd51 authored by Bryan Wu's avatar Bryan Wu
Browse files

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: default avatarLinus Walleij <linus.walleij@linaro.org>
Signed-off-by: default avatarBryan Wu <bryan.wu@canonical.com>
Acked-by: default avatarPawel Moll <pawel.moll@arm.com>
parent d61015fa

arch/arm/mach-realview/core.c

+0 −39
Original line number Diff line number Diff line
@@ -35,7 +35,6 @@ 


#include <mach/hardware.h>

#include <asm/irq.h>

#include <asm/leds.h>

#include <asm/mach-types.h>

#include <asm/hardware/arm_timer.h>

#include <asm/hardware/icst.h>
@@ -436,44 +435,6 @@ struct clcd_board clcd_plat_data = { 
	.remove		= versatile_clcd_remove_dma,

};



#ifdef CONFIG_LEDS

#define VA_LEDS_BASE (__io_address(REALVIEW_SYS_BASE) + REALVIEW_SYS_LED_OFFSET)



void realview_leds_event(led_event_t ledevt)

{

	unsigned long flags;

	u32 val;

	u32 led = 1 << smp_processor_id();



	local_irq_save(flags);

	val = readl(VA_LEDS_BASE);



	switch (ledevt) {

	case led_idle_start:

		val = val & ~led;

		break;



	case led_idle_end:

		val = val | led;

		break;



	case led_timer:

		val = val ^ REALVIEW_SYS_LED7;

		break;



	case led_halted:

		val = 0;

		break;



	default:

		break;

	}



	writel(val, VA_LEDS_BASE);

	local_irq_restore(flags);

}

#endif	/* CONFIG_LEDS */



/*

 * Where is the timer (VA)?

 */

arch/arm/mach-realview/core.h

+0 −2
Original line number Diff line number Diff line
@@ -26,7 +26,6 @@ 
#include <linux/io.h>



#include <asm/setup.h>

#include <asm/leds.h>



#define APB_DEVICE(name, busid, base, plat)			\

static AMBA_APB_DEVICE(name, busid, 0, REALVIEW_##base##_BASE, base##_IRQ, plat)
@@ -47,7 +46,6 @@ extern void __iomem *timer1_va_base; 
extern void __iomem *timer2_va_base;

extern void __iomem *timer3_va_base;



extern void realview_leds_event(led_event_t ledevt);

extern void realview_timer_init(unsigned int timer_irq);

extern int realview_flash_register(struct resource *res, u32 num);

extern int realview_eth_register(const char *name, struct resource *res);

arch/arm/mach-realview/realview_eb.c

+0 −5
Original line number Diff line number Diff line
@@ -30,7 +30,6 @@ 


#include <mach/hardware.h>

#include <asm/irq.h>

#include <asm/leds.h>

#include <asm/mach-types.h>

#include <asm/pmu.h>

#include <asm/pgtable.h>
@@ -462,10 +461,6 @@ static void __init realview_eb_init(void) 
		struct amba_device *d = amba_devs[i];

		amba_device_register(d, &iomem_resource);

	}



#ifdef CONFIG_LEDS

	leds_event = realview_leds_event;

#endif

}



MACHINE_START(REALVIEW_EB, "ARM-RealView EB")

arch/arm/mach-realview/realview_pb1176.c

+0 −5
Original line number Diff line number Diff line
@@ -32,7 +32,6 @@ 


#include <mach/hardware.h>

#include <asm/irq.h>

#include <asm/leds.h>

#include <asm/mach-types.h>

#include <asm/pmu.h>

#include <asm/pgtable.h>
@@ -375,10 +374,6 @@ static void __init realview_pb1176_init(void) 
		struct amba_device *d = amba_devs[i];

		amba_device_register(d, &iomem_resource);

	}



#ifdef CONFIG_LEDS

	leds_event = realview_leds_event;

#endif

}



MACHINE_START(REALVIEW_PB1176, "ARM-RealView PB1176")

arch/arm/mach-realview/realview_pb11mp.c

+0 −5
Original line number Diff line number Diff line
@@ -30,7 +30,6 @@ 


#include <mach/hardware.h>

#include <asm/irq.h>

#include <asm/leds.h>

#include <asm/mach-types.h>

#include <asm/pmu.h>

#include <asm/pgtable.h>
@@ -357,10 +356,6 @@ static void __init realview_pb11mp_init(void) 
		struct amba_device *d = amba_devs[i];

		amba_device_register(d, &iomem_resource);

	}



#ifdef CONFIG_LEDS

	leds_event = realview_leds_event;

#endif

}



MACHINE_START(REALVIEW_PB11MP, "ARM-RealView PB11MPCore")