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

Commit 2c06897e authored by Lee Jones's avatar Lee Jones Committed by Linus Walleij
Browse files

ARM: ux500: Only configure wake-up reasons on ux500 based platforms 



Multiplatform calls all enabled platforms' initcalls. In the
ux500_idle_init() initcall we call into the DBx500-PRCMU which in turn
executes some ux500 specific register reads/writes. When running on
some !ux500 platforms this ends up causing a kernel Oops. This patch
ensures the PRCMU call is only invoked when running on ux500 based
platforms.

Reported-by: default avatarRob Herring <rob.herring@calxeda.com>
Signed-off-by: default avatarLee Jones <lee.jones@linaro.org>
Signed-off-by: default avatarLinus Walleij <linus.walleij@linaro.org>
parent e4aa937e

arch/arm/mach-ux500/cpuidle.c

+4 −0
Original line number Diff line number Diff line
@@ -21,6 +21,7 @@ 
#include <asm/proc-fns.h>



#include "db8500-regs.h"

#include "id.h"



static atomic_t master = ATOMIC_INIT(0);

static DEFINE_SPINLOCK(master_lock);
@@ -114,6 +115,9 @@ static struct cpuidle_driver ux500_idle_driver = { 


int __init ux500_idle_init(void)

{

	if (!(cpu_is_u8500_family() || cpu_is_ux540_family()))

		return -ENODEV;



	/* Configure wake up reasons */

	prcmu_enable_wakeups(PRCMU_WAKEUP(ARM) | PRCMU_WAKEUP(RTC) |

			     PRCMU_WAKEUP(ABB));