diff options
Diffstat (limited to 'arch')
-rw-r--r-- | arch/arm/mach-omap2/timer.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/arch/arm/mach-omap2/timer.c b/arch/arm/mach-omap2/timer.c index b18ebbefae09..6c19d1e2029f 100644 --- a/arch/arm/mach-omap2/timer.c +++ b/arch/arm/mach-omap2/timer.c | |||
@@ -194,8 +194,8 @@ static struct device_node * __init omap_get_timer_dt(const struct of_device_id * | |||
194 | /** | 194 | /** |
195 | * omap_dmtimer_init - initialisation function when device tree is used | 195 | * omap_dmtimer_init - initialisation function when device tree is used |
196 | * | 196 | * |
197 | * For secure OMAP3 devices, timers with device type "timer-secure" cannot | 197 | * For secure OMAP3/DRA7xx devices, timers with device type "timer-secure" |
198 | * be used by the kernel as they are reserved. Therefore, to prevent the | 198 | * cannot be used by the kernel as they are reserved. Therefore, to prevent the |
199 | * kernel registering these devices remove them dynamically from the device | 199 | * kernel registering these devices remove them dynamically from the device |
200 | * tree on boot. | 200 | * tree on boot. |
201 | */ | 201 | */ |
@@ -203,7 +203,7 @@ static void __init omap_dmtimer_init(void) | |||
203 | { | 203 | { |
204 | struct device_node *np; | 204 | struct device_node *np; |
205 | 205 | ||
206 | if (!cpu_is_omap34xx()) | 206 | if (!cpu_is_omap34xx() && !soc_is_dra7xx()) |
207 | return; | 207 | return; |
208 | 208 | ||
209 | /* If we are a secure device, remove any secure timer nodes */ | 209 | /* If we are a secure device, remove any secure timer nodes */ |