summaryrefslogtreecommitdiff
path: root/src/northbridge
diff options
context:
space:
mode:
Diffstat (limited to 'src/northbridge')
-rw-r--r--src/northbridge/amd/agesa/family12/northbridge.c2
-rw-r--r--src/northbridge/amd/agesa/family14/northbridge.c2
-rw-r--r--src/northbridge/amd/agesa/family15/northbridge.c2
-rw-r--r--src/northbridge/amd/agesa/family15rl/northbridge.c2
-rw-r--r--src/northbridge/amd/agesa/family15tn/northbridge.c2
-rw-r--r--src/northbridge/amd/agesa/family16kb/northbridge.c2
-rw-r--r--src/northbridge/amd/amdfam10/acpi.c2
-rw-r--r--src/northbridge/amd/amdfam10/amdfam10.h2
-rw-r--r--src/northbridge/amd/amdk8/acpi.c2
-rw-r--r--src/northbridge/amd/amdk8/acpi.h2
-rw-r--r--src/northbridge/amd/pi/00630F01/northbridge.c2
-rw-r--r--src/northbridge/amd/pi/00730F01/northbridge.c2
-rw-r--r--src/northbridge/intel/fsp_rangeley/acpi.c4
-rw-r--r--src/northbridge/intel/fsp_rangeley/northbridge.h8
-rw-r--r--src/northbridge/intel/fsp_sandybridge/gma.c2
-rw-r--r--src/northbridge/intel/gm45/gma.c2
-rw-r--r--src/northbridge/intel/haswell/gma.c2
-rw-r--r--src/northbridge/intel/i945/gma.c2
-rw-r--r--src/northbridge/intel/nehalem/gma.c2
-rw-r--r--src/northbridge/intel/sandybridge/gma.c2
-rw-r--r--src/northbridge/intel/sch/gma.c2
21 files changed, 28 insertions, 22 deletions
diff --git a/src/northbridge/amd/agesa/family12/northbridge.c b/src/northbridge/amd/agesa/family12/northbridge.c
index 935e137ea6..ee291a5d3b 100644
--- a/src/northbridge/amd/agesa/family12/northbridge.c
+++ b/src/northbridge/amd/agesa/family12/northbridge.c
@@ -811,7 +811,7 @@ static unsigned long acpi_fill_hest(acpi_hest_t *hest)
return (unsigned long)current;
}
-static void northbridge_fill_ssdt_generator(void)
+static void northbridge_fill_ssdt_generator(device_t device)
{
msr_t msr;
char pscope[] = "\\_SB.PCI0";
diff --git a/src/northbridge/amd/agesa/family14/northbridge.c b/src/northbridge/amd/agesa/family14/northbridge.c
index 32b74f6ee7..2cf4736aa4 100644
--- a/src/northbridge/amd/agesa/family14/northbridge.c
+++ b/src/northbridge/amd/agesa/family14/northbridge.c
@@ -793,7 +793,7 @@ static void cpu_bus_init(device_t dev)
/* North Bridge Structures */
-static void northbridge_fill_ssdt_generator(void)
+static void northbridge_fill_ssdt_generator(device_t device)
{
msr_t msr;
char pscope[] = "\\_SB.PCI0";
diff --git a/src/northbridge/amd/agesa/family15/northbridge.c b/src/northbridge/amd/agesa/family15/northbridge.c
index f13e3981af..c21da210cd 100644
--- a/src/northbridge/amd/agesa/family15/northbridge.c
+++ b/src/northbridge/amd/agesa/family15/northbridge.c
@@ -502,7 +502,7 @@ static unsigned long acpi_fill_hest(acpi_hest_t *hest)
return (unsigned long)current;
}
-static void northbridge_fill_ssdt_generator(void)
+static void northbridge_fill_ssdt_generator(device_t device)
{
msr_t msr;
char pscope[] = "\\_SB.PCI0";
diff --git a/src/northbridge/amd/agesa/family15rl/northbridge.c b/src/northbridge/amd/agesa/family15rl/northbridge.c
index 0a1e7d3bd8..6c2e953791 100644
--- a/src/northbridge/amd/agesa/family15rl/northbridge.c
+++ b/src/northbridge/amd/agesa/family15rl/northbridge.c
@@ -477,7 +477,7 @@ static unsigned long acpi_fill_hest(acpi_hest_t *hest)
return (unsigned long)current;
}
-static void northbridge_fill_ssdt_generator(void)
+static void northbridge_fill_ssdt_generator(device_t device)
{
msr_t msr;
char pscope[] = "\\_SB.PCI0";
diff --git a/src/northbridge/amd/agesa/family15tn/northbridge.c b/src/northbridge/amd/agesa/family15tn/northbridge.c
index 37b6a8e276..aef0d83e65 100644
--- a/src/northbridge/amd/agesa/family15tn/northbridge.c
+++ b/src/northbridge/amd/agesa/family15tn/northbridge.c
@@ -477,7 +477,7 @@ static unsigned long acpi_fill_hest(acpi_hest_t *hest)
return (unsigned long)current;
}
-static void northbridge_fill_ssdt_generator(void)
+static void northbridge_fill_ssdt_generator(device_t device)
{
msr_t msr;
char pscope[] = "\\_SB.PCI0";
diff --git a/src/northbridge/amd/agesa/family16kb/northbridge.c b/src/northbridge/amd/agesa/family16kb/northbridge.c
index 9bbc2794dd..192c3df109 100644
--- a/src/northbridge/amd/agesa/family16kb/northbridge.c
+++ b/src/northbridge/amd/agesa/family16kb/northbridge.c
@@ -477,7 +477,7 @@ static unsigned long acpi_fill_hest(acpi_hest_t *hest)
return (unsigned long)current;
}
-static void northbridge_fill_ssdt_generator(void)
+static void northbridge_fill_ssdt_generator(device_t device)
{
msr_t msr;
char pscope[] = "\\_SB.PCI0";
diff --git a/src/northbridge/amd/amdfam10/acpi.c b/src/northbridge/amd/amdfam10/acpi.c
index dee2087d67..734ebb66a4 100644
--- a/src/northbridge/amd/amdfam10/acpi.c
+++ b/src/northbridge/amd/amdfam10/acpi.c
@@ -196,7 +196,7 @@ void update_ssdtx(void *ssdtx, int i)
}
-void northbridge_acpi_write_vars(void)
+void northbridge_acpi_write_vars(device_t device)
{
/*
* If more than one physical CPU is installed, northbridge_acpi_write_vars()
diff --git a/src/northbridge/amd/amdfam10/amdfam10.h b/src/northbridge/amd/amdfam10/amdfam10.h
index 0bbdbd3a3e..9213ed1408 100644
--- a/src/northbridge/amd/amdfam10/amdfam10.h
+++ b/src/northbridge/amd/amdfam10/amdfam10.h
@@ -1076,6 +1076,6 @@ struct acpi_rsdp;
unsigned long northbridge_write_acpi_tables(unsigned long start,
struct acpi_rsdp *rsdp);
-void northbridge_acpi_write_vars(void);
+void northbridge_acpi_write_vars(device_t device);
#endif /* AMDFAM10_H */
diff --git a/src/northbridge/amd/amdk8/acpi.c b/src/northbridge/amd/amdk8/acpi.c
index d407d7ec2e..1bb1d83a25 100644
--- a/src/northbridge/amd/amdk8/acpi.c
+++ b/src/northbridge/amd/amdk8/acpi.c
@@ -277,7 +277,7 @@ static void k8acpi_write_pci_data(int dlen, const char *name, int offset) {
acpigen_pop_len();
}
-void k8acpi_write_vars(void)
+void k8acpi_write_vars(device_t device)
{
msr_t msr;
char pscope[] = "\\_SB.PCI0";
diff --git a/src/northbridge/amd/amdk8/acpi.h b/src/northbridge/amd/amdk8/acpi.h
index a9c2ded67f..4d822e4fb4 100644
--- a/src/northbridge/amd/amdk8/acpi.h
+++ b/src/northbridge/amd/amdk8/acpi.h
@@ -21,7 +21,7 @@
#define AMDK8_ACPI_H
#include <arch/acpigen.h>
-void k8acpi_write_vars(void);
+void k8acpi_write_vars(device_t device);
unsigned long northbridge_write_acpi_tables(unsigned long start, acpi_rsdp_t *rsdp);
#endif
diff --git a/src/northbridge/amd/pi/00630F01/northbridge.c b/src/northbridge/amd/pi/00630F01/northbridge.c
index 60a1d49645..d21becf582 100644
--- a/src/northbridge/amd/pi/00630F01/northbridge.c
+++ b/src/northbridge/amd/pi/00630F01/northbridge.c
@@ -471,7 +471,7 @@ static unsigned long acpi_fill_hest(acpi_hest_t *hest)
return (unsigned long)current;
}
-static void northbridge_fill_ssdt_generator(void)
+static void northbridge_fill_ssdt_generator(device_t device)
{
msr_t msr;
char pscope[] = "\\_SB.PCI0";
diff --git a/src/northbridge/amd/pi/00730F01/northbridge.c b/src/northbridge/amd/pi/00730F01/northbridge.c
index 8e340ce5c1..2e46b1672d 100644
--- a/src/northbridge/amd/pi/00730F01/northbridge.c
+++ b/src/northbridge/amd/pi/00730F01/northbridge.c
@@ -465,7 +465,7 @@ static unsigned long acpi_fill_hest(acpi_hest_t *hest)
return (unsigned long)current;
}
-static void northbridge_fill_ssdt_generator(void)
+static void northbridge_fill_ssdt_generator(device_t device)
{
msr_t msr;
char pscope[] = "\\_SB.PCI0";
diff --git a/src/northbridge/intel/fsp_rangeley/acpi.c b/src/northbridge/intel/fsp_rangeley/acpi.c
index 6b6a703bdc..c726155b75 100644
--- a/src/northbridge/intel/fsp_rangeley/acpi.c
+++ b/src/northbridge/intel/fsp_rangeley/acpi.c
@@ -65,7 +65,7 @@ unsigned long acpi_fill_mcfg(unsigned long current)
return current;
}
-void northbridge_acpi_fill_ssdt_generator(void)
+void northbridge_acpi_fill_ssdt_generator(device_t device)
{
u32 bmbound;
char pscope[] = "\\_SB.PCI0";
@@ -74,5 +74,5 @@ void northbridge_acpi_fill_ssdt_generator(void)
acpigen_write_scope(pscope);
acpigen_write_name_dword("BMBD", bmbound);
acpigen_pop_len();
- generate_cpu_entries();
+ generate_cpu_entries(device);
}
diff --git a/src/northbridge/intel/fsp_rangeley/northbridge.h b/src/northbridge/intel/fsp_rangeley/northbridge.h
index d7f4ebd81f..dc4676bfd9 100644
--- a/src/northbridge/intel/fsp_rangeley/northbridge.h
+++ b/src/northbridge/intel/fsp_rangeley/northbridge.h
@@ -27,6 +27,9 @@
/* Everything below this line is ignored in the DSDT */
#ifndef __ACPI__
+#include <rules.h>
+#include <device/device.h>
+
/* Device 0:0.0 PCI configuration space (Host Bridge) */
/* SideBand B-UNIT */
@@ -72,7 +75,10 @@ void dump_pci_devices(void);
void dump_spd_registers(void);
void dump_mem(unsigned start, unsigned end);
void report_platform_info(void);
-void northbridge_acpi_fill_ssdt_generator(void);
+
+#if ENV_RAMSTAGE
+void northbridge_acpi_fill_ssdt_generator(device_t device);
+#endif
#endif /* #ifndef __ASSEMBLER__ */
#endif /* #ifndef __ACPI__ */
diff --git a/src/northbridge/intel/fsp_sandybridge/gma.c b/src/northbridge/intel/fsp_sandybridge/gma.c
index 26f1ae6789..132a1b869b 100644
--- a/src/northbridge/intel/fsp_sandybridge/gma.c
+++ b/src/northbridge/intel/fsp_sandybridge/gma.c
@@ -74,7 +74,7 @@ intel_gma_get_controller_info(void)
return &chip->gfx;
}
-static void gma_ssdt(void)
+static void gma_ssdt(device_t device)
{
const struct i915_gpu_controller_info *gfx = intel_gma_get_controller_info();
if (!gfx) {
diff --git a/src/northbridge/intel/gm45/gma.c b/src/northbridge/intel/gm45/gma.c
index 7cc59c8efa..f29b9b19f5 100644
--- a/src/northbridge/intel/gm45/gma.c
+++ b/src/northbridge/intel/gm45/gma.c
@@ -502,7 +502,7 @@ intel_gma_get_controller_info(void)
return &chip->gfx;
}
-static void gma_ssdt(void)
+static void gma_ssdt(device_t device)
{
const struct i915_gpu_controller_info *gfx = intel_gma_get_controller_info();
if (!gfx) {
diff --git a/src/northbridge/intel/haswell/gma.c b/src/northbridge/intel/haswell/gma.c
index f120670ebc..21a285c7f3 100644
--- a/src/northbridge/intel/haswell/gma.c
+++ b/src/northbridge/intel/haswell/gma.c
@@ -498,7 +498,7 @@ intel_gma_get_controller_info(void)
return &chip->gfx;
}
-static void gma_ssdt(void)
+static void gma_ssdt(device_t device)
{
const struct i915_gpu_controller_info *gfx = intel_gma_get_controller_info();
if (!gfx) {
diff --git a/src/northbridge/intel/i945/gma.c b/src/northbridge/intel/i945/gma.c
index 28f611fcb2..a2e51636db 100644
--- a/src/northbridge/intel/i945/gma.c
+++ b/src/northbridge/intel/i945/gma.c
@@ -499,7 +499,7 @@ intel_gma_get_controller_info(void)
return &chip->gfx;
}
-static void gma_ssdt(void)
+static void gma_ssdt(device_t device)
{
const struct i915_gpu_controller_info *gfx = intel_gma_get_controller_info();
if (!gfx) {
diff --git a/src/northbridge/intel/nehalem/gma.c b/src/northbridge/intel/nehalem/gma.c
index d4217de0cf..609701de95 100644
--- a/src/northbridge/intel/nehalem/gma.c
+++ b/src/northbridge/intel/nehalem/gma.c
@@ -1082,7 +1082,7 @@ intel_gma_get_controller_info(void)
return &chip->gfx;
}
-static void gma_ssdt(void)
+static void gma_ssdt(device_t device)
{
const struct i915_gpu_controller_info *gfx = intel_gma_get_controller_info();
if (!gfx) {
diff --git a/src/northbridge/intel/sandybridge/gma.c b/src/northbridge/intel/sandybridge/gma.c
index d7ad8febb1..979d65ab5c 100644
--- a/src/northbridge/intel/sandybridge/gma.c
+++ b/src/northbridge/intel/sandybridge/gma.c
@@ -624,7 +624,7 @@ intel_gma_get_controller_info(void)
return &chip->gfx;
}
-static void gma_ssdt(void)
+static void gma_ssdt(device_t device)
{
const struct i915_gpu_controller_info *gfx = intel_gma_get_controller_info();
if (!gfx) {
diff --git a/src/northbridge/intel/sch/gma.c b/src/northbridge/intel/sch/gma.c
index 5540eb1e3d..5786f1e5fa 100644
--- a/src/northbridge/intel/sch/gma.c
+++ b/src/northbridge/intel/sch/gma.c
@@ -57,7 +57,7 @@ intel_gma_get_controller_info(void)
return &chip->gfx;
}
-static void gma_ssdt(void)
+static void gma_ssdt(device_t device)
{
const struct i915_gpu_controller_info *gfx = intel_gma_get_controller_info();
if (!gfx) {