Vladimir Serbinenko (phcoder@gmail.com) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/7019 -gerrit commit 0908cc245542118ee3e8577dea5df3276c09a769 Author: Vladimir Serbinenko <phcoder@gmail.com> Date: Sun Oct 5 14:54:26 2014 +0200 amd: rename model_fxx_powernow to powernow. Change-Id: Iee581183f9cd9f5fecd5604536b735f6a04a0f93 Signed-off-by: Vladimir Serbinenko <phcoder@gmail.com> --- src/cpu/amd/model_fxx/powernow_acpi.c | 4 ++-- src/include/cpu/amd/model_fxx_powernow.h | 25 ------------------------- src/mainboard/amd/pistachio/acpi_tables.c | 2 +- src/mainboard/asrock/939a785gmh/acpi_tables.c | 2 +- src/mainboard/asus/a8n_e/acpi_tables.c | 2 +- src/mainboard/asus/a8v-e_se/acpi_tables.c | 2 +- src/mainboard/asus/k8v-x/acpi_tables.c | 2 +- src/mainboard/asus/m2v-mx_se/acpi_tables.c | 2 +- src/mainboard/asus/m2v/acpi_tables.c | 2 +- src/mainboard/gigabyte/m57sli/acpi_tables.c | 2 +- src/mainboard/hp/dl145_g1/acpi_tables.c | 2 +- src/mainboard/iwill/dk8_htx/mainboard.c | 2 +- src/mainboard/kontron/kt690/acpi_tables.c | 2 +- src/mainboard/msi/ms9652_fam10/acpi_tables.c | 4 ++-- src/mainboard/siemens/sitemp_g1p1/acpi_tables.c | 2 +- src/mainboard/technexion/tim5690/acpi_tables.c | 2 +- src/mainboard/technexion/tim8690/acpi_tables.c | 2 +- src/mainboard/tyan/s2891/acpi_tables.c | 2 +- src/mainboard/tyan/s2891/mainboard.c | 4 ++-- src/mainboard/tyan/s2892/acpi_tables.c | 2 +- src/mainboard/tyan/s2892/mainboard.c | 4 ++-- src/mainboard/tyan/s2895/acpi_tables.c | 2 +- src/mainboard/tyan/s2895/mainboard.c | 4 ++-- src/mainboard/winent/mb6047/acpi_tables.c | 2 +- src/mainboard/winent/mb6047/mainboard.c | 4 ++-- src/southbridge/amd/amd8111/lpc.c | 4 ++-- src/southbridge/amd/sb600/lpc.c | 4 ++-- src/southbridge/amd/sb700/lpc.c | 4 ++-- src/southbridge/nvidia/mcp55/lpc.c | 4 ++-- src/southbridge/via/k8t890/traf_ctrl.c | 4 ++-- 30 files changed, 40 insertions(+), 65 deletions(-) diff --git a/src/cpu/amd/model_fxx/powernow_acpi.c b/src/cpu/amd/model_fxx/powernow_acpi.c index 41cfc56..a294cd2 100644 --- a/src/cpu/amd/model_fxx/powernow_acpi.c +++ b/src/cpu/amd/model_fxx/powernow_acpi.c @@ -22,7 +22,7 @@ #include <stdint.h> #include <cpu/x86/msr.h> #include <arch/acpigen.h> -#include <cpu/amd/model_fxx_powernow.h> +#include <cpu/amd/powernow.h> #include <device/pci.h> #include <device/pci_ids.h> #include <cpu/x86/msr.h> @@ -878,7 +878,7 @@ static int pstates_algorithm(u32 pcontrol_blk, u8 plen, u8 onlyBSP) #endif -int amd_model_fxx_generate_powernow(u32 pcontrol_blk, u8 plen, u8 onlyBSP) +int amd_generate_powernow(u32 pcontrol_blk, u8 plen, u8 onlyBSP) { int lens; char pscope[] = "\\_PR"; diff --git a/src/include/cpu/amd/model_fxx_powernow.h b/src/include/cpu/amd/model_fxx_powernow.h deleted file mode 100644 index a6d9c20..0000000 --- a/src/include/cpu/amd/model_fxx_powernow.h +++ /dev/null @@ -1,25 +0,0 @@ -/* - * This file is part of the coreboot project. - * - * Copyright (C) 2009 Rudolf Marek <r.marek@assembler.cz> - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 2 of the License. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - */ - -#ifndef MODEL_FXX_POWERNOW_H -#define MODEL_FXX_POWERNOW_H - -int amd_model_fxx_generate_powernow(u32 pcontrol_blk, u8 plen, u8 onlyBSP); - -#endif diff --git a/src/mainboard/amd/pistachio/acpi_tables.c b/src/mainboard/amd/pistachio/acpi_tables.c index 2a587cd..63c8aec 100644 --- a/src/mainboard/amd/pistachio/acpi_tables.c +++ b/src/mainboard/amd/pistachio/acpi_tables.c @@ -28,7 +28,7 @@ #include <cpu/amd/amdk8_sysconf.h> #include "northbridge/amd/amdk8/acpi.h" #include <arch/cpu.h> -#include <cpu/amd/model_fxx_powernow.h> +#include <cpu/amd/powernow.h> unsigned long acpi_fill_madt(unsigned long current) { diff --git a/src/mainboard/asrock/939a785gmh/acpi_tables.c b/src/mainboard/asrock/939a785gmh/acpi_tables.c index 2b05888..1b3a747 100644 --- a/src/mainboard/asrock/939a785gmh/acpi_tables.c +++ b/src/mainboard/asrock/939a785gmh/acpi_tables.c @@ -28,7 +28,7 @@ #include <cpu/amd/amdk8_sysconf.h> #include "northbridge/amd/amdk8/acpi.h" #include <arch/cpu.h> -#include <cpu/amd/model_fxx_powernow.h> +#include <cpu/amd/powernow.h> #include <southbridge/amd/sb700/sb700.h> unsigned long acpi_fill_madt(unsigned long current) diff --git a/src/mainboard/asus/a8n_e/acpi_tables.c b/src/mainboard/asus/a8n_e/acpi_tables.c index 2e06915..c1e53aa 100644 --- a/src/mainboard/asus/a8n_e/acpi_tables.c +++ b/src/mainboard/asus/a8n_e/acpi_tables.c @@ -19,7 +19,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/asus/a8v-e_se/acpi_tables.c b/src/mainboard/asus/a8v-e_se/acpi_tables.c index 2c76878..c0d0862 100644 --- a/src/mainboard/asus/a8v-e_se/acpi_tables.c +++ b/src/mainboard/asus/a8v-e_se/acpi_tables.c @@ -32,7 +32,7 @@ #include "southbridge/via/vt8237r/vt8237r.h" #include "southbridge/via/k8t890/k8t890.h" #include "northbridge/amd/amdk8/acpi.h" -#include <cpu/amd/model_fxx_powernow.h> +#include <cpu/amd/powernow.h> #include <cpu/amd/amdk8_sysconf.h> void get_bus_conf(void) diff --git a/src/mainboard/asus/k8v-x/acpi_tables.c b/src/mainboard/asus/k8v-x/acpi_tables.c index 5273c00..1c48a95 100644 --- a/src/mainboard/asus/k8v-x/acpi_tables.c +++ b/src/mainboard/asus/k8v-x/acpi_tables.c @@ -32,7 +32,7 @@ #include "southbridge/via/vt8237r/vt8237r.h" #include "southbridge/via/k8t890/k8x8xx.h" #include "northbridge/amd/amdk8/acpi.h" -#include <cpu/amd/model_fxx_powernow.h> +#include <cpu/amd/powernow.h> #include <cpu/amd/amdk8_sysconf.h> void get_bus_conf(void) diff --git a/src/mainboard/asus/m2v-mx_se/acpi_tables.c b/src/mainboard/asus/m2v-mx_se/acpi_tables.c index faed40b..3beac4b 100644 --- a/src/mainboard/asus/m2v-mx_se/acpi_tables.c +++ b/src/mainboard/asus/m2v-mx_se/acpi_tables.c @@ -33,7 +33,7 @@ #include "southbridge/via/vt8237r/vt8237r.h" #include "southbridge/via/k8t890/k8t890.h" #include "northbridge/amd/amdk8/acpi.h" -#include <cpu/amd/model_fxx_powernow.h> +#include <cpu/amd/powernow.h> #include <cpu/amd/amdk8_sysconf.h> void get_bus_conf(void) diff --git a/src/mainboard/asus/m2v/acpi_tables.c b/src/mainboard/asus/m2v/acpi_tables.c index c0449ec..2cd594c 100644 --- a/src/mainboard/asus/m2v/acpi_tables.c +++ b/src/mainboard/asus/m2v/acpi_tables.c @@ -34,7 +34,7 @@ #include "southbridge/via/vt8237r/vt8237r.h" #include "southbridge/via/k8t890/k8t890.h" #include "northbridge/amd/amdk8/acpi.h" -#include <cpu/amd/model_fxx_powernow.h> +#include <cpu/amd/powernow.h> #include <cpu/amd/amdk8_sysconf.h> void get_bus_conf(void) diff --git a/src/mainboard/gigabyte/m57sli/acpi_tables.c b/src/mainboard/gigabyte/m57sli/acpi_tables.c index c9fc33b..13e7649 100644 --- a/src/mainboard/gigabyte/m57sli/acpi_tables.c +++ b/src/mainboard/gigabyte/m57sli/acpi_tables.c @@ -30,7 +30,7 @@ #include <device/device.h> #include <device/pci_ids.h> #include "northbridge/amd/amdk8/acpi.h" -#include <cpu/amd/model_fxx_powernow.h> +#include <cpu/amd/powernow.h> #include <device/pci.h> #include <cpu/amd/amdk8_sysconf.h> diff --git a/src/mainboard/hp/dl145_g1/acpi_tables.c b/src/mainboard/hp/dl145_g1/acpi_tables.c index 34cfff5..b051518 100644 --- a/src/mainboard/hp/dl145_g1/acpi_tables.c +++ b/src/mainboard/hp/dl145_g1/acpi_tables.c @@ -21,7 +21,7 @@ #include <cpu/amd/amdk8_sysconf.h> #include "northbridge/amd/amdk8/acpi.h" #include "mb_sysconf.h" -#include <cpu/amd/model_fxx_powernow.h> +#include <cpu/amd/powernow.h> unsigned long acpi_fill_madt(unsigned long current) { diff --git a/src/mainboard/iwill/dk8_htx/mainboard.c b/src/mainboard/iwill/dk8_htx/mainboard.c index fba0b6a..0202b50 100644 --- a/src/mainboard/iwill/dk8_htx/mainboard.c +++ b/src/mainboard/iwill/dk8_htx/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> diff --git a/src/mainboard/kontron/kt690/acpi_tables.c b/src/mainboard/kontron/kt690/acpi_tables.c index 0a9c2e8..a3b35d5 100644 --- a/src/mainboard/kontron/kt690/acpi_tables.c +++ b/src/mainboard/kontron/kt690/acpi_tables.c @@ -28,7 +28,7 @@ #include <cpu/amd/amdk8_sysconf.h> #include "northbridge/amd/amdk8/acpi.h" #include <arch/cpu.h> -#include <cpu/amd/model_fxx_powernow.h> +#include <cpu/amd/powernow.h> unsigned long acpi_fill_madt(unsigned long current) { diff --git a/src/mainboard/msi/ms9652_fam10/acpi_tables.c b/src/mainboard/msi/ms9652_fam10/acpi_tables.c index 541c903..148ac1a 100644 --- a/src/mainboard/msi/ms9652_fam10/acpi_tables.c +++ b/src/mainboard/msi/ms9652_fam10/acpi_tables.c @@ -30,7 +30,7 @@ #include <device/device.h> #include <device/pci_ids.h> //#include "northbridge/amd/amdfam10/amdfam10_acpi.h" -#include <cpu/amd/model_fxx_powernow.h> +#include <cpu/amd/powernow.h> #include <device/pci.h> #include <cpu/amd/amdfam10_sysconf.h> #include "mb_sysconf.h" @@ -93,7 +93,7 @@ unsigned long acpi_fill_madt(unsigned long current) unsigned long acpi_fill_ssdt_generator(unsigned long current, const char *oem_table_id) { //k8acpi_write_vars(); - //amd_model_fxx_generate_powernow(0, 0, 0); + //amd_generate_powernow(0, 0, 0); //return (unsigned long) (acpigen_get_current()); return 0; } diff --git a/src/mainboard/siemens/sitemp_g1p1/acpi_tables.c b/src/mainboard/siemens/sitemp_g1p1/acpi_tables.c index d092308..2601f62 100644 --- a/src/mainboard/siemens/sitemp_g1p1/acpi_tables.c +++ b/src/mainboard/siemens/sitemp_g1p1/acpi_tables.c @@ -31,7 +31,7 @@ #include <cpu/amd/amdk8_sysconf.h> #include <../../../northbridge/amd/amdk8/acpi.h> #include <arch/cpu.h> -#include <cpu/amd/model_fxx_powernow.h> +#include <cpu/amd/powernow.h> #include <southbridge/amd/rs690/rs690.h> #include "mainboard.h" #include <cbmem.h> diff --git a/src/mainboard/technexion/tim5690/acpi_tables.c b/src/mainboard/technexion/tim5690/acpi_tables.c index 0a9c2e8..a3b35d5 100644 --- a/src/mainboard/technexion/tim5690/acpi_tables.c +++ b/src/mainboard/technexion/tim5690/acpi_tables.c @@ -28,7 +28,7 @@ #include <cpu/amd/amdk8_sysconf.h> #include "northbridge/amd/amdk8/acpi.h" #include <arch/cpu.h> -#include <cpu/amd/model_fxx_powernow.h> +#include <cpu/amd/powernow.h> unsigned long acpi_fill_madt(unsigned long current) { diff --git a/src/mainboard/technexion/tim8690/acpi_tables.c b/src/mainboard/technexion/tim8690/acpi_tables.c index 0a9c2e8..a3b35d5 100644 --- a/src/mainboard/technexion/tim8690/acpi_tables.c +++ b/src/mainboard/technexion/tim8690/acpi_tables.c @@ -28,7 +28,7 @@ #include <cpu/amd/amdk8_sysconf.h> #include "northbridge/amd/amdk8/acpi.h" #include <arch/cpu.h> -#include <cpu/amd/model_fxx_powernow.h> +#include <cpu/amd/powernow.h> unsigned long acpi_fill_madt(unsigned long current) { diff --git a/src/mainboard/tyan/s2891/acpi_tables.c b/src/mainboard/tyan/s2891/acpi_tables.c index 8138b83..126e3ea 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 204268c..b54ca43 100644 --- a/src/mainboard/tyan/s2891/mainboard.c +++ b/src/mainboard/tyan/s2891/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 unsigned long mainboard_acpi_fill_ssdt_generator(unsigned long current, const char *oem_table_id) { - amd_model_fxx_generate_powernow(0, 0, 0); + amd_generate_powernow(0, 0, 0); return (unsigned long) (acpigen_get_current()); } diff --git a/src/mainboard/tyan/s2892/acpi_tables.c b/src/mainboard/tyan/s2892/acpi_tables.c index 8138b83..126e3ea 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 204268c..b54ca43 100644 --- a/src/mainboard/tyan/s2892/mainboard.c +++ b/src/mainboard/tyan/s2892/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 unsigned long mainboard_acpi_fill_ssdt_generator(unsigned long current, const char *oem_table_id) { - amd_model_fxx_generate_powernow(0, 0, 0); + amd_generate_powernow(0, 0, 0); return (unsigned long) (acpigen_get_current()); } diff --git a/src/mainboard/tyan/s2895/acpi_tables.c b/src/mainboard/tyan/s2895/acpi_tables.c index 9e724dc..d66a5de 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 204268c..b54ca43 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 unsigned long mainboard_acpi_fill_ssdt_generator(unsigned long current, const char *oem_table_id) { - amd_model_fxx_generate_powernow(0, 0, 0); + amd_generate_powernow(0, 0, 0); return (unsigned long) (acpigen_get_current()); } diff --git a/src/mainboard/winent/mb6047/acpi_tables.c b/src/mainboard/winent/mb6047/acpi_tables.c index 150cc7d..15443ee 100644 --- a/src/mainboard/winent/mb6047/acpi_tables.c +++ b/src/mainboard/winent/mb6047/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/winent/mb6047/mainboard.c b/src/mainboard/winent/mb6047/mainboard.c index 204268c..b54ca43 100644 --- a/src/mainboard/winent/mb6047/mainboard.c +++ b/src/mainboard/winent/mb6047/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 unsigned long mainboard_acpi_fill_ssdt_generator(unsigned long current, const char *oem_table_id) { - amd_model_fxx_generate_powernow(0, 0, 0); + amd_generate_powernow(0, 0, 0); return (unsigned long) (acpigen_get_current()); } diff --git a/src/southbridge/amd/amd8111/lpc.c b/src/southbridge/amd/amd8111/lpc.c index d9ff9aa..26ab34f 100644 --- a/src/southbridge/amd/amd8111/lpc.c +++ b/src/southbridge/amd/amd8111/lpc.c @@ -14,7 +14,7 @@ #if IS_ENABLED(CONFIG_GENERATE_ACPI_TABLES) && IS_ENABLED(CONFIG_PER_DEVICE_ACPI_TABLES) #include <arch/acpi.h> #include <arch/acpigen.h> -#include <cpu/amd/model_fxx_powernow.h> +#include <cpu/amd/powernow.h> #endif #include <stdlib.h> #include <string.h> @@ -130,7 +130,7 @@ unsigned long acpi_fill_mcfg(unsigned long current) static unsigned long southbridge_acpi_fill_ssdt_generator(unsigned long current, const char *oem_table_id) { #if CONFIG_SET_FIDVID - amd_model_fxx_generate_powernow(pm_base + 0x10, 6, 1); + amd_generate_powernow(pm_base + 0x10, 6, 1); acpigen_write_mainboard_resources("\\_SB.PCI0.MBRS", "_CRS"); #endif return (unsigned long) (acpigen_get_current()); diff --git a/src/southbridge/amd/sb600/lpc.c b/src/southbridge/amd/sb600/lpc.c index d83b811..01aa405 100644 --- a/src/southbridge/amd/sb600/lpc.c +++ b/src/southbridge/amd/sb600/lpc.c @@ -30,7 +30,7 @@ #include <arch/io.h> #include <arch/ioapic.h> #include <arch/acpi.h> -#include <cpu/amd/model_fxx_powernow.h> +#include <cpu/amd/powernow.h> #include "sb600.h" static void lpc_init(device_t dev) @@ -224,7 +224,7 @@ static void sb600_lpc_enable_resources(device_t dev) extern u16 pm_base; static unsigned long southbridge_acpi_fill_ssdt_generator(unsigned long current, const char *oem_table_id) { - amd_model_fxx_generate_powernow(pm_base + 8, 6, 1); + amd_generate_powernow(pm_base + 8, 6, 1); return (unsigned long) (acpigen_get_current()); } diff --git a/src/southbridge/amd/sb700/lpc.c b/src/southbridge/amd/sb700/lpc.c index 647006f..8949fbf 100644 --- a/src/southbridge/amd/sb700/lpc.c +++ b/src/southbridge/amd/sb700/lpc.c @@ -31,7 +31,7 @@ #include <arch/ioapic.h> #include <arch/acpi.h> #include <cbmem.h> -#include <cpu/amd/model_fxx_powernow.h> +#include <cpu/amd/powernow.h> #include "sb700.h" unsigned long acpi_fill_mcfg(unsigned long current) @@ -271,7 +271,7 @@ static void sb700_lpc_enable_resources(device_t dev) #if IS_ENABLED(CONFIG_GENERATE_ACPI_TABLES) && IS_ENABLED(CONFIG_PER_DEVICE_ACPI_TABLES) static unsigned long southbridge_acpi_fill_ssdt_generator(unsigned long current, const char *oem_table_id) { - amd_model_fxx_generate_powernow(ACPI_CPU_CONTROL, 6, 1); + amd_generate_powernow(ACPI_CPU_CONTROL, 6, 1); return (unsigned long) (acpigen_get_current()); } diff --git a/src/southbridge/nvidia/mcp55/lpc.c b/src/southbridge/nvidia/mcp55/lpc.c index 4533699..392306e 100644 --- a/src/southbridge/nvidia/mcp55/lpc.c +++ b/src/southbridge/nvidia/mcp55/lpc.c @@ -40,7 +40,7 @@ #include <arch/acpi.h> #include <arch/acpigen.h> #endif -#include <cpu/amd/model_fxx_powernow.h> +#include <cpu/amd/powernow.h> #include "mcp55.h" #define NMI_OFF 0 @@ -285,7 +285,7 @@ static const struct pci_driver lpc_driver __pci_driver = { static unsigned long southbridge_acpi_fill_ssdt_generator(unsigned long current, const char *oem_table_id) { - amd_model_fxx_generate_powernow(0, 0, 0); + amd_generate_powernow(0, 0, 0); return (unsigned long) (acpigen_get_current()); } diff --git a/src/southbridge/via/k8t890/traf_ctrl.c b/src/southbridge/via/k8t890/traf_ctrl.c index 0abb9af..9aa4fb8 100644 --- a/src/southbridge/via/k8t890/traf_ctrl.c +++ b/src/southbridge/via/k8t890/traf_ctrl.c @@ -23,7 +23,7 @@ #include <console/console.h> #include <arch/acpi.h> #include <arch/acpigen.h> -#include <cpu/amd/model_fxx_powernow.h> +#include <cpu/amd/powernow.h> #include "k8t890.h" extern unsigned long log2(unsigned long x); @@ -128,7 +128,7 @@ static void traf_ctrl_enable_k8t890(struct device *dev) #if IS_ENABLED(CONFIG_GENERATE_ACPI_TABLES) static unsigned long southbridge_acpi_fill_ssdt_generator(unsigned long current, const char *oem_table_id) { - amd_model_fxx_generate_powernow(0, 0, 0); + amd_generate_powernow(0, 0, 0); acpigen_write_mainboard_resources("\\_SB.PCI0.MBRS", "_CRS"); return (unsigned long) (acpigen_get_current()); }