x86: HPET_MSI Basic HPET_MSI setup code, cleanups (4588c1f0) · Commits · e / devices / android_kernel_teracube_emerald

arch/x86/kernel/hpet.c

+25 −25

Original line number	Diff line number	Diff line
		#include <linux/clocksource.h>
		#include <linux/clockchips.h>
		#include <linux/interrupt.h>
		#include <linux/sysdev.h>
		#include <linux/delay.h>
		#include <linux/errno.h>
		#include <linux/hpet.h>
		#include <linux/init.h>
		#include <linux/sysdev.h>
		#include <linux/pm.h>
		#include <linux/interrupt.h>
		#include <linux/cpu.h>
		#include <linux/pm.h>
		#include <linux/io.h>

		#include <asm/fixmap.h>
		#include <asm/hpet.h>
		#include <asm/i8253.h>
		#include <asm/io.h>
		#include <asm/hpet.h>

		#define HPET_MASK CLOCKSOURCE_MASK(32)
		#define HPET_SHIFT 22
		@@ -91,7 +91,7 @@ __setup("nohpet", disable_hpet);

		static inline int is_hpet_capable(void)
		{
		return (!boot_hpet_disable && hpet_address);
		return !boot_hpet_disable && hpet_address;
		}

		/*
		@@ -141,8 +141,8 @@ static void hpet_reserve_platform_timers(unsigned long id)
		hd.hd_irq[1] = HPET_LEGACY_RTC;

		for (i = 2; i < nrtimers; timer++, i++) {
		hd.hd_irq[i] = (readl(&timer->hpet_config) & Tn_INT_ROUTE_CNF_MASK) >>
		Tn_INT_ROUTE_CNF_SHIFT;
		hd.hd_irq[i] = (readl(&timer->hpet_config) &
		Tn_INT_ROUTE_CNF_MASK) >> Tn_INT_ROUTE_CNF_SHIFT;
		}

		hpet_alloc(&hd);