mainboard/system76: Fix compiling other boards on 4.12

Signed-off-by: Tim Crawford <tcrawford@system76.com>
This commit is contained in:
Tim Crawford
2020-05-13 11:02:02 -06:00
committed by Jeremy Soller
parent 45535e4a05
commit 0348ce2085
11 changed files with 17 additions and 17 deletions

View File

@@ -146,7 +146,7 @@ chip soc/intel/cannonlake
register "tcc_offset" = "2" register "tcc_offset" = "2"
# Serial IRQ Continuous # Serial IRQ Continuous
register "SerialIrqConfigSirqMode" = "1" register "serirq_mode" = "SERIRQ_CONTINUOUS"
# LPC (soc/intel/cannonlake/lpc.c) # LPC (soc/intel/cannonlake/lpc.c)
# LPC configuration from lspci -s 1f.0 -xxx # LPC configuration from lspci -s 1f.0 -xxx

View File

@@ -15,7 +15,7 @@
* GNU General Public License for more details. * GNU General Public License for more details.
*/ */
#include <arch/acpi.h> #include <acpi/acpi.h>
DefinitionBlock( DefinitionBlock(
"dsdt.aml", "dsdt.aml",
"DSDT", "DSDT",

View File

@@ -144,7 +144,7 @@ chip soc/intel/cannonlake
register "tcc_offset" = "12" register "tcc_offset" = "12"
# Serial IRQ Continuous # Serial IRQ Continuous
register "SerialIrqConfigSirqMode" = "1" register "serirq_mode" = "SERIRQ_CONTINUOUS"
# LPC (soc/intel/cannonlake/lpc.c) # LPC (soc/intel/cannonlake/lpc.c)
# LPC configuration from lspci -s 1f.0 -xxx # LPC configuration from lspci -s 1f.0 -xxx

View File

@@ -15,7 +15,7 @@
* GNU General Public License for more details. * GNU General Public License for more details.
*/ */
#include <arch/acpi.h> #include <acpi/acpi.h>
DefinitionBlock( DefinitionBlock(
"dsdt.aml", "dsdt.aml",
"DSDT", "DSDT",

View File

@@ -14,8 +14,8 @@
*/ */
#include <string.h> #include <string.h>
#include <arch/acpi.h> #include <acpi/acpi.h>
#include <arch/acpigen.h> #include <acpi/acpigen.h>
#include <arch/io.h> #include <arch/io.h>
#include <console/console.h> #include <console/console.h>
#include <device/device.h> #include <device/device.h>
@@ -194,14 +194,14 @@ static void pcie_hotplug_generator(int port_number)
acpigen_pop_len(); 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"); printk(BIOS_INFO, "system76: fill_ssdt\n");
pcie_hotplug_generator(CONFIG_MAX_ROOT_PORTS); pcie_hotplug_generator(CONFIG_MAX_ROOT_PORTS);
} }
static void mainboard_enable(struct device *dev) { static void mainboard_enable(struct device *dev) {
dev->ops->init = mainboard_init; dev->ops->init = mainboard_init;
dev->ops->acpi_fill_ssdt_generator = fill_ssdt; dev->ops->acpi_fill_ssdt = fill_ssdt;
// Configure pad for DisplayPort // Configure pad for DisplayPort
uint32_t config = 0x44000200; uint32_t config = 0x44000200;

View File

@@ -15,7 +15,7 @@
* GNU General Public License for more details. * GNU General Public License for more details.
*/ */
#include <arch/acpi.h> #include <acpi/acpi.h>
DefinitionBlock( DefinitionBlock(
"dsdt.aml", "dsdt.aml",
"DSDT", "DSDT",

View File

@@ -144,7 +144,7 @@ chip soc/intel/cannonlake
register "tcc_offset" = "12" register "tcc_offset" = "12"
# Serial IRQ Continuous # Serial IRQ Continuous
register "SerialIrqConfigSirqMode" = "1" register "serirq_mode" = "SERIRQ_CONTINUOUS"
# LPC (soc/intel/cannonlake/lpc.c) # LPC (soc/intel/cannonlake/lpc.c)
# LPC configuration from lspci -xxx # LPC configuration from lspci -xxx

View File

@@ -13,7 +13,7 @@
* GNU General Public License for more details. * GNU General Public License for more details.
*/ */
#include <arch/acpi.h> #include <acpi/acpi.h>
DefinitionBlock( DefinitionBlock(
"dsdt.aml", "dsdt.aml",
"DSDT", "DSDT",

View File

@@ -144,7 +144,7 @@ chip soc/intel/cannonlake
register "tcc_offset" = "12" register "tcc_offset" = "12"
# Serial IRQ Continuous # Serial IRQ Continuous
register "SerialIrqConfigSirqMode" = "1" register "serirq_mode" = "SERIRQ_CONTINUOUS"
# LPC (soc/intel/cannonlake/lpc.c) # LPC (soc/intel/cannonlake/lpc.c)
# LPC configuration from lspci -s 1f.0 -xxx # LPC configuration from lspci -s 1f.0 -xxx

View File

@@ -15,7 +15,7 @@
* GNU General Public License for more details. * GNU General Public License for more details.
*/ */
#include <arch/acpi.h> #include <acpi/acpi.h>
DefinitionBlock( DefinitionBlock(
"dsdt.aml", "dsdt.aml",
"DSDT", "DSDT",

View File

@@ -14,8 +14,8 @@
*/ */
#include <string.h> #include <string.h>
#include <arch/acpi.h> #include <acpi/acpi.h>
#include <arch/acpigen.h> #include <acpi/acpigen.h>
#include <arch/io.h> #include <arch/io.h>
#include <console/console.h> #include <console/console.h>
#include <device/device.h> #include <device/device.h>
@@ -194,14 +194,14 @@ static void pcie_hotplug_generator(int port_number)
acpigen_pop_len(); 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"); printk(BIOS_INFO, "system76: fill_ssdt\n");
pcie_hotplug_generator(CONFIG_MAX_ROOT_PORTS); pcie_hotplug_generator(CONFIG_MAX_ROOT_PORTS);
} }
static void mainboard_enable(struct device *dev) { static void mainboard_enable(struct device *dev) {
dev->ops->init = mainboard_init; dev->ops->init = mainboard_init;
dev->ops->acpi_fill_ssdt_generator = fill_ssdt; dev->ops->acpi_fill_ssdt = fill_ssdt;
// Configure pad for DisplayPort // Configure pad for DisplayPort
uint32_t config = 0x44000200; uint32_t config = 0x44000200;