google/kahlee/grunt: Move ASL to variants

Move the apci/ to the baseboard and move mainboard.asl to
each variant.

BUG=b:71873651
TEST=build
BRANCH=none

Change-Id: I8a829f2946e4b280cd78574eb8dbda6c2a9a1028
Signed-off-by: Marc Jones <marcj303@gmail.com>
Reviewed-on: https://review.coreboot.org/23229
Reviewed-by: Aaron Durbin <adurbin@chromium.org>
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: Richard Spiegel <richard.spiegel@silverbackltd.com>

15 files changed, 666 insertions, 0 deletions

diff --git a/src/mainboard/google/kahlee/variants/baseboard/include/baseboard/acpi/gpe.asl b/src/mainboard/google/kahlee/variants/baseboard/include/baseboard/acpi/gpe.asl
new file mode 100644
index 0000000000..9dbbde557c
--- /dev/null
+++ b/src/mainboard/google/kahlee/variants/baseboard/include/baseboard/acpi/gpe.asl
@@ -0,0 +1,40 @@
+/*
+ * This file is part of the coreboot project.
+ *
+ * Copyright (C) 2013 Sage Electronic Engineering, LLC
+ *
+ * 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.
+ */
+
+Scope (\_GPE)
+{
+	/*  PCIE WLAN Wake event  */
+	Method (_L08)
+	{
+		/* DBGO ("\\_GPE\\_L08\n") */
+		Notify (\_SB.PWRB, 0x02)	/* NOTIFY_DEVICE_WAKE */
+	}
+
+	/*  EHCI USB controller PME#  SCIMAP24*/
+	Method (_L18)
+	{
+		/* DBGO ("\\_GPE\\_L18\n") */
+		Notify (\_SB.PCI0.EHC0, 0x02)	/* NOTIFY_DEVICE_WAKE */
+		Notify (\_SB.PWRB, 0x02)	/* NOTIFY_DEVICE_WAKE */
+	}
+
+	/*  XHCI USB controller PME#  SCIMAP56*/
+	Method (_L1F)
+	{
+		/* DBGO ("\\_GPE\\_L1F\n") */
+		Notify (\_SB.PCI0.XHC0, 0x02)	/* NOTIFY_DEVICE_WAKE */
+		Notify (\_SB.PWRB, 0x02)	/* NOTIFY_DEVICE_WAKE */
+	}
+}	/* End Scope GPE */
diff --git a/src/mainboard/google/kahlee/variants/baseboard/include/baseboard/acpi/mainboard.asl b/src/mainboard/google/kahlee/variants/baseboard/include/baseboard/acpi/mainboard.asl
new file mode 100644
index 0000000000..ddf1211eee
--- /dev/null
+++ b/src/mainboard/google/kahlee/variants/baseboard/include/baseboard/acpi/mainboard.asl
@@ -0,0 +1,112 @@
+/*
+ * This file is part of the coreboot project.
+ *
+ * Copyright (C) 2013 Sage Electronic Engineering, LLC
+ *
+ * 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.
+ */
+
+/* Memory related values */
+Name (LOMH, 0x0)	/* Start of unused memory in C0000-E0000 range */
+Name (PBAD, 0x0)	/* Address of BIOS area (If TOM2 != 0, Addr >> 16) */
+Name (PBLN, 0x0)	/* Length of BIOS area */
+
+/* Base address of PCIe config space */
+Name (PCBA, CONFIG_MMCONF_BASE_ADDRESS)
+
+/* Length of PCIe config space, 1MB each bus */
+Name (PCLN, Multiply(0x100000, CONFIG_MMCONF_BUS_NUMBER))
+
+/* Base address of HPET table */
+Name (HPBA, 0xFED00000)
+
+/* Global Data */
+Name (OSVR, 3)		/* WinXp = 1, Vista = 2, Linux = 3, WinCE = 4 */
+Name (OSV, Ones)	/* Assume nothing */
+Name (PMOD, One)	/* Assume APIC */
+
+Device (ETPA)
+{
+	Name (_HID, "ELAN0000")
+	Name (_DDN, "Elan Touchpad")
+	Name (_UID, 1)
+	Name (ISTP, 1)	/* Touchpad */
+
+	Name (_CRS, ResourceTemplate()
+	{
+		I2cSerialBus (
+			0x15,			/* SlaveAddress */
+			ControllerInitiated,	/* SlaveMode */
+			400000,			/* ConnectionSpeed */
+			AddressingMode7Bit,	/* AddressingMode */
+			"\\_SB.I2CD",		/* ResourceSource */
+		)
+		GpioInt (Level, ActiveLow, ExclusiveAndWake, PullNone,,
+			"\\_SB.GPIO") { 0x5 }
+	})
+
+	/* Allow device to power off in S0 */
+	Name (_S0W, 3)
+}
+
+/* DA7219 codec */
+Device (DIAL)  /* audio codec*/
+{
+	Name (_ADR, 0)
+	Name (_HID, "DLGS7219")
+	Name (_CID, "DLGS7219")
+	Name (_DDN, "DA7219 Codec Controller ")
+	Name (_UID, 1)
+
+	Device (I2S) /* I2S machine driver for RT5650 */
+	{
+		Name (_ADR, 1)
+		Name (_HID, "AMDI7219")
+		Name (_CID, "AMDI7219")
+	}
+
+	Method (_CRS, 0x0, Serialized)
+	{
+		Name (SBUF, ResourceTemplate ()
+		{
+			I2CSerialBus(
+			0x1A,   /* SlaveAddress: bus address */
+			ControllerInitiated,    /* SlaveMode: default to ControllerInitiated */
+			400000,                 /* ConnectionSpeed: in Hz */
+			AddressingMode7Bit,     /* Addressing Mode: default to 7 bit */
+			"\\_SB.I2CA",           /* ResourceSource: I2C bus controller name */
+			)
+
+			/* Jack Detect AGPIO14 */
+			GpioInt (Edge, ActiveLow, ExclusiveAndWake, PullNone,,
+				"\\_SB.GPIO") { 14 }
+		})
+		Return (SBUF)
+	}
+
+	Method (_STA)
+	{
+		Return (0xF)
+	}
+}
+
+/* MAX98357 codec */
+Device (MAXA)
+{
+	Name (_ADR, 0)
+	Name (_HID, "MX98357A")
+	Name (_CID, "MX98357A")
+	Name (_DDN, "MX98357A Codec Controller ")
+	Name (_UID, 1)
+
+	Method (_STA, 0x0, NotSerialized) {
+			Return (0x0F)
+	}
+}
diff --git a/src/mainboard/google/kahlee/variants/baseboard/include/baseboard/acpi/routing.asl b/src/mainboard/google/kahlee/variants/baseboard/include/baseboard/acpi/routing.asl
new file mode 100644
index 0000000000..c61bc4bb6c
--- /dev/null
+++ b/src/mainboard/google/kahlee/variants/baseboard/include/baseboard/acpi/routing.asl
@@ -0,0 +1,175 @@
+/*
+ * This file is part of the coreboot project.
+ *
+ * Copyright (C) 2015, 2016 Advanced Micro Devices, Inc.
+ * Copyright (C) 2013 Sage Electronic Engineering, LLC
+ *
+ * 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.
+ */
+
+/*
+ * DefinitionBlock ("DSDT.AML","DSDT",0x01,"XXXXXX","XXXXXXXX",0x00010001)
+ *{
+ *	#include "routing.asl"
+ *}
+ */
+
+/* Routing is in System Bus scope */
+Name (PR0, Package()
+{
+	/* NB devices */
+	/* Bus 0, Dev 0 - F15 Host Controller */
+
+	/* Bus 0, Dev 1, Func 0 - PCI Bridge for Internal Graphics(IGP) */
+	/* Bus 0, Dev 1, Func 1 - HDMI Audio Controller */
+	Package() { 0x0001FFFF, 0, INTB, 0 },
+	Package() { 0x0001FFFF, 1, INTC, 0 },
+
+
+	/* Bus 0, Dev 2 Func 0,1,2,3,4,5 - PCIe Bridges */
+	Package() { 0x0002FFFF, 0, INTC, 0 },
+	Package() { 0x0002FFFF, 1, INTD, 0 },
+	Package() { 0x0002FFFF, 2, INTA, 0 },
+	Package() { 0x0002FFFF, 3, INTB, 0 },
+
+	/* FCH devices */
+	/* Bus 0, Dev 20 - F0:SMBus/ACPI;F3:LPC;F7:SD */
+	Package() { 0x0014FFFF, 0, INTA, 0 },
+	Package() { 0x0014FFFF, 1, INTB, 0 },
+	Package() { 0x0014FFFF, 2, INTC, 0 },
+	Package() { 0x0014FFFF, 3, INTD, 0 },
+
+	/* Bus 0, Dev 18 Func 0 - USB: EHCI */
+	Package() { 0x0012FFFF, 0, INTC, 0 },
+	Package() { 0x0012FFFF, 1, INTB, 0 },
+
+	/* Bus 0, Dev 10 Func 0 - USB: xHCI */
+	Package() { 0x0010FFFF, 0, INTC, 0 },
+	Package() { 0x0010FFFF, 1, INTB, 0 },
+
+	/* Bus 0, Dev 17 - SATA controller */
+	Package() { 0x0011FFFF, 0, INTD, 0 },
+
+})
+
+Name (APR0, Package()
+{
+	/* NB devices in APIC mode */
+	/* Bus 0, Dev 0 - F15 Host Controller */
+
+	/* Bus 0, Dev 1 - PCI Bridge for Internal Graphics(IGP) */
+	Package() { 0x0001FFFF, 0, 0, 43 },
+	Package() { 0x0001FFFF, 1, 0, 40 },
+
+	/* Bus 0, Dev 2 - PCIe Bridges  */
+	Package() { 0x0002FFFF, 0, 0, 44 },
+	Package() { 0x0002FFFF, 1, 0, 45 },
+	Package() { 0x0002FFFF, 2, 0, 46 },
+	Package() { 0x0002FFFF, 3, 0, 47 },
+
+	/* SB devices in APIC mode */
+	/* Bus 0, Dev 20 - F0:SMBus/ACPI;F3:LPC;F7:SD */
+	Package() { 0x0014FFFF, 0, 0, 16 },
+	Package() { 0x0014FFFF, 1, 0, 17 },
+	Package() { 0x0014FFFF, 2, 0, 18 },
+	Package() { 0x0014FFFF, 3, 0, 19 },
+
+	/* Bus 0, Dev 18 Func 0 - USB: EHCI */
+	Package() { 0x0012FFFF, 0, 0, 18 },
+	Package() { 0x0012FFFF, 1, 0, 17 },
+
+	/* Bus 0, Dev 10 Func 0 - USB: xHCI */
+	Package() { 0x0010FFFF, 0, 0, 18},
+	Package() { 0x0010FFFF, 1, 0, 17},
+
+	/* Bus 0, Dev 17 - SATA controller */
+	Package() { 0x0011FFFF, 0, 0, 19 },
+})
+
+
+/* GPP 0 */
+Name (PS4, Package()
+{
+	Package() { 0x0000FFFF, 0, INTA, 0 },
+	Package() { 0x0000FFFF, 1, INTB, 0 },
+	Package() { 0x0000FFFF, 2, INTC, 0 },
+	Package() { 0x0000FFFF, 3, INTD, 0 },
+})
+Name (APS4, Package()
+{
+	/* PCIe slot - Hooked to PCIe slot 4 */
+	Package() { 0x0000FFFF, 0, 0, 24 },
+	Package() { 0x0000FFFF, 1, 0, 25 },
+	Package() { 0x0000FFFF, 2, 0, 26 },
+	Package() { 0x0000FFFF, 3, 0, 27 },
+})
+
+/* GPP 1 */
+Name (PS5, Package()
+{
+	Package() { 0x0000FFFF, 0, INTB, 0 },
+	Package() { 0x0000FFFF, 1, INTC, 0 },
+	Package() { 0x0000FFFF, 2, INTD, 0 },
+	Package() { 0x0000FFFF, 3, INTA, 0 },
+})
+Name (APS5, Package()
+{
+	Package() { 0x0000FFFF, 0, 0, 28 },
+	Package() { 0x0000FFFF, 1, 0, 29 },
+	Package() { 0x0000FFFF, 2, 0, 30 },
+	Package() { 0x0000FFFF, 3, 0, 31 },
+})
+
+/* GPP 2 */
+Name (PS6, Package()
+{
+	Package() { 0x0000FFFF, 0, INTC, 0 },
+	Package() { 0x0000FFFF, 1, INTD, 0 },
+	Package() { 0x0000FFFF, 2, INTA, 0 },
+	Package() { 0x0000FFFF, 3, INTB, 0 },
+})
+Name (APS6, Package()
+{
+	Package() { 0x0000FFFF, 0, 0, 32 },
+	Package() { 0x0000FFFF, 1, 0, 33 },
+	Package() { 0x0000FFFF, 2, 0, 34 },
+	Package() { 0x0000FFFF, 3, 0, 35 },
+})
+
+/* GPP 3 */
+Name (PS7, Package()
+{
+	Package() { 0x0000FFFF, 0, INTD, 0 },
+	Package() { 0x0000FFFF, 1, INTA, 0 },
+	Package() { 0x0000FFFF, 2, INTB, 0 },
+	Package() { 0x0000FFFF, 3, INTC, 0 },
+})
+Name (APS7, Package()
+{
+	Package() { 0x0000FFFF, 0, 0, 36 },
+	Package() { 0x0000FFFF, 1, 0, 37 },
+	Package() { 0x0000FFFF, 2, 0, 38 },
+	Package() { 0x0000FFFF, 3, 0, 39 },
+})
+
+/* GPP 4 */
+Name(PS8, Package(){
+	Package(){0x0000FFFF, 0, INTA, 0 },
+	Package(){0x0000FFFF, 1, INTB, 0 },
+	Package(){0x0000FFFF, 2, INTC, 0 },
+	Package(){0x0000FFFF, 3, INTD, 0 },
+})
+Name (APS8, Package()
+{
+	Package() { 0x0000FFFF, 0, 0, 40 },
+	Package() { 0x0000FFFF, 1, 0, 41 },
+	Package() { 0x0000FFFF, 2, 0, 42 },
+	Package() { 0x0000FFFF, 3, 0, 43 },
+})
diff --git a/src/mainboard/google/kahlee/variants/baseboard/include/baseboard/acpi/sleep.asl b/src/mainboard/google/kahlee/variants/baseboard/include/baseboard/acpi/sleep.asl
new file mode 100644
index 0000000000..1e3a617ad5
--- /dev/null
+++ b/src/mainboard/google/kahlee/variants/baseboard/include/baseboard/acpi/sleep.asl
@@ -0,0 +1,89 @@
+/*
+ * This file is part of the coreboot project.
+ *
+ * Copyright (C) 2013 Sage Electronic Engineering, LLC
+ *
+ * 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.
+ */
+
+/* Wake status package */
+Name (WKST, Package() { Zero, Zero })
+
+/*
+* \_PTS - Prepare to Sleep method
+*
+*	Entry:
+*		Arg0=The value of the sleeping state S1=1, S2=2, etc
+*
+* Exit:
+*		-none-
+*
+* The _PTS control method is executed at the beginning of the sleep process
+* for S1-S5. The sleeping value is passed to the _PTS control method.  This
+* control method may be executed a relatively long time before entering the
+* sleep state and the OS may abort the operation without notification to
+* the ACPI driver.  This method cannot modify the configuration or power
+* state of any device in the system.
+*/
+Method (_PTS, 1)
+{
+	/* DBGO ("\\_PTS\n") */
+	/* DBGO ("From S0 to S") */
+	/* DBGO (Arg0) */
+	/* DBGO ("\n") */
+
+	/* Clear wake status structure. */
+	Store (0, PEWD)
+	Store (0, Index(WKST,0))
+	Store (0, Index(WKST,1))
+	Store (7, UPWS)
+}
+
+/*
+ *	\_BFS OEM Back From Sleep method
+ *
+ *	Entry:
+ *		Arg0=The value of the sleeping state S1=1, S2=2
+ *
+ *	Exit:
+ *		-none-
+ */
+Method (\_BFS, 1)
+{
+	/* DBGO ("\\_BFS\n") */
+	/* DBGO ("From S") */
+	/* DBGO (Arg0) */
+	/* DBGO (" to S0\n") */
+}
+
+/*
+ *  \_WAK System Wake method
+ *
+ *	Entry:
+ *		Arg0=The value of the sleeping state S1=1, S2=2
+ *
+ *	Exit:
+ *		Return package of 2 DWords
+ *		Dword 1 - Status
+ *			0x00000000	wake succeeded
+ *			0x00000001	Wake was signaled but failed due to lack of power
+ *			0x00000002	Wake was signaled but failed due to thermal condition
+ *		Dword 2 - Power Supply state
+ *			if non-zero the effective S-state the power supply entered
+ */
+Method (\_WAK, 1)
+{
+	/* DBGO ("\\_WAK\n") */
+	/* DBGO ("From S") */
+	/* DBGO (Arg0) */
+	/* DBGO (" to S0\n") */
+
+	Return (WKST)
+}
diff --git a/src/mainboard/google/kahlee/variants/baseboard/include/baseboard/acpi/thermal.asl b/src/mainboard/google/kahlee/variants/baseboard/include/baseboard/acpi/thermal.asl
new file mode 100644
index 0000000000..86f8758892
--- /dev/null
+++ b/src/mainboard/google/kahlee/variants/baseboard/include/baseboard/acpi/thermal.asl
@@ -0,0 +1,90 @@
+/*
+ * This file is part of the coreboot project.
+ *
+ * Copyright (C) 2014 Google Inc.
+ *
+ * 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.
+ */
+
+#include <variant/thermal.h>
+
+/* Thermal Zone */
+
+Scope (\_TZ)
+{
+	ThermalZone (THRM)
+	{
+		/* Thermal constants for passive cooling */
+		Name (_TC1, 0x02)
+		Name (_TC2, 0x05)
+
+		/* Thermal zone polling frequency: 10 seconds */
+		Name (_TZP, 100)
+
+		/* Thermal sampling period for passive cooling: 2 seconds */
+		Name (_TSP, 20)
+
+		/* Convert from Degrees C to 1/10 Kelvin for ACPI */
+		Method (CTOK, 1) {
+			/* 10th of Degrees C */
+			Multiply (Arg0, 10, Local0)
+
+			/* Convert to Kelvin */
+			Add (Local0, 2732, Local0)
+
+			Return (Local0)
+		}
+
+		/* Threshold for OS to shutdown */
+		Method (_CRT, 0, Serialized)
+		{
+			Return (CTOK (\TCRT))
+		}
+
+		/* Threshold for passive cooling */
+		Method (_PSV, 0, Serialized)
+		{
+			Return (CTOK (\TPSV))
+		}
+
+		/* Processors used for passive cooling */
+		Method (_PSL, 0, Serialized)
+		{
+			Return (\PPKG ())
+		}
+
+		Method (_TMP, 0, Serialized)
+		{
+			/* Get temperature from EC in deci-kelvin */
+			Store (\_SB.PCI0.LPCB.EC0.TSRD (TMPS), Local0)
+
+			/* Critical temperature in deci-kelvin */
+			Store (CTOK (\TCRT), Local1)
+
+			If (LGreaterEqual (Local0, Local1)) {
+				Store ("CRITICAL TEMPERATURE", Debug)
+				Store (Local0, Debug)
+
+				/* Wait 1 second for EC to re-poll */
+				Sleep (1000)
+
+				/* Re-read temperature from EC */
+				Store (\_SB.PCI0.LPCB.EC0.TSRD (TMPS), Local0)
+
+				Store ("RE-READ TEMPERATURE", Debug)
+				Store (Local0, Debug)
+			}
+
+			Return (Local0)
+		}
+
+		/* No active fan control (_ACx) on Kahlee */
+	}
+}
diff --git a/src/mainboard/google/kahlee/variants/grunt/include/variant/acpi/gpe.asl b/src/mainboard/google/kahlee/variants/grunt/include/variant/acpi/gpe.asl
new file mode 100644
index 0000000000..0a08774206
--- /dev/null
+++ b/src/mainboard/google/kahlee/variants/grunt/include/variant/acpi/gpe.asl
@@ -0,0 +1,16 @@
+/*
+ * This file is part of the coreboot project.
+ *
+ * Copyright (C) 2018 Sage Electronic Engineering, LLC
+ *
+ * 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.
+ */
+
+#include <baseboard/acpi/gpe.asl>
diff --git a/src/mainboard/google/kahlee/variants/grunt/include/variant/acpi/mainboard.asl b/src/mainboard/google/kahlee/variants/grunt/include/variant/acpi/mainboard.asl
new file mode 100644
index 0000000000..7e7c158d88
--- /dev/null
+++ b/src/mainboard/google/kahlee/variants/grunt/include/variant/acpi/mainboard.asl
@@ -0,0 +1,16 @@
+/*
+ * This file is part of the coreboot project.
+ *
+ * Copyright (C) 2018 Sage Electronic Engineering, LLC
+ *
+ * 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.
+ */
+
+#include <baseboard/acpi/mainboard.asl>
diff --git a/src/mainboard/google/kahlee/variants/grunt/include/variant/acpi/routing.asl b/src/mainboard/google/kahlee/variants/grunt/include/variant/acpi/routing.asl
new file mode 100644
index 0000000000..233494f51e
--- /dev/null
+++ b/src/mainboard/google/kahlee/variants/grunt/include/variant/acpi/routing.asl
@@ -0,0 +1,16 @@
+/*
+ * This file is part of the coreboot project.
+ *
+ * Copyright (C) 2018 Sage Electronic Engineering, LLC
+ *
+ * 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.
+ */
+
+#include <baseboard/acpi/routing.asl>
diff --git a/src/mainboard/google/kahlee/variants/grunt/include/variant/acpi/sleep.asl b/src/mainboard/google/kahlee/variants/grunt/include/variant/acpi/sleep.asl
new file mode 100644
index 0000000000..c5a1557962
--- /dev/null
+++ b/src/mainboard/google/kahlee/variants/grunt/include/variant/acpi/sleep.asl
@@ -0,0 +1,16 @@
+/*
+ * This file is part of the coreboot project.
+ *
+ * Copyright (C) 2018 Sage Electronic Engineering, LLC
+ *
+ * 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.
+ */
+
+#include <baseboard/acpi/sleep.asl>
diff --git a/src/mainboard/google/kahlee/variants/grunt/include/variant/acpi/thermal.asl b/src/mainboard/google/kahlee/variants/grunt/include/variant/acpi/thermal.asl
new file mode 100644
index 0000000000..77137bb903
--- /dev/null
+++ b/src/mainboard/google/kahlee/variants/grunt/include/variant/acpi/thermal.asl
@@ -0,0 +1,16 @@
+/*
+ * This file is part of the coreboot project.
+ *
+ * Copyright (C) 2018 Sage Electronic Engineering, LLC
+ *
+ * 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.
+ */
+
+#include <baseboard/acpi/thermal.asl>
diff --git a/src/mainboard/google/kahlee/variants/kahlee/include/variant/acpi/gpe.asl b/src/mainboard/google/kahlee/variants/kahlee/include/variant/acpi/gpe.asl
new file mode 100644
index 0000000000..0a08774206
--- /dev/null
+++ b/src/mainboard/google/kahlee/variants/kahlee/include/variant/acpi/gpe.asl
@@ -0,0 +1,16 @@
+/*
+ * This file is part of the coreboot project.
+ *
+ * Copyright (C) 2018 Sage Electronic Engineering, LLC
+ *
+ * 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.
+ */
+
+#include <baseboard/acpi/gpe.asl>
diff --git a/src/mainboard/google/kahlee/variants/kahlee/include/variant/acpi/mainboard.asl b/src/mainboard/google/kahlee/variants/kahlee/include/variant/acpi/mainboard.asl
new file mode 100644
index 0000000000..7e7c158d88
--- /dev/null
+++ b/src/mainboard/google/kahlee/variants/kahlee/include/variant/acpi/mainboard.asl
@@ -0,0 +1,16 @@
+/*
+ * This file is part of the coreboot project.
+ *
+ * Copyright (C) 2018 Sage Electronic Engineering, LLC
+ *
+ * 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.
+ */
+
+#include <baseboard/acpi/mainboard.asl>
diff --git a/src/mainboard/google/kahlee/variants/kahlee/include/variant/acpi/routing.asl b/src/mainboard/google/kahlee/variants/kahlee/include/variant/acpi/routing.asl
new file mode 100644
index 0000000000..233494f51e
--- /dev/null
+++ b/src/mainboard/google/kahlee/variants/kahlee/include/variant/acpi/routing.asl
@@ -0,0 +1,16 @@
+/*
+ * This file is part of the coreboot project.
+ *
+ * Copyright (C) 2018 Sage Electronic Engineering, LLC
+ *
+ * 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.
+ */
+
+#include <baseboard/acpi/routing.asl>
diff --git a/src/mainboard/google/kahlee/variants/kahlee/include/variant/acpi/sleep.asl b/src/mainboard/google/kahlee/variants/kahlee/include/variant/acpi/sleep.asl
new file mode 100644
index 0000000000..c5a1557962
--- /dev/null
+++ b/src/mainboard/google/kahlee/variants/kahlee/include/variant/acpi/sleep.asl
@@ -0,0 +1,16 @@
+/*
+ * This file is part of the coreboot project.
+ *
+ * Copyright (C) 2018 Sage Electronic Engineering, LLC
+ *
+ * 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.
+ */
+
+#include <baseboard/acpi/sleep.asl>
diff --git a/src/mainboard/google/kahlee/variants/kahlee/include/variant/acpi/thermal.asl b/src/mainboard/google/kahlee/variants/kahlee/include/variant/acpi/thermal.asl
new file mode 100644
index 0000000000..77137bb903
--- /dev/null
+++ b/src/mainboard/google/kahlee/variants/kahlee/include/variant/acpi/thermal.asl
@@ -0,0 +1,16 @@
+/*
+ * This file is part of the coreboot project.
+ *
+ * Copyright (C) 2018 Sage Electronic Engineering, LLC
+ *
+ * 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.
+ */
+
+#include <baseboard/acpi/thermal.asl>