aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/char
diff options
context:
space:
mode:
authorRandy Dunlap <randy_d_dunlap@linux.intel.com>2005-10-30 18:03:42 -0500
committerLinus Torvalds <torvalds@g5.osdl.org>2005-10-30 20:37:31 -0500
commit757c4724099a31a61754ea5202802eaa1def851c (patch)
tree19e8d379a50d96f80fc179dc4567449de1eed623 /drivers/char
parent318db8f03bc06e6de98e98a568b6b2fa64233b87 (diff)
[PATCH] hpet: allow HPET FIXED_MEM32 resource type
Allow the ACPI HPET description table to use a resource type of FIXED_MEM32 for the HPET reource. Use the fixed resoure size of 1 KB for the HPET resource as per the HPET spec. Signed-off-by: Randy Dunlap <randy_d_dunlap@linux.intel.com> Acked-by: Bob Picco <bob.picco@hp.com> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'drivers/char')
-rw-r--r--drivers/char/hpet.c17
1 files changed, 17 insertions, 0 deletions
diff --git a/drivers/char/hpet.c b/drivers/char/hpet.c
index 0159c463f0f9..e605259e3753 100644
--- a/drivers/char/hpet.c
+++ b/drivers/char/hpet.c
@@ -49,6 +49,8 @@
49#define HPET_USER_FREQ (64) 49#define HPET_USER_FREQ (64)
50#define HPET_DRIFT (500) 50#define HPET_DRIFT (500)
51 51
52#define HPET_RANGE_SIZE 1024 /* from HPET spec */
53
52static u32 hpet_nhpet, hpet_max_freq = HPET_USER_FREQ; 54static u32 hpet_nhpet, hpet_max_freq = HPET_USER_FREQ;
53 55
54/* A lock for concurrent access by app and isr hpet activity. */ 56/* A lock for concurrent access by app and isr hpet activity. */
@@ -922,6 +924,21 @@ static acpi_status hpet_resources(struct acpi_resource *res, void *data)
922 for (hpetp = hpets; hpetp; hpetp = hpetp->hp_next) 924 for (hpetp = hpets; hpetp; hpetp = hpetp->hp_next)
923 if (hpetp->hp_hpet == hdp->hd_address) 925 if (hpetp->hp_hpet == hdp->hd_address)
924 return -EBUSY; 926 return -EBUSY;
927 } else if (res->id == ACPI_RSTYPE_FIXED_MEM32) {
928 struct acpi_resource_fixed_mem32 *fixmem32;
929
930 fixmem32 = &res->data.fixed_memory32;
931 if (!fixmem32)
932 return -EINVAL;
933
934 hdp->hd_phys_address = fixmem32->range_base_address;
935 hdp->hd_address = ioremap(fixmem32->range_base_address,
936 HPET_RANGE_SIZE);
937
938 for (hpetp = hpets; hpetp; hpetp = hpetp->hp_next)
939 if (hpetp->hp_hpet == hdp->hd_address) {
940 return -EBUSY;
941 }
925 } else if (res->id == ACPI_RSTYPE_EXT_IRQ) { 942 } else if (res->id == ACPI_RSTYPE_EXT_IRQ) {
926 struct acpi_resource_ext_irq *irqp; 943 struct acpi_resource_ext_irq *irqp;
927 int i; 944 int i;