From 0348ce208528ffcdfdedb6f90e46e965ffb6f490 Mon Sep 17 00:00:00 2001 From: Tim Crawford Date: Wed, 13 May 2020 11:02:02 -0600 Subject: [PATCH] mainboard/system76: Fix compiling other boards on 4.12 Signed-off-by: Tim Crawford --- src/mainboard/system76/cfl-h/devicetree.cb | 2 +- src/mainboard/system76/cfl-h/dsdt.asl | 2 +- src/mainboard/system76/cml-u/devicetree.cb | 2 +- src/mainboard/system76/cml-u/dsdt.asl | 2 +- src/mainboard/system76/cml-u/ramstage.c | 8 ++++---- src/mainboard/system76/kbl-u/dsdt.asl | 2 +- src/mainboard/system76/thelio-b1/devicetree.cb | 2 +- src/mainboard/system76/thelio-b1/dsdt.asl | 2 +- src/mainboard/system76/whl-u/devicetree.cb | 2 +- src/mainboard/system76/whl-u/dsdt.asl | 2 +- src/mainboard/system76/whl-u/ramstage.c | 8 ++++---- 11 files changed, 17 insertions(+), 17 deletions(-) diff --git a/src/mainboard/system76/cfl-h/devicetree.cb b/src/mainboard/system76/cfl-h/devicetree.cb index ff73c86b61..3f169e086e 100644 --- a/src/mainboard/system76/cfl-h/devicetree.cb +++ b/src/mainboard/system76/cfl-h/devicetree.cb @@ -146,7 +146,7 @@ chip soc/intel/cannonlake register "tcc_offset" = "2" # Serial IRQ Continuous - register "SerialIrqConfigSirqMode" = "1" + register "serirq_mode" = "SERIRQ_CONTINUOUS" # LPC (soc/intel/cannonlake/lpc.c) # LPC configuration from lspci -s 1f.0 -xxx diff --git a/src/mainboard/system76/cfl-h/dsdt.asl b/src/mainboard/system76/cfl-h/dsdt.asl index a42052f208..05ec87c4ad 100644 --- a/src/mainboard/system76/cfl-h/dsdt.asl +++ b/src/mainboard/system76/cfl-h/dsdt.asl @@ -15,7 +15,7 @@ * GNU General Public License for more details. */ -#include +#include DefinitionBlock( "dsdt.aml", "DSDT", diff --git a/src/mainboard/system76/cml-u/devicetree.cb b/src/mainboard/system76/cml-u/devicetree.cb index 4e7f3f67a7..d6146bee58 100644 --- a/src/mainboard/system76/cml-u/devicetree.cb +++ b/src/mainboard/system76/cml-u/devicetree.cb @@ -144,7 +144,7 @@ chip soc/intel/cannonlake register "tcc_offset" = "12" # Serial IRQ Continuous - register "SerialIrqConfigSirqMode" = "1" + register "serirq_mode" = "SERIRQ_CONTINUOUS" # LPC (soc/intel/cannonlake/lpc.c) # LPC configuration from lspci -s 1f.0 -xxx diff --git a/src/mainboard/system76/cml-u/dsdt.asl b/src/mainboard/system76/cml-u/dsdt.asl index 75a98885ed..3d5f5a1225 100644 --- a/src/mainboard/system76/cml-u/dsdt.asl +++ b/src/mainboard/system76/cml-u/dsdt.asl @@ -15,7 +15,7 @@ * GNU General Public License for more details. */ -#include +#include DefinitionBlock( "dsdt.aml", "DSDT", diff --git a/src/mainboard/system76/cml-u/ramstage.c b/src/mainboard/system76/cml-u/ramstage.c index c990a2986f..6f028c100e 100644 --- a/src/mainboard/system76/cml-u/ramstage.c +++ b/src/mainboard/system76/cml-u/ramstage.c @@ -14,8 +14,8 @@ */ #include -#include -#include +#include +#include #include #include #include @@ -194,14 +194,14 @@ static void pcie_hotplug_generator(int port_number) acpigen_pop_len(); } -static void fill_ssdt(struct device *device) { +static void fill_ssdt(const struct device *device) { printk(BIOS_INFO, "system76: fill_ssdt\n"); pcie_hotplug_generator(CONFIG_MAX_ROOT_PORTS); } static void mainboard_enable(struct device *dev) { dev->ops->init = mainboard_init; - dev->ops->acpi_fill_ssdt_generator = fill_ssdt; + dev->ops->acpi_fill_ssdt = fill_ssdt; // Configure pad for DisplayPort uint32_t config = 0x44000200; diff --git a/src/mainboard/system76/kbl-u/dsdt.asl b/src/mainboard/system76/kbl-u/dsdt.asl index ffc7149ae7..08d97f3ea4 100644 --- a/src/mainboard/system76/kbl-u/dsdt.asl +++ b/src/mainboard/system76/kbl-u/dsdt.asl @@ -15,7 +15,7 @@ * GNU General Public License for more details. */ -#include +#include DefinitionBlock( "dsdt.aml", "DSDT", diff --git a/src/mainboard/system76/thelio-b1/devicetree.cb b/src/mainboard/system76/thelio-b1/devicetree.cb index e7e449f657..50d6aca6ff 100644 --- a/src/mainboard/system76/thelio-b1/devicetree.cb +++ b/src/mainboard/system76/thelio-b1/devicetree.cb @@ -144,7 +144,7 @@ chip soc/intel/cannonlake register "tcc_offset" = "12" # Serial IRQ Continuous - register "SerialIrqConfigSirqMode" = "1" + register "serirq_mode" = "SERIRQ_CONTINUOUS" # LPC (soc/intel/cannonlake/lpc.c) # LPC configuration from lspci -xxx diff --git a/src/mainboard/system76/thelio-b1/dsdt.asl b/src/mainboard/system76/thelio-b1/dsdt.asl index 38bd40cb32..6b16989093 100644 --- a/src/mainboard/system76/thelio-b1/dsdt.asl +++ b/src/mainboard/system76/thelio-b1/dsdt.asl @@ -13,7 +13,7 @@ * GNU General Public License for more details. */ -#include +#include DefinitionBlock( "dsdt.aml", "DSDT", diff --git a/src/mainboard/system76/whl-u/devicetree.cb b/src/mainboard/system76/whl-u/devicetree.cb index 4e7f3f67a7..d6146bee58 100644 --- a/src/mainboard/system76/whl-u/devicetree.cb +++ b/src/mainboard/system76/whl-u/devicetree.cb @@ -144,7 +144,7 @@ chip soc/intel/cannonlake register "tcc_offset" = "12" # Serial IRQ Continuous - register "SerialIrqConfigSirqMode" = "1" + register "serirq_mode" = "SERIRQ_CONTINUOUS" # LPC (soc/intel/cannonlake/lpc.c) # LPC configuration from lspci -s 1f.0 -xxx diff --git a/src/mainboard/system76/whl-u/dsdt.asl b/src/mainboard/system76/whl-u/dsdt.asl index 75a98885ed..3d5f5a1225 100644 --- a/src/mainboard/system76/whl-u/dsdt.asl +++ b/src/mainboard/system76/whl-u/dsdt.asl @@ -15,7 +15,7 @@ * GNU General Public License for more details. */ -#include +#include DefinitionBlock( "dsdt.aml", "DSDT", diff --git a/src/mainboard/system76/whl-u/ramstage.c b/src/mainboard/system76/whl-u/ramstage.c index c990a2986f..6f028c100e 100644 --- a/src/mainboard/system76/whl-u/ramstage.c +++ b/src/mainboard/system76/whl-u/ramstage.c @@ -14,8 +14,8 @@ */ #include -#include -#include +#include +#include #include #include #include @@ -194,14 +194,14 @@ static void pcie_hotplug_generator(int port_number) acpigen_pop_len(); } -static void fill_ssdt(struct device *device) { +static void fill_ssdt(const struct device *device) { printk(BIOS_INFO, "system76: fill_ssdt\n"); pcie_hotplug_generator(CONFIG_MAX_ROOT_PORTS); } static void mainboard_enable(struct device *dev) { dev->ops->init = mainboard_init; - dev->ops->acpi_fill_ssdt_generator = fill_ssdt; + dev->ops->acpi_fill_ssdt = fill_ssdt; // Configure pad for DisplayPort uint32_t config = 0x44000200;