mirror of
https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git
synced 2026-10-29 03:01:39 -04:00
Merge branches 'timers-core-for-linus' and 'timers-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
Pull timer updates - and a leftover fix - from Thomas Gleixner:
"A rather large (commit wise) update from the timer side:
- A bulk update to make compile tests work in the clocksource drivers
- An overhaul of the h8300 timers
- Some more Y2038 work
- A few overflow prevention checks in the timekeeping/ntp code
- The usual pile of fixes and improvements to the various
clocksource/clockevent drivers and core code"
Also:
"A single fix for the posix-clock poll code which did not make it into
4.4"
* 'timers-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip: (84 commits)
clocksource/drivers/acpi_pm: Convert to pr_* macros
clocksource: Make clocksource validation work for all clocksources
timekeeping: Cap adjustments so they don't exceed the maxadj value
ntp: Fix second_overflow's input parameter type to be 64bits
ntp: Change time_reftime to time64_t and utilize 64bit __ktime_get_real_seconds
timekeeping: Provide internal function __ktime_get_real_seconds
clocksource/drivers/h8300: Use ioread / iowrite
clocksource/drivers/h8300: Initializer cleanup.
clocksource/drivers/h8300: Simplify delta handling
clocksource/drivers/h8300: Fix timer not overflow case
clocksource/drivers/h8300: Change to overflow interrupt
clocksource/drivers/lpc32: Correct pr_err() output format
clocksource/drivers/arm_global_timer: Fix suspend resume
clocksource/drivers/pistachio: Fix wrong calculated clocksource read value
clockevents/drivers/arm_global_timer: Use writel_relaxed in gt_compare_set
clocksource/drivers/dw_apb_timer: Inline apbt_readl and apbt_writel
clocksource/drivers/dw_apb_timer: Use {readl|writel}_relaxed in critical path
clocksource/drivers/dw_apb_timer: Fix apbt_readl return types
clocksource/drivers/tango-xtal: Replace code by clocksource_mmio_init
clocksource/drivers/h8300: Increase the compilation test coverage
...
* 'timers-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
posix-clock: Fix return code on the poll method's error path
This commit is contained in:
commit
b4cee21ee0
38 changed files with 621 additions and 624 deletions
|
|
@ -21,9 +21,9 @@ static const char ipr_bit[] = {
|
|||
10, 10, 10, 10, 9, 9, 9, 9,
|
||||
};
|
||||
|
||||
static void *intc_baseaddr;
|
||||
static void __iomem *intc_baseaddr;
|
||||
|
||||
#define IPR ((unsigned long)intc_baseaddr + 6)
|
||||
#define IPR (intc_baseaddr + 6)
|
||||
|
||||
static void h8300h_disable_irq(struct irq_data *data)
|
||||
{
|
||||
|
|
@ -81,8 +81,8 @@ static int __init h8300h_intc_of_init(struct device_node *intc,
|
|||
BUG_ON(!intc_baseaddr);
|
||||
|
||||
/* All interrupt priority low */
|
||||
ctrl_outb(0x00, IPR + 0);
|
||||
ctrl_outb(0x00, IPR + 1);
|
||||
writeb(0x00, IPR + 0);
|
||||
writeb(0x00, IPR + 1);
|
||||
|
||||
domain = irq_domain_add_linear(intc, NR_IRQS, &irq_ops, NULL);
|
||||
BUG_ON(!domain);
|
||||
|
|
|
|||
Loading…
Reference in a new issue