From d39f09f691568bfad8fd652834258617a7c2f5ef Mon Sep 17 00:00:00 2001 From: Michel JAOUEN Date: Thu, 19 Jan 2012 17:33:37 +0100 Subject: pm: mach-ux500: support ape u9450 id, cpu, irq, reg, timer, uart, l2 cache. ST-Ericsson ID: 409625 Signed-off-by: Michel JAOUEN --- arch/arm/mach-ux500/pm/timer.c | 2 +- arch/arm/mach-ux500/product.c | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/arch/arm/mach-ux500/pm/timer.c b/arch/arm/mach-ux500/pm/timer.c index b870163200c..fc81c2c15ad 100644 --- a/arch/arm/mach-ux500/pm/timer.c +++ b/arch/arm/mach-ux500/pm/timer.c @@ -179,7 +179,7 @@ void ux500_rtcrtt_next(u32 time_us) static int __init ux500_rtcrtt_init(void) { - if (cpu_is_u8500()) { + if (cpu_is_u8500() || cpu_is_u9540()) { rtc_base = __io_address(U8500_RTC_BASE); } else if (cpu_is_u5500()) { rtc_base = __io_address(U5500_RTC_BASE); diff --git a/arch/arm/mach-ux500/product.c b/arch/arm/mach-ux500/product.c index 014fe4b145d..f4647b3ab29 100644 --- a/arch/arm/mach-ux500/product.c +++ b/arch/arm/mach-ux500/product.c @@ -38,7 +38,8 @@ bool ux500_jtag_enabled(void) if (cpu_is_u5500()) return readl_relaxed(__io_address(U5500_PRCMU_DBG_PWRCTRL)) & PRCMU_DBG_PWRCTRL_A9DBGCLKEN; - if (cpu_is_u8500()) + + if (cpu_is_u8500() || cpu_is_u9540()) return (product_config.rt_flags & TEE_RT_FLAGS_JTAG_ENABLED) == TEE_RT_FLAGS_JTAG_ENABLED; -- cgit v1.2.3