Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 8e6cec1c authored by Thomas Gleixner's avatar Thomas Gleixner
Browse files

Merge branch 'clockevents/4.12-fixes' of... 

Merge branch 'clockevents/4.12-fixes' of https://git.linaro.org/people/daniel.lezcano/linux into timers/urgent

Pull clockevents fixes from Daniel Lezcano:

 - Fixed wrong iomem area unmapped in the arch_arm_timer (Frank Rowand)

 - Added missing includes for sun5i and cadence-ttc (Stephen Rothwell)
parents dbb236c1 459fa246

drivers/clocksource/arm_arch_timer.c

+2 −2
Original line number Diff line number Diff line
@@ -1209,9 +1209,9 @@ arch_timer_mem_frame_get_cntfrq(struct arch_timer_mem_frame *frame) 
		return 0;

	}



	rate = readl_relaxed(frame + CNTFRQ);

	rate = readl_relaxed(base + CNTFRQ);



	iounmap(frame);

	iounmap(base);



	return rate;

}

drivers/clocksource/cadence_ttc_timer.c

+1 −0
Original line number Diff line number Diff line
@@ -18,6 +18,7 @@ 
#include <linux/clk.h>

#include <linux/interrupt.h>

#include <linux/clockchips.h>

#include <linux/clocksource.h>

#include <linux/of_address.h>

#include <linux/of_irq.h>

#include <linux/slab.h>

drivers/clocksource/timer-sun5i.c

+1 −0
Original line number Diff line number Diff line
@@ -12,6 +12,7 @@ 


#include <linux/clk.h>

#include <linux/clockchips.h>

#include <linux/clocksource.h>

#include <linux/delay.h>

#include <linux/interrupt.h>

#include <linux/irq.h>