diff options
| author | Philippe Langlais <philippe.langlais@linaro.org> | 2011-06-08 14:56:42 +0200 |
|---|---|---|
| committer | said m bagheri <ebgheri@steludxu2848.(none)> | 2011-06-17 13:41:44 +0200 |
| commit | 0b02b8a608f399260bc62dd4b3791ef17d6e0642 (patch) | |
| tree | caae77dfe01db293b08e51b9e6e1c3a1cc2f1247 /arch/arm/configs | |
| parent | a8054d8fc4ec0df5d8445d8ce9103c85e5ba8a31 (diff) | |
ARM: ux500: timer: Replace timer-rtt clockevent
Replace the timer-rtt clockevent with something streamlined
for cpuidle since that is the only way the rtt will be used.
It will only be used to program wake-ups from ApSleep/ApDeepSleep.
ST-Ericsson Linux next: ER338422
ST-Ericsson ID: ER336077
ST-Ericsson FOSS-OUT ID: Trivial
Change-Id: I94f4f82f11cb4e5a0f710128baa89626f5d21c2c
Signed-off-by: Jonas Aaberg <jonas.aberg@stericsson.com>
Reviewed-on: http://gerrit.lud.stericsson.com/gerrit/21959
Reviewed-by: Rickard ANDERSSON <rickard.andersson@stericsson.com>
Conflicts:
arch/arm/configs/u8500_defconfig
arch/arm/mach-ux500/Makefile
arch/arm/mach-ux500/pm/Kconfig
arch/arm/mach-ux500/pm/cpuidle.c
arch/arm/mach-ux500/timer-db8500.c
arch/arm/mach-ux500/timer-rtt.c
Diffstat (limited to 'arch/arm/configs')
| -rw-r--r-- | arch/arm/configs/u8500_defconfig | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/configs/u8500_defconfig b/arch/arm/configs/u8500_defconfig index bbd70161f8a..248d8c9e684 100644 --- a/arch/arm/configs/u8500_defconfig +++ b/arch/arm/configs/u8500_defconfig @@ -217,7 +217,7 @@ CONFIG_LEDS_PWM=y CONFIG_RTC_CLASS=y CONFIG_RTC_DRV_AB=y CONFIG_RTC_DRV_AB8500=y -CONFIG_RTC_DRV_PL031=y +# CONFIG_RTC_DRV_PL031 is not set CONFIG_DMADEVICES=y CONFIG_STE_DMA40=y CONFIG_STAGING=y |