amd8111, ck804, mcp55: use CONFIG_HPET_ADDRESS

As acpi_write_hpet() uses CONFIG_HPET_ADDRESS in the HPET table we
need to use CONFIG_HPET_ADDRESS when assigning it to the device.

Change-Id: I656f917658f1c1717bb3653fa048a6d36fca2454
Signed-off-by: Jonathan A. Kollasch <jakllsch@kollasch.net>
Reviewed-on: http://review.coreboot.org/10925
Tested-by: build bot (Jenkins)
Reviewed-by: Idwer Vollering <vidwer@gmail.com>
Tested-by: Raptor Engineering Automated Test Stand <noreply@raptorengineeringinc.com>
Reviewed-by: Patrick Georgi <pgeorgi@google.com>
This commit is contained in:
Jonathan A. Kollasch 2015-07-15 13:47:33 -05:00
parent 0dee57837b
commit 6f0e8bdc16
3 changed files with 3 additions and 3 deletions

View File

@ -26,7 +26,7 @@ static void enable_hpet(struct device *dev)
{ {
unsigned long hpet_address; unsigned long hpet_address;
pci_write_config32(dev,0xa0, 0xfed00001); pci_write_config32(dev, 0xa0, CONFIG_HPET_ADDRESS|1);
hpet_address = pci_read_config32(dev,0xa0)& 0xfffffffe; hpet_address = pci_read_config32(dev,0xa0)& 0xfffffffe;
printk(BIOS_DEBUG, "enabling HPET @0x%lx\n", hpet_address); printk(BIOS_DEBUG, "enabling HPET @0x%lx\n", hpet_address);

View File

@ -207,7 +207,7 @@ static void ck804_lpc_read_resources(device_t dev)
res = find_resource(dev, 0x44); /* HPET */ res = find_resource(dev, 0x44); /* HPET */
if (res) { if (res) {
res->base = 0xfed00000; res->base = CONFIG_HPET_ADDRESS;
res->flags |= IORESOURCE_ASSIGNED | IORESOURCE_FIXED; res->flags |= IORESOURCE_ASSIGNED | IORESOURCE_FIXED;
} }
} }

View File

@ -83,7 +83,7 @@ static void enable_hpet(struct device *dev)
{ {
unsigned long hpet_address; unsigned long hpet_address;
pci_write_config32(dev, 0x44, 0xfed00001); pci_write_config32(dev, 0x44, CONFIG_HPET_ADDRESS|1);
hpet_address=pci_read_config32(dev, 0x44) & 0xfffffffe; hpet_address=pci_read_config32(dev, 0x44) & 0xfffffffe;
printk(BIOS_DEBUG, "enabling HPET @0x%lx\n", hpet_address); printk(BIOS_DEBUG, "enabling HPET @0x%lx\n", hpet_address);
} }