6 files changed, 9 insertions, 13 deletions

diff --git a/src/mainboard/tyan/s2891/acpi_tables.c b/src/mainboard/tyan/s2891/acpi_tables.c
index 8138b8348e..126e3ea041 100644
--- a/src/mainboard/tyan/s2891/acpi_tables.c
+++ b/src/mainboard/tyan/s2891/acpi_tables.c
@@ -18,7 +18,7 @@
 #include <cpu/amd/mtrr.h>
 #include <cpu/amd/amdk8_sysconf.h>
 #include "northbridge/amd/amdk8/acpi.h"
-#include <cpu/amd/model_fxx_powernow.h>
+#include <cpu/amd/powernow.h>
 
 /* APIC */
 unsigned long acpi_fill_madt(unsigned long current)
diff --git a/src/mainboard/tyan/s2891/mainboard.c b/src/mainboard/tyan/s2891/mainboard.c
index c3237b305c..9a8dd906a8 100644
--- a/src/mainboard/tyan/s2891/mainboard.c
+++ b/src/mainboard/tyan/s2891/mainboard.c
@@ -1,15 +1,13 @@
 #include <console/console.h>
 #include <device/device.h>
 #include <arch/acpi.h>
-#include <cpu/amd/model_fxx_powernow.h>
+#include <cpu/amd/powernow.h>
 #include <arch/acpi.h>
 #include <arch/acpigen.h>
 #include <cpu/amd/amdk8_sysconf.h>
 
-extern u16 pm_base;
-
 static void mainboard_acpi_fill_ssdt_generator(void) {
-	amd_model_fxx_generate_powernow(0, 0, 0);
+	amd_generate_powernow(0, 0, 0);
 }
 
 static void mainboard_enable(device_t dev)
diff --git a/src/mainboard/tyan/s2892/acpi_tables.c b/src/mainboard/tyan/s2892/acpi_tables.c
index 8138b8348e..126e3ea041 100644
--- a/src/mainboard/tyan/s2892/acpi_tables.c
+++ b/src/mainboard/tyan/s2892/acpi_tables.c
@@ -18,7 +18,7 @@
 #include <cpu/amd/mtrr.h>
 #include <cpu/amd/amdk8_sysconf.h>
 #include "northbridge/amd/amdk8/acpi.h"
-#include <cpu/amd/model_fxx_powernow.h>
+#include <cpu/amd/powernow.h>
 
 /* APIC */
 unsigned long acpi_fill_madt(unsigned long current)
diff --git a/src/mainboard/tyan/s2892/mainboard.c b/src/mainboard/tyan/s2892/mainboard.c
index c3237b305c..9a8dd906a8 100644
--- a/src/mainboard/tyan/s2892/mainboard.c
+++ b/src/mainboard/tyan/s2892/mainboard.c
@@ -1,15 +1,13 @@
 #include <console/console.h>
 #include <device/device.h>
 #include <arch/acpi.h>
-#include <cpu/amd/model_fxx_powernow.h>
+#include <cpu/amd/powernow.h>
 #include <arch/acpi.h>
 #include <arch/acpigen.h>
 #include <cpu/amd/amdk8_sysconf.h>
 
-extern u16 pm_base;
-
 static void mainboard_acpi_fill_ssdt_generator(void) {
-	amd_model_fxx_generate_powernow(0, 0, 0);
+	amd_generate_powernow(0, 0, 0);
 }
 
 static void mainboard_enable(device_t dev)
diff --git a/src/mainboard/tyan/s2895/acpi_tables.c b/src/mainboard/tyan/s2895/acpi_tables.c
index 9e724dc05e..d66a5de54b 100644
--- a/src/mainboard/tyan/s2895/acpi_tables.c
+++ b/src/mainboard/tyan/s2895/acpi_tables.c
@@ -18,7 +18,7 @@
 #include <cpu/amd/mtrr.h>
 #include <cpu/amd/amdk8_sysconf.h>
 #include "northbridge/amd/amdk8/acpi.h"
-#include <cpu/amd/model_fxx_powernow.h>
+#include <cpu/amd/powernow.h>
 
 /* APIC */
 unsigned long acpi_fill_madt(unsigned long current)
diff --git a/src/mainboard/tyan/s2895/mainboard.c b/src/mainboard/tyan/s2895/mainboard.c
index c3237b305c..604df5100f 100644
--- a/src/mainboard/tyan/s2895/mainboard.c
+++ b/src/mainboard/tyan/s2895/mainboard.c
@@ -1,7 +1,7 @@
 #include <console/console.h>
 #include <device/device.h>
 #include <arch/acpi.h>
-#include <cpu/amd/model_fxx_powernow.h>
+#include <cpu/amd/powernow.h>
 #include <arch/acpi.h>
 #include <arch/acpigen.h>
 #include <cpu/amd/amdk8_sysconf.h>
@@ -9,7 +9,7 @@
 extern u16 pm_base;
 
 static void mainboard_acpi_fill_ssdt_generator(void) {
-	amd_model_fxx_generate_powernow(0, 0, 0);
+	amd_generate_powernow(0, 0, 0);
 }
 
 static void mainboard_enable(device_t dev)