diff options
| author | Edward O'Callaghan <edward.ocallaghan@koparo.com> | 2015-06-07 19:42:47 +1000 |
|---|---|---|
| committer | Edward O'Callaghan <edward.ocallaghan@koparo.com> | 2015-06-08 13:01:55 +0200 |
| commit | 4565aea8fbb114f65ecce7bdaaa538f80c382599 (patch) | |
| tree | cadf9cc0c2c7d58ca105ac78b1cd1b8fdb63cade | |
| parent | cacf7234afaaef29d1fe5739f423fb2c1b29cdfb (diff) | |
| download | coreboot-4565aea8fbb114f65ecce7bdaaa538f80c382599.tar.xz | |
southbridge/amd/{agesa,pi}/hudson/lpc.c: Sync together
Resync together, backporting a fix for the initialization of
8254 and 8259, as in commit 8d9a1bd5. Also fix a typo and
reduce out useless whitespace differences.
Change-Id: I9a9b1fb9083c5417a8d061f90a89074f2a601ddf
Signed-off-by: Edward O'Callaghan <edward.ocallaghan@koparo.com>
Reported-by: Paul Menzel <paulepanter@users.sourceforge.net>
Reviewed-on: http://review.coreboot.org/10453
Tested-by: build bot (Jenkins)
Reviewed-by: Stefan Reinauer <stefan.reinauer@coreboot.org>
| -rw-r--r-- | src/southbridge/amd/agesa/hudson/lpc.c | 11 | ||||
| -rw-r--r-- | src/southbridge/amd/pi/hudson/lpc.c | 16 |
2 files changed, 17 insertions, 10 deletions
diff --git a/src/southbridge/amd/agesa/hudson/lpc.c b/src/southbridge/amd/agesa/hudson/lpc.c index 65cb955047..c727fa9fa1 100644 --- a/src/southbridge/amd/agesa/hudson/lpc.c +++ b/src/southbridge/amd/agesa/hudson/lpc.c @@ -30,6 +30,8 @@ #include <arch/io.h> #include <arch/ioapic.h> #include <arch/acpi.h> +#include <pc80/i8254.h> +#include <pc80/i8259.h> #include "hudson.h" static void lpc_init(device_t dev) @@ -79,6 +81,12 @@ static void lpc_init(device_t dev) * 1 tells cmos_init to always initialize the CMOS. */ cmos_init(0); + + /* Initialize i8259 pic */ + setup_i8259 (); + + /* Initialize i8254 timers */ + setup_i8254 (); } static void hudson_lpc_read_resources(device_t dev) @@ -320,7 +328,6 @@ unsigned long acpi_fill_mcfg(unsigned long current) return current; } - static struct pci_operations lops_pci = { .set_subsystem = pci_dev_set_subsystem, }; @@ -328,10 +335,10 @@ static struct pci_operations lops_pci = { static struct device_operations lpc_ops = { .read_resources = hudson_lpc_read_resources, .set_resources = hudson_lpc_set_resources, + .enable_resources = hudson_lpc_enable_resources, #if IS_ENABLED(CONFIG_HAVE_ACPI_TABLES) .write_acpi_tables = acpi_write_hpet, #endif - .enable_resources = hudson_lpc_enable_resources, .init = lpc_init, .scan_bus = scan_lpc_bus, .ops_pci = &lops_pci, diff --git a/src/southbridge/amd/pi/hudson/lpc.c b/src/southbridge/amd/pi/hudson/lpc.c index b813d12173..c727fa9fa1 100644 --- a/src/southbridge/amd/pi/hudson/lpc.c +++ b/src/southbridge/amd/pi/hudson/lpc.c @@ -28,8 +28,8 @@ #include <pc80/mc146818rtc.h> #include <pc80/isa-dma.h> #include <arch/io.h> -#include <arch/acpi.h> #include <arch/ioapic.h> +#include <arch/acpi.h> #include <pc80/i8254.h> #include <pc80/i8259.h> #include "hudson.h" @@ -134,7 +134,7 @@ static void hudson_lpc_set_resources(struct device *dev) /** * @brief Enable resources for children devices * - * @param dev the device whos children's resources are to be enabled + * @param dev the device whose children's resources are to be enabled * */ static void hudson_lpc_enable_childrens_resources(device_t dev) @@ -316,18 +316,18 @@ static void hudson_lpc_enable_childrens_resources(device_t dev) pci_write_config8(dev, 0x74, wiosize); } -unsigned long acpi_fill_mcfg(unsigned long current) -{ - /* Just a dummy */ - return current; -} - static void hudson_lpc_enable_resources(device_t dev) { pci_dev_enable_resources(dev); hudson_lpc_enable_childrens_resources(dev); } +unsigned long acpi_fill_mcfg(unsigned long current) +{ + /* Just a dummy */ + return current; +} + static struct pci_operations lops_pci = { .set_subsystem = pci_dev_set_subsystem, }; |