diff options
| -rw-r--r-- | arch/arm/configs/imx23evk_defconfig (renamed from arch/arm/configs/mx23evk_defconfig) | 0 | ||||
| -rw-r--r-- | arch/arm/mach-mx28/Kconfig | 4 | ||||
| -rw-r--r-- | arch/arm/plat-mxs/timer-nomatch.c | 3 |
3 files changed, 7 insertions, 0 deletions
diff --git a/arch/arm/configs/mx23evk_defconfig b/arch/arm/configs/imx23evk_defconfig index 76f2a2a15363..76f2a2a15363 100644 --- a/arch/arm/configs/mx23evk_defconfig +++ b/arch/arm/configs/imx23evk_defconfig diff --git a/arch/arm/mach-mx28/Kconfig b/arch/arm/mach-mx28/Kconfig index c78d48da8fac..7ea1a91f4023 100644 --- a/arch/arm/mach-mx28/Kconfig +++ b/arch/arm/mach-mx28/Kconfig @@ -6,4 +6,8 @@ config MACH_MX28EVK depends on ARCH_MX28 select USB_ARCH_HAS_EHCI +config MXS_TIMER_WITH_MACH + bool + default y + endchoice diff --git a/arch/arm/plat-mxs/timer-nomatch.c b/arch/arm/plat-mxs/timer-nomatch.c index 91c9b2044357..66c488c99b42 100644 --- a/arch/arm/plat-mxs/timer-nomatch.c +++ b/arch/arm/plat-mxs/timer-nomatch.c @@ -29,6 +29,9 @@ #include <mach/device.h> #include <mach/regs-timrot.h> +#ifndef HW_TIMROT_TIMCOUNTn +#define HW_TIMROT_TIMCOUNTn HW_TIMROT_RUNNING_COUNTn +#endif static struct mxs_sys_timer *online_timer; static irqreturn_t |