diff options
| author | Philippe Langlais <philippe.langlais@linaro.org> | 2011-05-05 13:16:38 +0200 |
|---|---|---|
| committer | Ulf Hansson <ulf.hansson@stericsson.com> | 2011-09-19 15:14:58 +0200 |
| commit | 39df61cebd74536b1e4a4550abc8068b03443bcc (patch) | |
| tree | af628607a15a47d8ca3da1c19c63f3106173a308 | |
| parent | 9d2549c4f28d31fb904fbbadc8d75e0c4c7f497f (diff) | |
ARM: u5500: Fix build issues for u5500
Fix compilation errors (most are related to timer and power
which are not yet supported hence workaround is provided for now).
Updated u5500_defconfig based on latest dev kernel branch.
Patch for correct timer will be done in separate patch.
Signed-off-by: Shreshtha Kumar Sahu <shreshthakumar.sahu@stericsson.com>
Change-Id: Ie16d9a0d88a9346ae5967272fc79bd951ade005b
Reviewed-on: http://gerrit.lud.stericsson.com/gerrit/18256
Tested-by: Rabin VINCENT <rabin.vincent@stericsson.com>
Reviewed-by: Srinidhi KASAGAR <srinidhi.kasagar@stericsson.com>
Conflicts:
arch/arm/configs/u5500_defconfig
arch/arm/mach-ux500/Kconfig
arch/arm/mach-ux500/Makefile
arch/arm/mach-ux500/timer-db8500.c
| -rw-r--r-- | arch/arm/mach-ux500/Kconfig | 2 | ||||
| -rw-r--r-- | arch/arm/mach-ux500/Makefile | 4 | ||||
| -rw-r--r-- | arch/arm/mach-ux500/timer.c | 2 |
3 files changed, 5 insertions, 3 deletions
diff --git a/arch/arm/mach-ux500/Kconfig b/arch/arm/mach-ux500/Kconfig index 510173c27d8..bc0caf63e1a 100644 --- a/arch/arm/mach-ux500/Kconfig +++ b/arch/arm/mach-ux500/Kconfig @@ -74,7 +74,7 @@ choice config UX500_PRCMU_TIMER bool "PRCMU Timer sched_clock" - depends on U8500_CPUIDLE + depends on U8500_CPUIDLE && !UX500_SOC_DB5500 help Add support for an always on sched_clock, required for proper cpuidle and suspend. diff --git a/arch/arm/mach-ux500/Makefile b/arch/arm/mach-ux500/Makefile index 73a84869f0d..2017c1f8eb7 100644 --- a/arch/arm/mach-ux500/Makefile +++ b/arch/arm/mach-ux500/Makefile @@ -8,13 +8,13 @@ endif obj-y := clock.o cpu.o devices.o dcache.o \ devices-common.o id.o pins.o \ - timer.o timer-mtu.o timer-rtt.o usb.o + timer.o timer-mtu.o usb.o obj-y += pm/ obj-$(CONFIG_UX500_SOC_DB5500) += cpu-db5500.o dma-db5500.o prcmu-db5500.o \ devices-db5500.o obj-$(CONFIG_UX500_SOC_DB8500) += cpu-db8500.o devices-db8500.o \ prcmu-db8500.o clock-db8500.o \ - regulator-db8500.o + regulator-db8500.o timer-rtt.o obj-$(CONFIG_MACH_U8500) += board-mop500.o board-mop500-sdi.o \ board-mop500-regulators.o \ board-mop500-uib.o board-mop500-stuib.o \ diff --git a/arch/arm/mach-ux500/timer.c b/arch/arm/mach-ux500/timer.c index 2d3673da5ab..2a8588f17fa 100644 --- a/arch/arm/mach-ux500/timer.c +++ b/arch/arm/mach-ux500/timer.c @@ -69,8 +69,10 @@ static void __init ux500_timer_init(void) * */ mtu_timer_init(); +#ifdef CONFIG_UX500_PRCMU_TIMER rtc_rtt_timer_init(0); prcmu_timer_init(); +#endif #ifdef CONFIG_UX500_CONTEXT WARN_ON(context_ape_notifier_register(&mtu_context_notifier)); |