diff options
| author | Tony Lindgren <tony@atomide.com> | 2015-07-23 21:14:02 -0700 |
|---|---|---|
| committer | Tony Lindgren <tony@atomide.com> | 2015-07-23 21:14:02 -0700 |
| commit | 97d9a3d0967f711e271ef950f1745307720c95d5 (patch) | |
| tree | 0fe61791923a06a61e2512feb49b30504550b32c /arch/arm/mach-omap2/timer.c | |
| parent | 228e5fadba3c7d6ef39bac087cd086ab9d68d945 (diff) | |
| parent | 3b86616e3058462c340710dc7a5ac34ec8453944 (diff) | |
Merge tag 'for-v4.3/omap-hwmod-prcm-a' of git://git.kernel.org/pub/scm/linux/kernel/git/pjw/omap-pending into omap-for-v4.3/soc
ARM: OMAP2+: PRCM and hwmod changes for v4.3
This series adds:
- I/O wakeup support for AM43xx
- register lock and unlock support to the hwmod code (needed for the RTC
IP blocks on some chips)
- several fixes for sparse warnings and an unnecessary null pointer test
- a DRA7xx clockdomain configuration workaround, to deal with some hardware
bugs
Basic build, boot, and PM tests are here:
http://www.pwsan.com/omap/testlogs/hwmod-prcm-for-v4.3/20150723080012/
Since I do not have an AM43xx or DRA7xx device, I can't test on those
platforms.
Diffstat (limited to 'arch/arm/mach-omap2/timer.c')
| -rw-r--r-- | arch/arm/mach-omap2/timer.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/arch/arm/mach-omap2/timer.c b/arch/arm/mach-omap2/timer.c index c52051b6742c..f44bcab3f52f 100644 --- a/arch/arm/mach-omap2/timer.c +++ b/arch/arm/mach-omap2/timer.c @@ -208,8 +208,7 @@ static void __init omap_dmtimer_init(void) /* If we are a secure device, remove any secure timer nodes */ if ((omap_type() != OMAP2_DEVICE_TYPE_GP)) { np = omap_get_timer_dt(omap_timer_match, "ti,timer-secure"); - if (np) - of_node_put(np); + of_node_put(np); } } |